Added option to copy service order

jzongker · jzongker · commit 0db20766bef3 · 2026-01-06T23:36:09.000-06:00
diff --git a/public/locales/de.json b/public/locales/de.json
@@ -1019,6 +1019,7 @@
       "copyNothing": "Nichts",
       "copyPositions": "Nur Positionen",
       "copyPrevious": "Vom Vorherigen Plan Kopieren",
+      "copyServiceOrder": "Gottesdienstablauf kopieren",
       "none": "Keine",
       "planAdd": "Plan hinzufügen",
       "planEdit": "Plan bearbeiten",
diff --git a/public/locales/en.json b/public/locales/en.json
@@ -1046,6 +1046,7 @@
       "copyNothing": "Nothing",
       "copyPositions": "Positions Only",
       "copyPrevious": "Copy from Previous Plan",
+      "copyServiceOrder": "Copy Order of Service",
       "none": "None",
       "planAdd": "Add a Plan",
       "planEdit": "Edit Plan",
@@ -1240,6 +1241,7 @@
     "serviceOrder": {
       "add": "Add",
       "addLesson": "Add Lesson",
+      "associateLesson": "Associate Lesson",
       "addSection": "Add Section",
       "customizeLesson": "Customize",
       "lessonPreview": "Lesson Preview",
diff --git a/public/locales/es.json b/public/locales/es.json
@@ -1020,6 +1020,7 @@
       "copyNothing": "Nada",
       "copyPositions": "Solo Posiciones",
       "copyPrevious": "Copiar del Plan Anterior",
+      "copyServiceOrder": "Copiar Orden del Servicio",
       "none": "Ninguno",
       "planAdd": "Agregar un Plan",
       "planEdit": "Editar Plan",
diff --git a/public/locales/fr.json b/public/locales/fr.json
@@ -1019,6 +1019,7 @@
       "copyNothing": "Rien",
       "copyPositions": "Postes uniquement",
       "copyPrevious": "Copier du Plan Précédent",
+      "copyServiceOrder": "Copier l'ordre du culte",
       "none": "Aucun",
       "planAdd": "Ajouter un plan",
       "planEdit": "Modifier le plan",
diff --git a/public/locales/hi.json b/public/locales/hi.json
@@ -1019,6 +1019,7 @@
       "copyNothing": "कुछ नहीं",
       "copyPositions": "केवल पद",
       "copyPrevious": "पिछली योजना से कॉपी",
+      "copyServiceOrder": "सेवा क्रम कॉपी करें",
       "none": "कोई नहीं",
       "planAdd": "योजना जोड़ें",
       "planEdit": "योजना संपादित करें",
diff --git a/public/locales/it.json b/public/locales/it.json
@@ -1019,6 +1019,7 @@
       "copyNothing": "Niente",
       "copyPositions": "Solo Posizioni",
       "copyPrevious": "Copia dal Piano Precedente",
+      "copyServiceOrder": "Copia Ordine del Servizio",
       "none": "Nessuno",
       "planAdd": "Aggiungi un Piano",
       "planEdit": "Modifica Piano",
diff --git a/public/locales/ko.json b/public/locales/ko.json
@@ -1019,6 +1019,7 @@
       "copyNothing": "없음",
       "copyPositions": "직책만",
       "copyPrevious": "이전 계획에서 복사",
+      "copyServiceOrder": "예배 순서 복사",
       "none": "없음",
       "planAdd": "계획 추가",
       "planEdit": "계획 편집",
diff --git a/public/locales/no.json b/public/locales/no.json
@@ -1019,6 +1019,7 @@
       "copyNothing": "Ingenting",
       "copyPositions": "Kun posisjoner",
       "copyPrevious": "Kopier fra Forrige Plan",
+      "copyServiceOrder": "Kopier gudstjenesteorden",
       "none": "Ingen",
       "planAdd": "Legg til plan",
       "planEdit": "Rediger plan",
diff --git a/public/locales/pt.json b/public/locales/pt.json
@@ -1019,6 +1019,7 @@
       "copyNothing": "Nada",
       "copyPositions": "Apenas Posições",
       "copyPrevious": "Copiar do Plano Anterior",
+      "copyServiceOrder": "Copiar Ordem do Culto",
       "none": "Nenhum",
       "planAdd": "Adicionar um Plano",
       "planEdit": "Editar Plano",
diff --git a/public/locales/ru.json b/public/locales/ru.json
@@ -1019,6 +1019,7 @@
       "copyNothing": "Ничего",
       "copyPositions": "Только позиции",
       "copyPrevious": "Копировать из Предыдущего Плана",
+      "copyServiceOrder": "Копировать порядок богослужения",
       "none": "Нет",
       "planAdd": "Добавить план",
       "planEdit": "Редактировать план",
diff --git a/public/locales/tl.json b/public/locales/tl.json
@@ -1019,6 +1019,7 @@
       "copyNothing": "Wala",
       "copyPositions": "Mga Posisyon Lamang",
       "copyPrevious": "Kopyahin mula sa Nakaraang Plano",
+      "copyServiceOrder": "Kopyahin ang Order of Service",
       "none": "Wala",
       "planAdd": "Magdagdag ng plano",
       "planEdit": "I-edit ang plano",
diff --git a/public/locales/zh.json b/public/locales/zh.json
@@ -1019,6 +1019,7 @@
       "copyNothing": "无",
       "copyPositions": "仅职位",
       "copyPrevious": "从上一个计划复制",
+      "copyServiceOrder": "复制礼拜程序",
       "none": "无",
       "planAdd": "添加计划",
       "planEdit": "编辑计划",
diff --git a/src/plans/components/LessonScheduleEdit.tsx b/src/plans/components/LessonScheduleEdit.tsx
@@ -14,9 +14,9 @@ interface Props {
 
 export const LessonScheduleEdit: React.FC<Props> = (props) => {
   const [scheduledDate, setScheduledDate] = useState<Date>(() => {
-    const date = DateHelper.getLastSunday();
-    date.setDate(date.getDate() + 7);
-    return date;
+    const lastSunday = DateHelper.getLastSunday();
+    // Create a new date using local year/month/day to avoid timezone issues
+    return new Date(lastSunday.getFullYear(), lastSunday.getMonth(), lastSunday.getDate() + 7, 12, 0, 0);
   });
   const [errors, setErrors] = useState<string[]>([]);
   const [lessonTree, setLessonTree] = useState<LessonTreeInterface>({});
diff --git a/src/plans/components/PlanEdit.tsx b/src/plans/components/PlanEdit.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { FormControl, InputLabel, MenuItem, Select, TextField, type SelectChangeEvent } from "@mui/material";
+import { Checkbox, FormControl, FormControlLabel, InputLabel, MenuItem, Select, TextField, type SelectChangeEvent } from "@mui/material";
 import { DateHelper, ErrorMessages, InputBox, Locale } from "@churchapps/apphelper";
 import { type PlanInterface } from "../../helpers";
 import { useMutation } from "@tanstack/react-query";
@@ -16,6 +16,7 @@ interface Props {
 export const PlanEdit = (props: Props) => {
   const [plan, setPlan] = React.useState<PlanInterface>({ ...props.plan, serviceOrder: true });
   const [copyMode, setCopyMode] = React.useState<string>("all"); // "none" | "positions" | "all"
+  const [copyServiceOrder, setCopyServiceOrder] = React.useState<boolean>(false);
   const [errors, setErrors] = React.useState<string[]>([]);
 
   // Get the most recent plan that is before the new plan's date
@@ -67,10 +68,10 @@ export const PlanEdit = (props: Props) => {
   const savePlanMutation = useMutation({
     mutationFn: async () => {
       const { ApiHelper } = await import("@churchapps/apphelper");
-      if (copyMode === "none" || !previousPlan) {
+      if ((copyMode === "none" && !copyServiceOrder) || !previousPlan) {
         return ApiHelper.post("/plans", [plan], "DoingApi");
       } else {
-        return ApiHelper.post("/plans/copy/" + previousPlan.id, { ...plan, copyMode }, "DoingApi");
+        return ApiHelper.post("/plans/copy/" + previousPlan.id, { ...plan, copyMode, copyServiceOrder }, "DoingApi");
       }
     },
     onSuccess: () => {
@@ -122,21 +123,24 @@ export const PlanEdit = (props: Props) => {
           aria-label="Service date"
         />
         {!plan.id && previousPlan && (
-          <FormControl fullWidth>
-            <InputLabel id="copyMode">{Locale.label("plans.planEdit.copyPrevious") || "Copy from previous plan"}:</InputLabel>
-            <Select
-              name="copyMode"
-              labelId="copyMode"
-              label={Locale.label("plans.planEdit.copyPrevious") || "Copy from previous plan"}
-              value={copyMode}
-              onChange={handleChange}
-              data-testid="copy-mode-select"
-            >
-              <MenuItem value="none">{Locale.label("plans.planEdit.copyNothing") || "Nothing"}</MenuItem>
-              <MenuItem value="positions">{Locale.label("plans.planEdit.copyPositions") || "Positions Only"}</MenuItem>
-              <MenuItem value="all">{Locale.label("plans.planEdit.copyAll") || "Positions and Assignments"}</MenuItem>
-            </Select>
-          </FormControl>
+          <>
+            <FormControl fullWidth>
+              <InputLabel id="copyMode">{Locale.label("plans.planEdit.copyPrevious") || "Copy from previous plan"}:</InputLabel>
+              <Select
+                name="copyMode"
+                labelId="copyMode"
+                label={Locale.label("plans.planEdit.copyPrevious") || "Copy from previous plan"}
+                value={copyMode}
+                onChange={handleChange}
+                data-testid="copy-mode-select"
+              >
+                <MenuItem value="none">{Locale.label("plans.planEdit.copyNothing") || "Nothing"}</MenuItem>
+                <MenuItem value="positions">{Locale.label("plans.planEdit.copyPositions") || "Positions Only"}</MenuItem>
+                <MenuItem value="all">{Locale.label("plans.planEdit.copyAll") || "Positions and Assignments"}</MenuItem>
+              </Select>
+            </FormControl>
+            <FormControlLabel control={<Checkbox checked={copyServiceOrder} onChange={(e) => setCopyServiceOrder(e.target.checked)} />} label={Locale.label("plans.planEdit.copyServiceOrder") || "Copy Order of Service"} />
+          </>
         )}
       </InputBox>
     </>
diff --git a/src/plans/components/PlanList.tsx b/src/plans/components/PlanList.tsx
@@ -41,8 +41,9 @@ export const PlanList = memo((props: Props) => {
   }, [plansQuery.data, props.ministry.id, props.planTypeId]);
 
   const addPlan = useCallback(() => {
-    const date = DateHelper.getLastSunday();
-    date.setDate(date.getDate() + 7);
+    const lastSunday = DateHelper.getLastSunday();
+    // Create a new date using local year/month/day to avoid timezone issues
+    const date = new Date(lastSunday.getFullYear(), lastSunday.getMonth(), lastSunday.getDate() + 7, 12, 0, 0);
     const name = DateHelper.prettyDate(date);
     setPlan({
       ministryId: props.ministry.id,
