Added bldgadditional
This commit is contained in:
parent
bc83099819
commit
99608062ff
4 changed files with 136 additions and 73 deletions
|
|
@ -4,14 +4,13 @@ import { FiLogOut } from 'solid-icons/fi'
|
|||
import { Tabs } from '@kobalte/core/tabs'
|
||||
import { onMount, createSignal, Show, createEffect } from 'solid-js'
|
||||
import dayjs from 'dayjs'
|
||||
import { checkConnection, createPdf } from '../../utils/functions'
|
||||
import { checkConnection, createPdfOccupancy, createPdfElectrical } from '../../utils/functions'
|
||||
import { FaSolidThumbsUp } from 'solid-icons/fa'
|
||||
import { _employeeName, _employeeId } from '../../stores/employee'
|
||||
import { useNavigate } from '@solidjs/router'
|
||||
import { _applicationNo, _date, _optn, _name, _location, _type, _assessor, _feeList, _codeList, _amountList, _signatureAssessor, _signatureApprover, _assessorid, _approvedDate, _assessedDate, _units, _totalUnits, _floorArea } from '../../stores/pdfinfo'
|
||||
import { VsRefresh } from 'solid-icons/vs'
|
||||
import { getApi, getApiMulti, postApi } from '../../utils/functions'
|
||||
import createPdfOccupancy from '../../utils/functions/createPdfOccupancy'
|
||||
|
||||
const PESO = import.meta.env.VITE_PESO
|
||||
|
||||
|
|
@ -42,6 +41,8 @@ export default () => {
|
|||
|
||||
const [filter, setFilter] = createSignal('')
|
||||
|
||||
let bldgadditional = false
|
||||
|
||||
const checkAccess = async (access: string) => {
|
||||
const response = await getApi('check-access', access, employeeId())
|
||||
const result = response
|
||||
|
|
@ -226,6 +227,9 @@ export default () => {
|
|||
await setNewStatus(division, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION', '98', 'ELECORVALIDATE', 0)
|
||||
await updateDocflow(division, application, 'FOR ELECTRICAL ORDER OF PAYMENT PRINTING')
|
||||
} else if (division === 'occupancy') {
|
||||
const additionalResult = await getApi('check-bldgadditional-approval', application)
|
||||
bldgadditional = additionalResult > 0
|
||||
|
||||
await setNewStatus(division, 'OCCUPANCY ORDER OF PAYMENT PRINTED', '173', 'OCCOPPRINTED', 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)
|
||||
|
|
@ -239,7 +243,7 @@ export default () => {
|
|||
setPrintedApplication(application)
|
||||
setPrinted(true)
|
||||
if (division === 'electrical') {
|
||||
createPdf()
|
||||
createPdfElectrical()
|
||||
} else createPdfOccupancy()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@ export default () => {
|
|||
|
||||
const [apology, setApology] = createSignal(false)
|
||||
|
||||
let bldgadditional = false
|
||||
|
||||
const getListForApproval = async () => {
|
||||
const responseE = await getApiMulti('get-listopapproval-electrical')
|
||||
setApplicationListElectrical(responseE.result)
|
||||
|
|
@ -112,7 +114,7 @@ export default () => {
|
|||
const total = calculateTotal(op.result4)
|
||||
const formattedTotal = new Intl.NumberFormat('en-US', {
|
||||
minimumFractionDigits: 2,
|
||||
maximumFractionDigits: 2,
|
||||
// maximumFractionDigits: 2,
|
||||
}).format(total)
|
||||
setTotalOp(formattedTotal)
|
||||
setDateOp(dayjs(op.result5[0]).format('MMMM DD, YYYY'))
|
||||
|
|
@ -124,35 +126,6 @@ export default () => {
|
|||
return total
|
||||
}
|
||||
|
||||
// const approveHandler = async (application: string) => {
|
||||
// let signed: boolean = false
|
||||
// let forprinting: boolean = false
|
||||
// let updateOrderofpayment: boolean = false
|
||||
|
||||
// setConnected(await checkConnection())
|
||||
// if (connected() === false) {
|
||||
// setErrorMessage('No Connection on Server')
|
||||
// return
|
||||
// }
|
||||
|
||||
// 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('FOR ELECTRICAL ORDER OF PAYMENT PRINTING', '95', 'ELECOPPRINT', 0)
|
||||
// if (!forprinting) return
|
||||
|
||||
// updateOrderofpayment = await updateOp()
|
||||
|
||||
// if (updateOrderofpayment) {
|
||||
// postTransaction()
|
||||
// postPops(application)
|
||||
// setApprovedApplication(application)
|
||||
// setApproved(true)
|
||||
// }
|
||||
// }
|
||||
|
||||
const approveHandler = async (division: string, application: string) => {
|
||||
let signed: boolean = false
|
||||
let forprinting: boolean = false
|
||||
|
|
@ -166,7 +139,6 @@ 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, application, 'FOR ELECTRICAL ORDER OF PAYMENT APPROVAL')
|
||||
if (!signed) return
|
||||
|
||||
|
|
@ -182,10 +154,12 @@ export default () => {
|
|||
setApproved(true)
|
||||
}
|
||||
} else if (division === 'occupancy') {
|
||||
const additionalResult = await getApi('check-bldgadditional-approval', application)
|
||||
bldgadditional = additionalResult > 0
|
||||
|
||||
signed = await setNewStatus(division, 'OCCUPANCY ORDER OF PAYMENT APPROVED AND SIGNED', '172', 'OCCOPAPPROVEDSIGNED', 1)
|
||||
// const approvedid = await getIdByApplication(division, application)
|
||||
updateDocflow(division, application, 'FOR OCCUPANCY RECOMMENDING APPROVAL')
|
||||
updateDocflow(division, application, 'FOR ADDITIONAL ORDER OF PAYMENT RECOMMENDING APPROVAL')
|
||||
if (bldgadditional) updateDocflow(division, application, 'FOR ADDITIONAL ORDER OF PAYMENT RECOMMENDING APPROVAL')
|
||||
if (!signed) return
|
||||
|
||||
forprinting = await setNewStatus(division, 'APPROVED FOR PRINTING OF BUREAU OF FIRE AND ORDER OF PAYMENT', '23', 'OCORDEROFPAYMENT', 0)
|
||||
|
|
@ -218,29 +192,12 @@ export default () => {
|
|||
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 occupancy = await postApi('update-opapproved-occupancy', { data: parseInt(applicationId().toString()) })
|
||||
if (bldgadditional) await postApi('update-opapproved-bldgadditional', { data: parseInt(applicationId().toString()) })
|
||||
return occupancy
|
||||
}
|
||||
}
|
||||
|
||||
// const getPrintDetails = async (id: number) => {
|
||||
// const response = await ofetch(API + 'get-printdetails-electrical/' + id)
|
||||
// const applicationno = response.result
|
||||
// const date = response.result2
|
||||
// const location = response.result3
|
||||
// const name = response.result8
|
||||
// const type = `${response.result4} - ${response.result5}`
|
||||
// const assessor = response.result7
|
||||
|
||||
// _optn.set('M' + applicationno.split('-')[0] + applicationno.split('-')[1])
|
||||
// _applicationNo.set(applicationno)
|
||||
// _date.set(dayjs(date).format('MMMM DD, YYYY'))
|
||||
// _name.set(name)
|
||||
// _location.set(location)
|
||||
// _type.set(type)
|
||||
// _assessor.set(assessor)
|
||||
// _assessorid.set(employeeId())
|
||||
// }
|
||||
|
||||
const postPops = async (division: string, application: string) => {
|
||||
let response
|
||||
|
||||
|
|
@ -335,25 +292,9 @@ export default () => {
|
|||
}
|
||||
|
||||
const updateDocflow = async (division: string, application: string, 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 })
|
||||
// }
|
||||
|
||||
await postApi(`update-docflow-${division}`, { data: status, data2: application })
|
||||
}
|
||||
|
||||
// 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)
|
||||
// }
|
||||
// return parseInt(response)
|
||||
// }
|
||||
|
||||
const refresh = async (division: string) => {
|
||||
if (division === 'electrical') {
|
||||
await load('electrical')
|
||||
|
|
|
|||
|
|
@ -23,3 +23,5 @@ export const _assessedDate = atom('')
|
|||
export const _units = atom(0)
|
||||
export const _totalUnits = atom(0)
|
||||
export const _floorArea = atom(0)
|
||||
|
||||
export const _additional = atom(false)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue