From f1124758231bb54fa3613292f27021365d6933be Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Thu, 2 Oct 2025 16:12:46 +0800 Subject: [PATCH 1/3] Updated checking of server connection --- backend/main.go | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/backend/main.go b/backend/main.go index 2b30339..d4aee14 100644 --- a/backend/main.go +++ b/backend/main.go @@ -51,7 +51,7 @@ func connect() { //SERVER // router.Use(cors.New(cors.Config{ // AllowOrigins: []string{"http://192.168.7.160:8080/inquiry"}, - // AllowMethods: []string{"GET"}, + // AllowMethods: []string{"GET", "POST"}, // AllowHeaders: []string{"Origin", "OCBO-ShieldConnection"}, // ExposeHeaders: []string{"Content-Length"}, // AllowCredentials: true, @@ -71,7 +71,7 @@ func connect() { c.Writer.Header().Set("X-Frame-Options", "DENY") c.Writer.Header().Set("X-Download-Options", "noopen") c.Writer.Header().Set("Referrer-Policy", "no-referrer") - c.Writer.Header().Set("Server", "Batman") + c.Writer.Header().Set("Server", "OCBO Server") switch method { case "test": @@ -85,13 +85,14 @@ func connect() { case "check-connection": err = db.QueryRow("SELECT 1 AS result").Scan(&result) if err != nil { - c.AbortWithError(http.StatusBadRequest, err) - c.String(http.StatusBadRequest, err.Error()) - } + // c.AbortWithError(http.StatusBadRequest, err) + // c.String(http.StatusBadRequest, err.Error()) + // c.String(http.StatusBadGateway, "false") + c.JSON(http.StatusBadGateway, gin.H{"result": false}) + return - c.JSON(http.StatusOK, gin.H{ - "result": "Connection is OK", - }) + } + c.JSON(http.StatusOK, gin.H{"result": true}) case "get-listopapproval-electrical": var result2 string @@ -642,6 +643,7 @@ func connect() { Data3 string `json:"data3"` Data4 string `json:"data4"` Data5 string `json:"data5"` + Data6 int `json:"data6"` } var registrationData RegistrationData if err := c.ShouldBindJSON(®istrationData); err != nil { @@ -657,13 +659,13 @@ func connect() { c.Writer.Header().Set("Referrer-Policy", "no-referrer") dbpost, err := db.Prepare(`INSERT INTO electricaldocflowtxn (electricaldocflowtxnid, electricalid, txndate, remarks, comments, is_tag, tagword, is_approve, employeeid, is_delete) - VALUES (NULL, ?, ?, NULL, ?, ?, 0, ?, 0)`) + VALUES (NULL, ?, ?, ?, NULL, ?, ?, 0, ?, 0)`) if err != nil { panic(err.Error()) } defer dbpost.Close() - exec, err := dbpost.Exec(registrationData.Data, registrationData.Data2, registrationData.Data3, registrationData.Data4, registrationData.Data5) + exec, err := dbpost.Exec(registrationData.Data, registrationData.Data2, registrationData.Data3, registrationData.Data4, registrationData.Data5, registrationData.Data6) if err != nil { panic(err.Error()) } @@ -674,9 +676,9 @@ func connect() { } if affect > 0 { - c.String(http.StatusOK, "Success on Registrating e-Sign") + c.String(http.StatusOK, "Success on Setting New Status") } else { - c.String(http.StatusInternalServerError, "Failed on Registrating e-Sign") + c.String(http.StatusInternalServerError, "Failed on Setting New Status") } }) From 5c74872b04a44f0f7a320f03894151f19243b4ea Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Thu, 2 Oct 2025 16:13:08 +0800 Subject: [PATCH 2/3] Improved color of popup messages --- src/pages/LoginPage/Login.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/LoginPage/Login.tsx b/src/pages/LoginPage/Login.tsx index 4e3eea3..d135520 100644 --- a/src/pages/LoginPage/Login.tsx +++ b/src/pages/LoginPage/Login.tsx @@ -128,11 +128,11 @@ export default () => {
- + - +

Login Successful

 @@ -146,11 +146,11 @@ export default () => {
setLoggedin(0)}> - + - +

Login Failed

 From 44cde5e63fbd8dd86b3d5ba49246358e3050a943 Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Thu, 2 Oct 2025 16:13:33 +0800 Subject: [PATCH 3/3] Updated main page --- src/pages/MainPage/Main.sass | 1 - src/pages/MainPage/Main.tsx | 52 +++++++++++++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/src/pages/MainPage/Main.sass b/src/pages/MainPage/Main.sass index 60c32a6..f08c623 100644 --- a/src/pages/MainPage/Main.sass +++ b/src/pages/MainPage/Main.sass @@ -25,7 +25,6 @@ h1 position: relative display: flex gap: 5rem - &__list[data-orientation="horizontal"] align-items: center diff --git a/src/pages/MainPage/Main.tsx b/src/pages/MainPage/Main.tsx index 83570d5..db627da 100644 --- a/src/pages/MainPage/Main.tsx +++ b/src/pages/MainPage/Main.tsx @@ -8,7 +8,7 @@ import dayjs from 'dayjs' const API = import.meta.env.VITE_BACKEND const PESO = import.meta.env.VITE_PESO -const ID = import.meta.env.VITE_ID +const ID = import.meta.env.VITE_HEADID export default () => { const [totalOp, setTotalOp] = createSignal(0) @@ -81,14 +81,32 @@ export default () => { // } const approveHandler = async () => { + let signed: boolean = false + let forprinting: boolean = false + + signed = await setNewStatus('ELECTRICAL ORDER OF PAYMENT APPROVED AND SIGNED', '170', 'ELECOPAPPROVEDSIGNED') + if (signed) { + console.log('Signed') + forprinting = await setNewStatus('FOR ELECTRICAL ORDER OF PAYMENT PRINTING', '95', 'ELECOPPRINT') + } + if (forprinting) { + console.log('For Printing') + } + } + + 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()) - for (let i = 0; i < applicationList().length; i++) { + try { await ofetch(API + 'post-newstatus-electrical', { method: 'POST', - body: { data: applicationId(), data2: formattedDate, data3: ID, data4: descriptionList()[i], data5: 'json' }, + body: { data: statusid, data2: formattedDate, data3: status, data4: tag, data5: tagword, data6: parseInt(ID) }, }) + return true + } catch { + return false } } @@ -161,11 +179,37 @@ export default () => {

List of Ready to Approve and Sign Building Order of Payments

 + + + + + {/* + + + + */} + + +
Application NumberNameShow Details
+

List of Ready to Approve and Sign Occupancy Order of Payments

 + + + + + {/* + + + + */} + + +
Application NumberNameShow Details
+ @@ -236,7 +280,7 @@ export default () => { - +