@propriety/court-calendar 1.0.18 → 1.0.21

package/dist/types.d.ts

@@ -84,7 +84,7 @@ export interface Evidence {
     Evidence: string;
     ParcelID: string;
     Year: number;
-    Uploaded: {
+    uploaded: {
         Evidence: string;
         UploadDate: Date | null;
     };

package/package.json

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

package/src/_components/CCalendar.css

@@ -36,7 +36,7 @@
 }
 
 .themed,
-.themed div:not(.MuiAvatar-root, .iconHolder, .evidence-row, .timeline-connector),
+.themed div:not(.MuiAvatar-root, .iconHolder, .evidence-row, .evidence-row *, .timeline-connector),
 .themed .MuiInputBase-root,
 .themed label,
 .themed a,

package/src/_components/List/CalendarList.tsx

@@ -247,9 +247,7 @@ export default function CalendarList({
         .filter((date) => {
             if (!date.CourtDate) return false;
             const courtDate = new Date(date.CourtDate);
-            return (
-                courtDate.getMonth() === currentDate.getMonth() && courtDate.getFullYear() === currentDate.getFullYear()
-            );
+            return courtDate.getFullYear() === currentDate.getFullYear();
         })
         .map((date) => ({
             id: date.CourtDateID,

package/src/_components/Modal/CaseDetails/EvidenceSection.tsx

@@ -8,7 +8,7 @@ export default function EvidenceSection({ evidence }: { evidence: Evidence | nul
     console.log('evidence in EvidenceSection:', evidence);
 
     // Check if uploaded evidence exists
-    const hasUploadedEvidence = evidence?.Uploaded?.Evidence;
+    const hasUploadedEvidence = evidence?.uploaded?.Evidence;
 
     // Parse evidence types
     const parseEvidenceTypes = (evidenceStr: string | undefined): string[] => {
@@ -26,7 +26,7 @@ export default function EvidenceSection({ evidence }: { evidence: Evidence | nul
 
     // Get evidence types to display
     const evidenceTypes = hasUploadedEvidence
-        ? parseEvidenceTypes(evidence.Uploaded.Evidence)
+        ? parseEvidenceTypes(evidence.uploaded.Evidence)
         : parseEvidenceTypes(evidence?.Evidence);
 
     const hasSales = evidenceTypes.some((type) => type.includes('sales') || type.includes('unequal'));
@@ -34,8 +34,8 @@ export default function EvidenceSection({ evidence }: { evidence: Evidence | nul
     const hasAnyEvidence = hasSales || hasEquity;
 
     // Format upload date if available
-    const uploadDate = evidence?.Uploaded?.UploadDate
-        ? new Date(evidence.Uploaded.UploadDate).toLocaleDateString()
+    const uploadDate = evidence?.uploaded?.UploadDate
+        ? new Date(evidence.uploaded.UploadDate).toLocaleDateString()
         : '';
 
     // format creation date if available

package/src/_components/Modal/View/CaseViewer.tsx

@@ -3,13 +3,14 @@ import type { CalendarFilterCtx, Case } from '@/types';
 import Box from '@mui/material/Box';
 import Stack from '@mui/material/Stack';
 import Typography from '@mui/material/Typography';
-import { formatEvidence } from '@/helpers/formatter';
 import CircularProgress from '@mui/material/CircularProgress';
+import Tooltip from '@mui/material/Tooltip';
 import { DataGrid, type GridColDef } from '@mui/x-data-grid';
 import CaseToolbar from './CaseToolbar';
 import { filterCases } from '@/helpers/cases';
 import CheckCircleIcon from '@mui/icons-material/CheckCircle';
 import CancelIcon from '@mui/icons-material/Cancel';
+import HourglassBottomIcon from '@mui/icons-material/HourglassBottom';
 
 const CaseViewer = memo(function CaseViewer({
     cases,
@@ -78,8 +79,44 @@ const CaseViewer = memo(function CaseViewer({
         {
             field: 'evidence',
             headerName: 'Evidence',
-            width: 100,
+            width: 150,
             disableColumnMenu: true,
+            renderCell: (params) => {
+                const evidence = params.row._case.evidence;
+                if (!evidence || !evidence.Evidence) {
+                    return (
+                        <Tooltip title='No evidence'>
+                            <Box display='flex' alignItems='center' gap={0.5} width='100%' mt={1.7}>
+                                <CancelIcon sx={{ color: '#f44336', fontSize: 20 }} />
+                                <Typography variant='body2'>None</Typography>
+                            </Box>
+                        </Tooltip>
+                    );
+                }
+                const evidenceType = (evidence.uploaded?.Evidence || evidence.Evidence).replace(/[[\]"]+/g, '');
+                const hasBeenUploaded = evidence.uploaded && evidence.uploaded.Evidence;
+                if (hasBeenUploaded) {
+                    const uploadDate = evidence.uploaded.UploadDate
+                        ? new Date(evidence.uploaded.UploadDate).toLocaleDateString()
+                        : 'unknown date';
+                    return (
+                        <Tooltip title={`Uploaded on ${uploadDate}`}>
+                            <Box display='flex' alignItems='center' gap={0.5} width='100%' mt={1.7}>
+                                <CheckCircleIcon sx={{ color: '#4caf50', fontSize: 20 }} />
+                                <Typography variant='body2'>{evidenceType}</Typography>
+                            </Box>
+                        </Tooltip>
+                    );
+                }
+                return (
+                    <Tooltip title='Created, not yet uploaded'>
+                        <Box display='flex' alignItems='center' gap={0.5} width='100%' mt={1.7}>
+                            <HourglassBottomIcon sx={{ color: '#ff9800', fontSize: 20 }} />
+                            <Typography variant='body2'>{evidenceType}</Typography>
+                        </Box>
+                    </Tooltip>
+                );
+            },
         },
         {
             field: 'determination',
@@ -130,7 +167,7 @@ const CaseViewer = memo(function CaseViewer({
             owner: caseItem.property_data?.PropertyOwnerFull || 'Loading...',
             reviewed: caseItem.DateCompleted ? 'Yes' : 'No',
             address: caseItem.property_data?.Address || 'Loading...',
-            evidence: caseItem.evidence ? formatEvidence(caseItem.evidence) : 'N/A',
+            evidence: caseItem.evidence,
             determination: getActionDetail(caseItem),
             pid: caseItem.ParcelID || 'N/A',
             _case: caseItem,
@@ -164,22 +201,24 @@ const CaseViewer = memo(function CaseViewer({
             <div
                 className='case-table-anim'
                 style={{
-                    maxHeight: tableOpen ? 1000 : 0,
-                    overflow: 'hidden',
+                    maxHeight: tableOpen ? 5000 : 0,
+                    overflow: tableOpen ? 'visible' : 'hidden',
                     transition: 'max-height 0.5s cubic-bezier(0.4, 0, 0.2, 1)',
                 }}
             >
                 {!isFetchingCases && cases.length > 0 && (
-                    <Stack>
-                        <Box mb={2}>
-                            <CaseToolbar filterCtx={filterCtx} setFilterCtx={setFilterCtx} />
-                        </Box>
-                        <Box mx={1} mb={1} justifyContent={'center'} alignItems={'center'} display='flex'>
-                            <Typography variant='body1' fontStyle={''}>
-                                {rows.length} case{rows.length !== 1 ? 's' : ''} found, click a row to view additional
-                                case details.
-                            </Typography>
-                        </Box>
+                    <>
+                        <Stack>
+                            <Box mb={2}>
+                                <CaseToolbar filterCtx={filterCtx} setFilterCtx={setFilterCtx} />
+                            </Box>
+                            <Box mx={1} mb={1} justifyContent={'center'} alignItems={'center'} display='flex'>
+                                <Typography variant='body1' fontStyle={''}>
+                                    {rows.length} case{rows.length !== 1 ? 's' : ''} found, click a row to view
+                                    additional case details.
+                                </Typography>
+                            </Box>
+                        </Stack>
                         <DataGrid
                             autoHeight
                             rows={rows}
@@ -196,7 +235,7 @@ const CaseViewer = memo(function CaseViewer({
                                 },
                             }}
                         />
-                    </Stack>
+                    </>
                 )}
             </div>
         </Box>

package/src/_components/Modal/View/DateDetails.tsx

@@ -1,4 +1,4 @@
-import { HearingType, Lifecycle, type Case, type CourtDate } from '../../../types';
+import { HearingType, type Case, type CourtDate } from '../../../types';
 import Box from '@mui/material/Box';
 import Typography from '@mui/material/Typography';
 import FormRow from '../../Shared/FormRow';
@@ -7,7 +7,7 @@ import Stack from '@mui/material/Stack';
 import { useReferenceData } from '@/context/ReferenceDataContext';
 import { useMemo } from 'react';
 import NoticeFileLink from './NoticeFileLink';
-import { isCaseSettled } from '@/helpers/cases';
+import { isCaseSettled, isCaseUploadedOrSettled } from '@/helpers/cases';
 import StatusTimeline from './StatusTimeline';
 import AdjournedBox from './AdjournedBox';
 import ChairBox from './ChairBox';
@@ -36,12 +36,9 @@ export default function DateDetails({
 
     const allUploaded = useMemo(() => {
         if (!selectedCourtDate) return false;
-        return (
-            selectedCourtDate.Lifecycle === Lifecycle.UPLOADED ||
-            selectedCourtDate.Lifecycle === Lifecycle.SCHEDULED ||
-            selectedCourtDate.Lifecycle === Lifecycle.ADJOURNED
-        );
-    }, [selectedCourtDate]);
+        if (cases.length === 0) return false;
+        return cases.every((c) => isCaseUploadedOrSettled(c, isVillage));
+    }, [selectedCourtDate, cases]);
 
     const allSettled = useMemo(() => {
         if (cases.length === 0) return false;

package/src/_components/Modal/View/StatusTimeline.tsx

@@ -65,7 +65,7 @@ export default function StatusTimeline({
                                 sx={{ color: 'var(--text, inherit)' }}
                             >
                                 {stage.label}
-                                {skipped && ' (Skipped)'}
+                                {skipped && ''}
                             </Typography>
                         </Stack>
                         {index < stages.length - 1 && (

package/src/_components/Toolbar/Toolbar.tsx

@@ -24,6 +24,7 @@ export default function Toolbar({
     handleCreateClick,
     currentView,
     setCurrentView,
+    currentDate,
     setCurrentDate,
     activeUser,
     isFetchingCases,
@@ -46,34 +47,43 @@ export default function Toolbar({
     useEffect(() => {
         if (calendarApi) {
             const handleDatesSet = () => {
-                setCurrentTitle(calendarApi.getCurrentData().viewTitle);
+                if (currentView !== 'tableView') {
+                    setCurrentTitle(calendarApi.getCurrentData().viewTitle);
+                }
             };
             calendarApi.on('datesSet', handleDatesSet);
             return () => {
                 calendarApi.off('datesSet', handleDatesSet);
             };
         }
-    }, [calendarApi]);
+    }, [calendarApi, currentView]);
 
     useEffect(() => {
+        if (currentView === 'tableView') {
+            setCurrentTitle(currentDate.getFullYear().toString());
+            return;
+        }
         if (calendarApi) {
-            if (currentView === 'tableView') {
-                setCurrentTitle(calendarApi.getDate().toLocaleDateString('en-US', { month: 'long', year: 'numeric' }));
-                return;
-            }
             setCurrentTitle(calendarApi.getCurrentData().viewTitle);
         }
-    }, [calendarApi, currentView]);
+    }, [calendarApi, currentView, currentDate]);
 
     function goToToday() {
+        setCurrentDate(new Date());
+        if (currentView === 'tableView') return;
         if (calendarApi) {
             calendarApi.today();
-            setCurrentDate(new Date());
             setCurrentTitle(calendarApi.getCurrentData().viewTitle);
         }
     }
 
     function handleNext() {
+        if (currentView === 'tableView') {
+            const next = new Date(currentDate);
+            next.setFullYear(next.getFullYear() + 1);
+            setCurrentDate(next);
+            return;
+        }
         if (calendarApi) {
             calendarApi.next();
             setCurrentDate(calendarApi.getDate());
@@ -82,6 +92,12 @@ export default function Toolbar({
     }
 
     function handlePrev() {
+        if (currentView === 'tableView') {
+            const prev = new Date(currentDate);
+            prev.setFullYear(prev.getFullYear() - 1);
+            setCurrentDate(prev);
+            return;
+        }
         if (calendarApi) {
             calendarApi.prev();
             setCurrentDate(calendarApi.getDate());

package/src/helpers/cases.ts

@@ -81,6 +81,11 @@ export function isCaseSettled(c: Case, isVillage: boolean): boolean {
     return false;
 }
 
+export function isCaseUploadedOrSettled(c: Case, isVillage: boolean): boolean {
+    if (isCaseSettled(c, isVillage)) return true;
+    return c.evidence !== null && c.evidence.uploaded !== null && c.evidence.uploaded.Evidence !== null;
+}
+
 export function isCaseMissingEvidence(c: Case): boolean {
     if (!c.evidence) return true;
     if (!c.evidence.Evidence || c.evidence.Evidence === null) return true;

package/src/helpers/formatter.ts

@@ -38,8 +38,8 @@ function to24Hour(time: string): string {
 // [\"Sales\"] -> Sales
 export function formatEvidence(evidence: Evidence): string {
     if (!evidence || !evidence.Evidence) return '';
-    const hasBeenUploaded = evidence.Uploaded && evidence.Uploaded.Evidence;
+    const hasBeenUploaded = evidence.uploaded && evidence.uploaded.Evidence;
     if (!hasBeenUploaded) return `${evidence.Evidence.replace(/[[\]"]+/g, '')} created`;
-    const uploadDate = evidence.Uploaded.UploadDate ?? '';
-    return `${evidence.Uploaded.Evidence.replace(/[[\]"]+/g, '')} uploaded on ${uploadDate ? new Date(uploadDate).toLocaleDateString() : 'unknown date'}`;
+    const uploadDate = evidence.uploaded.UploadDate ?? '';
+    return `${evidence.uploaded.Evidence.replace(/[[\]"]+/g, '')} uploaded on ${uploadDate ? new Date(uploadDate).toLocaleDateString() : 'unknown date'}`;
 }

package/src/types.ts

@@ -104,7 +104,7 @@ export interface Evidence {
     Evidence: string;
     ParcelID: string;
     Year: number;
-    Uploaded: {
+    uploaded: {
         Evidence: string;
         UploadDate: Date | null;
     };