diff --git a/backend/main.go b/backend/main.go index d70adee..25248e2 100644 --- a/backend/main.go +++ b/backend/main.go @@ -536,38 +536,28 @@ func connect() { case "get-employeename": err := db.QueryRow("SELECT IFNULL(employeename, '') AS result FROM employee WHERE employeeid = ?", data).Scan(&result) if err != nil { - if err == sql.ErrNoRows { - result = "0" - } else { - c.AbortWithError(http.StatusBadRequest, err) - c.String(http.StatusBadRequest, err.Error()) - } + c.AbortWithError(http.StatusBadRequest, err) + c.String(http.StatusBadRequest, err.Error()) } c.JSON(http.StatusOK, gin.H{ "result": result, }) case "get-opdetails-electrical": - var result2, result3, result4, result5, result6, result7, result8, result9, result10 string + var result2, result3, result4, result5 string array := []string{} array2 := []string{} array3 := []string{} array4 := []string{} array5 := []string{} - array6 := []string{} - array7 := []string{} - array8 := []string{} - array9 := []string{} - array10 := []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.type, '') AS result6, IFNULL(em.employeename, '') AS result7, IFNULL(rb.accountdescription, '') AS result8, IFNULL(o.amount, '') AS result9, IFNULL(o.opDate, '') AS result10 - 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.electricalid = ?`, data) + results, err := db.Query("SELECT IFNULL(assessedbyid, 0) AS result, IFNULL(reviewedbyid, 0) AS result2, IFNULL(ref_bldgcomputationsheetid, 0) AS result3, IFNULL(amount, 0) AS result4, IFNULL(opDate, '') AS result5 FROM electrical_orderofpayment_new WHERE electricalid = ?", data) if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) } for results.Next() { - err = results.Scan(&result, &result2, &result3, &result4, &result5, &result6, &result7, &result8, &result9, &result10) + err = results.Scan(&result, &result2, &result3, &result4, &result5) if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) @@ -577,27 +567,17 @@ func connect() { array3 = append(array3, result3) array4 = append(array4, result4) array5 = append(array5, result5) - array6 = append(array6, result6) - array7 = append(array7, result7) - array8 = append(array8, result8) - array9 = append(array9, result9) - array10 = append(array10, result10) } c.JSON(http.StatusOK, gin.H{ - "result": array, - "result2": array2, - "result3": array3, - "result4": array4, - "result5": array5, - "result6": array6, - "result7": array7, - "result8": array8, - "result9": array9, - "result10": array10, + "result": array, + "result2": array2, + "result3": array3, + "result4": array4, + "result5": array5, }) - case "get-paymentname": + case "get-paymentname": err := db.QueryRow("SELECT IFNULL(accountdescription, '') AS result FROM ref_bldgcomputationsheet WHERE ref_bldgcomputationsheetid = ?", data).Scan(&result) if err != nil { c.AbortWithError(http.StatusBadRequest, err) diff --git a/src/components/Box/Box.tsx b/src/components/Box/Box.tsx index 255dd2a..b641bcd 100644 --- a/src/components/Box/Box.tsx +++ b/src/components/Box/Box.tsx @@ -6,7 +6,7 @@ interface Props { color?: string children: JSXElement curved?: boolean - padding?: string + padding?: number background?: string } @@ -14,7 +14,7 @@ export default (props: Props) => { const boxClass = createMemo(() => (props.curved ? 'curvedbox' : 'box')) return ( -
+
{props.children}
) diff --git a/src/components/Column/Column.tsx b/src/components/Column/Column.tsx index 7a33aa6..aec3d3e 100644 --- a/src/components/Column/Column.tsx +++ b/src/components/Column/Column.tsx @@ -5,13 +5,12 @@ interface Props { children: JSXElement content?: 'top' | 'center' | 'bottom' | 'split' | 'spaced' gap?: number - padding?: string } export default (props: Props) => { return ( <> -
+
{props.children}
diff --git a/src/pages/LoginPage/Login.tsx b/src/pages/LoginPage/Login.tsx index 4e3eea3..7916775 100644 --- a/src/pages/LoginPage/Login.tsx +++ b/src/pages/LoginPage/Login.tsx @@ -76,7 +76,7 @@ export default () => { - + Login @@ -132,7 +132,7 @@ export default () => { - +

Login Successful

 @@ -150,7 +150,7 @@ export default () => { - +

Login Failed

 diff --git a/src/pages/MainPage/Main.sass b/src/pages/MainPage/Main.sass index 787c898..7e66e00 100644 --- a/src/pages/MainPage/Main.sass +++ b/src/pages/MainPage/Main.sass @@ -92,11 +92,6 @@ h1 &__application-number font-size: 1.75rem - font-weight: 700 - display: flex - flex-direction: column - flex-wrap: wrap - align-items: center &__name padding: 1rem 0 0 0 @@ -116,3 +111,4 @@ h1 &__detail font-size: 1rem + diff --git a/src/pages/MainPage/Main.tsx b/src/pages/MainPage/Main.tsx index f87ef00..5e90131 100644 --- a/src/pages/MainPage/Main.tsx +++ b/src/pages/MainPage/Main.tsx @@ -15,10 +15,6 @@ export default () => { const [assessor, setAssessor] = createSignal('') const [approver, setApprover] = createSignal('') const [dateOp, setDateOp] = createSignal('') - const [client, setClient] = createSignal('') - const [location, setLocation] = createSignal('') - const [type, setType] = createSignal('') - const [applicationNo, setApplicationNo] = createSignal('') const getListForApproval = async () => { try { @@ -64,13 +60,10 @@ export default () => { const getopdetails = async () => { const op = await ofetch(API + 'get-opdetails-electrical/23512', { parseResponse: JSON.parse }) - setApplicationNo(op.result[0]) - setAssessor(op.result7[0]) - setLocation(op.result5[0]) - setType(op.result6[0]) + setTotalOp(calculateTotal(op.result4)) + setAssessor(await getEmployeeName(op.result[0])) + setApprover(await getEmployeeName(op.result2[0])) setDateOp(dayjs(op.result5[0]).format('MMMM DD, YYYY')) - setClient(displayFullname(op.result2[0], op.result3[0], op.result4[0])) - setTotalOp(calculateTotal(op.result9)) } const calculateTotal = (list: number[]) => { @@ -101,20 +94,6 @@ export default () => { } } - const displayFullname = (firstname: string, middleinitial: string, lastname: string) => { - let result - if (firstname.length > 0) { - if (middleinitial.length > 0) { - result = `${firstname} ${middleinitial}. ${lastname}` - } else { - result = `${firstname} ${lastname}` - } - } else { - result = lastname - } - return result - } - onMount(async () => { await load() }) @@ -180,24 +159,12 @@ export default () => { - - {applicationNo()} + + 25-0000000123 -
- Name of Applicant: - {client()} -
- -
- Location: - {location()} -
- -
- Type: - {type().toUpperCase()} -
- + + Sample Name +
Assessed By: {assessor()} diff --git a/src/pages/RegisterPage/Register.tsx b/src/pages/RegisterPage/Register.tsx index 4612159..b837073 100644 --- a/src/pages/RegisterPage/Register.tsx +++ b/src/pages/RegisterPage/Register.tsx @@ -161,7 +161,7 @@ export default () => { - + Registration @@ -301,7 +301,7 @@ export default () => { - +

e-Sign Registration Completed