Compare commits
No commits in common. "96ab5314321e307527811d04e6c222ac867ebcff" and "577066c9eacf6a81af049b4f429b683f85bde158" have entirely different histories.
96ab531432
...
577066c9ea
2 changed files with 42 additions and 64 deletions
|
|
@ -18,12 +18,12 @@ import (
|
|||
)
|
||||
|
||||
// DEV
|
||||
// var connection string = "root:superuser@tcp(localhost:3306)/iips"
|
||||
// var connectionPops string = "root:superuser@tcp(localhost:3306)/pops"
|
||||
var connection string = "root:superuser@tcp(localhost:3306)/iips"
|
||||
var connectionPops string = "root:superuser@tcp(localhost:3306)/pops"
|
||||
|
||||
// SERVER
|
||||
var connection string = "iips:iipsuser@tcp(192.168.7.100:3306)/iips"
|
||||
var connectionPops string = "pops:Pops2023!@tcp(192.168.76.10:3306)/pops"
|
||||
// var connection string = "iips:iipsuser@tcp(192.168.7.100:3306)/iips"
|
||||
// var connectionPops string = "pops:Pops2023!@tcp(192.168.76.10:3306)/pops"
|
||||
|
||||
func main() {
|
||||
connect()
|
||||
|
|
@ -44,23 +44,23 @@ func connect() {
|
|||
router.Use(cors.Default())
|
||||
|
||||
//DEV
|
||||
// router.Use(cors.New(cors.Config{
|
||||
// AllowOrigins: []string{"http://localhost:5173"},
|
||||
// AllowMethods: []string{"GET", "POST"},
|
||||
// AllowHeaders: []string{"Origin", "OCBO-ShieldConnection"},
|
||||
// ExposeHeaders: []string{"Content-Length"},
|
||||
// AllowCredentials: true,
|
||||
// }))
|
||||
|
||||
//SERVER
|
||||
router.Use(cors.New(cors.Config{
|
||||
AllowAllOrigins: true,
|
||||
AllowOrigins: []string{"http://localhost:5173"},
|
||||
AllowMethods: []string{"GET", "POST"},
|
||||
AllowHeaders: []string{"Origin"},
|
||||
AllowHeaders: []string{"Origin", "OCBO-ShieldConnection"},
|
||||
ExposeHeaders: []string{"Content-Length"},
|
||||
AllowCredentials: true,
|
||||
}))
|
||||
|
||||
//SERVER
|
||||
// router.Use(cors.New(cors.Config{
|
||||
// AllowAllOrigins: true,
|
||||
// AllowMethods: []string{"GET", "POST"},
|
||||
// AllowHeaders: []string{"Origin"},
|
||||
// ExposeHeaders: []string{"Content-Length"},
|
||||
// AllowCredentials: true,
|
||||
// }))
|
||||
|
||||
router.StaticFile("/", "static/index.html")
|
||||
|
||||
// shield := "inquiry"
|
||||
|
|
@ -612,8 +612,8 @@ func connect() {
|
|||
array11 := []string{}
|
||||
array12 := []string{}
|
||||
|
||||
results, err := db.Query(`SELECT IFNULL(e.electricalNo, '') AS result, IFNULL(c.firstName, '') AS result2, IFNULL(c.middleInitial, '') AS result3, IFNULL(c.lastName, '') AS result4, IFNULL(e.locationofinstallation, '') AS result5, IFNULL(re.occupancyoruse, '') AS result6, IFNULL(em.employeename, '') AS result7, IFNULL(rb.accountdescription, '') AS result8, IFNULL(o.amount, '') AS result9, IFNULL(o.opDate, '') AS result10, IFNULL(e.electricalid, 0) AS result11, IFNULL(o.assessedbyid, 0) AS result12
|
||||
FROM electrical e, customer c, electrical_orderofpayment_new o, ref_elec_occupancy re, ref_bldgcomputationsheet rb, employee em WHERE e.customerid = c.customerid AND e.electricalid = o.electricalid AND e.ref_elec_occupancyid = re.ref_elec_occupancyid AND o.ref_bldgcomputationsheetid = rb.ref_bldgcomputationsheetid AND o.assessedbyid = em.employeeid AND e.electricalNo = ?`, data)
|
||||
results, err := db.Query(`SELECT IFNULL(e.electricalNo, '') AS result, IFNULL(c.firstName, '') AS result2, IFNULL(c.middleInitial, '') AS result3, IFNULL(c.lastName, '') AS result4, IFNULL(e.locationofinstallation, '') AS result5, IFNULL(re.type, '') AS result6, IFNULL(em.employeename, '') AS result7, IFNULL(rb.accountdescription, '') AS result8, IFNULL(o.amount, '') AS result9, IFNULL(o.opDate, '') AS result10, IFNULL(e.electricalid, 0) AS result11, IFNULL(o.assessedbyid, 0) AS result12
|
||||
FROM electrical e, customer c, electrical_orderofpayment_new o, ref_electrical_type re, ref_bldgcomputationsheet rb, employee em WHERE e.customerid = c.customerid AND e.electricalid = o.electricalid AND e.ref_electrical_typeid = re.ref_electrical_typeid AND o.ref_bldgcomputationsheetid = rb.ref_bldgcomputationsheetid AND o.assessedbyid = em.employeeid AND e.electricalNo = ?`, data)
|
||||
if err != nil {
|
||||
c.AbortWithError(http.StatusBadRequest, err)
|
||||
c.String(http.StatusBadRequest, err.Error())
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import './Assessor.sass'
|
||||
import { Logo, Page, Row, Padding, ModalButton, Button, Clickable, Link, Modal, Column, Box, Input } from '../../components'
|
||||
import { Logo, Page, Row, Padding, ModalButton, Button, Clickable, Link, Modal, Column, Box } from '../../components'
|
||||
import { FiLogOut } from 'solid-icons/fi'
|
||||
import { Tabs } from '@kobalte/core/tabs'
|
||||
import { ofetch } from 'ofetch'
|
||||
|
|
@ -10,7 +10,6 @@ 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 } from '../../stores/pdfinfo'
|
||||
import { VsRefresh } from 'solid-icons/vs'
|
||||
|
||||
const API = import.meta.env.VITE_BACKEND
|
||||
const PESO = import.meta.env.VITE_PESO
|
||||
|
|
@ -24,6 +23,15 @@ export default () => {
|
|||
const [location, setLocation] = createSignal('')
|
||||
const [type, setType] = createSignal('')
|
||||
const [applicationId, setApplicationId] = createSignal(0)
|
||||
// const [assessorId, setAssessorId] = createSignal(0)
|
||||
|
||||
// const [gflgu, setGflgu] = createSignal<number[]>([])
|
||||
// const [gfdpwh, setGfdpwh] = createSignal<number[]>([])
|
||||
// const [tfbo, setTfbo] = createSignal<number[]>([])
|
||||
|
||||
// const [descriptionList, setDescriptionList] = createSignal<string[]>([])
|
||||
// const [amountList, setAmountList] = createSignal<string[]>([])
|
||||
// const [dateOpList, setDateOpList] = createSignal<string[]>([])
|
||||
|
||||
const [applicationList, setApplicationList] = createSignal<string[]>([])
|
||||
const [nameList, setNameList] = createSignal<string[]>([])
|
||||
|
|
@ -40,9 +48,9 @@ export default () => {
|
|||
const [employeeId, setEmployeeId] = createSignal(0)
|
||||
const [employeeName, setEmployeeName] = createSignal('')
|
||||
|
||||
const [filter, setFilter] = createSignal('')
|
||||
const [fullIDList, setFullIDList] = createSignal<string[]>([])
|
||||
const [fullNameList, setFullNameList] = createSignal<string[]>([])
|
||||
// const [docApplicationNo, setDocApplicationNo] = createSignal('')
|
||||
// const [docDate, setDocDate] = createSignal('')
|
||||
// const [docLocation, setDocLocation] = createSignal('')
|
||||
|
||||
const checkAccess = async (access: string) => {
|
||||
try {
|
||||
|
|
@ -55,19 +63,6 @@ export default () => {
|
|||
}
|
||||
}
|
||||
|
||||
const handleFilterChange = (value: string) => {
|
||||
// setFilter(value)
|
||||
if (value.trim() === '') {
|
||||
setApplicationList(fullIDList())
|
||||
setNameList(fullNameList())
|
||||
} else {
|
||||
const filteredApplications = fullIDList().filter((app) => app.toLowerCase().includes(value.toLowerCase()))
|
||||
const filteredNames = fullNameList().slice(0, filteredApplications.length)
|
||||
setApplicationList(filteredApplications)
|
||||
setNameList(filteredNames)
|
||||
}
|
||||
}
|
||||
|
||||
const getPrintDetails = async (id: number) => {
|
||||
const response = await ofetch(API + 'get-printdetails-electrical/' + id)
|
||||
const applicationno = response.result
|
||||
|
|
@ -164,6 +159,11 @@ export default () => {
|
|||
const assessorId = await getEmployeeId(op.result7[0])
|
||||
const assessorsignId = await geteSignId(assessorId)
|
||||
getAssessedDate(op.result11[0])
|
||||
|
||||
console.log('name', op.result7[0])
|
||||
console.log('id', assessorId)
|
||||
console.log('esignid', assessorsignId)
|
||||
console.log('aaaa', op.result11[0])
|
||||
}
|
||||
|
||||
const calculateTotal = (list: number[]) => {
|
||||
|
|
@ -171,22 +171,11 @@ export default () => {
|
|||
return total
|
||||
}
|
||||
|
||||
const getListForPrinting = async (query?: string) => {
|
||||
const getListForPrinting = async () => {
|
||||
try {
|
||||
const response = await ofetch(API + 'get-listopprinting-electrical', { parseResponse: JSON.parse })
|
||||
const filteredApplications = response.result.filter((item: any) =>
|
||||
item
|
||||
.toString()
|
||||
.toLowerCase()
|
||||
.includes((query ?? '').toLowerCase())
|
||||
)
|
||||
const filteredNames = response.result2.filter((item: any) =>
|
||||
item.toString().toLowerCase().includes((query ?? '').toLowerCase())
|
||||
)
|
||||
// setApplicationList(response.result)
|
||||
// setNameList(response.result2)
|
||||
setApplicationList(filteredApplications)
|
||||
setNameList(filteredNames)
|
||||
setApplicationList(response.result)
|
||||
setNameList(response.result2)
|
||||
} catch (error) {
|
||||
console.error(error)
|
||||
}
|
||||
|
|
@ -222,10 +211,10 @@ export default () => {
|
|||
return
|
||||
}
|
||||
|
||||
signed = await setNewStatus('ELECTRICAL ORDER OF PAYMENT PRINTED', '171', 'ELECOPPRINTED', 1)
|
||||
signed = await setNewStatus('ELECTRICAL ORDER OF PAYMENT PRINTED', '171', 'ELECOPPRINTED')
|
||||
if (!signed) return
|
||||
|
||||
forprinting = await setNewStatus('FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION', '98', 'ELECORVALIDATE', 0)
|
||||
forprinting = await setNewStatus('FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION', '98', 'ELECORVALIDATE')
|
||||
if (!forprinting) return
|
||||
|
||||
updateOrderofpayment = await updateOp()
|
||||
|
|
@ -251,7 +240,7 @@ export default () => {
|
|||
}
|
||||
}
|
||||
|
||||
const setNewStatus = async (status: string, tag: string, tagword: string, approved: number) => {
|
||||
const setNewStatus = async (status: string, tag: string, tagword: string) => {
|
||||
const today = new Date()
|
||||
const formattedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss')
|
||||
const statusid = parseInt(applicationId().toString())
|
||||
|
|
@ -259,7 +248,7 @@ export default () => {
|
|||
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(employeeId().toString()) },
|
||||
body: { data: statusid, data2: formattedDate, data3: status, data4: tag, data5: tagword, data6: parseInt(employeeId().toString()) },
|
||||
})
|
||||
return true
|
||||
} catch {
|
||||
|
|
@ -334,10 +323,6 @@ export default () => {
|
|||
}
|
||||
}
|
||||
|
||||
const refresh = async () => {
|
||||
await getListForPrinting()
|
||||
}
|
||||
|
||||
const logout = async () => {
|
||||
removeEmployee()
|
||||
navigate('/')
|
||||
|
|
@ -449,13 +434,6 @@ export default () => {
|
|||
</Clickable>
|
||||
</Row>
|
||||
|
||||
<Padding top={0} bottom={0} right={10} left={10}>
|
||||
<Row content="split">
|
||||
<Input label="aa" value={filter()} onChange={getListForPrinting} />
|
||||
<Button label="Refresh Data" edges="curved" design="bo-primary" icon={VsRefresh} onClick={refresh}></Button>
|
||||
</Row>
|
||||
</Padding>
|
||||
|
||||
<Row>
|
||||
<table class="table">
|
||||
<thead>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue