Cleaning artifacts

application/shared/konzert/kasse.ts

@@ -121,10 +121,6 @@ export default class Kasse {
     return this.anfangsbestandEUR + this.einnahmeTotalEUR - this.ausgabenTotalEUR;
   }
 
-  set endbestandEUR(betrag: number) {
-    // no op
-  }
-
   // FREIGABE
 
   get istFreigegeben(): boolean {

application/vue/src/components/content/JazzFormAndHeader.tsx

@@ -8,7 +8,6 @@ export default function JazzFormAndHeader<T>({
   data,
   saveForm,
   additionalButtons,
-  changedPropsToWatch,
   children,
   resetChanges,
   breadcrumb,
@@ -17,7 +16,6 @@ export default function JazzFormAndHeader<T>({
   readonly data?: Partial<T>;
   readonly saveForm: (vals: T) => void;
   readonly additionalButtons?: ReactNode[];
-  readonly changedPropsToWatch?: string[];
   readonly resetChanges?: () => Promise<unknown>;
   readonly breadcrumb?: Partial<BreadcrumbProps> | React.ReactElement<typeof Breadcrumb>;
 }>) {
@@ -27,7 +25,6 @@ export default function JazzFormAndHeader<T>({
     <JazzFormAndHeaderExtended
       additionalButtons={additionalButtons}
       breadcrumb={breadcrumb}
-      changedPropsToWatch={changedPropsToWatch}
       data={data}
       form={form}
       resetChanges={resetChanges}

application/vue/src/components/content/JazzFormAndHeaderExtended.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { PropsWithChildren, ReactNode, useCallback, useEffect, useState } from "react";
+import { PropsWithChildren, ReactNode, useCallback, useEffect, useMemo, useState } from "react";
 import { Breadcrumb, type BreadcrumbProps, Form, FormInstance } from "antd";
 import { areDifferent } from "@/commons/comparingAndTransforming.ts";
 import { ResetButton, SaveButton } from "@/components/colored/JazzButtons.tsx";
@@ -10,16 +10,15 @@ import { logDiffForDirty } from "jc-shared/commons/comparingAndTransforming.ts";
 import useCheckErrors from "@/commons/useCheckErrors.ts";
 import cloneDeep from "lodash/cloneDeep";
 import { useJazzContext } from "@/components/content/useJazzContext.ts";
-import { NamePath } from "rc-field-form/es/interface";
 import noop from "lodash/noop";
+import { JazzFormContext } from "@/components/content/useJazzFormContext.ts";
 
 export default function JazzFormAndHeaderExtended<T>({
   title,
   data,
   saveForm,
   additionalButtons,
   additionalButtonsLast,
-  changedPropsToWatch,
   children,
   dateString,
   firstTag,
@@ -34,7 +33,6 @@ export default function JazzFormAndHeaderExtended<T>({
   readonly saveForm: (vals: T) => void;
   readonly additionalButtons?: ReactNode[];
   readonly additionalButtonsLast?: ReactNode[];
-  readonly changedPropsToWatch?: NamePath[];
   readonly dateString?: string;
   readonly firstTag?: ReactNode;
   readonly tags?: ReactNode[];
@@ -55,7 +53,7 @@ export default function JazzFormAndHeaderExtended<T>({
   const updateDirtyIfChanged = useCallback(() => {
     const curr = form.getFieldsValue(true);
     logDiffForDirty(initialValue, curr, false);
-    const different = areDifferent(initialValue, curr, ["agenturauswahl", "hotelauswahl", "endbestandEUR"]);
+    const different = areDifferent(initialValue, curr);
     setIsDirty(different);
     return different;
   }, [form, initialValue, setIsDirty]);
@@ -87,44 +85,49 @@ export default function JazzFormAndHeaderExtended<T>({
     .concat(<SaveButton disabled={!isDirty || hasErrors} key="save" />)
     .concat(additionalButtonsLast ?? []);
 
+  const jazzFormContext = useMemo(() => {
+    return { checkDirty: updateDirtyIfChanged };
+  }, [updateDirtyIfChanged]);
+
   return (
-    <Form
-      colon={false}
-      form={form}
-      layout="vertical"
-      onFinish={() =>
-        form
-          .validateFields()
-          .then(async () => {
-            setIsDirty(false);
-            saveForm(form.getFieldsValue(true));
-          })
-          .catch(checkErrors)
-      }
-      onKeyDown={(event) => {
-        const target = event.target as HTMLInputElement;
-        if (event.key === "Enter" && target?.role !== "textbox" && event?.type === "textarea") {
-          event.preventDefault();
-          return false;
+    <JazzFormContext.Provider value={jazzFormContext}>
+      <Form
+        colon={false}
+        form={form}
+        layout="vertical"
+        onFinish={() =>
+          form
+            .validateFields()
+            .then(async () => {
+              setIsDirty(false);
+              saveForm(form.getFieldsValue(true));
+            })
+            .catch(checkErrors)
         }
-      }}
-      onValuesChange={() => {
-        updateDirtyIfChanged();
-        checkErrors();
-      }}
-    >
-      <JazzPageHeader
-        breadcrumb={breadcrumb}
-        buttons={buttons}
-        dateString={dateString}
-        firstTag={firstTag}
-        hasErrors={hasErrors}
-        style={style}
-        tags={tags}
-        title={title}
-      />
-      <RowWrapper>{children}</RowWrapper>
-      {changedPropsToWatch ? <Form.Item dependencies={changedPropsToWatch} noStyle shouldUpdate={updateDirtyIfChanged} /> : null}
-    </Form>
+        onKeyDown={(event) => {
+          const target = event.target as HTMLInputElement;
+          if (event.key === "Enter" && target?.role !== "textbox" && event?.type === "textarea") {
+            event.preventDefault();
+            return false;
+          }
+        }}
+        onValuesChange={() => {
+          updateDirtyIfChanged();
+          checkErrors();
+        }}
+      >
+        <JazzPageHeader
+          breadcrumb={breadcrumb}
+          buttons={buttons}
+          dateString={dateString}
+          firstTag={firstTag}
+          hasErrors={hasErrors}
+          style={style}
+          tags={tags}
+          title={title}
+        />
+        <RowWrapper>{children}</RowWrapper>
+      </Form>
+    </JazzFormContext.Provider>
   );
 }

application/vue/src/components/content/useJazzFormContext.ts

@@ -0,0 +1,9 @@
+import { createContext } from "react";
+
+type JazzFormSharedGlobals = {
+  checkDirty: () => boolean;
+};
+export const JazzFormContext = createContext<JazzFormSharedGlobals>({
+  // eslint-disable-next-line lodash/prefer-constant
+  checkDirty: () => false,
+});

application/vue/src/components/konzert/KonzertComp.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { useNavigate, useParams } from "react-router";
 import { useQuery } from "@tanstack/react-query";
 import { konzertWithRiderForUrl, saveKonzert, saveOptionen, saveRider } from "@/rest/loader.ts";
@@ -17,6 +17,9 @@ import KonzertWithRiderBoxes from "jc-shared/konzert/konzertWithRiderBoxes.ts";
 export default function KonzertComp() {
   const { url } = useParams();
   const [isKasseHelpOpen, setIsKasseHelpOpen] = useState(false);
+  const [agenturauswahl, setAgenturauswahl] = useState("[temporär]");
+  const [hotelauswahl, setHotelauswahl] = useState("[temporär]");
+  const [hotelpreiseAlsDefault, setHotelpreiseAlsDefault] = useState(false);
 
   const { data: konzert, refetch } = useQuery({ queryKey: ["konzert", url], queryFn: () => konzertWithRiderForUrl(url || "") });
 
@@ -32,6 +35,13 @@ export default function KonzertComp() {
   const { currentUser, optionen, setMemoizedId } = useJazzContext();
   const navigate = useNavigate();
 
+  const reloadAndResetAuswahlen = useCallback(() => {
+    setHotelauswahl("[temporär]");
+    setAgenturauswahl("[temporär]");
+    setHotelpreiseAlsDefault(false);
+    return refetch();
+  }, [refetch]);
+
   useEffect(() => {
     setMemoizedId(konzert?.id);
   }, [konzert?.id, setMemoizedId]);
@@ -55,15 +65,11 @@ export default function KonzertComp() {
       return mutateKonzert.mutate(konz);
     }
 
-    const untypedKonzert = vals as { agenturauswahl?: string; hotelauswahl?: string; hotelpreiseAlsDefault?: boolean };
-    optionen.addOrUpdateKontakt("agenturen", konz.agentur, untypedKonzert.agenturauswahl);
-    delete untypedKonzert.agenturauswahl;
+    optionen.addOrUpdateKontakt("agenturen", konz.agentur, agenturauswahl);
     if (konz.artist.brauchtHotel) {
-      optionen.addOrUpdateKontakt("hotels", konz.hotel, untypedKonzert.hotelauswahl);
-      delete untypedKonzert.hotelauswahl;
-      if (untypedKonzert.hotelpreiseAlsDefault) {
+      optionen.addOrUpdateKontakt("hotels", konz.hotel, hotelauswahl);
+      if (hotelpreiseAlsDefault) {
         optionen.updateHotelpreise(konz.hotel, konz.unterkunft.zimmerPreise);
-        delete untypedKonzert.hotelpreiseAlsDefault;
       }
     }
     optionen.updateBackline("Jazzclub", konz.technik.backlineJazzclub);
@@ -75,12 +81,21 @@ export default function KonzertComp() {
   }
 
   const initialContext = useMemo(() => {
-    return { isKasseHelpOpen, setKasseHelpOpen: setIsKasseHelpOpen };
-  }, [isKasseHelpOpen]);
+    return {
+      isKasseHelpOpen,
+      setKasseHelpOpen: setIsKasseHelpOpen,
+      agenturauswahl,
+      setAgenturauswahl,
+      hotelauswahl,
+      setHotelauswahl,
+      hotelpreiseAlsDefault,
+      setHotelpreiseAlsDefault,
+    };
+  }, [agenturauswahl, hotelauswahl, hotelpreiseAlsDefault, isKasseHelpOpen]);
 
   return (
     <KonzertContext.Provider value={initialContext}>
-      <KonzertFormAndPageHeader data={konzert} resetChanges={refetch} saveForm={saveForm}>
+      <KonzertFormAndPageHeader data={konzert} resetChanges={reloadAndResetAuswahlen} saveForm={saveForm}>
         <ShowOnCopy title="Kopiertes Konzert" />
         <KonzertTabs />
       </KonzertFormAndPageHeader>

application/vue/src/components/konzert/KonzertContext.ts

@@ -4,7 +4,19 @@ import noop from "lodash/noop";
 export const KonzertContext = createContext<{
   isKasseHelpOpen: boolean;
   setKasseHelpOpen: (open: boolean) => void;
+  agenturauswahl: string;
+  setAgenturauswahl: (auswahl: string) => void;
+  hotelauswahl: string;
+  setHotelauswahl: (auswahl: string) => void;
+  hotelpreiseAlsDefault: boolean;
+  setHotelpreiseAlsDefault: (open: boolean) => void;
 }>({
   isKasseHelpOpen: false,
   setKasseHelpOpen: noop,
+  agenturauswahl: "",
+  hotelauswahl: "",
+  hotelpreiseAlsDefault: false,
+  setHotelauswahl: noop,
+  setAgenturauswahl: noop,
+  setHotelpreiseAlsDefault: noop,
 });

application/vue/src/components/konzert/KonzertFormAndPageHeader.tsx

@@ -68,7 +68,6 @@ export default function KonzertFormAndPageHeader({
         isKassenseite && <HelpWithKasseButton callback={() => setKasseHelpOpen(true)} key="helpKasse" />,
         <TeamCalendar key="cal" />,
       ]}
-      changedPropsToWatch={[["kasse", "kassenfreigabe"], "agenturauswahl"]}
       data={data}
       dateString={displayDate}
       form={form}

application/vue/src/components/konzert/allgemeines/KontaktCard.tsx

@@ -1,16 +1,17 @@
 import Kontakt from "jc-shared/veranstaltung/kontakt.ts";
-import { Col, Form } from "antd";
-import React, { PropsWithChildren, useEffect, useState } from "react";
+import { Col, Form, Select } from "antd";
+import React, { PropsWithChildren, useContext, useEffect, useMemo, useState } from "react";
 import Collapsible from "@/widgets/Collapsible.tsx";
 import { TextField } from "@/widgets/TextField";
 import TextArea from "antd/es/input/TextArea";
-import SingleSelect from "@/widgets/SingleSelect";
 import useFormInstance from "antd/es/form/hooks/useFormInstance";
 import find from "lodash/find";
 import map from "lodash/map";
 import sortedUniq from "lodash/sortedUniq";
 import compact from "lodash/compact";
 import { JazzRow } from "@/widgets/JazzRow.tsx";
+import { KonzertContext } from "@/components/konzert/KonzertContext.ts";
+import { JazzFormContext } from "@/components/content/useJazzFormContext.ts";
 
 type KontaktCardProps = {
   readonly kontakte: Kontakt[];
@@ -19,13 +20,17 @@ type KontaktCardProps = {
 };
 export default function KontaktCard({ kontakte, selector, noTopBorder, children }: KontaktCardProps & PropsWithChildren) {
   const form = useFormInstance();
+  const jazzFormContext = useContext(JazzFormContext);
+  const { agenturauswahl, setAgenturauswahl, hotelauswahl, setHotelauswahl } = useContext(KonzertContext);
 
   const [auswahlen, setAuswahlen] = useState<string[]>([]);
   useEffect(() => {
     const names = sortedUniq(compact(map(kontakte, "name")));
     setAuswahlen(["[temporär]", "[neu]"].concat(names));
   }, [kontakte]);
 
+  const realOptions = useMemo(() => map(auswahlen, (opt) => ({ label: opt, value: opt })), [auswahlen]);
+
   function auswahlChanged(name: string) {
     if (name === "[temporär]") {
       return;
@@ -43,7 +48,14 @@ export default function KontaktCard({ kontakte, selector, noTopBorder, children
       telefon: result.telefon,
     };
     form.setFieldsValue(values);
+    if (selector === "agentur") {
+      setAgenturauswahl(name);
+    } else if (selector === "hotel") {
+      setHotelauswahl(name);
+    }
+    jazzFormContext.checkDirty();
   }
+
   return (
     <Collapsible
       label={selector === "agentur" ? "Agentur" : "Hotel"}
@@ -52,13 +64,14 @@ export default function KontaktCard({ kontakte, selector, noTopBorder, children
     >
       <JazzRow>
         <Col span={12}>
-          <SingleSelect
-            initialValue="[temporär]"
-            label="Auswahl"
-            name={[`${selector}auswahl`]}
-            onChange={auswahlChanged}
-            options={auswahlen}
-          />
+          <Form.Item label={<b>Auswahl:</b>}>
+            <Select
+              onChange={auswahlChanged}
+              options={realOptions}
+              showSearch
+              value={selector === "agentur" ? agenturauswahl : hotelauswahl}
+            />
+          </Form.Item>
           <TextField label="Name" name={[selector, "name"]} />
         </Col>
         <Col span={12}>

application/vue/src/components/konzert/hotel/HotelCard.tsx

@@ -1,9 +1,8 @@
-import React, { useEffect } from "react";
+import React, { useContext, useEffect } from "react";
 import Collapsible from "@/widgets/Collapsible.tsx";
-import { Col, Form } from "antd";
+import { Checkbox, Col, Form } from "antd";
 import TextArea from "antd/es/input/TextArea";
 import { NumberInput } from "@/widgets/numericInputWidgets";
-import CheckItem from "@/widgets/CheckItem";
 import dayjs from "dayjs";
 import { useJazzContext } from "@/components/content/useJazzContext.ts";
 import { useWatch } from "antd/es/form/Form";
@@ -13,10 +12,12 @@ import find from "lodash/find";
 import { JazzRow } from "@/widgets/JazzRow";
 import KonzertWithRiderBoxes from "jc-shared/konzert/konzertWithRiderBoxes.ts";
 import useHotelSummierer from "@/components/konzert/hotel/useHotelSummierer.ts";
+import { KonzertContext } from "@/components/konzert/KonzertContext.ts";
 
 export default function HotelCard() {
   const form = useFormInstance<KonzertWithRiderBoxes>();
   const { optionen } = useJazzContext();
+  const { hotelpreiseAlsDefault, setHotelpreiseAlsDefault } = useContext(KonzertContext);
 
   const hotelName = useWatch(["hotel", "name"], { form, preserve: true });
   const eventStartDate = useWatch("startDate", { form, preserve: true });
@@ -90,7 +91,9 @@ export default function HotelCard() {
       </JazzRow>
       <JazzRow>
         <Col span={24}>
-          <CheckItem label="Preise als Default übernehmen" name={["hotelpreiseAlsDefault"]} />
+          <Checkbox checked={hotelpreiseAlsDefault} onChange={(e) => setHotelpreiseAlsDefault(e.target.checked)}>
+            <b>Preise als Default übernehmen</b>
+          </Checkbox>
         </Col>
       </JazzRow>
     </Collapsible>

application/vue/src/components/konzert/kasse/AusgabenCard.tsx

@@ -16,7 +16,7 @@ import useKassenSaldierer from "@/components/konzert/kasse/useKassenSaldierer.ts
 import { JazzRowWithRef } from "@/widgets/JazzRowWithRef.tsx";
 
 export default function AusgabenCard() {
-  const form = useFormInstance<KonzertWithRiderBoxes & { endbestandEUR: number }>();
+  const form = useFormInstance<KonzertWithRiderBoxes>();
   const { refAnBank, refAusgaben } = useContext(KassenContext);
   const { color } = colorsAndIconsForSections;