diff --git a/backend/main.go b/backend/main.go index d4aee14..2b30339 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", "POST"}, + // AllowMethods: []string{"GET"}, // 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", "OCBO Server") + c.Writer.Header().Set("Server", "Batman") switch method { case "test": @@ -85,14 +85,13 @@ 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.String(http.StatusBadGateway, "false") - c.JSON(http.StatusBadGateway, gin.H{"result": false}) - return - + c.AbortWithError(http.StatusBadRequest, err) + c.String(http.StatusBadRequest, err.Error()) } - c.JSON(http.StatusOK, gin.H{"result": true}) + + c.JSON(http.StatusOK, gin.H{ + "result": "Connection is OK", + }) case "get-listopapproval-electrical": var result2 string @@ -643,7 +642,6 @@ 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 { @@ -659,13 +657,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, registrationData.Data6) + exec, err := dbpost.Exec(registrationData.Data, registrationData.Data2, registrationData.Data3, registrationData.Data4, registrationData.Data5) if err != nil { panic(err.Error()) } @@ -676,9 +674,9 @@ func connect() { } if affect > 0 { - c.String(http.StatusOK, "Success on Setting New Status") + c.String(http.StatusOK, "Success on Registrating e-Sign") } else { - c.String(http.StatusInternalServerError, "Failed on Setting New Status") + c.String(http.StatusInternalServerError, "Failed on Registrating e-Sign") } }) diff --git a/src/pages/LoginPage/Login.tsx b/src/pages/LoginPage/Login.tsx index d135520..4e3eea3 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

diff --git a/src/pages/MainPage/Main.sass b/src/pages/MainPage/Main.sass index f08c623..60c32a6 100644 --- a/src/pages/MainPage/Main.sass +++ b/src/pages/MainPage/Main.sass @@ -25,6 +25,7 @@ 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 db627da..83570d5 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_HEADID +const ID = import.meta.env.VITE_ID export default () => { const [totalOp, setTotalOp] = createSignal(0) @@ -81,32 +81,14 @@ 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()) - try { + for (let i = 0; i < applicationList().length; i++) { await ofetch(API + 'post-newstatus-electrical', { method: 'POST', - body: { data: statusid, data2: formattedDate, data3: status, data4: tag, data5: tagword, data6: parseInt(ID) }, + body: { data: applicationId(), data2: formattedDate, data3: ID, data4: descriptionList()[i], data5: 'json' }, }) - return true - } catch { - return false } } @@ -179,37 +161,11 @@ 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
-
@@ -280,7 +236,7 @@ export default () => { - +