feat(settings): add new option to choose the exact meeting date on S-140

sws2apps · Oct 5, 2023 · a7918fd · a7918fd
1 parent 6bdd6c0
commit a7918fd
Show file tree

Hide file tree

Showing 9 changed files with 344 additions and 279 deletions.
diff --git a/src/classes/Schedules.js b/src/classes/Schedules.js
@@ -277,6 +277,19 @@ SchedulesClass.prototype.S140Data = function (scheduleName) {
     const scheduleData = this.get(week);
     const sourceData = Sources.get(week).local();
 
+    let midDay = +Setting.midweek_meeting_day;
+    const [varYear, varMonth, varDay] = week.split('/');
+    midDay = parseInt(varDay, 10) + midDay - 1;
+    const lDate = new Date(varYear, varMonth - 1, midDay);
+
+    const meetingDate = t('longDateFormat', {
+      lng: sourceLang,
+      ns: 'source',
+      month: Setting.monthNames()[lDate.getMonth()],
+      date: lDate.getDate(),
+      year: lDate.getFullYear(),
+    });
+
     // pgm start
     const time = {};
     time.pgmStart = meetingStart;
@@ -407,7 +420,7 @@ SchedulesClass.prototype.S140Data = function (scheduleName) {
     const obj = {};
     obj.week = week;
     obj.scheduleData = scheduleData;
-    obj.sourceData = { ...sourceData, ...time };
+    obj.sourceData = { ...sourceData, ...time, meeting_date: meetingDate };
     data.push(obj);
   }
 

diff --git a/src/classes/Setting.js b/src/classes/Setting.js
@@ -29,6 +29,7 @@ class SettingClass {
     this.opening_prayer_WM_autoAssign = false;
     this.user_members_delegate = [];
     this.weekend_meeting_day = 6;
+    this.midweek_meeting_useExactDate = false;
   }
 }
 
@@ -61,6 +62,7 @@ SettingClass.prototype.load = async function () {
   this.user_members_delegate = congData.user_members_delegate || [];
   this.opening_prayer_WM_autoAssign = congData.opening_prayer_WM_autoAssign;
   this.weekend_meeting_day = congData.weekend_meeting_day;
+  this.midweek_meeting_useExactDate = congData.midweek_meeting_useExactDate;
 };
 
 SettingClass.prototype.update = async function (setting, overwrite) {

diff --git a/src/features/settings/BasicSettings.jsx b/src/features/settings/BasicSettings.jsx
@@ -20,6 +20,7 @@ import {
   openingPrayerMMAutoAssignState,
   openingPrayerWMAutoAssignState,
   weekendMeetingDayState,
+  midweekMeetingExactDateState,
 } from '../../states/congregation';
 import { scheduleUseFullnameState } from '../../states/schedule';
 import { generateDisplayName } from '../../utils/person';
@@ -35,6 +36,7 @@ const BasicSettings = () => {
   const [autoAssignWMOpeningPrayer, setAutoAssignWMOpeningPrayer] = useRecoilState(openingPrayerWMAutoAssignState);
   const [scheduleUseFullname, setScheduleUseFullname] = useRecoilState(scheduleUseFullnameState);
   const [weekendMeetingDay, setWeekendMeetingDay] = useRecoilState(weekendMeetingDayState);
+  const [midweekMeetingExactDate, setMidweekMeetingExactDate] = useRecoilState(midweekMeetingExactDateState);
 
   const congName = useRecoilValue(congNameState);
   const congNumber = useRecoilValue(congNumberState);
@@ -48,6 +50,7 @@ const BasicSettings = () => {
   const [tmpautoAssignWMOpeningPrayer, setTmpautoAssignWMOpeningPrayer] = useState(autoAssignWMOpeningPrayer);
   const [useFullname, setUseFullname] = useState(scheduleUseFullname);
   const [tempWeekendMeetingDay, setTempWeekendMeetingDay] = useState(weekendMeetingDay);
+  const [tmpMidweekMeetingExactDate, setTmpMidweekMeetingExactDate] = useState(midweekMeetingExactDate);
 
   const roleLMMO = Setting.cong_role.includes('lmmo') || Setting.cong_role.includes('lmmo-backup');
   const coordinatorRole = Setting.cong_role.includes('coordinator');
@@ -111,6 +114,12 @@ const BasicSettings = () => {
     setWeekendMeetingDay(e.target.value);
   };
 
+  const handleSwitchMMExactDate = async (value) => {
+    setTmpMidweekMeetingExactDate(value);
+    await Setting.update({ midweek_meeting_useExactDate: value });
+    setMidweekMeetingExactDate(value);
+  };
+
   useEffect(() => {
     setCoName(Setting.co_name || '');
     setCoDisplayName(Setting.co_displayName || '');
@@ -217,6 +226,17 @@ const BasicSettings = () => {
             </TextField>
           </Box>
 
+          <FormControlLabel
+            control={
+              <Checkbox
+                checked={tmpautoAssignMMOpeningPrayer}
+                readOnly={!roleLMMO}
+                onChange={roleLMMO ? (e) => handleSwitchMMAutoAssignPrayer(e.target.checked) : null}
+              />
+            }
+            label={t('autoAssignMMOpeningPrayer')}
+          />
+
           <FormControlLabel
             control={
               <Checkbox
@@ -231,12 +251,12 @@ const BasicSettings = () => {
           <FormControlLabel
             control={
               <Checkbox
-                checked={tmpautoAssignMMOpeningPrayer}
+                checked={tmpMidweekMeetingExactDate}
                 readOnly={!roleLMMO}
-                onChange={roleLMMO ? (e) => handleSwitchMMAutoAssignPrayer(e.target.checked) : null}
+                onChange={roleLMMO ? (e) => handleSwitchMMExactDate(e.target.checked) : null}
               />
             }
-            label={t('autoAssignMMOpeningPrayer')}
+            label={t('useExactMidweekMeetingDate')}
           />
         </Box>