diff --git a/README.md b/README.md index c9ed008..e28b8f0 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,6 @@ quinn@qlik.example sim@qlik.example phillie@qlik.example peta@qlik.example -peta@qlik.example sibylla@qlik.example evan@qlik.example franklin@qlik.example diff --git a/geneit_app/src/api/FamilyApi.ts b/geneit_app/src/api/FamilyApi.ts index f43bf2f..1518cac 100644 --- a/geneit_app/src/api/FamilyApi.ts +++ b/geneit_app/src/api/FamilyApi.ts @@ -83,6 +83,14 @@ export class Family implements FamilyAPI { } } +export class ExtendedFamilyInfo extends Family { + public disable_couple_photos: boolean; + constructor(p: any) { + super(p); + this.disable_couple_photos = p.disable_couple_photos; + } +} + export enum JoinFamilyResult { TooManyRequests, InvalidCode, @@ -152,13 +160,13 @@ export class FamilyApi { /** * Get information about a single family */ - static async GetSingle(id: number): Promise { + static async GetSingle(id: number): Promise { const res = await APIClient.exec({ method: "GET", uri: `/family/${id}`, }); - return new Family(res.data); + return new ExtendedFamilyInfo(res.data); } /** @@ -222,12 +230,14 @@ export class FamilyApi { static async UpdateFamily(settings: { id: number; name: string; + disable_couple_photos: boolean; }): Promise { await APIClient.exec({ method: "PATCH", uri: `/family/${settings.id}`, jsonData: { name: settings.name, + disable_couple_photos: settings.disable_couple_photos, }, }); } diff --git a/geneit_app/src/routes/family/FamilyCoupleRoute.tsx b/geneit_app/src/routes/family/FamilyCoupleRoute.tsx index 12a5340..4b7fb10 100644 --- a/geneit_app/src/routes/family/FamilyCoupleRoute.tsx +++ b/geneit_app/src/routes/family/FamilyCoupleRoute.tsx @@ -414,49 +414,52 @@ export function CouplePage(p: { - {/* Photo */} - - -
- -
- {p.editing ? ( -

- Veuillez enregistrer / annuler les modifications apportées à - la fiche avant de changer la photo du couple. -

- ) : ( - <> - {" "} - {couple.hasPhoto && ( - - - + { + /* Photo */ !family.family.disable_couple_photos && ( + + +
+ +
+ {p.editing ? ( +

+ Veuillez enregistrer / annuler les modifications apportées + à la fiche avant de changer la photo du couple. +

+ ) : ( + <> + {" "} + {couple.hasPhoto && ( + + + + )}{" "} + {couple.hasPhoto && ( + + )} + )}{" "} - {couple.hasPhoto && ( - - )} - - )}{" "} -
- - +
+ + + ) + } {/* Children */} {p.children && ( diff --git a/geneit_app/src/routes/family/FamilyCouplesListRoute.tsx b/geneit_app/src/routes/family/FamilyCouplesListRoute.tsx index 0ba8e1a..c34c1f1 100644 --- a/geneit_app/src/routes/family/FamilyCouplesListRoute.tsx +++ b/geneit_app/src/routes/family/FamilyCouplesListRoute.tsx @@ -225,6 +225,9 @@ function CouplesTable(p: { }, ]; + // If couple photos are hidden, remove their column + if (family.family.disable_couple_photos) columns.splice(0, 1); + return ( c.id} onCellDoubleClick={(p) => { - let member; + /*let member; if (p.field === "wife") member = family.members.get(p.row.wife); else if (p.field === "husband") member = family.members.get(p.row.husband); @@ -241,7 +244,7 @@ function CouplesTable(p: { if (member) { n(family.family.memberURL(member)); return; - } + }*/ n(family.family.coupleURL(p.row)); }} diff --git a/geneit_app/src/routes/family/FamilySettingsRoute.tsx b/geneit_app/src/routes/family/FamilySettingsRoute.tsx index c81e927..9f98d70 100644 --- a/geneit_app/src/routes/family/FamilySettingsRoute.tsx +++ b/geneit_app/src/routes/family/FamilySettingsRoute.tsx @@ -6,7 +6,10 @@ import { Button, CardActions, CardContent, + Checkbox, + FormControlLabel, TextField, + Tooltip, Typography, } from "@mui/material"; import React from "react"; @@ -73,6 +76,9 @@ function FamilySettingsCard(): React.ReactElement { const family = useFamily(); const [newName, setNewName] = React.useState(family.family.name); + const [disableCouplePhotos, setDisableCouplePhotos] = React.useState( + family.family.disable_couple_photos + ); const canEdit = family.family.is_admin; @@ -87,6 +93,7 @@ function FamilySettingsCard(): React.ReactElement { await FamilyApi.UpdateFamily({ id: family.family.family_id, name: newName, + disable_couple_photos: disableCouplePhotos, }); family.reloadFamilyInfo(); @@ -137,6 +144,18 @@ function FamilySettingsCard(): React.ReactElement { maxLength: ServerApi.Config.constraints.family_name_len.max, }} /> + + setDisableCouplePhotos(c)} + /> + } + label="Désactiver les photos de couple" + /> + diff --git a/geneit_app/src/widgets/BaseFamilyRoute.tsx b/geneit_app/src/widgets/BaseFamilyRoute.tsx index c6639e6..178b6d4 100644 --- a/geneit_app/src/widgets/BaseFamilyRoute.tsx +++ b/geneit_app/src/widgets/BaseFamilyRoute.tsx @@ -26,17 +26,17 @@ import { } from "@mui/material"; import React from "react"; import { Outlet, useLocation, useParams } from "react-router-dom"; -import { Family, FamilyApi } from "../api/FamilyApi"; +import { CoupleApi, CouplesList } from "../api/CoupleApi"; +import { ExtendedFamilyInfo, FamilyApi } from "../api/FamilyApi"; import { MemberApi, MembersList } from "../api/MemberApi"; import { useAlert } from "../hooks/context_providers/AlertDialogProvider"; import { useConfirm } from "../hooks/context_providers/ConfirmDialogProvider"; import { useSnackbar } from "../hooks/context_providers/SnackbarProvider"; import { AsyncWidget } from "./AsyncWidget"; import { RouterLink } from "./RouterLink"; -import { CoupleApi, CouplesList } from "../api/CoupleApi"; interface FamilyContext { - family: Family; + family: ExtendedFamilyInfo; members: MembersList; couples: CouplesList; familyId: number; @@ -53,7 +53,7 @@ export function BaseFamilyRoute(): React.ReactElement { const alert = useAlert(); const confirm = useConfirm(); - const [family, setFamily] = React.useState(null); + const [family, setFamily] = React.useState(null); const [members, setMembers] = React.useState(null); const [couples, setCouples] = React.useState(null); diff --git a/geneit_app/src/widgets/forms/DateInput.tsx b/geneit_app/src/widgets/forms/DateInput.tsx index ec2686d..363aefa 100644 --- a/geneit_app/src/widgets/forms/DateInput.tsx +++ b/geneit_app/src/widgets/forms/DateInput.tsx @@ -1,6 +1,7 @@ import { Stack, TextField, Typography } from "@mui/material"; import { NumberConstraint, ServerApi } from "../../api/ServerApi"; import { DateValue, fmtDate } from "../../api/MemberApi"; +import { PropEdit } from "./PropEdit"; export function DateInput(p: { id: string; @@ -13,13 +14,7 @@ export function DateInput(p: { if (!p.value) return <>; return ( - - {p.label} : {fmtDate(p.value!)} - + ); } diff --git a/geneit_backend/migrations/2023-08-26-140604_disable_couple_photos/down.sql b/geneit_backend/migrations/2023-08-26-140604_disable_couple_photos/down.sql new file mode 100644 index 0000000..99d0527 --- /dev/null +++ b/geneit_backend/migrations/2023-08-26-140604_disable_couple_photos/down.sql @@ -0,0 +1,2 @@ +-- This file should undo anything in `up.sql` +alter table families drop column disable_couple_photos; \ No newline at end of file diff --git a/geneit_backend/migrations/2023-08-26-140604_disable_couple_photos/up.sql b/geneit_backend/migrations/2023-08-26-140604_disable_couple_photos/up.sql new file mode 100644 index 0000000..e2080fb --- /dev/null +++ b/geneit_backend/migrations/2023-08-26-140604_disable_couple_photos/up.sql @@ -0,0 +1,2 @@ +-- Your SQL goes here +ALTER TABLE families add column disable_couple_photos boolean not null default false; \ No newline at end of file diff --git a/geneit_backend/src/controllers/families_controller.rs b/geneit_backend/src/controllers/families_controller.rs index 5b5f4c0..d5c3f92 100644 --- a/geneit_backend/src/controllers/families_controller.rs +++ b/geneit_backend/src/controllers/families_controller.rs @@ -1,7 +1,7 @@ use crate::constants::{StaticConstraints, FAMILY_INVITATION_CODE_LEN}; use crate::controllers::HttpResult; use crate::extractors::family_extractor::{FamilyInPath, FamilyInPathWithAdminMembership}; -use crate::models::UserID; +use crate::models::{FamilyMembership, UserID}; use crate::services::login_token_service::LoginToken; use crate::services::rate_limiter_service::RatedAction; use crate::services::{families_service, rate_limiter_service}; @@ -75,10 +75,21 @@ pub async fn list(token: LoginToken) -> HttpResult { ) } +#[derive(serde::Serialize)] +struct RichFamilyInfo { + #[serde(flatten)] + membership: FamilyMembership, + disable_couple_photos: bool, +} + /// Get the information of a single family pub async fn single_info(f: FamilyInPath) -> HttpResult { - Ok(HttpResponse::Ok() - .json(families_service::get_family_membership(f.family_id(), f.user_id()).await?)) + let membership = families_service::get_family_membership(f.family_id(), f.user_id()).await?; + let family = families_service::get_by_id(f.family_id()).await?; + Ok(HttpResponse::Ok().json(RichFamilyInfo { + membership, + disable_couple_photos: family.disable_couple_photos, + })) } /// Attempt to leave a family @@ -91,6 +102,7 @@ pub async fn leave(f: FamilyInPath) -> HttpResult { #[derive(serde::Deserialize)] pub struct UpdateFamilyBody { name: String, + disable_couple_photos: bool, } /// Update a family @@ -107,6 +119,7 @@ pub async fn update( let mut family = families_service::get_by_id(f.family_id()).await?; family.name = req.0.name; + family.disable_couple_photos = req.0.disable_couple_photos; families_service::update_family(&family).await?; log::info!("User {:?} updated family {:?}", f.user_id(), f.family_id()); diff --git a/geneit_backend/src/models.rs b/geneit_backend/src/models.rs index 9b39897..e901fac 100644 --- a/geneit_backend/src/models.rs +++ b/geneit_backend/src/models.rs @@ -64,6 +64,7 @@ pub struct Family { pub time_create: i64, pub name: String, pub invitation_code: String, + pub disable_couple_photos: bool, } impl Family { diff --git a/geneit_backend/src/schema.rs b/geneit_backend/src/schema.rs index bda2564..265bbfd 100644 --- a/geneit_backend/src/schema.rs +++ b/geneit_backend/src/schema.rs @@ -25,6 +25,7 @@ diesel::table! { time_create -> Int8, name -> Varchar, invitation_code -> Varchar, + disable_couple_photos -> Bool, } } diff --git a/geneit_backend/src/services/families_service.rs b/geneit_backend/src/services/families_service.rs index 475b406..77c6b0c 100644 --- a/geneit_backend/src/services/families_service.rs +++ b/geneit_backend/src/services/families_service.rs @@ -174,6 +174,7 @@ pub async fn update_family(family: &Family) -> anyhow::Result<()> { .set(( families::dsl::name.eq(family.name.clone()), families::dsl::invitation_code.eq(family.invitation_code.clone()), + families::dsl::disable_couple_photos.eq(family.disable_couple_photos), )) .execute(conn) })?;