diff --git a/src/pages/AssessorPage/Assessor.tsx b/src/pages/AssessorPage/Assessor.tsx index ec55703..591501a 100644 --- a/src/pages/AssessorPage/Assessor.tsx +++ b/src/pages/AssessorPage/Assessor.tsx @@ -79,7 +79,7 @@ export default () => { const [filter, setFilter] = createSignal('') - const listType = ['Print', 'Reprint', 'Reprint and Void'] + const listType = ['Print', 'Reprint (No Change)', 'Void and Reprint'] const [selectedType, setSelectedType] = createSignal('Print') const [voidError, setVoidError] = createSignal(false) @@ -342,8 +342,6 @@ export default () => { } const rePrintHandler = async (division: string, application: string) => { - // let updateOrderofpayment: boolean = false - setConnected(await checkConnection()) if (connected() === false) { setErrorMessage('No Connection on Server') @@ -370,29 +368,27 @@ export default () => { } if (division === 'electrical') { - await setNewStatus(division, 'ELECTRICAL ORDER OF PAYMENT REPRINTED', '175', 'ELECOPREPRINTED', 1) - await setNewStatus(division, 'ELECTRICAL ORDERPAYMENT RELEASED', '97', 'ELECRELEASED', 1) - await setNewStatus(division, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION', '98', 'ELECORVALIDATE', 0) + await setNewStatus(division, 'ELECTRICAL ORDER OF PAYMENT VOIDED', '173', 'ELECOPVOIDED', 1) + await setNewStatus(division, 'FOR ELECTRICAL ORDER OF PAYMENT APPROVAL', '94', 'ELECOPAPPROVE', 0) await updateDocflow(division, application, 'FOR ELECTRICAL ORDER OF PAYMENT PRINTING') } else if (division === 'occupancy') { - await setNewStatus(division, 'OCCUPANCY ORDER OF PAYMENT REPRINTED', '176', 'OCCOPREPRINTED', 1) - await setNewStatus(division, 'OCCUPANCY ORDER OF PAYMENT RELEASED', '174', 'OCCOPRELEASED', 1) - await setNewStatus(division, 'ORDER OF PAYMENT RELEASE FOR BUREAU OF FIRE', '24', 'OCOOPRELEASE', 0) + await setNewStatus(division, 'OCCUPANCY ORDER OF PAYMENT VOIDED', '174', 'OCCOPVOIDED', 1) + //UNFINISH await updateDocflow(division, application, 'APPROVED FOR PRINTING OF BUREAU OF FIRE AND ORDER OF PAYMENT') } await voidPopsOp(application) await postTransaction(application) + } else { + setPrintedApplication(application) + setPrinted(true) + + if (division === 'electrical') { + createPdfElectrical() + } else if (division === 'occupancy') { + createPdfOccupancy() + } else console.log('building') } - - setPrintedApplication(application) - setPrinted(true) - - if (division === 'electrical') { - createPdfElectrical() - } else if (division === 'occupancy') { - createPdfOccupancy() - } else console.log('building') } const updateOp = async (division: string) => { @@ -863,7 +859,7 @@ export default () => { {/* */} - +