10 implement entries that recure in weekly periods

.changeset/sixty-wolves-sell.md

@@ -0,0 +1,7 @@
+---
+"@quassel/frontend": patch
+"@quassel/backend": patch
+"@quassel/ui": patch
+---
+
+Allow custom carers and languages per participant

.changeset/wet-forks-nail.md

@@ -0,0 +1,6 @@
+---
+"@quassel/frontend": patch
+"@quassel/ui": patch
+---
+
+Introduce setting weeklyRecurring for entries

apps/backend/src/defaults/carers/carer.dto.ts

@@ -19,5 +19,7 @@ export class CarerDto {
   entries: number[];
 }
 export class CarerResponseDto extends CarerDto {}
-export class CarerCreationDto extends OmitType(CarerDto, ["id", "entries"]) {}
+export class CarerCreationDto extends OmitType(CarerDto, ["id", "entries", "participant"]) {
+  participant?: number;
+}
 export class CarerMutationDto extends PartialType(CarerCreationDto) {}

apps/backend/src/defaults/carers/carers.controller.ts

@@ -1,5 +1,5 @@
-import { Body, Controller, Delete, Get, Param, Patch, Post } from "@nestjs/common";
-import { ApiOperation, ApiTags, ApiUnprocessableEntityResponse } from "@nestjs/swagger";
+import { Body, Controller, Delete, Get, Param, Patch, Post, Query } from "@nestjs/common";
+import { ApiOperation, ApiQuery, ApiTags, ApiUnprocessableEntityResponse } from "@nestjs/swagger";
 import { CarersService } from "./carers.service";
 import { CarerCreationDto, CarerMutationDto, CarerResponseDto } from "./carer.dto";
 import { ErrorResponseDto } from "../../common/dto/error.dto";
@@ -19,9 +19,10 @@
   }
 
   @Get()
+  @ApiQuery({ name: "participantId", required: false, type: Number })
   @ApiOperation({ summary: "Get all carers" })
-  index(): Promise<CarerResponseDto[]> {
-    return this.carersService.findAll();
+  index(@Query("participantId") participantId?: number): Promise<CarerResponseDto[]> {
+    return this.carersService.findAll(participantId);
   }
 
   @Get(":id")

apps/backend/src/defaults/carers/carers.service.ts

@@ -14,7 +14,7 @@
 
   async create(carerCreationDto: CarerCreationDto) {
     const carer = new Carer();
-    carer.assign(carerCreationDto);
+    carer.assign(carerCreationDto, { em: this.em });
 
     try {
       await this.em.persist(carer).flush();
@@ -28,8 +28,12 @@
     return carer.toObject();
   }
 
-  async findAll() {
-    return (await this.carerRepository.findAll()).map((carer) => carer.toObject());
+  async findAll(participantId?: number) {
+    return (
+      await this.carerRepository.findAll({
+        where: participantId ? { $or: [{ participant: null }, { participant: participantId }] } : { participant: null },
+      })
+    ).map((carer) => carer.toObject());
   }
 
   async findOne(id: number) {

apps/backend/src/defaults/languages/language.dto.ts

@@ -24,5 +24,7 @@ export class LanguageDto {
   entryLanguages: number[];
 }
 export class LanguageResponseDto extends LanguageDto {}
-export class LanguageCreationDto extends OmitType(LanguageDto, ["id", "entryLanguages"]) {}
+export class LanguageCreationDto extends OmitType(LanguageDto, ["id", "entryLanguages", "participant"]) {
+  participant?: number;
+}
 export class LanguageMutationDto extends PartialType(LanguageCreationDto) {}

apps/backend/src/defaults/languages/languages.controller.ts

@@ -1,5 +1,5 @@
-import { Body, Controller, Delete, Get, Param, Patch, Post } from "@nestjs/common";
-import { ApiOperation, ApiTags, ApiUnprocessableEntityResponse } from "@nestjs/swagger";
+import { Body, Controller, Delete, Get, Param, Patch, Post, Query } from "@nestjs/common";
+import { ApiOperation, ApiQuery, ApiTags, ApiUnprocessableEntityResponse } from "@nestjs/swagger";
 import { LanguagesService } from "./languages.service";
 import { ErrorResponseDto } from "../../common/dto/error.dto";
 import { Roles } from "../../system/users/roles.decorator";
@@ -19,9 +19,10 @@
   }
 
   @Get()
+  @ApiQuery({ name: "participantId", required: false, type: Number })
   @ApiOperation({ summary: "Get all languages" })
-  index(): Promise<LanguageResponseDto[]> {
-    return this.languagesService.findAll();
+  index(@Query("participantId") participantId?: number): Promise<LanguageResponseDto[]> {
+    return this.languagesService.findAll(participantId);
   }
 
   @Get(":id")

apps/backend/src/defaults/languages/languages.service.ts

@@ -14,7 +14,7 @@
 
   async create(languageCreationDto: LanguageCreationDto) {
     const language = new Language();
-    language.assign(languageCreationDto);
+    language.assign(languageCreationDto, { em: this.em });
 
     try {
       await this.em.persist(language).flush();
@@ -28,8 +28,12 @@
     return language.toObject();
   }
 
-  async findAll() {
-    return (await this.languageRepository.findAll()).map((language) => language.toObject());
+  async findAll(participantId?: number) {
+    return (
+      await this.languageRepository.findAll({
+        where: participantId ? { $or: [{ participant: null }, { participant: participantId }] } : { participant: null },
+      })
+    ).map((language) => language.toObject());
   }
 
   async findOne(id: number) {

apps/backend/src/research/questionnaires/questionnaires.service.ts

@@ -47,7 +47,7 @@
       throw e;
     }
 
-    return (await questionnaire.populate(["entries", "entries.carer", "entries.entryLanguages.language"])).toObject();
+    return (await questionnaire.populate(["entries", "entries.carer", "entries.entryLanguages.language", "participant"])).toObject();
   }
 
   async findAll() {
@@ -56,7 +56,9 @@
 
   async findOne(id: number) {
     return (
-      await this.questionnaireRepository.findOneOrFail(id, { populate: ["entries", "entries.carer", "entries.entryLanguages.language"] })
+      await this.questionnaireRepository.findOneOrFail(id, {
+        populate: ["entries", "entries.carer", "entries.entryLanguages.language", "participant"],
+      })
     ).toObject();
   }
 
@@ -70,7 +72,7 @@
 
   async update(id: number, questionnaireMutationDto: QuestionnaireMutationDto) {
     const questionnaire = await this.questionnaireRepository.findOneOrFail(id, {
-      populate: ["entries", "entries.carer", "entries.entryLanguages.language"],
+      populate: ["entries", "entries.carer", "entries.entryLanguages.language", "participant"],
     });
     questionnaire.assign(questionnaireMutationDto);
 

apps/frontend/src/api.gen.ts

@@ -471,6 +471,14 @@ export interface components {
              */
             role?: "ASSISTANT" | "ADMIN";
         };
+        CarerCreationDto: {
+            /**
+             * @description The name of the carer
+             * @example Grandmother
+             */
+            name: string;
+            participant?: number;
+        };
         StudyDto: {
             /**
              * @description The id of the study (child id)
@@ -532,14 +540,6 @@ export interface components {
             carers: number[];
             languages: number[];
         };
-        CarerCreationDto: {
-            /**
-             * @description The name of the carer
-             * @example Grandmother
-             */
-            name: string;
-            participant?: components["schemas"]["ParticipantDto"];
-        };
         CarerResponseDto: {
             /**
              * @description The id of the carer
@@ -560,7 +560,7 @@ export interface components {
              * @example Grandmother
              */
             name?: string;
-            participant?: components["schemas"]["ParticipantDto"];
+            participant?: number;
         };
         LanguageCreationDto: {
             /**
@@ -573,7 +573,7 @@ export interface components {
              * @example de-DE
              */
             ietfBcp47?: string;
-            participant?: components["schemas"]["ParticipantDto"];
+            participant?: number;
         };
         LanguageResponseDto: {
             /**
@@ -605,7 +605,7 @@ export interface components {
              * @example de-DE
              */
             ietfBcp47?: string;
-            participant?: components["schemas"]["ParticipantDto"];
+            participant?: number;
         };
         ParticipantCreationDto: {
             /**
@@ -1345,7 +1345,9 @@ export interface operations {
     };
     CarersController_index: {
         parameters: {
-            query?: never;
+            query?: {
+                participantId?: number;
+            };
             header?: never;
             path?: never;
             cookie?: never;
@@ -1461,7 +1463,9 @@ export interface operations {
     };
     LanguagesController_index: {
         parameters: {
-            query?: never;
+            query?: {
+                participantId?: number;
+            };
             header?: never;
             path?: never;
             cookie?: never;

apps/frontend/src/components/CarerSelect.tsx

@@ -1,10 +1,10 @@
-import { $api } from "../stores/api";
+import { components } from "../api.gen";
 import { EntitySelect, EntitySelectProps } from "./EntitySelect";
 
-type CarerSelectProps = EntitySelectProps;
+type CarerSelectProps = EntitySelectProps & {
+  data: components["schemas"]["CarerDto"][];
+};
 
-export function CarerSelect({ value, onChange, ...rest }: CarerSelectProps) {
-  const { data } = $api.useQuery("get", "/carers");
-
-  return <EntitySelect value={value} onChange={onChange} {...rest} data={data} buildLabel={(carer) => carer.name} />;
+export function CarerSelect({ value, onChange, onAddNew, data, ...rest }: CarerSelectProps) {
+  return <EntitySelect value={value} onChange={onChange} onAddNew={onAddNew} {...rest} data={data} labelKey="name" />;
 }

apps/frontend/src/components/EntitySelect.tsx

@@ -1,22 +1,99 @@
-import { Select, SelectProps } from "@quassel/ui";
+import { Combobox, TextInput, TextInputProps, useCombobox } from "@quassel/ui";
+import { useEffect, useState } from "react";
+import { i18n } from "../stores/i18n";
+import { useStore } from "@nanostores/react";
+import { params } from "@nanostores/i18n";
 
-export type EntitySelectProps = Omit<SelectProps, "value" | "onChange"> & {
+export type EntitySelectProps = Omit<TextInputProps, "value" | "onChange"> & {
   value?: number;
-  onChange?: (id?: number) => void;
+  onChange?: (value?: number) => void;
+  onAddNew?: (value: string) => Promise<number>;
 };
 
+type StringKeys<T> = { [K in keyof T]-?: T[K] extends string ? K : never }[keyof T];
+
 type Props<T extends { id: number }> = Omit<EntitySelectProps, "data"> & {
   data?: T[];
-  buildLabel: (value: T) => string;
+  onAddNew?: (value: string) => void;
+  labelKey: StringKeys<T>;
 };
 
-export function EntitySelect<T extends { id: number }>({ value, onChange, data, buildLabel, ...rest }: Props<T>) {
+const customValueKey = "CUSTOM_VALUE";
+
+const messages = i18n("entitySelect", {
+  actionCreateNew: params('Create new "{value}"'),
+});
+
+export function EntitySelect<T extends { id: number }>({ value, onChange, data, labelKey, onAddNew, ...rest }: Props<T>) {
+  const t = useStore(messages);
+
+  const combobox = useCombobox({
+    onDropdownClose: () => combobox.resetSelectedOption(),
+  });
+
+  const [searchValue, setSearchValue] = useState("");
+
+  const shouldFilterOptions = !data?.some((item) => item[labelKey] === searchValue);
+  const filteredOptions =
+    (shouldFilterOptions
+      ? data?.filter((item) => (item[labelKey] as string)?.toLowerCase().includes(searchValue.toLowerCase().trim()))
+      : data) ?? [];
+
+  const options = filteredOptions?.map((item) => (
+    <Combobox.Option key={item.id} value={item.id.toString()}>
+      {item[labelKey] as string}
+    </Combobox.Option>
+  ));
+
+  useEffect(() => {
+    if (value && data) {
+      const index = data.findIndex((item) => item.id === value);
+      if (index !== -1) {
+        setSearchValue(data[index][labelKey] as string);
+        combobox.selectOption(index);
+      }
+    }
+  }, [value, data]);
+
+  useEffect(() => {
+    if (shouldFilterOptions) combobox.selectFirstOption();
+  }, [searchValue]);
+
   return (
-    <Select
-      value={value?.toString()}
-      onChange={(value) => onChange?.(value ? parseInt(value) : undefined)}
-      data={data?.map((entity) => ({ value: entity.id.toString(), label: buildLabel(entity) })) ?? []}
-      {...rest}
-    />
+    <Combobox
+      store={combobox}
+      onOptionSubmit={async (value) => {
+        let id: number;
+        if (value === customValueKey) {
+          id = await onAddNew!(searchValue);
+        } else {
+          id = +value;
+        }
+        onChange?.(id);
+        combobox.closeDropdown();
+      }}
+    >
+      <Combobox.Target>
+        <TextInput
+          value={searchValue}
+          onChange={({ target: { value } }) => {
+            setSearchValue(value);
+          }}
+          onClick={() => combobox.openDropdown()}
+          onFocus={() => combobox.openDropdown()}
+          onBlur={() => combobox.closeDropdown()}
+          {...rest}
+        />
+      </Combobox.Target>
+
+      <Combobox.Dropdown>
+        <Combobox.Options>
+          {onAddNew && !options?.length && (
+            <Combobox.Option value={customValueKey}>{t.actionCreateNew({ value: searchValue })}</Combobox.Option>
+          )}
+          {options}
+        </Combobox.Options>
+      </Combobox.Dropdown>
+    </Combobox>
   );
 }

apps/frontend/src/components/LanguageSelect.tsx

@@ -1,10 +1,10 @@
-import { $api } from "../stores/api";
+import { components } from "../api.gen";
 import { EntitySelect, EntitySelectProps } from "./EntitySelect";
 
-type LanguageSelectProps = EntitySelectProps;
+type LanguageSelectProps = EntitySelectProps & {
+  data: components["schemas"]["LanguageDto"][];
+};
 
-export function LanguageSelect({ value, onChange, ...rest }: LanguageSelectProps) {
-  const { data } = $api.useQuery("get", "/languages");
-
-  return <EntitySelect value={value} onChange={onChange} searchable {...rest} data={data} buildLabel={(language) => language.name} />;
+export function LanguageSelect({ value, onChange, data, onAddNew, ...rest }: LanguageSelectProps) {
+  return <EntitySelect value={value} onChange={onChange} onAddNew={onAddNew} {...rest} data={data} labelKey="name" />;
 }