@propriety/court-calendar 0.0.13 → 0.0.15

package/package.json

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

package/src/_components/CCalendar.tsx

@@ -59,7 +59,7 @@ export default function CCalendar({ apiKey, activeUser }: { apiKey: string; acti
         searchTerm: '',
         municode: null,
         user: null,
-        showOnlyUnsettled: false,
+        showOnlyUnsettled: true,
         showOnlyWithoutEvidence: false,
         showOnlyUnreviewed: false,
     });
@@ -81,7 +81,7 @@ export default function CCalendar({ apiKey, activeUser }: { apiKey: string; acti
     async function getAllCourtDates(apiKey: string) {
         // Try to load from IndexedDB cache
         const cachedDates = await getCourtDatesCache();
-        if (cachedDates) {
+        if (cachedDates && cachedDates.length > 0) {
             setCourtDates(cachedDates);
         } else {
             getAllDates(apiKey)
@@ -132,7 +132,7 @@ export default function CCalendar({ apiKey, activeUser }: { apiKey: string; acti
         updateCourtDateInMemory(updatedCourtDate);
 
         // Then persist to API in background
-        updateCourtDate(courtDateId, updatedData, apiKey).then((success) => {
+        updateCourtDate(courtDateId, updatedData, apiKey, undefined, activeUser).then((success) => {
             if (!success) {
                 // Revert on failure
                 updateCourtDateInMemory(courtDate);
@@ -718,6 +718,7 @@ export default function CCalendar({ apiKey, activeUser }: { apiKey: string; acti
                 deleteCases={deleteCaseMemoryAndCache}
                 isFetchingCases={isFetchingCases}
                 apiKey={apiKey}
+                activeUser={activeUser}
             />
             <Tooltip id='event-tooltip' className='cc-tooltip' />
         </div>

package/src/_components/Modal/CreateEdit/DateSelector.tsx

@@ -1,42 +1,42 @@
-import { DatePicker } from '@mui/x-date-pickers';
-import dayjs from 'dayjs';
-import type { CourtDate } from '@/types';
-
-export default function DateSelector({
-    editing,
-    property,
-    label,
-    setEdited,
-    disabled,
-}: {
-    editing: CourtDate | undefined;
-    property: keyof CourtDate;
-    label: string;
-    setEdited: (data: CourtDate) => void;
-    disabled: boolean;
-}) {
-    return (
-        <DatePicker
-            label={label}
-            disabled={disabled}
-            value={
-                editing && editing[property] && typeof editing[property] !== 'boolean'
-                    ? dayjs(editing[property] as string | number | Date)
-                    : null
-            }
-            onChange={(newValue) => {
-                setEdited({
-                    ...editing!,
-                    [property]: newValue!.toDate(),
-                });
-            }}
-            reduceAnimations
-            sx={{ width: '100%' }}
-            slotProps={{
-                popper: {
-                    className: 'themed',
-                },
-            }}
-        />
-    );
-}
+import { DatePicker } from '@mui/x-date-pickers';
+import dayjs from 'dayjs';
+import type { CourtDate } from '@/types';
+
+export default function DateSelector({
+    editing,
+    property,
+    label,
+    setEdited,
+    disabled,
+}: {
+    editing: CourtDate | undefined;
+    property: keyof CourtDate;
+    label: string;
+    setEdited: (data: CourtDate) => void;
+    disabled: boolean;
+}) {
+    return (
+        <DatePicker
+            label={label}
+            disabled={disabled}
+            value={
+                editing && editing[property] && typeof editing[property] !== 'boolean'
+                    ? dayjs(editing[property] as string | number | Date)
+                    : null
+            }
+            onChange={(newValue) => {
+                setEdited({
+                    ...editing!,
+                    [property]: newValue!.toDate(),
+                });
+            }}
+            reduceAnimations
+            sx={{ width: '100%' }}
+            slotProps={{
+                popper: {
+                    className: 'themed',
+                },
+            }}
+        />
+    );
+}

package/src/_components/Modal/Modal.css

@@ -1,15 +1,15 @@
-/* Modal appearing animation */
-.modal-appear-animate {
-    animation: modalFadeIn 0.35s cubic-bezier(0.4, 0, 0.2, 1);
-}
-
-@keyframes modalFadeIn {
-    from {
-        opacity: 0;
-        transform: scale(0.96) translateY(24px);
-    }
-    to {
-        opacity: 1;
-        transform: scale(1) translateY(0);
-    }
-}
+/* Modal appearing animation */
+.modal-appear-animate {
+    animation: modalFadeIn 0.35s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+@keyframes modalFadeIn {
+    from {
+        opacity: 0;
+        transform: scale(0.96) translateY(24px);
+    }
+    to {
+        opacity: 1;
+        transform: scale(1) translateY(0);
+    }
+}

package/src/_components/Modal/Modal.tsx

@@ -29,6 +29,7 @@ export default function CCModal({
     deleteCases,
     isFetchingCases,
     apiKey,
+    activeUser,
 }: {
     modalIsOpen: boolean;
     modalMode: ModalMode;
@@ -43,6 +44,7 @@ export default function CCModal({
     deleteCases: (courtDateId: string) => void;
     isFetchingCases: boolean;
     apiKey: string;
+    activeUser: number;
 }) {
     const [editedData, setEditedData] = useState<CourtDate | undefined>(undefined);
     const [editedCases, setEditedCases] = useState<Case[]>([]);
@@ -149,6 +151,7 @@ export default function CCModal({
             editedData,
             apiKey,
             editedCases.map((c) => c.SCARIndexNumber),
+            activeUser,
         );
         // Update cache after save
         const courtDateId = editedData.CourtDateID;
@@ -171,6 +174,7 @@ export default function CCModal({
             editedData.MuniCode,
             apiKey,
             editedCases.map((c) => c.SCARIndexNumber),
+            editedData.HearingTime || undefined,
         );
         if (id) {
             const updatedData = { ...editedData, CourtDateID: id };

package/src/_components/Modal/View/InfoBoxBtn.css

@@ -1,39 +1,39 @@
-.info-box-btn {
-    cursor: pointer;
-    width: 100%;
-    display: inherit;
-    position: relative;
-}
-
-.info-box-btn > .info-box-btn-cover {
-    position: absolute;
-    top: 0%;
-    width: 5%;
-    right: 0;
-    height: 100%;
-    background-color: var(--text) !important;
-    color: var(--text);
-    z-index: 99999;
-    border-top-right-radius: 8px;
-    border-bottom-right-radius: 8px;
-    overflow: hidden;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    opacity: 0.7;
-    transition:
-        background-color 0.3s,
-        height 0.3s,
-        width 0.3s,
-        top 0.3s,
-        border-radius 0.3s,
-        opacity 0.3s;
-}
-.info-box-btn:hover > .info-box-btn-cover {
-    height: 100%;
-    width: 100%;
-    background-color: var(--fc-today-bg-color) !important;
-    top: 0;
-    border-radius: 8px;
-    opacity: 1;
-}
+.info-box-btn {
+    cursor: pointer;
+    width: 100%;
+    display: inherit;
+    position: relative;
+}
+
+.info-box-btn > .info-box-btn-cover {
+    position: absolute;
+    top: 0%;
+    width: 5%;
+    right: 0;
+    height: 100%;
+    background-color: var(--text) !important;
+    color: var(--text);
+    z-index: 99999;
+    border-top-right-radius: 8px;
+    border-bottom-right-radius: 8px;
+    overflow: hidden;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    opacity: 0.7;
+    transition:
+        background-color 0.3s,
+        height 0.3s,
+        width 0.3s,
+        top 0.3s,
+        border-radius 0.3s,
+        opacity 0.3s;
+}
+.info-box-btn:hover > .info-box-btn-cover {
+    height: 100%;
+    width: 100%;
+    background-color: var(--fc-today-bg-color) !important;
+    top: 0;
+    border-radius: 8px;
+    opacity: 1;
+}

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

@@ -1,29 +1,29 @@
-import Typography from '@mui/material/Typography';
-import InfoBox from './InfoBox';
-import './InfoBoxBtn.css';
-import Stack from '@mui/material/Stack';
-import Box from '@mui/material/Box';
-
-export default function InfoBoxBtn({
-    label,
-    info,
-    btnLabel,
-    btnIcon,
-    onBtnClick,
-}: {
-    label: string;
-    info: string;
-    btnLabel?: string;
-    btnIcon?: React.ReactNode;
-    onBtnClick?: () => void;
-}) {
-    return (
-        <Box className='info-box-btn' onClick={onBtnClick}>
-            <Stack className='info-box-btn-cover' direction={'column'}>
-                <Typography variant={'h6'}>{btnLabel}</Typography>
-                {btnIcon}
-            </Stack>
-            <InfoBox label={label} info={info} />
-        </Box>
-    );
-}
+import Typography from '@mui/material/Typography';
+import InfoBox from './InfoBox';
+import './InfoBoxBtn.css';
+import Stack from '@mui/material/Stack';
+import Box from '@mui/material/Box';
+
+export default function InfoBoxBtn({
+    label,
+    info,
+    btnLabel,
+    btnIcon,
+    onBtnClick,
+}: {
+    label: string;
+    info: string;
+    btnLabel?: string;
+    btnIcon?: React.ReactNode;
+    onBtnClick?: () => void;
+}) {
+    return (
+        <Box className='info-box-btn' onClick={onBtnClick}>
+            <Stack className='info-box-btn-cover' direction={'column'}>
+                <Typography variant={'h6'}>{btnLabel}</Typography>
+                {btnIcon}
+            </Stack>
+            <InfoBox label={label} info={info} />
+        </Box>
+    );
+}

package/src/_components/Shared/FormRow.tsx

@@ -1,37 +1,37 @@
-import Box from '@mui/material/Box';
-import Stack from '@mui/material/Stack';
-import Typography from '@mui/material/Typography';
-
-export default function FormRow({
-    children,
-    gap = 7,
-    header,
-    subheader,
-}: {
-    children: React.ReactNode;
-    gap?: number;
-    header?: string;
-    subheader?: string;
-}) {
-    return (
-        <>
-            <Stack direction='column' spacing={0.5} mb={header !== undefined ? 3 : 0}>
-                <Typography variant='h6'>{header}</Typography>
-                <Typography variant='body2' sx={{ opacity: 0.85 }}>
-                    {subheader}
-                </Typography>
-            </Stack>
-            <Box
-                marginTop={1}
-                marginBottom={1}
-                display='flex'
-                flexDirection='row'
-                alignItems={'center'}
-                justifyContent={'space-between'}
-                gap={gap}
-            >
-                {children}
-            </Box>
-        </>
-    );
-}
+import Box from '@mui/material/Box';
+import Stack from '@mui/material/Stack';
+import Typography from '@mui/material/Typography';
+
+export default function FormRow({
+    children,
+    gap = 7,
+    header,
+    subheader,
+}: {
+    children: React.ReactNode;
+    gap?: number;
+    header?: string;
+    subheader?: string;
+}) {
+    return (
+        <>
+            <Stack direction='column' spacing={0.5} mb={header !== undefined ? 3 : 0}>
+                <Typography variant='h6'>{header}</Typography>
+                <Typography variant='body2' sx={{ opacity: 0.85 }}>
+                    {subheader}
+                </Typography>
+            </Stack>
+            <Box
+                marginTop={1}
+                marginBottom={1}
+                display='flex'
+                flexDirection='row'
+                alignItems={'center'}
+                justifyContent={'space-between'}
+                gap={gap}
+            >
+                {children}
+            </Box>
+        </>
+    );
+}

package/src/_components/Shared/SearchBar.tsx

@@ -1,87 +1,87 @@
-import InputAdornment from '@mui/material/InputAdornment';
-import TextField from '@mui/material/TextField';
-import CancelIcon from '@mui/icons-material/Cancel';
-import SearchIcon from '@mui/icons-material/Search';
-import IconButton from '@mui/material/IconButton';
-import { useState, useEffect, useRef } from 'react';
-
-export default function SearchBar({
-    searchTerm,
-    setSearchTerm,
-    width,
-}: {
-    searchTerm: string;
-    setSearchTerm: (term: string) => void;
-    width?: string | number;
-}) {
-    const [inputValue, setInputValue] = useState(searchTerm);
-    const inputRef = useRef<HTMLInputElement>(null);
-
-    // Keep local inputValue in sync with searchTerm prop
-    useEffect(() => {
-        setInputValue(searchTerm);
-    }, [searchTerm]);
-
-    useEffect(() => {
-        const handler = setTimeout(() => {
-            if (inputValue !== searchTerm) {
-                setSearchTerm(inputValue);
-            }
-        }, 300);
-        return () => clearTimeout(handler);
-    }, [inputValue, searchTerm, setSearchTerm]);
-
-    return (
-        <TextField
-            aria-label='Search'
-            placeholder='Search...'
-            size='small'
-            variant='outlined'
-            value={inputValue}
-            onChange={(e) => setInputValue(e.target.value)}
-            fullWidth={width === undefined}
-            style={{ width: width ?? '100%' }}
-            sx={{
-                '& .MuiOutlinedInput-root:hover': {
-                    backgroundColor: 'var(--fc-today-bg-color) !important',
-                    '& .MuiInputAdornment-root': {
-                        backgroundColor: 'inherit !important',
-                    },
-                },
-            }}
-            slotProps={{
-                input: {
-                    ref: inputRef,
-                    sx: { paddingY: '2px' },
-                    startAdornment: (
-                        <InputAdornment
-                            position='start'
-                            onClick={() => inputRef.current?.focus()}
-                            sx={{ cursor: 'pointer' }}
-                        >
-                            <SearchIcon
-                                fontSize='small'
-                                sx={{
-                                    userSelect: 'none',
-                                    pointerEvents: 'none',
-                                }}
-                            />
-                        </InputAdornment>
-                    ),
-                    endAdornment: inputValue ? (
-                        <InputAdornment position='end'>
-                            <IconButton
-                                size='small'
-                                aria-label='Clear search'
-                                sx={{ marginRight: -0.75, paddingY: '2px' }}
-                                onClick={() => setInputValue('')}
-                            >
-                                <CancelIcon fontSize='small' />
-                            </IconButton>
-                        </InputAdornment>
-                    ) : null,
-                },
-            }}
-        />
-    );
-}
+import InputAdornment from '@mui/material/InputAdornment';
+import TextField from '@mui/material/TextField';
+import CancelIcon from '@mui/icons-material/Cancel';
+import SearchIcon from '@mui/icons-material/Search';
+import IconButton from '@mui/material/IconButton';
+import { useState, useEffect, useRef } from 'react';
+
+export default function SearchBar({
+    searchTerm,
+    setSearchTerm,
+    width,
+}: {
+    searchTerm: string;
+    setSearchTerm: (term: string) => void;
+    width?: string | number;
+}) {
+    const [inputValue, setInputValue] = useState(searchTerm);
+    const inputRef = useRef<HTMLInputElement>(null);
+
+    // Keep local inputValue in sync with searchTerm prop
+    useEffect(() => {
+        setInputValue(searchTerm);
+    }, [searchTerm]);
+
+    useEffect(() => {
+        const handler = setTimeout(() => {
+            if (inputValue !== searchTerm) {
+                setSearchTerm(inputValue);
+            }
+        }, 300);
+        return () => clearTimeout(handler);
+    }, [inputValue, searchTerm, setSearchTerm]);
+
+    return (
+        <TextField
+            aria-label='Search'
+            placeholder='Search...'
+            size='small'
+            variant='outlined'
+            value={inputValue}
+            onChange={(e) => setInputValue(e.target.value)}
+            fullWidth={width === undefined}
+            style={{ width: width ?? '100%' }}
+            sx={{
+                '& .MuiOutlinedInput-root:hover': {
+                    backgroundColor: 'var(--fc-today-bg-color) !important',
+                    '& .MuiInputAdornment-root': {
+                        backgroundColor: 'inherit !important',
+                    },
+                },
+            }}
+            slotProps={{
+                input: {
+                    ref: inputRef,
+                    sx: { paddingY: '2px' },
+                    startAdornment: (
+                        <InputAdornment
+                            position='start'
+                            onClick={() => inputRef.current?.focus()}
+                            sx={{ cursor: 'pointer' }}
+                        >
+                            <SearchIcon
+                                fontSize='small'
+                                sx={{
+                                    userSelect: 'none',
+                                    pointerEvents: 'none',
+                                }}
+                            />
+                        </InputAdornment>
+                    ),
+                    endAdornment: inputValue ? (
+                        <InputAdornment position='end'>
+                            <IconButton
+                                size='small'
+                                aria-label='Clear search'
+                                sx={{ marginRight: -0.75, paddingY: '2px' }}
+                                onClick={() => setInputValue('')}
+                            >
+                                <CancelIcon fontSize='small' />
+                            </IconButton>
+                        </InputAdornment>
+                    ) : null,
+                },
+            }}
+        />
+    );
+}

package/src/helpers/cases.ts

@@ -62,11 +62,19 @@ export function isCaseSettled(c: Case, isVillage: boolean): boolean {
     if (!isVillage) {
         // town
         if (c.SCARDeterminationAction === null) return false;
-        if (c.SCARDeterminationAction.toLowerCase().includes('s')) return true;
+        if (
+            c.SCARDeterminationAction.toLowerCase().includes('s') ||
+            c.SCARDeterminationAction.toLowerCase().includes('w')
+        )
+            return true;
     } else {
         // village
         if (c.VillageSCARDeterminationAction === null) return false;
-        if (c.VillageSCARDeterminationAction.toLowerCase().includes('s')) return true;
+        if (
+            c.VillageSCARDeterminationAction.toLowerCase().includes('s') ||
+            c.VillageSCARDeterminationAction.toLowerCase().includes('w')
+        )
+            return true;
     }
     return false;
 }

package/src/helpers/courtDates.ts

@@ -1,5 +1,5 @@
 import { HearingType, Lifecycle, SourceType, type CourtDate } from '../types';
-import { formatDateForAPI } from './formatter';
+import { formatDateTimeForAPI } from './formatter';
 
 export async function getAllDates(apiKey: string): Promise<Array<CourtDate>> {
     if (!apiKey) return [];
@@ -30,8 +30,10 @@ export async function updateCourtDate(
     updatedData: Partial<CourtDate>,
     apiKey: string,
     courtCases?: string[],
+    user?: number,
 ): Promise<boolean> {
     if (!apiKey) return false;
+    console.log(`Updating court date ${courtDateId} by user: ${user} with data:`, updatedData);
     const res = await fetch(`https://utils.aventine.ai/court-dates/${courtDateId}/update`, {
         method: 'PUT',
         mode: 'cors',
@@ -41,20 +43,23 @@ export async function updateCourtDate(
         },
         body: JSON.stringify({
             adjournment_date: updatedData.AdjournmentDate
-                ? formatDateForAPI(new Date(updatedData.AdjournmentDate))
+                ? formatDateTimeForAPI(new Date(updatedData.AdjournmentDate), updatedData.HearingTime || undefined)
+                : undefined,
+            court_date: updatedData.CourtDate
+                ? formatDateTimeForAPI(new Date(updatedData.CourtDate), updatedData.HearingTime || undefined)
                 : undefined,
-            court_date: updatedData.CourtDate ? formatDateForAPI(new Date(updatedData.CourtDate)) : undefined,
             hearing_link: updatedData.HearingLink !== '' ? updatedData.HearingLink : undefined,
-            hearing_officer: updatedData.HearingOfficer !== null ? updatedData.HearingOfficer : undefined,
+            hearing_officer: updatedData.HearingOfficer !== undefined ? updatedData.HearingOfficer : undefined,
             hearing_time: updatedData.HearingTime !== '' ? updatedData.HearingTime : undefined,
             hearing_type: updatedData.Type !== HearingType.UNKNOWN ? updatedData.Type : undefined,
             muni: updatedData.MuniCode,
-            firstChair: updatedData.FirstChair !== null ? updatedData.FirstChair : undefined,
-            secondChair: updatedData.SecondChair !== null ? updatedData.SecondChair : undefined,
+            first_chair: updatedData.FirstChair !== undefined ? updatedData.FirstChair : undefined,
+            second_chair: updatedData.SecondChair !== undefined ? updatedData.SecondChair : undefined,
             lifecycle: updatedData.Lifecycle !== Lifecycle.SCHEDULED ? updatedData.Lifecycle : undefined,
             court_cases: courtCases || undefined,
             is_adjourned: updatedData.IsAdjourned !== undefined ? updatedData.IsAdjourned : undefined,
             notes: updatedData.Notes !== null ? updatedData.Notes : undefined,
+            edit_user: user !== undefined ? user : undefined,
         }),
     });
     if (res.ok) {
@@ -90,6 +95,7 @@ export async function createCourtDate(
     muniCode: string,
     apiKey: string,
     courtCases?: string[],
+    hearingTime?: string,
 ): Promise<number | null> {
     if (!apiKey) return null;
     const res = await fetch(`https://utils.aventine.ai/court-dates/create`, {
@@ -100,7 +106,7 @@ export async function createCourtDate(
             'x-api-key': apiKey,
         },
         body: JSON.stringify({
-            court_date: formatDateForAPI(new Date(courtDate)),
+            court_date: formatDateTimeForAPI(new Date(courtDate), hearingTime || undefined),
             muni: muniCode,
             source: SourceType.MANUAL,
             court_cases: courtCases || [],