Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/admin/icons/siren-on-slash-solid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions apps/admin/src/foster-families/db.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
import { orderByRank } from "#i/core/order-by-rank.js"
import { prisma } from "#i/core/prisma.server.js"
import type { FosterFamilySearchParams } from "#i/foster-families/search-params.js"
import { FosterFamilyEmergencies } from "#i/foster-families/search-params.js"

export class MissingSpeciesToHostError extends Error {}
export class InvalidAvailabilityDateError extends Error {}
Expand Down Expand Up @@ -267,6 +268,14 @@ export class FosterFamilyDbDelegate {
})
}

if (searchParams.emergencies.size > 0) {
where.push({
OR: Array.from(searchParams.emergencies).map(
(emergencies) => FOSTER_FAMILY_EMERGENCIES_WHERE[emergencies],
),
})
}

if (searchParams.garden.size > 0) {
where.push({ garden: { in: Array.from(searchParams.garden) } })
}
Expand Down Expand Up @@ -345,6 +354,7 @@ type DataCreate = {
comments: string | null
displayName: string
email: string
emergencies?: boolean
garden: FosterFamilyGarden
housing: FosterFamilyHousing
phone: string
Expand All @@ -361,6 +371,7 @@ type DataUpdate = {
comments?: string | null
displayName?: string
email?: string
emergencies?: boolean
garden?: FosterFamilyGarden
housing?: FosterFamilyHousing
isBanned?: boolean
Expand All @@ -369,3 +380,15 @@ type DataUpdate = {
speciesToHost?: Species[]
zipCode?: string
}

const FOSTER_FAMILY_EMERGENCIES_WHERE: Record<
FosterFamilyEmergencies,
Prisma.FosterFamilyWhereInput
> = {
[FosterFamilyEmergencies.YES]: {
emergencies: true,
},
[FosterFamilyEmergencies.NO]: {
emergencies: false,
},
}
47 changes: 46 additions & 1 deletion apps/admin/src/foster-families/filter-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ import {
SORTED_GARDEN,
SORTED_HOUSING,
} from "#i/foster-families/housing.js"
import { FosterFamilySearchParams } from "#i/foster-families/search-params.js"
import {
FosterFamilyEmergencies,
FosterFamilySearchParams,
} from "#i/foster-families/search-params.js"
import { Icon } from "#i/generated/icon.js"

export function FosterFamilyFilters({
Expand Down Expand Up @@ -121,6 +124,48 @@ export function FosterFamilyFilters({
</ToggleInputList>
</Filters.Filter>

<Filters.Filter
value={FosterFamilySearchParams.keys.emergencies}
label="Accueil court terme et urgence"
count={fosterFamilySearchParams.emergencies.size}
hiddenContent={Array.from(fosterFamilySearchParams.emergencies).map(
(emergencies) => (
<input
key={emergencies}
type="hidden"
name={FosterFamilySearchParams.keys.emergencies}
value={emergencies}
/>
),
)}
>
<ToggleInputList>
<ToggleInput
type="checkbox"
label="Oui"
name={FosterFamilySearchParams.keys.emergencies}
value={FosterFamilyEmergencies.YES}
icon={<Icon href="icon-siren-on-solid" />}
checked={fosterFamilySearchParams.emergencies.has(
FosterFamilyEmergencies.YES,
)}
onChange={() => {}}
/>

<ToggleInput
type="checkbox"
label="Non"
name={FosterFamilySearchParams.keys.emergencies}
value={FosterFamilyEmergencies.NO}
icon={<Icon href="icon-siren-on-slash-solid" />}
checked={fosterFamilySearchParams.emergencies.has(
FosterFamilyEmergencies.NO,
)}
onChange={() => {}}
/>
</ToggleInputList>
</Filters.Filter>

<Filters.Filter
value={FosterFamilySearchParams.keys.speciesToHost}
label="Espèce à accueillir"
Expand Down
36 changes: 36 additions & 0 deletions apps/admin/src/foster-families/form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const actionSchema = zu.object({
comments: zu.string().trim(),
displayName: zu.string().trim().min(1, "Veuillez entrer un nom"),
email: zu.string().email("Veuillez entrer un email valide"),
emergencies: zu.enum(["YES", "NO"]),
garden: zu.nativeEnum(FosterFamilyGarden),
housing: zu.nativeEnum(FosterFamilyHousing),
phone: zu
Expand All @@ -77,6 +78,7 @@ type DefaultFosterFamily = null | SerializeFrom<
Pick<
FosterFamily,
| "address"
| "emergencies"
| "availability"
| "availabilityExpirationDate"
| "city"
Expand Down Expand Up @@ -439,6 +441,10 @@ export function FosterFamilyForm({

<Separator />

<EmergenciesField defaultFosterFamily={defaultFosterFamily} />

<Separator />

<Form.Field>
<Form.Label>
Espèces à accueillir{" "}
Expand Down Expand Up @@ -570,3 +576,33 @@ function GardenField({
</Form.Field>
)
}

function EmergenciesField({
defaultFosterFamily,
}: {
defaultFosterFamily?: DefaultFosterFamily
}) {
return (
<Form.Field>
<Form.Label>
Accepte les accueils court terme et d'urgence <RequiredStar />
</Form.Label>

<RadioInputList>
<RadioInput
label="Oui"
name={ActionFormData.keys.emergencies}
value={ActionFormData.schema.shape.emergencies.Enum.YES}
defaultChecked={defaultFosterFamily?.emergencies !== false}
/>

<RadioInput
label="Non"
name={ActionFormData.keys.emergencies}
value={ActionFormData.schema.shape.emergencies.Enum.NO}
defaultChecked={defaultFosterFamily?.emergencies === false}
/>
</RadioInputList>
</Form.Field>
)
}
12 changes: 12 additions & 0 deletions apps/admin/src/foster-families/search-params.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@ import {
import { SearchParamsIO } from "@animeaux/search-params-io"
import { zu } from "@animeaux/zod-utils"

export enum FosterFamilyEmergencies {
YES = "Y",
NO = "N",
}

export const FosterFamilySearchParams = SearchParamsIO.create({
keys: {
availability: "a",
emergencies: "e",
displayName: "q",
garden: "garden",
housing: "housing",
Expand All @@ -24,6 +30,7 @@ export const FosterFamilySearchParams = SearchParamsIO.create({
return Schema.parse({
availability: SearchParamsIO.getValues(searchParams, keys.availability),
displayName: SearchParamsIO.getValue(searchParams, keys.displayName),
emergencies: SearchParamsIO.getValues(searchParams, keys.emergencies),
garden: SearchParamsIO.getValues(searchParams, keys.garden),
housing: SearchParamsIO.getValues(searchParams, keys.housing),
cities: SearchParamsIO.getValues(searchParams, keys.cities),
Expand All @@ -45,6 +52,8 @@ export const FosterFamilySearchParams = SearchParamsIO.create({

SearchParamsIO.setValue(searchParams, keys.displayName, data.displayName)

SearchParamsIO.setValues(searchParams, keys.emergencies, data.emergencies)

SearchParamsIO.setValues(searchParams, keys.garden, data.garden)

SearchParamsIO.setValues(searchParams, keys.housing, data.housing)
Expand Down Expand Up @@ -78,6 +87,9 @@ const Schema = zu.object({
zu.searchParams.nativeEnum(FosterFamilyAvailability),
),
displayName: zu.searchParams.string(),
emergencies: zu.searchParams.set(
zu.searchParams.nativeEnum(FosterFamilyEmergencies),
),
garden: zu.searchParams.set(zu.searchParams.nativeEnum(FosterFamilyGarden)),
housing: zu.searchParams.set(zu.searchParams.nativeEnum(FosterFamilyHousing)),
cities: zu.searchParams.set(zu.searchParams.string()),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
fosterFamily: prisma.fosterFamily.findUnique({
where: { id: paramsResult.data.id },
select: {
emergencies: true,
address: true,
availability: true,
availabilityExpirationDate: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,24 @@ export function SituationCard() {
].join("")}
</Markdown>
</SimpleItem>

<SimpleItem
icon={
<Icon
href={
fosterFamily.emergencies
? "icon-siren-on-solid"
: "icon-siren-on-slash-solid"
}
/>
}
>
<Markdown components={HIGHLIGHT_COMPONENTS}>
{fosterFamily.emergencies
? "Accueil court terme et urgence : **Oui**"
: "Accueil court terme et urgence : **Non**"}
</Markdown>
</SimpleItem>
</ItemList>
</Card.Content>
</Card>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ export async function action({ request, params }: ActionFunctionArgs) {
paramsResult.data.id,
{
address: formData.data.address,
emergencies:
formData.data.emergencies ===
ActionFormDataForUpdate.schema.shape.emergencies.Enum.YES,
availability: formData.data.availability,
availabilityExpirationDate:
formData.data.availabilityExpirationDate ?? null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
where: { id: paramsResult.data.id },
select: {
address: true,
emergencies: true,
availability: true,
availabilityExpirationDate: true,
city: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ export async function action({ request }: ActionFunctionArgs) {
comments: formData.data.comments || null,
displayName: formData.data.displayName,
email: formData.data.email,
emergencies:
formData.data.emergencies ===
ActionFormData.schema.shape.emergencies.Enum.YES,
garden: formData.data.garden,
housing: formData.data.housing,
phone: formData.data.phone,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "FosterFamily" ADD COLUMN "emergencies" BOOLEAN NOT NULL DEFAULT false;
1 change: 1 addition & 0 deletions libs/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ model FosterFamily {
updatedAt DateTime @updatedAt
activities Activity[]

emergencies Boolean @default(false)
availability FosterFamilyAvailability @default(UNKNOWN)
availabilityExpirationDate DateTime?
comments String?
Expand Down
Loading