fix(reports): update logic to count inactive publishers

src/components/progress_bar/index.tsx

@@ -28,7 +28,9 @@ const ProgressBar = ({ value, maxValue }: ProgressBarProps) => {
         )}
 
         {maxValue - value > 0 && (
-          <StyledProgressBarToFill>{maxValue - value}</StyledProgressBarToFill>
+          <StyledProgressBarToFill>
+            {value === 0 ? 0 : maxValue - value}
+          </StyledProgressBarToFill>
         )}
       </StyledProgressBar>
     </StyledProgressBarBox>

src/features/congregation/publisher_records/publisher_tabs/list_by_groups/index.tsx

@@ -6,7 +6,7 @@ import Divider from '@components/divider';
 import PersonItem from '../person_item';
 
 const ListByGroups = (props: ListByGroupsProps) => {
-  const { groups, month, expanded, handleExpandedChange } =
+  const { groups, month, expanded, handleExpandedChange, type } =
     useListByGroups(props);
 
   return (
@@ -28,6 +28,7 @@ const ListByGroups = (props: ListByGroupsProps) => {
                 key={person.person_uid}
                 person={person}
                 month={month}
+                type={type}
               />
             ))}
           </Stack>

src/features/congregation/publisher_records/publisher_tabs/list_by_groups/useListByGroups.tsx

@@ -83,7 +83,7 @@ const useListByGroups = ({ type }: ListByGroupsProps) => {
 
   const handleExpandedChange = (value: string | false) => setExpanded(value);
 
-  return { groups, month, expanded, handleExpandedChange };
+  return { groups, month, expanded, handleExpandedChange, type };
 };
 
 export default useListByGroups;

src/features/congregation/publisher_records/publisher_tabs/person_item/index.tsx

@@ -4,12 +4,12 @@ import { PersonItemProps } from './index.types';
 import usePersonItem from './usePersonItem';
 import PersonDetails from '@features/persons/person_details';
 
-const PersonItem = ({ person, month }: PersonItemProps) => {
-  const { handleOpenPublisher } = usePersonItem(person);
+const PersonItem = (props: PersonItemProps) => {
+  const { handleOpenPublisher, month, person, badges } = usePersonItem(props);
 
   return (
     <UserCard onClick={handleOpenPublisher}>
-      <PersonDetails person={person} month={month} />
+      <PersonDetails person={person} month={month} badgesOverride={badges} />
 
       <IconArrowLink color="var(--black)" />
     </UserCard>

src/features/congregation/publisher_records/publisher_tabs/person_item/index.types.ts

@@ -2,5 +2,6 @@ import { PersonType } from '@definition/person';
 
 export type PersonItemProps = {
   person: PersonType;
-  month: string
+  month: string;
+  type: 'active' | 'inactive';
 };

src/features/congregation/publisher_records/publisher_tabs/person_item/usePersonItem.tsx

@@ -1,14 +1,52 @@
+import { useMemo } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { PersonType } from '@definition/person';
+import { useRecoilValue } from 'recoil';
+import { useAppTranslation } from '@hooks/index';
+import { BadgeColor } from '@definition/app';
+import { congFieldServiceReportsState } from '@states/field_service_reports';
+import { monthNamesState } from '@states/app';
+import { PersonItemProps } from './index.types';
 
-const usePersonItem = (person: PersonType) => {
+const usePersonItem = ({ month, person, type }: PersonItemProps) => {
   const navigate = useNavigate();
 
+  const { t } = useAppTranslation();
+
+  const reports = useRecoilValue(congFieldServiceReportsState);
+  const monthNames = useRecoilValue(monthNamesState);
+
+  const badges = useMemo(() => {
+    if (type === 'active') return;
+
+    const userReports = reports.filter(
+      (record) => record.report_data.person_uid === person.person_uid
+    );
+    if (userReports.length === 0) return;
+
+    // get last report
+    userReports.sort((a, b) =>
+      b.report_data.report_date.localeCompare(a.report_data.report_date)
+    );
+    const lastReport = userReports.at(0).report_data.report_date;
+
+    const [year, month] = lastReport.split('/');
+    const monthname = monthNames[+month - 1];
+
+    const date = t('tr_monthYear', { month: monthname, year });
+
+    return [
+      {
+        name: t('tr_publisherLastReport', { month: date }),
+        color: 'grey' as BadgeColor,
+      },
+    ];
+  }, [type, reports, person, monthNames, t]);
+
   const handleOpenPublisher = () => {
     navigate(`/publisher-records/${person.person_uid}`);
   };
 
-  return { handleOpenPublisher };
+  return { handleOpenPublisher, month, person, badges };
 };
 
 export default usePersonItem;

src/features/persons/hooks/usePersons.tsx

@@ -1,6 +1,7 @@
 import { useRecoilValue } from 'recoil';
 import { personsActiveState } from '@states/persons';
 import { formatDate } from '@services/dateformat';
+import { addMonths } from '@utils/date';
 import usePerson from './usePerson';
 
 const usePersons = () => {
@@ -94,35 +95,35 @@ const usePersons = () => {
     const startMonth = `${+year - 1}/09`;
     const endMonth = `${year}/08`;
 
-    const result = persons.filter((record) => {
-      const isMidweek = personIsMidweekStudent(record);
+    const result = persons.filter((person) => {
+      const isMidweek = personIsMidweekStudent(person);
       if (isMidweek) return false;
 
-      const firstReport = personGetFirstReport(record);
-
-      if (firstReport > endMonth) return false;
-
+      // get all histories with end date
       const history = [
-        ...record.person_data.publisher_baptized.history,
-        ...record.person_data.publisher_unbaptized.history,
-      ].filter((record) => !record._deleted);
+        ...person.person_data.publisher_baptized.history,
+        ...person.person_data.publisher_unbaptized.history,
+      ].filter((record) => !record._deleted && record.start_date?.length > 0);
+
+      const historyWithEndDate = history.filter(
+        (record) => record.end_date?.length > 0
+      );
 
-      if (history.length === 1 && history.at(0).end_date === null) {
-        return false;
-      }
+      const isInactive = historyWithEndDate.some((record) => {
+        const monthNext = formatDate(addMonths(record.end_date, 1), 'yyyy/MM');
 
-      const inactive = history.some((data) => {
-        if (data.start_date === null) return false;
-        if (data.end_date === null) return false;
+        const isActive = history.some((active) => {
+          const date = formatDate(new Date(active.start_date), 'yyyy/MM');
 
-        const endTmp = new Date(data.end_date);
+          return date === monthNext;
+        });
 
-        const endTmpDate = formatDate(endTmp, 'yyyy/MM');
+        if (isActive) return false;
 
-        return endTmpDate >= startMonth && endTmpDate <= endMonth;
+        return monthNext >= startMonth && monthNext <= endMonth;
       });
 
-      return inactive;
+      return isInactive;
     });
 
     return result;

src/features/persons/person_details/index.types.ts

@@ -1,8 +1,9 @@
-import { CustomClassName } from '@definition/app';
+import { BadgeColor, CustomClassName } from '@definition/app';
 import { PersonType } from '@definition/person';
 
 export type PersonDetailsProps = {
   person: PersonType;
   month: string;
   className?: CustomClassName;
+  badgesOverride?: { name: string; color: BadgeColor }[];
 };

src/features/persons/person_details/usePersonDetails.tsx

@@ -2,7 +2,11 @@ import { useMemo } from 'react';
 import { PersonDetailsProps } from './index.types';
 import usePerson from '@features/persons/hooks/usePerson';
 
-const usePersonDetails = ({ month, person }: PersonDetailsProps) => {
+const usePersonDetails = ({
+  month,
+  person,
+  badgesOverride,
+}: PersonDetailsProps) => {
   const { getName, getBadges } = usePerson();
 
   const name = useMemo(() => {
@@ -20,8 +24,10 @@ const usePersonDetails = ({ month, person }: PersonDetailsProps) => {
   const badges = useMemo(() => {
     if (!person) return [];
 
+    if (badgesOverride) return badgesOverride;
+
     return getBadges(person, month);
-  }, [person, getBadges, month]);
+  }, [person, getBadges, month, badgesOverride]);
 
   return { name, female, badges };
 };

src/features/reports/branch_office/submit_report/useSubmitReport.tsx

@@ -43,7 +43,7 @@ const useSubmitReport = ({ onClose }: SubmitReportProps) => {
       if (!isInactive) continue;
 
       const [year, varMonth] = month.split('/');
-      const endDate = new Date(+year, +varMonth, 0).toISOString();
+      const endDate = new Date(+year, +varMonth - 1, 0).toISOString();
 
       const newPerson = structuredClone(person);
 

src/features/reports/field_service/report_details/useReportDetails.tsx

@@ -253,7 +253,8 @@ const useReportDetails = () => {
     handleAssignAP,
     handleVerifyReport,
     isInactive,
-    handleMarkAsActive,currentMonth
+    handleMarkAsActive,
+    currentMonth,
   };
 };
 

src/locales/en/congregation.json

@@ -434,5 +434,6 @@
   "tr_eventType": "Event type",
   "tr_averageAttendanceMM": "Average midweek meeting attendance",
   "tr_S10ReportWithYear": "Congregation analysis report: {{ year }}",
-  "tr_groupNotAssigned": "Group not assigned"
+  "tr_groupNotAssigned": "Group not assigned",
+  "tr_publisherLastReport": "Last report on {{ month }}"
 }