From b08ac16aef316cb5304856bb4e593cd9425e1a21 Mon Sep 17 00:00:00 2001
From: Patrick Alvin Alcala <patrick_alv@yahoo.com>
Date: Wed, 1 Oct 2025 12:38:55 +0800
Subject: [PATCH] Updated backend

---
 backend/main.go | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/backend/main.go b/backend/main.go
index 25248e2..d70adee 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -536,28 +536,38 @@ func connect() {
 		case "get-employeename":
 			err := db.QueryRow("SELECT IFNULL(employeename, '') AS result FROM employee WHERE employeeid = ?", data).Scan(&result)
 			if err != nil {
-				c.AbortWithError(http.StatusBadRequest, err)
-				c.String(http.StatusBadRequest, err.Error())
+				if err == sql.ErrNoRows {
+					result = "0"
+				} else {
+					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 string
+			var result2, result3, result4, result5, result6, result7, result8, result9, result10 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(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)
+			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)
 			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)
+				err = results.Scan(&result, &result2, &result3, &result4, &result5, &result6, &result7, &result8, &result9, &result10)
 				if err != nil {
 					c.AbortWithError(http.StatusBadRequest, err)
 					c.String(http.StatusBadRequest, err.Error())
@@ -567,17 +577,27 @@ 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,
+				"result":   array,
+				"result2":  array2,
+				"result3":  array3,
+				"result4":  array4,
+				"result5":  array5,
+				"result6":  array6,
+				"result7":  array7,
+				"result8":  array8,
+				"result9":  array9,
+				"result10": array10,
 			})
 
-    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)