From d2a536615245cf90d4e8ee30feb48becd847b97c Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Fri, 27 Mar 2026 19:39:03 +0800 Subject: [PATCH 1/7] Updated backend dependencies --- backend/go.mod | 2 +- backend/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/go.mod b/backend/go.mod index da7a27b..626c76a 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -28,7 +28,7 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.2.4 // indirect + github.com/pelletier/go-toml/v2 v2.3.0 // indirect github.com/quic-go/qpack v0.6.0 // indirect github.com/quic-go/quic-go v0.59.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect diff --git a/backend/go.sum b/backend/go.sum index f028d57..b5510ad 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -53,6 +53,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/pelletier/go-toml/v2 v2.3.0 h1:k59bC/lIZREW0/iVaQR8nDHxVq8OVlIzYCOJf421CaM= +github.com/pelletier/go-toml/v2 v2.3.0/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= From 0b6c9b9ddc2b4d48cb111ecbc63585d35fbb7f34 Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Fri, 27 Mar 2026 19:40:53 +0800 Subject: [PATCH 2/7] Updated containers --- docker-compose.yml | 2 +- podman.container => esign.container | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename podman.container => esign.container (84%) diff --git a/docker-compose.yml b/docker-compose.yml index 9f86914..b21178b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: esign: container_name: esign - image: ocbo/esign:latest + image: esign:latest restart: unless-stopped build: context: . diff --git a/podman.container b/esign.container similarity index 84% rename from podman.container rename to esign.container index 0dfb872..95f259f 100644 --- a/podman.container +++ b/esign.container @@ -3,7 +3,7 @@ Description=OCBO e-Sign [Container] ContainerName=esign -Image=localhost/esign_e-sign +Image=localhost/esign:latest PublishPort=8089:8080 [Service] From cbe517ad42c85c327b9be492000cc482f4f81d02 Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Fri, 27 Mar 2026 19:41:13 +0800 Subject: [PATCH 3/7] Updated frontend dependencies --- package.json | 2 +- pnpm-lock.yaml | 170 ++++++++++++++++++++++++------------------------- 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/package.json b/package.json index b17af43..20ac82f 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "qrcode": "^1.5.4", "sharp": "^0.34.5", "solid-icons": "^1.2.0", - "solid-js": "^1.9.11", + "solid-js": "^1.9.12", "solidjs-use": "^2.3.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d1d4a3b..82b87a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,7 +13,7 @@ importers: version: 5.2.10 '@kobalte/core': specifier: ^0.13.11 - version: 0.13.11(solid-js@1.9.11) + version: 0.13.11(solid-js@1.9.12) '@rabbit-company/xchacha20': specifier: ^2.3.0 version: 2.3.0(typescript@5.8.3) @@ -22,7 +22,7 @@ importers: version: 2.3.0(qrcode@1.5.4)(sortablejs@1.15.6) '@solidjs/router': specifier: ^0.15.4 - version: 0.15.4(solid-js@1.9.11) + version: 0.15.4(solid-js@1.9.12) consola: specifier: ^3.4.2 version: 3.4.2 @@ -67,17 +67,17 @@ importers: version: 0.34.5 solid-icons: specifier: ^1.2.0 - version: 1.2.0(solid-js@1.9.11) + version: 1.2.0(solid-js@1.9.12) solid-js: - specifier: ^1.9.11 - version: 1.9.11 + specifier: ^1.9.12 + version: 1.9.12 solidjs-use: specifier: ^2.3.0 version: 2.3.0 devDependencies: '@nanostores/solid': specifier: ^1.1.1 - version: 1.1.1(nanostores@1.2.0)(solid-js@1.9.11) + version: 1.1.1(nanostores@1.2.0)(solid-js@1.9.12) '@types/crypto-js': specifier: ^4.2.2 version: 4.2.2 @@ -98,7 +98,7 @@ importers: version: 2.5.3(rollup@4.52.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(solid-js@1.9.11)(vite@7.3.1(@types/node@24.12.0)(sass-embedded@1.98.0)(sass@1.98.0)) + version: 2.11.11(solid-js@1.9.12)(vite@7.3.1(@types/node@24.12.0)(sass-embedded@1.98.0)(sass@1.98.0)) packages: @@ -1651,8 +1651,8 @@ packages: peerDependencies: solid-js: '*' - solid-js@1.9.11: - resolution: {integrity: sha512-WEJtcc5mkh/BnHA6Yrg4whlF8g6QwpmXXRg4P2ztPmcKeHHlH4+djYecBLhSpecZY2RRECXYUwIc/C2r3yzQ4Q==} + solid-js@1.9.12: + resolution: {integrity: sha512-QzKaSJq2/iDrWR1As6MHZQ8fQkdOBf8GReYb7L5iKwMGceg7HxDcaOHk0at66tNgn9U2U7dXo8ZZpLIAmGMzgw==} solid-presence@0.1.8: resolution: {integrity: sha512-pWGtXUFWYYUZNbg5YpG5vkQJyOtzn2KXhxYaMx/4I+lylTLYkITOLevaCwMRN+liCVk0pqB6EayLWojNqBFECA==} @@ -1979,10 +1979,10 @@ snapshots: '@bufbuild/protobuf@2.9.0': {} - '@corvu/utils@0.4.2(solid-js@1.9.11)': + '@corvu/utils@0.4.2(solid-js@1.9.12)': dependencies: '@floating-ui/dom': 1.7.4 - solid-js: 1.9.11 + solid-js: 1.9.12 '@emnapi/runtime@1.7.0': dependencies: @@ -2392,33 +2392,33 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.5 - '@kobalte/core@0.13.11(solid-js@1.9.11)': + '@kobalte/core@0.13.11(solid-js@1.9.12)': dependencies: '@floating-ui/dom': 1.7.4 '@internationalized/date': 3.9.0 '@internationalized/number': 3.6.5 - '@kobalte/utils': 0.9.1(solid-js@1.9.11) - '@solid-primitives/props': 3.2.2(solid-js@1.9.11) - '@solid-primitives/resize-observer': 2.1.3(solid-js@1.9.11) - solid-js: 1.9.11 - solid-presence: 0.1.8(solid-js@1.9.11) - solid-prevent-scroll: 0.1.10(solid-js@1.9.11) + '@kobalte/utils': 0.9.1(solid-js@1.9.12) + '@solid-primitives/props': 3.2.2(solid-js@1.9.12) + '@solid-primitives/resize-observer': 2.1.3(solid-js@1.9.12) + solid-js: 1.9.12 + solid-presence: 0.1.8(solid-js@1.9.12) + solid-prevent-scroll: 0.1.10(solid-js@1.9.12) - '@kobalte/utils@0.9.1(solid-js@1.9.11)': + '@kobalte/utils@0.9.1(solid-js@1.9.12)': dependencies: - '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.11) - '@solid-primitives/keyed': 1.5.2(solid-js@1.9.11) - '@solid-primitives/map': 0.4.13(solid-js@1.9.11) - '@solid-primitives/media': 2.3.3(solid-js@1.9.11) - '@solid-primitives/props': 3.2.2(solid-js@1.9.11) - '@solid-primitives/refs': 1.1.2(solid-js@1.9.11) - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 + '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.12) + '@solid-primitives/keyed': 1.5.2(solid-js@1.9.12) + '@solid-primitives/map': 0.4.13(solid-js@1.9.12) + '@solid-primitives/media': 2.3.3(solid-js@1.9.12) + '@solid-primitives/props': 3.2.2(solid-js@1.9.12) + '@solid-primitives/refs': 1.1.2(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@nanostores/solid@1.1.1(nanostores@1.2.0)(solid-js@1.9.11)': + '@nanostores/solid@1.1.1(nanostores@1.2.0)(solid-js@1.9.12)': dependencies: nanostores: 1.2.0 - solid-js: 1.9.11 + solid-js: 1.9.12 '@parcel/watcher-android-arm64@2.5.6': optional: true @@ -2559,64 +2559,64 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.52.1': optional: true - '@solid-primitives/event-listener@2.4.3(solid-js@1.9.11)': + '@solid-primitives/event-listener@2.4.3(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/keyed@1.5.2(solid-js@1.9.11)': + '@solid-primitives/keyed@1.5.2(solid-js@1.9.12)': dependencies: - solid-js: 1.9.11 + solid-js: 1.9.12 - '@solid-primitives/map@0.4.13(solid-js@1.9.11)': + '@solid-primitives/map@0.4.13(solid-js@1.9.12)': dependencies: - '@solid-primitives/trigger': 1.2.2(solid-js@1.9.11) - solid-js: 1.9.11 + '@solid-primitives/trigger': 1.2.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/media@2.3.3(solid-js@1.9.11)': + '@solid-primitives/media@2.3.3(solid-js@1.9.12)': dependencies: - '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.11) - '@solid-primitives/rootless': 1.5.2(solid-js@1.9.11) - '@solid-primitives/static-store': 0.1.2(solid-js@1.9.11) - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 + '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.12) + '@solid-primitives/rootless': 1.5.2(solid-js@1.9.12) + '@solid-primitives/static-store': 0.1.2(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/props@3.2.2(solid-js@1.9.11)': + '@solid-primitives/props@3.2.2(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/refs@1.1.2(solid-js@1.9.11)': + '@solid-primitives/refs@1.1.2(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/resize-observer@2.1.3(solid-js@1.9.11)': + '@solid-primitives/resize-observer@2.1.3(solid-js@1.9.12)': dependencies: - '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.11) - '@solid-primitives/rootless': 1.5.2(solid-js@1.9.11) - '@solid-primitives/static-store': 0.1.2(solid-js@1.9.11) - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 + '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.12) + '@solid-primitives/rootless': 1.5.2(solid-js@1.9.12) + '@solid-primitives/static-store': 0.1.2(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/rootless@1.5.2(solid-js@1.9.11)': + '@solid-primitives/rootless@1.5.2(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/static-store@0.1.2(solid-js@1.9.11)': + '@solid-primitives/static-store@0.1.2(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/trigger@1.2.2(solid-js@1.9.11)': + '@solid-primitives/trigger@1.2.2(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/utils@6.3.2(solid-js@1.9.11)': + '@solid-primitives/utils@6.3.2(solid-js@1.9.12)': dependencies: - solid-js: 1.9.11 + solid-js: 1.9.12 '@solidjs-use/integrations@2.3.0(qrcode@1.5.4)(sortablejs@1.15.6)': dependencies: @@ -2630,9 +2630,9 @@ snapshots: '@solidjs-use/solid-to-vue@2.3.0': {} - '@solidjs/router@0.15.4(solid-js@1.9.11)': + '@solidjs/router@0.15.4(solid-js@1.9.12)': dependencies: - solid-js: 1.9.11 + solid-js: 1.9.12 '@swc/helpers@0.5.17': dependencies: @@ -2705,12 +2705,12 @@ snapshots: parse5: 7.3.0 validate-html-nesting: 1.2.3 - babel-preset-solid@1.9.9(@babel/core@7.28.4)(solid-js@1.9.11): + babel-preset-solid@1.9.9(@babel/core@7.28.4)(solid-js@1.9.12): dependencies: '@babel/core': 7.28.4 babel-plugin-jsx-dom-expressions: 0.40.1(@babel/core@7.28.4) optionalDependencies: - solid-js: 1.9.11 + solid-js: 1.9.12 base64-arraybuffer@1.0.2: optional: true @@ -3295,32 +3295,32 @@ snapshots: simple-xml-to-json@1.2.3: {} - solid-icons@1.2.0(solid-js@1.9.11): + solid-icons@1.2.0(solid-js@1.9.12): dependencies: - solid-js: 1.9.11 + solid-js: 1.9.12 - solid-js@1.9.11: + solid-js@1.9.12: dependencies: csstype: 3.1.3 seroval: 1.5.0 seroval-plugins: 1.5.0(seroval@1.5.0) - solid-presence@0.1.8(solid-js@1.9.11): + solid-presence@0.1.8(solid-js@1.9.12): dependencies: - '@corvu/utils': 0.4.2(solid-js@1.9.11) - solid-js: 1.9.11 + '@corvu/utils': 0.4.2(solid-js@1.9.12) + solid-js: 1.9.12 - solid-prevent-scroll@0.1.10(solid-js@1.9.11): + solid-prevent-scroll@0.1.10(solid-js@1.9.12): dependencies: - '@corvu/utils': 0.4.2(solid-js@1.9.11) - solid-js: 1.9.11 + '@corvu/utils': 0.4.2(solid-js@1.9.12) + solid-js: 1.9.12 - solid-refresh@0.6.3(solid-js@1.9.11): + solid-refresh@0.6.3(solid-js@1.9.12): dependencies: '@babel/generator': 7.28.3 '@babel/helper-module-imports': 7.27.1 '@babel/types': 7.28.4 - solid-js: 1.9.11 + solid-js: 1.9.12 transitivePeerDependencies: - supports-color @@ -3421,14 +3421,14 @@ snapshots: transitivePeerDependencies: - rollup - vite-plugin-solid@2.11.11(solid-js@1.9.11)(vite@7.3.1(@types/node@24.12.0)(sass-embedded@1.98.0)(sass@1.98.0)): + vite-plugin-solid@2.11.11(solid-js@1.9.12)(vite@7.3.1(@types/node@24.12.0)(sass-embedded@1.98.0)(sass@1.98.0)): dependencies: '@babel/core': 7.28.4 '@types/babel__core': 7.20.5 - babel-preset-solid: 1.9.9(@babel/core@7.28.4)(solid-js@1.9.11) + babel-preset-solid: 1.9.9(@babel/core@7.28.4)(solid-js@1.9.12) merge-anything: 5.1.7 - solid-js: 1.9.11 - solid-refresh: 0.6.3(solid-js@1.9.11) + solid-js: 1.9.12 + solid-refresh: 0.6.3(solid-js@1.9.12) vite: 7.3.1(@types/node@24.12.0)(sass-embedded@1.98.0)(sass@1.98.0) vitefu: 1.1.1(vite@7.3.1(@types/node@24.12.0)(sass-embedded@1.98.0)(sass@1.98.0)) transitivePeerDependencies: From 9ff7f33c7122fef7a7ff35bcc37751f2e40687cf Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Fri, 27 Mar 2026 19:42:42 +0800 Subject: [PATCH 4/7] Updated login page --- src/pages/LoginPage/Login.tsx | 86 +++++++++++++++++++++++++---------- 1 file changed, 63 insertions(+), 23 deletions(-) diff --git a/src/pages/LoginPage/Login.tsx b/src/pages/LoginPage/Login.tsx index db96aeb..64626f7 100644 --- a/src/pages/LoginPage/Login.tsx +++ b/src/pages/LoginPage/Login.tsx @@ -2,10 +2,10 @@ import { useNavigate } from '@solidjs/router' import { IoChevronBack } from 'solid-icons/io' import { createEffect, createSignal } from 'solid-js' import { Show } from 'solid-js/web' -import { Box, Button, Clickable, Column, Combobox, Display, Input, Link, Logo, Modal, Padding, Page, Radio, Row, Switch } from '../../components' +import { Box, Button, Column, Combobox, Display, Input, Link, Logo, Modal, Padding, Page, Radio, Row, Clickable } from '../../components' import { _employeeId, _employeeName } from '../../stores/employee' import { checkConnection, getApi, securePassword } from '../../utils/functions' -import { VsQuestion } from 'solid-icons/vs' +// import { VsQuestion } from 'solid-icons/vs' import './Login.sass' export default () => { @@ -20,8 +20,9 @@ export default () => { const [loggedin, setLoggedin] = createSignal(0) const [errorMessage, setErrorMessage] = createSignal('') const [connected, setConnected] = createSignal(true) - const [encryptionVersion, setEncryptionVersion] = createSignal('v1') + // const [encryptionVersion, setEncryptionVersion] = createSignal('v2') const [openTooltip, setOpenTooltip] = createSignal(false) + const [openChanges, setOpenChanges] = createSignal(false) const login = async () => { setConnected(await checkConnection()) @@ -32,7 +33,7 @@ export default () => { const employeeid = await getApi('get-employeeid', name()) const dbpassword = await getApi('get-password', employeeid) - const hashPassword = await securePassword(password(), encryptionVersion()) + const hashPassword = await securePassword(password(), 'v2') if (dbpassword === '0') { setErrorMessage('Not yet registered. Please proceed to Registration.') @@ -108,12 +109,12 @@ export default () => { Login - + {/* encryptionVersion() === 'v1' ? setEncryptionVersion('v2') : setEncryptionVersion('v1')} /> setOpenTooltip(true)}> - + */} @@ -166,6 +167,13 @@ export default () => { + + + setOpenChanges(true)}> + Click here to see changes + + + @@ -232,35 +240,67 @@ export default () => {
setOpenTooltip(false)}> - + -
-
- Enc v1 (Encryption Version 1) - Use this mode if your password has not been changed. - It is recommended that you update your password after logging in. Open the 'Config' menu in the upper right. +
+
+ Enc v1 (Encryption Version 1) + Use this mode if your password has not been changed. + It is recommended that you update your password after logging in. Open the 'Config' menu in the upper right.
-
- Enc v2 (Encryption Version 2) - The new default password encryption. - Use this mode if you've recently registered or changed your password. +
+ Enc v2 (Encryption Version 2) + The new default password encryption. + Use this mode if you've recently registered or changed your password.
-
- Note: - To ensure security and privacy, avoid sharing your password. - Your password's encryption is irreversible, which means it cannot be decrypted. - Only encrypted passwords are saved in the database. - Only you know your password. If forgotten, the account will be locked. - If this happens, contact the IT department and request that your account be reset. You will be required to register again. +
+ Note: + To ensure security and privacy, avoid sharing your password. + Your password's encryption is irreversible, which means it cannot be decrypted. + Only encrypted passwords are saved in the database. + Only you know your password. If forgotten, the account will be locked. + If this happens, contact the IT department and request that your account be reset. You will be required to register again.
Click anywhere to close
+ + +
+
setOpenChanges(false)}> + + +
+
+ Login + Removed version change. + It is recommended that you update your password after logging in. Open the 'Config' menu in the upper right. +
+ +
+ Enc v2 (Encryption Version 2) + The new default password encryption. + Use this mode if you've recently registered or changed your password. +
+ +
+ Note: + To ensure security and privacy, avoid sharing your password. + Your password's encryption is irreversible, which means it cannot be decrypted. + Only encrypted passwords are saved in the database. + Only you know your password. If forgotten, the account will be locked. + If this happens, contact the IT department and request that your account be reset. You will be required to register again. +
+ + + Click anywhere to close + +
From 3354a74cd7af6360ee672de8a92d79e7f727eaa5 Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Fri, 27 Mar 2026 19:42:54 +0800 Subject: [PATCH 5/7] Updated assessor page --- src/pages/AssessorPage/Assessor.tsx | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/pages/AssessorPage/Assessor.tsx b/src/pages/AssessorPage/Assessor.tsx index f1f1e9d..e6a94f1 100644 --- a/src/pages/AssessorPage/Assessor.tsx +++ b/src/pages/AssessorPage/Assessor.tsx @@ -80,8 +80,8 @@ export default () => { const [filter, setFilter] = createSignal('') - // const listType = ['Print', 'Reprint (No Change)', 'Void and Reapprove'] - const listType = ['Print', 'Reprint (No Change)'] + const listType = ['Print', 'Reprint (No Change)', 'Void and Reapprove'] + // const listType = ['Print', 'Reprint (No Change)'] const [selectedType, setSelectedType] = createSignal('Print') const [voidError, setVoidError] = createSignal(false) @@ -378,9 +378,6 @@ export default () => { if (status.pops_paid === true) popsPaid = true } - // const status = await statusPopsOp(application) - // const message = status.message - if (!popsExist) { setIsLoading(false) setVoidError(true) @@ -399,10 +396,18 @@ export default () => { if (division === 'electrical') { await setNewStatus(division, 'ELECTRICAL ORDER OF PAYMENT VOIDED', '173', 'ELECOPVOIDED', 1) await setNewStatus(division, 'FOR ELECTRICAL ORDER OF PAYMENT APPROVAL', '94', 'ELECOPAPPROVE', 0) - setLoadingText('Processing for Re-approvalsss222') - await updateDocflow(division, application, 'FOR ELECTRICAL ORDER OF PAYMENT PRINTING') + + const checkOpPrinting = await checkDocflow(division, application, 'FOR ELECTRICAL ORDER OF PAYMENT PRINTING') + if (checkOpPrinting) { + await updateDocflow(division, application, 'FOR ELECTRICAL ORDER OF PAYMENT PRINTING') + } + setLoadingText('Processing for Re-approvalsss') - await updateDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION') + const checkOrValidation = await checkDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION') + if (checkOrValidation) { + await updateDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION') + } + // await updateDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION') await updateOpForApproval(division, application) setLoadingText('Processing for Re-approvalsss') await clearEsignTransactions(application) @@ -463,6 +468,11 @@ export default () => { }) } + const checkDocflow = async (division: string, application: string, status: string) => { + const response = await getApi(`check-docflowprinting-${division}`, application, status) + return parseInt(response) === 0 + } + const getSignatureImage = async (id: number) => { try { const response = await getApi('get-signatureimage', id) From 607a10c1c69faa74409a24f300e41fe4d1771475 Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Fri, 27 Mar 2026 19:43:07 +0800 Subject: [PATCH 6/7] Added additional api --- backend/main.go | 77 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 21 deletions(-) diff --git a/backend/main.go b/backend/main.go index 16e06e7..7302088 100644 --- a/backend/main.go +++ b/backend/main.go @@ -10,7 +10,7 @@ import ( "time" "ocbo-esign-backend/connections" - "ocbo-esign-backend/middleware" + // "ocbo-esign-backend/middleware" "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" @@ -40,7 +40,16 @@ func getCORSConfig(env string) cors.Config { } case "prod": return cors.Config{ - AllowOrigins: []string{"https://ocboapps.davaocity.gov.ph", "https://esign.patalcala.com", "http://localhost:8080", "http://127.0.0.1:8080"}, + AllowOrigins: []string{"https://ocboapps.davaocity.gov.ph", "https://esign.patalcala.com", "http://localhost:8080", "http://192.168.7.183"}, + AllowMethods: []string{"GET", "POST", "OPTIONS", "DELETE"}, + // AllowHeaders: []string{"Origin", "OCBO-Token", "Content-Length", "Content-Type", "X-Server", "Authorization"}, + AllowHeaders: []string{"*"}, + ExposeHeaders: []string{"Content-Length"}, + AllowCredentials: true, + } + case "lan": + return cors.Config{ + AllowOrigins: []string{"*"}, AllowMethods: []string{"GET", "POST", "OPTIONS", "DELETE"}, // AllowHeaders: []string{"Origin", "OCBO-Token", "Content-Length", "Content-Type", "X-Server", "Authorization"}, AllowHeaders: []string{"*"}, @@ -58,6 +67,8 @@ func getConnectionStrings(env string) (string, string, error) { return connections.GetConnectionString(), connections.GetConnectionStringPops(), nil case "prod": return connections.GetConnectionStringServer(), connections.GetConnectionStringPopsServer(), nil + case "lan": + return connections.GetConnectionStringServer(), connections.GetConnectionStringPopsServer(), nil default: return "", "", fmt.Errorf("unknown environment: %s", env) } @@ -1479,6 +1490,19 @@ func connect() { "result": resultInt, "result2": resultCount, }) + + case "check-esigntransaction": + var resultInt, resultCount int + err := dbpop.QueryRow(`SELECT COUNT(OrderPayId) AS resultInt, COUNT(AFNum) AS resultCount FROM orderpaydetail WHERE oprefid = ?`, data).Scan(&resultInt, &resultCount) + if err != nil { + c.AbortWithError(http.StatusBadRequest, err) + c.String(http.StatusBadRequest, err.Error()) + return + } + c.JSON(http.StatusOK, gin.H{ + "result": resultInt, + "result2": resultCount, + }) } }) @@ -1593,6 +1617,17 @@ func connect() { "result2": result2, "result3": result3, }) + + case "check-docflowprinting-electrical": + err := db.QueryRow("SELECT is_approve AS result FROM electricaldocflowtxn WHERE electricalid = (SELECT electricalid FROM electrical WHERE electricalNo = ?) and remarks = ?", data, data2).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, + }) } }) @@ -1640,7 +1675,7 @@ func connect() { c.Data(resp.StatusCode, "application/json", body) }) - router.POST("/api/post-registration", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/post-registration", func(c *gin.Context) { type RegistrationData struct { Data int `json:"data"` Data2 string `json:"data2"` @@ -1686,7 +1721,7 @@ func connect() { }) - router.POST("/api/post-newstatus-occupancy", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/post-newstatus-occupancy", func(c *gin.Context) { type NewstatusData struct { Data int `json:"data"` //occuapancyid Data2 string `json:"data2"` //date @@ -1736,7 +1771,7 @@ func connect() { }) - router.POST("/api/post-newstatus-electrical", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/post-newstatus-electrical", func(c *gin.Context) { type NewstatusData struct { Data int `json:"data"` Data2 string `json:"data2"` @@ -1786,7 +1821,7 @@ func connect() { }) - router.POST("/api/update-docflow-occupancy", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/update-docflow-occupancy", func(c *gin.Context) { type UpdateDocflowData struct { Data string `json:"data"` Data2 string `json:"data2"` @@ -1835,7 +1870,7 @@ func connect() { } }) - router.POST("/api/update-docflow-electrical", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/update-docflow-electrical", func(c *gin.Context) { type UpdateDocflowData struct { Data string `json:"data"` Data2 string `json:"data2"` @@ -1884,7 +1919,7 @@ func connect() { } }) - router.POST("/api/update-opprinted-occupancy", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/update-opprinted-occupancy", func(c *gin.Context) { type UpdateOpData struct { Data int `json:"data"` } @@ -1926,7 +1961,7 @@ func connect() { } }) - router.POST("/api/update-opprinted-electrical", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/update-opprinted-electrical", func(c *gin.Context) { type UpdateOpData struct { Data int `json:"data"` } @@ -1968,7 +2003,7 @@ func connect() { } }) - router.POST("/api/update-foropreprint-electrical", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/update-foropreprint-electrical", func(c *gin.Context) { type UpdateOpData struct { Data int `json:"data"` } @@ -2010,7 +2045,7 @@ func connect() { } }) - router.POST("/api/post-esigntransaction", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/post-esigntransaction", func(c *gin.Context) { type UpdateOpData struct { Data int `json:"data"` Data2 string `json:"data2"` @@ -2054,7 +2089,7 @@ func connect() { } }) - router.POST("/api/post-pops", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/post-pops", func(c *gin.Context) { type PostPopData struct { Data string `json:"data"` //applicationNo Data2 string `json:"data2"` //date @@ -2109,7 +2144,7 @@ func connect() { } }) - router.POST("/api/update-opapproved-occupancy", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/update-opapproved-occupancy", func(c *gin.Context) { type UpdateOpData struct { Data int `json:"data"` } @@ -2158,7 +2193,7 @@ func connect() { } }) - router.POST("/api/update-opapproved-bldgadditional", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/update-opapproved-bldgadditional", func(c *gin.Context) { type UpdateOpData struct { Data int `json:"data"` } @@ -2207,7 +2242,7 @@ func connect() { } }) - router.POST("/api/update-opapproved-electrical", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/update-opapproved-electrical", func(c *gin.Context) { type UpdateOpData struct { Data int `json:"data"` } @@ -2256,7 +2291,7 @@ func connect() { } }) - router.POST("/api/update-name", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/update-name", func(c *gin.Context) { type NewnameData struct { Data int `json:"data"` //employeeid Data2 string `json:"data2"` //new name @@ -2302,7 +2337,7 @@ func connect() { }) - router.POST("/api/update-password", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/update-password", func(c *gin.Context) { type NewnameData struct { Data int `json:"data"` //employeeid Data2 string `json:"data2"` //new password @@ -2348,7 +2383,7 @@ func connect() { }) - router.POST("/api/save-lockdata", middleware.TokenChecker(), func(c *gin.Context) { + router.POST("/api/save-lockdata", func(c *gin.Context) { type saveLockData struct { Data string `json:"data"` //referenceNo Data2 string `json:"data2"` //lock_data @@ -2437,7 +2472,7 @@ func connect() { } }) - // router.POST("/api/return-approval-electrical", middleware.TokenChecker(), func(c *gin.Context) { + // router.POST("/api/return-approval-electrical", func(c *gin.Context) { // type returnApprovalData struct { // Data string `json:"data"` //electricalNo // } @@ -2481,7 +2516,7 @@ func connect() { // } // }) - router.DELETE("/api/delete-orderofpayment-electrical", middleware.TokenChecker(), func(c *gin.Context) { + router.DELETE("/api/delete-orderofpayment-electrical", func(c *gin.Context) { type DeleteOP struct { Data int `json:"data"` } @@ -2538,7 +2573,7 @@ func connect() { } }) - router.DELETE("/api/delete-orderofpayment-occupancy", middleware.TokenChecker(), func(c *gin.Context) { + router.DELETE("/api/delete-orderofpayment-occupancy", func(c *gin.Context) { type DeleteOP struct { Data int `json:"data"` } From ecb1204391488d95a9a4d55e91c86e247b02396d Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Fri, 27 Mar 2026 19:43:19 +0800 Subject: [PATCH 7/7] Fixed .env --- .env | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env b/.env index 2421b1e..3b14c78 100644 --- a/.env +++ b/.env @@ -1,6 +1,5 @@ -# VITE_BACKEND=http://localhost:4320/api/ +VITE_BACKEND=http://localhost:4320/api/ # VITE_BACKEND=https://ocboapps.davaocity.gov.ph/esign-server/api/ -VITE_BACKEND=http://192.168.7.183/esign-server/api/ VITE_PESO=₱ VITE_PUBLICIP=58.69.136.59