PatAlcala9/ocbo-esign
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: PatAlcala9:cf9622801a1707fa5001075c3f3917acb584120b
Branches Tags
PatAlcala9:main
..
compare: PatAlcala9:fff4a1a9a10a9f7b312ac0ad5893922bce0aa49d
Branches Tags
PatAlcala9:main

No commits in common. "cf9622801a1707fa5001075c3f3917acb584120b" and "fff4a1a9a10a9f7b312ac0ad5893922bce0aa49d" have entirely different histories.
cf9622801a ... fff4a1a9a1

5 changed files with 48 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/go.sum
View file

@ -1,3 +1,5 @@
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=

11
backend/main.go
View file

@ -1430,17 +1430,6 @@ func connect() {
"result": result,
})
case "check-popsrecord":
err := dbpop.QueryRow("SELECT COUNT(OrderPayId) AS result FROM orderpaydetail WHERE oprefid = ?" , data).Scan(&result)
if err != nil {
c.AbortWithError(http.StatusBadRequest, err)
c.String(http.StatusBadRequest, err.Error())
return
}
c.JSON(http.StatusOK, gin.H{
"result": result,
})
}
})

2
package.json
View file

@ -33,7 +33,7 @@
"solidjs-use": "^2.3.0"
},
"devDependencies": {
"@biomejs/biome": "^2.4.2",
"@biomejs/biome": "^2.3.14",
"@nanostores/solid": "^1.1.1",
"@types/crypto-js": "^4.2.2",
"@types/node": "^24.10.13",

74
pnpm-lock.yaml generated
View file

@ -73,8 +73,8 @@ importers:
version: 2.3.0
devDependencies:
'@biomejs/biome':
specifier: ^2.4.2
version: 2.4.2
specifier: ^2.3.14
version: 2.3.14
'@nanostores/solid':
specifier: ^1.1.1
version: 1.1.1(nanostores@1.1.0)(solid-js@1.9.11)
@ -187,59 +187,59 @@ packages:
resolution: {integrity: sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==}
engines: {node: '>=6.9.0'}
'@biomejs/biome@2.4.2':
resolution: {integrity: sha512-vVE/FqLxNLbvYnFDYg3Xfrh1UdFhmPT5i+yPT9GE2nTUgI4rkqo5krw5wK19YHBd7aE7J6r91RRmb8RWwkjy6w==}
'@biomejs/biome@2.3.14':
resolution: {integrity: sha512-QMT6QviX0WqXJCaiqVMiBUCr5WRQ1iFSjvOLoTk6auKukJMvnMzWucXpwZB0e8F00/1/BsS9DzcKgWH+CLqVuA==}
engines: {node: '>=14.21.3'}
hasBin: true
'@biomejs/cli-darwin-arm64@2.4.2':
resolution: {integrity: sha512-3pEcKCP/1POKyaZZhXcxFl3+d9njmeAihZ17k8lL/1vk+6e0Cbf0yPzKItFiT+5Yh6TQA4uKvnlqe0oVZwRxCA==}
'@biomejs/cli-darwin-arm64@2.3.14':
resolution: {integrity: sha512-UJGPpvWJMkLxSRtpCAKfKh41Q4JJXisvxZL8ChN1eNW3m/WlPFJ6EFDCE7YfUb4XS8ZFi3C1dFpxUJ0Ety5n+A==}
engines: {node: '>=14.21.3'}
cpu: [arm64]
os: [darwin]
'@biomejs/cli-darwin-x64@2.4.2':
resolution: {integrity: sha512-P7hK1jLVny+0R9UwyGcECxO6sjETxfPyBm/1dmFjnDOHgdDPjPqozByunrwh4xPKld8sxOr5eAsSqal5uKgeBg==}
'@biomejs/cli-darwin-x64@2.3.14':
resolution: {integrity: sha512-PNkLNQG6RLo8lG7QoWe/hhnMxJIt1tEimoXpGQjwS/dkdNiKBLPv4RpeQl8o3s1OKI3ZOR5XPiYtmbGGHAOnLA==}
engines: {node: '>=14.21.3'}
cpu: [x64]
os: [darwin]
'@biomejs/cli-linux-arm64-musl@2.4.2':
resolution: {integrity: sha512-/x04YK9+7erw6tYEcJv9WXoBHcULI/wMOvNdAyE9S3JStZZ9yJyV67sWAI+90UHuDo/BDhq0d96LDqGlSVv7WA==}
'@biomejs/cli-linux-arm64-musl@2.3.14':
resolution: {integrity: sha512-LInRbXhYujtL3sH2TMCH/UBwJZsoGwfQjBrMfl84CD4hL/41C/EU5mldqf1yoFpsI0iPWuU83U+nB2TUUypWeg==}
engines: {node: '>=14.21.3'}
cpu: [arm64]
os: [linux]
libc: [musl]
'@biomejs/cli-linux-arm64@2.4.2':
resolution: {integrity: sha512-DI3Mi7GT2zYNgUTDEbSjl3e1KhoP76OjQdm8JpvZYZWtVDRyLd3w8llSr2TWk1z+U3P44kUBWY3X7H9MD1/DGQ==}
'@biomejs/cli-linux-arm64@2.3.14':
resolution: {integrity: sha512-KT67FKfzIw6DNnUNdYlBg+eU24Go3n75GWK6NwU4+yJmDYFe9i/MjiI+U/iEzKvo0g7G7MZqoyrhIYuND2w8QQ==}
engines: {node: '>=14.21.3'}
cpu: [arm64]
os: [linux]
libc: [glibc]
'@biomejs/cli-linux-x64-musl@2.4.2':
resolution: {integrity: sha512-wbBmTkeAoAYbOQ33f6sfKG7pcRSydQiF+dTYOBjJsnXO2mWEOQHllKlC2YVnedqZFERp2WZhFUoO7TNRwnwEHQ==}
'@biomejs/cli-linux-x64-musl@2.3.14':
resolution: {integrity: sha512-KQU7EkbBBuHPW3/rAcoiVmhlPtDSGOGRPv9js7qJVpYTzjQmVR+C9Rfcz+ti8YCH+zT1J52tuBybtP4IodjxZQ==}
engines: {node: '>=14.21.3'}
cpu: [x64]
os: [linux]
libc: [musl]
'@biomejs/cli-linux-x64@2.4.2':
resolution: {integrity: sha512-GK2ErnrKpWFigYP68cXiCHK4RTL4IUWhK92AFS3U28X/nuAL5+hTuy6hyobc8JZRSt+upXt1nXChK+tuHHx4mA==}
'@biomejs/cli-linux-x64@2.3.14':
resolution: {integrity: sha512-ZsZzQsl9U+wxFrGGS4f6UxREUlgHwmEfu1IrXlgNFrNnd5Th6lIJr8KmSzu/+meSa9f4rzFrbEW9LBBA6ScoMA==}
engines: {node: '>=14.21.3'}
cpu: [x64]
os: [linux]
libc: [glibc]
'@biomejs/cli-win32-arm64@2.4.2':
resolution: {integrity: sha512-k2uqwLYrNNxnaoiW3RJxoMGnbKda8FuCmtYG3cOtVljs3CzWxaTR+AoXwKGHscC9thax9R4kOrtWqWN0+KdPTw==}
'@biomejs/cli-win32-arm64@2.3.14':
resolution: {integrity: sha512-+IKYkj/pUBbnRf1G1+RlyA3LWiDgra1xpS7H2g4BuOzzRbRB+hmlw0yFsLprHhbbt7jUzbzAbAjK/Pn0FDnh1A==}
engines: {node: '>=14.21.3'}
cpu: [arm64]
os: [win32]
'@biomejs/cli-win32-x64@2.4.2':
resolution: {integrity: sha512-9ma7C4g8Sq3cBlRJD2yrsHXB1mnnEBdpy7PhvFrylQWQb4PoyCmPucdX7frvsSBQuFtIiKCrolPl/8tCZrKvgQ==}
'@biomejs/cli-win32-x64@2.3.14':
resolution: {integrity: sha512-oizCjdyQ3WJEswpb3Chdngeat56rIdSYK12JI3iI11Mt5T5EXcZ7WLuowzEaFPNJ3zmOQFliMN8QY1Pi+qsfdQ==}
engines: {node: '>=14.21.3'}
cpu: [x64]
os: [win32]
@ -2029,39 +2029,39 @@ snapshots:
'@babel/helper-string-parser': 7.27.1
'@babel/helper-validator-identifier': 7.27.1
'@biomejs/biome@2.4.2':
'@biomejs/biome@2.3.14':
optionalDependencies:
'@biomejs/cli-darwin-arm64': 2.4.2
'@biomejs/cli-darwin-x64': 2.4.2
'@biomejs/cli-linux-arm64': 2.4.2
'@biomejs/cli-linux-arm64-musl': 2.4.2
'@biomejs/cli-linux-x64': 2.4.2
'@biomejs/cli-linux-x64-musl': 2.4.2
'@biomejs/cli-win32-arm64': 2.4.2
'@biomejs/cli-win32-x64': 2.4.2
'@biomejs/cli-darwin-arm64': 2.3.14
'@biomejs/cli-darwin-x64': 2.3.14
'@biomejs/cli-linux-arm64': 2.3.14
'@biomejs/cli-linux-arm64-musl': 2.3.14
'@biomejs/cli-linux-x64': 2.3.14
'@biomejs/cli-linux-x64-musl': 2.3.14
'@biomejs/cli-win32-arm64': 2.3.14
'@biomejs/cli-win32-x64': 2.3.14
'@biomejs/cli-darwin-arm64@2.4.2':
'@biomejs/cli-darwin-arm64@2.3.14':
optional: true
'@biomejs/cli-darwin-x64@2.4.2':
'@biomejs/cli-darwin-x64@2.3.14':
optional: true
'@biomejs/cli-linux-arm64-musl@2.4.2':
'@biomejs/cli-linux-arm64-musl@2.3.14':
optional: true
'@biomejs/cli-linux-arm64@2.4.2':
'@biomejs/cli-linux-arm64@2.3.14':
optional: true
'@biomejs/cli-linux-x64-musl@2.4.2':
'@biomejs/cli-linux-x64-musl@2.3.14':
optional: true
'@biomejs/cli-linux-x64@2.4.2':
'@biomejs/cli-linux-x64@2.3.14':
optional: true
'@biomejs/cli-win32-arm64@2.4.2':
'@biomejs/cli-win32-arm64@2.3.14':
optional: true
'@biomejs/cli-win32-x64@2.4.2':
'@biomejs/cli-win32-x64@2.3.14':
optional: true
'@bufbuild/protobuf@2.9.0': {}

19
src/pages/MainPage/Main.tsx
View file

@ -150,14 +150,11 @@ export default () => {
updateOrderofpayment = await updateOp(division)
if (updateOrderofpayment) {
postPops(division, application)
if (checkPops()) {
postTransaction()
postPops(division, application)
setApprovedApplication(application)
setApproved(true)
}
}
} else if (division === 'occupancy') {
const additionalResult = await getApi('check-bldgadditional-approval', application)
bldgadditional = additionalResult > 0
@ -176,16 +173,13 @@ export default () => {
updateOrderofpayment = await updateOp(division)
if (updateOrderofpayment) {
postPops(division, application)
if (checkPops()){
postTransaction()
postPops(division, application)
setApprovedApplication(application)
setApproved(true)
}
}
}
}
const setNewStatus = async (division: string, status: string, tag: string, tagword: string, approved: number) => {
// const today = new Date()
@ -200,6 +194,8 @@ export default () => {
}
}
const updateOp = async (division: string) => {
if (division === 'electrical') {
return await postApi('update-opapproved-electrical', { data: parseInt(applicationId().toString()) })
@ -237,13 +233,6 @@ export default () => {
}
}
const checkPops = async (application string) => {
const response = await getApi('check-popsrecord', application)
const result = response.result[0]
return result > 0
}
// const calculateAmounts = () => {
// const amounts: string[] = amountList()
// let gflguList: number[] = []