diff --git a/src/pages/AssessorPage/Assessor.sass b/src/pages/AssessorPage/Assessor.sass index 46c4f3d..66e84ad 100644 --- a/src/pages/AssessorPage/Assessor.sass +++ b/src/pages/AssessorPage/Assessor.sass @@ -51,6 +51,3 @@ font-size: 1.75rem font-weight: 700 padding: 0.5rem 1rem - -.profile - cursor: pointer diff --git a/src/pages/AssessorPage/Assessor.tsx b/src/pages/AssessorPage/Assessor.tsx index f5096b2..40f0a5b 100644 --- a/src/pages/AssessorPage/Assessor.tsx +++ b/src/pages/AssessorPage/Assessor.tsx @@ -222,6 +222,7 @@ export default () => { } const updateOp = async () => { + console.log(applicationId()) try { await ofetch(API + 'update-opprinted-electrical', { method: 'POST', @@ -325,11 +326,6 @@ export default () => { navigate('/') } - const gotoProfile = async () => { - sessionStorage.setItem('name', employeeName()) - navigate('/profile') - } - onMount(async () => { const logged = await checkLogged() @@ -361,9 +357,7 @@ export default () => { - - {employeeName()} - + {employeeName()} diff --git a/src/pages/MainPage/Main.tsx b/src/pages/MainPage/Main.tsx index 8f2722a..afd92e8 100644 --- a/src/pages/MainPage/Main.tsx +++ b/src/pages/MainPage/Main.tsx @@ -5,13 +5,12 @@ import { Tabs } from '@kobalte/core/tabs' import { ofetch } from 'ofetch' import { onMount, createSignal } from 'solid-js' import dayjs from 'dayjs' -import { checkConnection, getApi, getApiMulti, postApi } from '../../utils/functions' +import { checkConnection, getApi, getApiMulti } from '../../utils/functions' import { FaSolidThumbsUp } from 'solid-icons/fa' import { _employeeName } from '../../stores/employee' import { useNavigate } from '@solidjs/router' import { _applicationNo, _date, _optn, _name, _location, _type, _assessor, _feeList, _codeList, _amountList, _signatureAssessor, _signatureApprover, _assessorid, _approvedDate, _assessedDate } from '../../stores/pdfinfo' import { VsRefresh } from 'solid-icons/vs' -import { BiRegularErrorAlt } from 'solid-icons/bi' const API = import.meta.env.VITE_BACKEND const PESO = import.meta.env.VITE_PESO @@ -22,7 +21,7 @@ const PUBLICIP = import.meta.env.VITE_PUBLICIP export default () => { const navigate = useNavigate() - const [totalOp, setTotalOp] = createSignal('') + const [totalOp, setTotalOp] = createSignal(0) const [assessor, setAssessor] = createSignal('') const [dateOp, setDateOp] = createSignal('') const [location, setLocation] = createSignal('') @@ -51,8 +50,6 @@ export default () => { const [employeeId, setEmployeeId] = createSignal(0) const [employeeName, setEmployeeName] = createSignal('') - const [apology, setApology] = createSignal(false) - const getListForApproval = async () => { const responseE = await getApiMulti('get-listopapproval-electrical') setApplicationListElectrical(responseE.result) @@ -101,24 +98,23 @@ export default () => { } const getopdetails = async (division: string, applicationNo: string) => { - let op if (division === 'electrical') { - op = await getApiMulti('get-opdetails-electrical', applicationNo) + const op = await getApiMulti('get-opdetails-electrical', applicationNo) + setAssessor(op.result7[0]) + setLocation(op.result5[0]) + setType(op.result6[0]) + setDateOp(dayjs(op.result10[0]).format('MMMM DD, YYYY')) + setApplicationId(op.result11[0]) + setTotalOp(calculateTotal(op.result9)) } else if (division === 'occupancy') { - op = await getApiMulti('get-opdetails-occupancy', applicationNo) + const op = await getApiMulti('get-opdetails-occupancy', applicationNo) + setAssessor(op.result7[0]) + setLocation(op.result5[0]) + setType(op.result6[0]) + setDateOp(dayjs(op.result10[0]).format('MMMM DD, YYYY')) + setApplicationId(op.result11[0]) + setTotalOp(calculateTotal(op.result9)) } - - setLocation(op.result[0]) - setType(op.result2[0]) - setAssessor(op.result3[0]) - const total = calculateTotal(op.result4) - const formattedTotal = new Intl.NumberFormat('en-US', { - minimumFractionDigits: 2, - maximumFractionDigits: 2, - }).format(total) - setTotalOp(formattedTotal) - setDateOp(dayjs(op.result5[0]).format('MMMM DD, YYYY')) - setApplicationId(op.result6[0]) } const calculateTotal = (list: number[]) => { @@ -167,15 +163,15 @@ export default () => { } if (division === 'electrical') { - signed = await setNewStatus(division, 'ELECTRICAL ORDER OF PAYMENT APPROVED AND SIGNED', '170', 'ELECOPAPPROVEDSIGNED', 1) - const approvedid = await getIdByApplication(division, application) - updateDocflow(division, approvedid, 'FOR ELECTRICAL ORDER OF PAYMENT APPROVAL') + signed = await setNewStatus('ELECTRICAL ORDER OF PAYMENT APPROVED AND SIGNED', '170', 'ELECOPAPPROVEDSIGNED', 1) + const approvedid = await getIdByApplication(application) + updateDocflow(approvedid, 'FOR ELECTRICAL ORDER OF PAYMENT APPROVAL') if (!signed) return - forprinting = await setNewStatus(division, 'FOR ELECTRICAL ORDER OF PAYMENT PRINTING', '95', 'ELECOPPRINT', 0) + forprinting = await setNewStatus('FOR ELECTRICAL ORDER OF PAYMENT PRINTING', '95', 'ELECOPPRINT', 0) if (!forprinting) return - updateOrderofpayment = await updateOp(division) + updateOrderofpayment = await updateOp() if (updateOrderofpayment) { postTransaction() @@ -184,42 +180,43 @@ export default () => { setApproved(true) } } else if (division === 'occupancy') { - signed = await setNewStatus(division, 'OCCUPANCY ORDER OF PAYMENT APPROVED AND SIGNED', '172', 'OCCOPAPPROVEDSIGNED', 1) - const approvedid = await getIdByApplication(division, application) - updateDocflow(division, approvedid, 'FOR OCCUPANCY RECOMMENDING APPROVAL') + signed = await setNewStatus('OCCUPANCY ORDER OF PAYMENT APPROVED AND SIGNED', '172', 'OCCOPAPPROVEDSIGNED', 1) + const approvedid = await getIdByApplication(application) + updateDocflow(approvedid, 'FOR OCCUPANCY RECOMMENDING APPROVAL') if (!signed) return - forprinting = await setNewStatus(division, 'APPROVED FOR PRINTING OF BUREAU OF FIRE AND ORDER OF PAYMENT', '23', 'OCORDEROFPAYMENT', 0) + forprinting = await setNewStatus('APPROVED FOR PRINTING OF BUREAU OF FIRE AND ORDER OF PAYMENT', '23', 'OCORDEROFPAYMENT', 0) if (!forprinting) return - updateOrderofpayment = await updateOp(division) - - if (updateOrderofpayment) { - postTransaction() - postPops(division, application) - setApprovedApplication(application) - setApproved(true) - } + updateOrderofpayment = await updateOp() } } - const setNewStatus = async (division: string, status: string, tag: string, tagword: string, approved: number) => { + const setNewStatus = async (status: string, tag: string, tagword: string, approved: number) => { const today = new Date() const formattedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss') const statusid = parseInt(applicationId().toString()) - if (division === 'electrical') { - return await postApi('post-newstatus-electrical', { data: statusid, data2: formattedDate, data3: status, data4: tag, data5: tagword, data6: parseInt(approved.toString()), data7: parseInt(ID) }) - } else { - return await postApi('post-newstatus-occupancy', { data: statusid, data2: formattedDate, data3: status, data4: tag, data5: tagword, data6: parseInt(approved.toString()), data7: parseInt(ID) }) + try { + await ofetch(API + 'post-newstatus-electrical', { + method: 'POST', + body: { data: statusid, data2: formattedDate, data3: status, data4: tag, data5: tagword, data6: parseInt(approved.toString()), data7: parseInt(ID) }, + }) + return true + } catch { + return false } } - const updateOp = async (division: string) => { - if (division === 'electrical') { - return await postApi('update-opapproved-electrical', { data: parseInt(applicationId().toString()) }) - } else { - return await postApi('update-opapproved-occupancy', { data: parseInt(applicationId().toString()) }) + const updateOp = async () => { + try { + await ofetch(API + 'update-opapproved-electrical', { + method: 'POST', + body: { data: parseInt(applicationId().toString()) }, + }) + return true + } catch { + return false } } @@ -341,22 +338,20 @@ export default () => { }) } - const updateDocflow = async (division: string, applicationid: number, status: string) => { - if (division === 'electrical') { - await postApi('update-docflow-electrical', { data: parseInt(applicationid.toString()), data2: status }) - } else if (division === 'occupancy') { - await postApi('update-docflow-occupancy', { data: parseInt(applicationid.toString()), data2: status }) - } + const updateDocflow = async (electricalid: number, status: string) => { + await ofetch(API + 'update-docflow-electrical', { + method: 'POST', + body: { data: parseInt(electricalid.toString()), data2: status }, + }) } - const getIdByApplication = async (division: string, applicationNo: string) => { - let response - if (division === 'electrical') { - response = await getApi('get-idbyapplication-electrical', applicationNo) - } else if (division === 'occupancy') { - response = await getApi('get-idbyapplication-occupancy', applicationNo) + const getIdByApplication = async (applicationNo: string) => { + try { + const response = await getApi('get-idbyapplication-electrical', applicationNo) + return parseInt(response) + } catch { + return 0 } - return parseInt(response) } const refresh = async (division: string) => { @@ -456,7 +451,7 @@ export default () => { - +
@@ -471,15 +466,13 @@ export default () => { ))} @@ -602,7 +595,7 @@ export default () => {
Total Fee: - {PESO} {totalOp()} + {PESO} {totalOp().toFixed(2)}
@@ -690,35 +683,6 @@ export default () => { - -
setApology(false)}> - - - - - - -

Delayed Release of Feature

- - - - -

{errorMessage()}

- - - - - Occupancy Approval is delayed until Occupancy Printing is complete - - - - - Click anywhere to close - - - - -
) } diff --git a/src/pages/ProfilePage/Profile.sass b/src/pages/ProfilePage/Profile.sass deleted file mode 100644 index b0f57d7..0000000 --- a/src/pages/ProfilePage/Profile.sass +++ /dev/null @@ -1,11 +0,0 @@ -.name - padding: 1rem 2rem - border-radius: 8px - font-size: 1.75rem - font-weight: 800 - display: flex - flex-direction: column - flex-wrap: wrap - align-items: center - background: #16212C - box-shadow: 8px 8px 28px #0d141b, -8px -8px 28px #1f2e3d diff --git a/src/pages/ProfilePage/Profile.tsx b/src/pages/ProfilePage/Profile.tsx deleted file mode 100644 index 9272fae..0000000 --- a/src/pages/ProfilePage/Profile.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import './Profile.sass' -import { Logo, Link, Page, Row, Padding, Combobox, Box, Button, Modal, Column, QR, Input, Display } from '../../components' -import { IoChevronBack } from 'solid-icons/io' -import { _employeeName, _employeeId } from '../../stores/employee' - -export default () => { - return ( - <> - - - - - - -

OCBO e-Sign

- - - - - - - Back - - - - -

{sessionStorage.getItem('name')}

- - - Role: - - - - - - ) -} diff --git a/src/styles/classes.sass b/src/styles/classes.sass index 2ea4ea4..84f05df 100644 --- a/src/styles/classes.sass +++ b/src/styles/classes.sass @@ -114,11 +114,3 @@ tbody tr:nth-child(even) background-color: rgba(color.adjust(vars.$background, $lightness: 10%), 0.8) - - // &__electrical - // @extend .table - // box-shadow: inset 0 1px 2px #2c2c16, 0 2px 4px #4d572432, 0 4px 8px #5e65344e - - &__disabled - @extend .table - cursor: not-allowed
Application Number{nameListOccupancy()[index]} - +