| @@ -53,7 +53,7 @@ type SearchQuery2 = Partial<Omit<receivedInvoiceSearchForm, "id">>; | |||||
| type SearchParamNames2 = keyof SearchQuery2; | type SearchParamNames2 = keyof SearchQuery2; | ||||
| const InvoiceSearch: React.FC<Props> & SubComponents = ({ invoices, projects, abilities }) => { | const InvoiceSearch: React.FC<Props> & SubComponents = ({ invoices, projects, abilities }) => { | ||||
| console.log(abilities) | |||||
| console.log(uniq(invoices.map((invoice) => invoice.teamCodeName))) | |||||
| const { t } = useTranslation("Invoice"); | const { t } = useTranslation("Invoice"); | ||||
| const [filteredIvoices, setFilterInovices] = useState(invoices); | const [filteredIvoices, setFilterInovices] = useState(invoices); | ||||
| @@ -489,12 +489,13 @@ const InvoiceSearch: React.FC<Props> & SubComponents = ({ invoices, projects, ab | |||||
| <SearchBox | <SearchBox | ||||
| criteria={searchCriteria} | criteria={searchCriteria} | ||||
| onSearch={(query) => { | onSearch={(query) => { | ||||
| // console.log(query) | |||||
| // console.log(query.team) | |||||
| // console.log(invoices[0].team) | |||||
| setFilterInovices( | setFilterInovices( | ||||
| invoices.filter( | invoices.filter( | ||||
| (s) => (s.invoiceNo.toLowerCase().includes(query.invoiceNo.toLowerCase())) | (s) => (s.invoiceNo.toLowerCase().includes(query.invoiceNo.toLowerCase())) | ||||
| && (s.projectCode.toLowerCase().includes(query.projectCode.toLowerCase())) | && (s.projectCode.toLowerCase().includes(query.projectCode.toLowerCase())) | ||||
| && (query.team === "All" || query.team.toLowerCase().includes(s.team.toLowerCase())) | |||||
| && (query.team === "All" || query.team.includes(s.team)) | |||||
| && (isDateInRange(s.issuedDate, query.invoiceDate ?? undefined, query.invoiceDateTo ?? undefined)) | && (isDateInRange(s.issuedDate, query.invoiceDate ?? undefined, query.invoiceDateTo ?? undefined)) | ||||
| && (isDateInRange(s.receiptDate, query.dueDate ?? undefined, query.dueDateTo ?? undefined)) | && (isDateInRange(s.receiptDate, query.dueDate ?? undefined, query.dueDateTo ?? undefined)) | ||||
| ), | ), | ||||