@propriety/court-calendar 1.0.53 → 1.0.55

package/dist/_components/List/CalendarList.d.ts

@@ -3,7 +3,7 @@ export default function CalendarList({ filteredDates, setSelectedDate, currentDa
     filteredDates: CourtDate[];
     setSelectedDate: (date: CourtDate) => void;
     currentDate: Date;
-    onUpdateChair?: (courtDateId: number, position: 'first' | 'second', userId: number | null) => void;
+    onUpdateChair?: (courtDateId: number, position: "first" | "second", userId: number | null) => void;
     allCases: Record<string, Case[]>;
     isPrinting?: boolean;
 }): import("react/jsx-runtime").JSX.Element;

package/dist/index.mjs

@@ -14455,7 +14455,7 @@ function dD({
     let T = !0, z = !0;
     for (const q of N)
       T && !si(q, Nn(k.MuniCode)) && (T = !1), z && q.DateCompleted === null && (z = !1);
-    return z ? N.length > 0 && T ? "Settled/Decision" : k.Lifecycle === Wt.UPLOADED ? "NYSCEF Uploaded" : y(k) ? "Adjourned (No Date)" : k.Lifecycle === Wt.ADJOURNED ? "Adjourned" : k.Lifecycle === Wt.SCHEDULED || k.Lifecycle === Wt.ASSIGNED ? "Scheduled" : "Blank" : "Reviewing";
+    return N.length > 0 && T ? "Settled/Decision" : z ? k.Lifecycle === Wt.UPLOADED ? "NYSCEF Uploaded" : y(k) ? "Adjourned (No Date)" : k.Lifecycle === Wt.ADJOURNED ? "Adjourned" : k.Lifecycle === Wt.SCHEDULED || k.Lifecycle === Wt.ASSIGNED ? "Scheduled" : "Blank" : "Reviewing";
   }
   function E(k) {
     return k.Type === lt.IN_PERSON ? "In Person" : k.Type === lt.UNKNOWN ? "Unknown" : "Virtual";
@@ -14572,7 +14572,11 @@ function dD({
           {
             user1ID: N.user1ID,
             user2ID: N.user2ID,
-            onUpdateChair: r ? (T, z) => r(N.courtDateId, T, z) : void 0
+            onUpdateChair: r ? (T, z) => r(
+              N.courtDateId,
+              T,
+              z
+            ) : void 0
           }
         );
       }
@@ -14622,7 +14626,11 @@ function dD({
       numCases: k.CourtCases,
       courtDate: k.CourtDate,
       status: v(k),
-      assigned: { user1ID: k.FirstChair, user2ID: k.SecondChair, courtDateId: k.CourtDateID },
+      assigned: {
+        user1ID: k.FirstChair,
+        user2ID: k.SecondChair,
+        courtDateId: k.CourtDateID
+      },
       uploadDeadline: k.UploadDeadline,
       location: E(k)
     }, z = [];
@@ -14634,7 +14642,8 @@ function dD({
         $.set(Q, [...$.get(Q) || [], J]);
       }
       for (const [J, Y] of $) {
-        if (x.has(`${k.MuniCode}-${J}`)) continue;
+        if (x.has(`${k.MuniCode}-${J}`))
+          continue;
         const [Q, be, Me] = J.split("-").map(Number);
         z.push({
           ...T,
@@ -14669,7 +14678,12 @@ function dD({
         }
       },
       onRowClick: (k) => {
-        const N = parseInt(k.id.toString().split("-")[0], 10), T = t.find((z) => z.CourtDateID === N);
+        const N = parseInt(
+          k.id.toString().split("-")[0],
+          10
+        ), T = t.find(
+          (z) => z.CourtDateID === N
+        );
         T && e(T);
       },
       getRowClassName: () => "ccalendar-list-row"
@@ -17981,7 +17995,7 @@ function ED({
             start: (() => {
               const [ae, Z, de] = be.split("-").map(Number), ve = new Date(ae, Z - 1, de);
               if (q.HearingTime) {
-                const [Te, Ee] = q.HearingTime.split(":").map(Number);
+                const [Te, Ee] = q.HearingTime.replace(/\s*(AM|PM)$/i, "").split(":").map(Number);
                 ve.setHours(Te, Ee, 0, 0);
               }
               return ve;
@@ -18009,7 +18023,7 @@ function ED({
     return z.length > 0 && z.every((J) => si(J, q)) ? [] : T.MultipleDates.filter(Boolean).map((J, Y) => {
       const Q = new Date(J);
       if (T.HearingTime) {
-        const [be, Me] = T.HearingTime.split(":").map(Number);
+        const [be, Me] = T.HearingTime.replace(/\s*(AM|PM)$/i, "").split(":").map(Number);
         Q.setHours(be, Me, 0, 0);
       }
       return {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@propriety/court-calendar",
     "private": false,
-    "version": "1.0.53",
+    "version": "1.0.55",
     "type": "module",
     "main": "dist/index.js",
     "module": "./dist/index.mjs",

package/src/_components/List/CalendarList.tsx

@@ -1,10 +1,16 @@
-import { useReferenceData } from '@/context/ReferenceDataContext';
-import { useFilter } from '@/context/FilterContext';
-import { DateType, HearingType, Lifecycle, type Case, type CourtDate } from '@/types';
-import { DataGrid, type GridColDef } from '@mui/x-data-grid';
-import FirstSecondChairIcons from '../Shared/FirstSecondChairIcons';
-import { isCaseSettled } from '@/helpers/cases';
-import { isVillageDate, caseKey } from '@/helpers/courtDates';
+import { useReferenceData } from "@/context/ReferenceDataContext";
+import { useFilter } from "@/context/FilterContext";
+import {
+    DateType,
+    HearingType,
+    Lifecycle,
+    type Case,
+    type CourtDate,
+} from "@/types";
+import { DataGrid, type GridColDef } from "@mui/x-data-grid";
+import FirstSecondChairIcons from "../Shared/FirstSecondChairIcons";
+import { isCaseSettled } from "@/helpers/cases";
+import { isVillageDate, caseKey } from "@/helpers/courtDates";
 
 export default function CalendarList({
     filteredDates,
@@ -17,49 +23,56 @@ export default function CalendarList({
     filteredDates: CourtDate[];
     setSelectedDate: (date: CourtDate) => void;
     currentDate: Date;
-    onUpdateChair?: (courtDateId: number, position: 'first' | 'second', userId: number | null) => void;
+    onUpdateChair?: (
+        courtDateId: number,
+        position: "first" | "second",
+        userId: number | null,
+    ) => void;
     allCases: Record<string, Case[]>;
     isPrinting?: boolean;
 }) {
     const { getTownshipName, getCountyName } = useReferenceData();
     const { filterCtx } = useFilter();
     const countyColors: Record<string, string> = {
-        Blank: '#c4c4c4',
-        Suffolk: '#faa1f1',
-        Sullivan: '#00c875',
-        Westchester: '#df2f4a',
-        Ulster: '#225091',
-        Columbia: '#9d50dd',
-        Rockland: '#037f4c',
-        Putnam: '#579bfc',
-        Nassau: '#cab641',
-        Greene: '#9cd326',
-        Dutchess: '#ffcb00',
-        Orange: '#ff6d3b',
-        Delaware: '#bb3354',
+        Blank: "#c4c4c4",
+        Suffolk: "#faa1f1",
+        Sullivan: "#00c875",
+        Westchester: "#df2f4a",
+        Ulster: "#225091",
+        Columbia: "#9d50dd",
+        Rockland: "#037f4c",
+        Putnam: "#579bfc",
+        Nassau: "#cab641",
+        Greene: "#9cd326",
+        Dutchess: "#ffcb00",
+        Orange: "#ff6d3b",
+        Delaware: "#bb3354",
     };
 
     const typeColors: Record<string, string> = {
-        'Court Dates': '#216edf',
-        Negotiations: '#33d391',
+        "Court Dates": "#216edf",
+        Negotiations: "#33d391",
     };
 
     const statusColors: Record<string, string> = {
-        Blank: '#c4c4c4', // default
-        Reviewing: '#fdab3d', // dateCompleted not set
-        Scheduled: '#216edf', // Lifecycle.SCHEDULED or Lifecycle.ASSIGNED
-        'NYSCEF Uploaded': '#037f4c', // Status.UPLOADED
-        Adjourned: '#faa1f1', // isAdjourned true
-        'Adjourned (No Date)': 'rgb(151, 11, 134)', // OA cases with no specific adjournment date
-        'Settled/Decision': '#df2f4a', // isCaseSettled true
+        Blank: "#c4c4c4", // default
+        Reviewing: "#fdab3d", // dateCompleted not set
+        Scheduled: "#216edf", // Lifecycle.SCHEDULED or Lifecycle.ASSIGNED
+        "NYSCEF Uploaded": "#037f4c", // Status.UPLOADED
+        Adjourned: "#faa1f1", // isAdjourned true
+        "Adjourned (No Date)": "rgb(151, 11, 134)", // OA cases with no specific adjournment date
+        "Settled/Decision": "#df2f4a", // isCaseSettled true
     };
 
     function hasOACases(date: CourtDate): boolean {
         const isVillage = isVillageDate(date.MuniCode);
-        const isOA = (det: string) => (det || '').toLowerCase() === 'oa';
-        return (allCases[caseKey(date)] || []).some((c) =>
-            !c.AdjournedDate &&
-            (isVillage ? isOA(c.VillageSCARDeterminationAction) : isOA(c.SCARDeterminationAction)),
+        const isOA = (det: string) => (det || "").toLowerCase() === "oa";
+        return (allCases[caseKey(date)] || []).some(
+            (c) =>
+                !c.AdjournedDate &&
+                (isVillage
+                    ? isOA(c.VillageSCARDeterminationAction)
+                    : isOA(c.SCARDeterminationAction)),
         );
     }
 
@@ -68,7 +81,10 @@ export default function CalendarList({
         let allSettled = true;
         let allReviewed = true;
         for (const caseItem of cases) {
-            if (allSettled && !isCaseSettled(caseItem, isVillageDate(date.MuniCode))) {
+            if (
+                allSettled &&
+                !isCaseSettled(caseItem, isVillageDate(date.MuniCode))
+            ) {
                 allSettled = false;
             }
             if (allReviewed && caseItem.DateCompleted === null) {
@@ -76,51 +92,55 @@ export default function CalendarList({
             }
         }
 
-        if (!allReviewed) return 'Reviewing';
-        if (cases.length > 0 && allSettled) return 'Settled/Decision';
-        if (date.Lifecycle === Lifecycle.UPLOADED) return 'NYSCEF Uploaded';
-        if (hasOACases(date)) return 'Adjourned (No Date)';
-        if (date.Lifecycle === Lifecycle.ADJOURNED) return 'Adjourned';
-        if (date.Lifecycle === Lifecycle.SCHEDULED || date.Lifecycle === Lifecycle.ASSIGNED) return 'Scheduled';
+        if (cases.length > 0 && allSettled) return "Settled/Decision";
+        if (!allReviewed) return "Reviewing";
+        if (date.Lifecycle === Lifecycle.UPLOADED) return "NYSCEF Uploaded";
+        if (hasOACases(date)) return "Adjourned (No Date)";
+        if (date.Lifecycle === Lifecycle.ADJOURNED) return "Adjourned";
+        if (
+            date.Lifecycle === Lifecycle.SCHEDULED ||
+            date.Lifecycle === Lifecycle.ASSIGNED
+        )
+            return "Scheduled";
 
-        return 'Blank';
+        return "Blank";
     }
 
     function determineLocation(date: CourtDate): string {
-        if (date.Type === HearingType.IN_PERSON) return 'In Person';
-        if (date.Type === HearingType.UNKNOWN) return 'Unknown';
-        return 'Virtual';
+        if (date.Type === HearingType.IN_PERSON) return "In Person";
+        if (date.Type === HearingType.UNKNOWN) return "Unknown";
+        return "Virtual";
     }
 
     const locationColors: Record<string, string> = {
-        Virtual: 'var(--fc-event-virtual-color)',
-        'In Person': 'var(--fc-event-inperson-color)',
-        Unknown: 'var(--fc-event-unknown-color)',
+        Virtual: "var(--fc-event-virtual-color)",
+        "In Person": "var(--fc-event-inperson-color)",
+        Unknown: "var(--fc-event-unknown-color)",
     };
 
     const columns: GridColDef[] = [
         {
-            field: 'township',
-            headerName: 'Municipality',
+            field: "township",
+            headerName: "Municipality",
             width: 150,
             disableColumnMenu: true,
         },
         {
-            field: 'county',
-            headerName: 'County',
+            field: "county",
+            headerName: "County",
             width: 125,
             disableColumnMenu: true,
             renderCell: (params) => {
                 const county = params.value as string;
-                const color = countyColors[county] || '#c4c4c4';
+                const color = countyColors[county] || "#c4c4c4";
                 return (
                     <span
                         style={{
                             backgroundColor: color,
-                            color: '#fff',
-                            padding: '4px 8px',
-                            borderRadius: '4px',
-                            fontWeight: 'bold',
+                            color: "#fff",
+                            padding: "4px 8px",
+                            borderRadius: "4px",
+                            fontWeight: "bold",
                             border: `1px solid`,
                         }}
                     >
@@ -130,21 +150,21 @@ export default function CalendarList({
             },
         },
         {
-            field: 'type',
-            headerName: 'Type',
+            field: "type",
+            headerName: "Type",
             width: 125,
             disableColumnMenu: true,
             renderCell: (params) => {
                 const type = params.value as string;
-                const color = typeColors[type] || '#c4c4c4';
+                const color = typeColors[type] || "#c4c4c4";
                 return (
                     <span
                         style={{
                             backgroundColor: color,
-                            color: '#fff',
-                            padding: '4px 8px',
-                            borderRadius: '4px',
-                            fontWeight: 'bold',
+                            color: "#fff",
+                            padding: "4px 8px",
+                            borderRadius: "4px",
+                            fontWeight: "bold",
                             border: `1px solid`,
                         }}
                     >
@@ -154,44 +174,45 @@ export default function CalendarList({
             },
         },
         {
-            field: 'district',
-            headerName: 'District',
+            field: "district",
+            headerName: "District",
             width: 75,
             disableColumnMenu: true,
         },
         {
-            field: 'numCases',
-            headerName: '# Cases',
+            field: "numCases",
+            headerName: "# Cases",
             width: 75,
             disableColumnMenu: true,
         },
         {
-            field: 'courtDate',
-            headerName: 'Court Date',
+            field: "courtDate",
+            headerName: "Court Date",
             width: 125,
             disableColumnMenu: true,
             valueFormatter: (params: Date) => {
                 const date = new Date(params);
                 return date.toLocaleDateString();
             },
-            sortComparator: (v1, v2) => new Date(v1).getTime() - new Date(v2).getTime(),
+            sortComparator: (v1, v2) =>
+                new Date(v1).getTime() - new Date(v2).getTime(),
         },
         {
-            field: 'status',
-            headerName: 'Status',
+            field: "status",
+            headerName: "Status",
             width: 150,
             disableColumnMenu: true,
             renderCell: (params) => {
                 const status = params.value as string;
-                const color = statusColors[status] || '#c4c4c4';
+                const color = statusColors[status] || "#c4c4c4";
                 return (
                     <span
                         style={{
                             backgroundColor: color,
-                            color: '#fff',
-                            padding: '4px 8px',
-                            borderRadius: '4px',
-                            fontWeight: 'bold',
+                            color: "#fff",
+                            padding: "4px 8px",
+                            borderRadius: "4px",
+                            fontWeight: "bold",
                             border: `1px solid`,
                         }}
                     >
@@ -201,8 +222,8 @@ export default function CalendarList({
             },
         },
         {
-            field: 'assigned',
-            headerName: 'Assigned',
+            field: "assigned",
+            headerName: "Assigned",
             width: 125,
             disableColumnMenu: true,
             renderCell: (params) => {
@@ -217,7 +238,12 @@ export default function CalendarList({
                         user2ID={assigned.user2ID}
                         onUpdateChair={
                             onUpdateChair
-                                ? (position, userId) => onUpdateChair(assigned.courtDateId, position, userId)
+                                ? (position, userId) =>
+                                      onUpdateChair(
+                                          assigned.courtDateId,
+                                          position,
+                                          userId,
+                                      )
                                 : undefined
                         }
                     />
@@ -225,8 +251,8 @@ export default function CalendarList({
             },
         },
         {
-            field: 'uploadDeadline',
-            headerName: 'Upload Deadline',
+            field: "uploadDeadline",
+            headerName: "Upload Deadline",
             width: 125,
             disableColumnMenu: true,
             valueFormatter: (params: Date) => {
@@ -235,21 +261,21 @@ export default function CalendarList({
             },
         },
         {
-            field: 'location',
-            headerName: 'Location',
+            field: "location",
+            headerName: "Location",
             width: 125,
             disableColumnMenu: true,
             renderCell: (params) => {
                 const location = params.value as string;
-                const color = locationColors[location] || '#c4c4c4';
+                const color = locationColors[location] || "#c4c4c4";
                 return (
                     <span
                         style={{
                             backgroundColor: color,
-                            color: '#fff',
-                            padding: '4px 8px',
-                            borderRadius: '4px',
-                            fontWeight: 'bold',
+                            color: "#fff",
+                            padding: "4px 8px",
+                            borderRadius: "4px",
+                            fontWeight: "bold",
                             border: `1px solid`,
                         }}
                     >
@@ -265,7 +291,7 @@ export default function CalendarList({
             .filter((d) => d.CourtDate)
             .map((d) => {
                 const dt = new Date(d.CourtDate!);
-                return `${d.MuniCode}-${dt.getFullYear()}-${String(dt.getMonth() + 1).padStart(2, '0')}-${String(dt.getDate()).padStart(2, '0')}`;
+                return `${d.MuniCode}-${dt.getFullYear()}-${String(dt.getMonth() + 1).padStart(2, "0")}-${String(dt.getDate()).padStart(2, "0")}`;
             }),
     );
 
@@ -276,74 +302,91 @@ export default function CalendarList({
             return courtDate.getFullYear() === currentDate.getFullYear();
         })
         .flatMap((date) => {
-            const hasMultiple = Array.isArray(date.MultipleDates) && date.MultipleDates.length > 0;
+            const hasMultiple =
+                Array.isArray(date.MultipleDates) &&
+                date.MultipleDates.length > 0;
             const baseRow = {
                 id: `${date.CourtDateID}`,
-                township: `${getTownshipName(date.MuniCode)}${hasMultiple ? ' (day 1)' : ''}`,
+                township: `${getTownshipName(date.MuniCode)}${hasMultiple ? " (day 1)" : ""}`,
                 county: getCountyName(date.MuniCode),
-                type: date.DateType === DateType.NEGOTIATIONS ? 'Negotiations' : 'Court Dates',
+                type:
+                    date.DateType === DateType.NEGOTIATIONS
+                        ? "Negotiations"
+                        : "Court Dates",
                 district: date.MuniCode,
                 numCases: date.CourtCases,
                 courtDate: date.CourtDate,
                 status: determineStatus(date),
-                assigned: { user1ID: date.FirstChair, user2ID: date.SecondChair, courtDateId: date.CourtDateID },
+                assigned: {
+                    user1ID: date.FirstChair,
+                    user2ID: date.SecondChair,
+                    courtDateId: date.CourtDateID,
+                },
                 uploadDeadline: date.UploadDeadline,
                 location: determineLocation(date),
             };
-            const adjRows: typeof baseRow[] = [];
+            const adjRows: (typeof baseRow)[] = [];
             if (filterCtx.showAdjournmentDates) {
                 const buckets = new Map<string, Case[]>();
                 for (const c of allCases[caseKey(date)] || []) {
                     if (!c.AdjournedDate) continue;
                     const d = new Date(c.AdjournedDate);
-                    const key = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+                    const key = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
                     buckets.set(key, [...(buckets.get(key) || []), c]);
                 }
                 for (const [key, adjCases] of buckets) {
-                    if (realCourtDateKeys.has(`${date.MuniCode}-${key}`)) continue;
-                    const [y, m, d] = key.split('-').map(Number);
+                    if (realCourtDateKeys.has(`${date.MuniCode}-${key}`))
+                        continue;
+                    const [y, m, d] = key.split("-").map(Number);
                     adjRows.push({
                         ...baseRow,
                         id: `${date.CourtDateID}-adj-${key}`,
                         township: `${getTownshipName(date.MuniCode)} (${date.MuniCode}) - Adjournment`,
                         numCases: adjCases.length,
                         courtDate: new Date(y, m - 1, d),
-                        status: 'Adjourned',
+                        status: "Adjourned",
                     });
                 }
             }
 
             if (!hasMultiple) return [baseRow, ...adjRows];
-            const extraRows = date.MultipleDates!.filter(Boolean).map((extraDate, index) => ({
-                ...baseRow,
-                id: `${date.CourtDateID}-extra-${index}`,
-                township: `${getTownshipName(date.MuniCode)} (day ${index + 2})`,
-                courtDate: extraDate,
-            }));
+            const extraRows = date
+                .MultipleDates!.filter(Boolean)
+                .map((extraDate, index) => ({
+                    ...baseRow,
+                    id: `${date.CourtDateID}-extra-${index}`,
+                    township: `${getTownshipName(date.MuniCode)} (day ${index + 2})`,
+                    courtDate: extraDate,
+                }));
             return [baseRow, ...adjRows, ...extraRows];
         });
 
     return (
-        <div style={{ height: isPrinting ? 'auto' : 600, width: '100%' }}>
+        <div style={{ height: isPrinting ? "auto" : 600, width: "100%" }}>
             <DataGrid
                 rows={rows}
                 columns={columns}
-                className='themed'
+                className="themed"
                 autoHeight={isPrinting}
                 hideFooter={isPrinting}
                 initialState={{
                     sorting: {
-                        sortModel: [{ field: 'courtDate', sort: 'asc' }],
+                        sortModel: [{ field: "courtDate", sort: "asc" }],
                     },
                 }}
                 onRowClick={(params) => {
-                    const courtDateId = parseInt(params.id.toString().split('-')[0], 10);
-                    const selected = filteredDates.find((date) => date.CourtDateID === courtDateId);
+                    const courtDateId = parseInt(
+                        params.id.toString().split("-")[0],
+                        10,
+                    );
+                    const selected = filteredDates.find(
+                        (date) => date.CourtDateID === courtDateId,
+                    );
                     if (selected) {
                         setSelectedDate(selected);
                     }
                 }}
-                getRowClassName={() => 'ccalendar-list-row'}
+                getRowClassName={() => "ccalendar-list-row"}
             />
         </div>
     );

package/src/hooks/UseCalendarEvents.ts

@@ -245,7 +245,7 @@ export function useCalendarEvents({
                             const [y, m, d] = key.split('-').map(Number);
                             const adjStart = new Date(y, m - 1, d);
                             if (date.HearingTime) {
-                                const [h, min] = date.HearingTime.split(':').map(Number);
+                                const [h, min] = date.HearingTime.replace(/\s*(AM|PM)$/i, '').split(':').map(Number);
                                 adjStart.setHours(h, min, 0, 0);
                             }
                             return adjStart;
@@ -281,7 +281,7 @@ export function useCalendarEvents({
             return date.MultipleDates.filter(Boolean).map((extraDate, index) => {
                 const start = new Date(extraDate);
                 if (date.HearingTime) {
-                    const [h, m] = date.HearingTime.split(':').map(Number);
+                    const [h, m] = date.HearingTime.replace(/\s*(AM|PM)$/i, '').split(':').map(Number);
                     start.setHours(h, m, 0, 0);
                 }
                 return {