| @@ -227,16 +227,15 @@ const InvoiceSearch: React.FC<Props> = ({ issuedInvoice, receivedInvoice }) => { | |||||
| function isDateInRange(dateToCheck: string, startDate: string, endDate: string): boolean { | function isDateInRange(dateToCheck: string, startDate: string, endDate: string): boolean { | ||||
| if (!startDate || !endDate) { | |||||
| return false; | |||||
| if ((!startDate || startDate === "Invalid Date") && (!endDate || endDate === "Invalid Date")) { | |||||
| return true; | |||||
| } | } | ||||
| // console.log(dateToCheck, startDate, endDate) | |||||
| const dateToCheckObj = new Date(dateToCheck); | const dateToCheckObj = new Date(dateToCheck); | ||||
| const startDateObj = new Date(startDate); | const startDateObj = new Date(startDate); | ||||
| const endDateObj = new Date(endDate); | const endDateObj = new Date(endDate); | ||||
| // console.log(dateToCheckObj >= startDateObj && dateToCheckObj <= endDateObj) | |||||
| return dateToCheckObj >= startDateObj && dateToCheckObj <= endDateObj; | |||||
| return ((!startDate || startDate === "Invalid Date") || dateToCheckObj >= startDateObj) && ((!endDate || endDate === "Invalid Date") || dateToCheckObj <= endDateObj); | |||||
| } | } | ||||
| const handleTabChange = useCallback<NonNullable<TabsProps["onChange"]>>( | const handleTabChange = useCallback<NonNullable<TabsProps["onChange"]>>( | ||||
| @@ -286,10 +285,10 @@ const InvoiceSearch: React.FC<Props> = ({ issuedInvoice, receivedInvoice }) => { | |||||
| setFilteredIssuedInvoices( | setFilteredIssuedInvoices( | ||||
| issuedInvoice.filter( | issuedInvoice.filter( | ||||
| (s) => | (s) => | ||||
| (isDateInRange(s.invoiceDate, query.invoiceDate ?? undefined, query.invoiceDateTo ?? undefined)) || | |||||
| (isDateInRange(s.dueDate, query.dueDate ?? undefined, query.dueDateTo ?? undefined)) || | |||||
| (s.invoiceNo === query.invoiceNo) || | |||||
| (s.projectCode === query.projectCode) | |||||
| (isDateInRange(s.invoiceDate, query.invoiceDate ?? undefined, query.invoiceDateTo ?? undefined)) && | |||||
| (isDateInRange(s.dueDate, query.dueDate ?? undefined, query.dueDateTo ?? undefined)) && | |||||
| (s.invoiceNo.toLowerCase().includes(query.invoiceNo.toLowerCase())) && | |||||
| (s.projectCode.toLowerCase().includes(query.projectCode.toLowerCase())) | |||||
| ), | ), | ||||
| ); | ); | ||||
| }} | }} | ||||
| @@ -305,9 +304,9 @@ const InvoiceSearch: React.FC<Props> = ({ issuedInvoice, receivedInvoice }) => { | |||||
| setFilteredReceivedInvoices( | setFilteredReceivedInvoices( | ||||
| receivedInvoice.filter( | receivedInvoice.filter( | ||||
| (s) => | (s) => | ||||
| (isDateInRange(s.receiptDate, query.receiptDate ?? undefined, query.receiptDateTo ?? undefined)) || | |||||
| (s.invoiceNo === query.invoiceNo) || | |||||
| (s.projectCode === query.projectCode) | |||||
| (isDateInRange(s.receiptDate, query.receiptDate ?? undefined, query.receiptDateTo ?? undefined)) && | |||||
| (s.invoiceNo.toLowerCase().includes(query.invoiceNo.toLowerCase())) && | |||||
| (s.projectCode.toLowerCase().includes(query.projectCode.toLowerCase())) | |||||
| ), | ), | ||||
| ); | ); | ||||
| }} | }} | ||||