diff --git a/.env b/.env index c02d6c7..09cacb8 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ -VITE_BACKEND=http://localhost:4320/api/ -# VITE_BACKEND=http://192.168.7.160:8080/esign-server/api/ +# VITE_BACKEND=http://localhost:4320/api/ +VITE_BACKEND=http://192.168.7.160:8080/esign-server/api/ VITE_HEAD=ARCH. KHASHAYAR L. TOGHYANI VITE_PESO=₱ VITE_HEADID=276 \ No newline at end of file diff --git a/backend/main.go b/backend/main.go index dfd067f..1a2cde6 100644 --- a/backend/main.go +++ b/backend/main.go @@ -736,16 +736,6 @@ func connect() { "result": result, }) - case "get-signeddateassessed-electrical": - err := db.QueryRow(`SELECT IFNULL(txndate, '') AS result FROM electricaldocflowtxn WHERE electricalid = ? AND remarks = "FOR ELECTRICAL ORDER OF PAYMENT APPROVAL"`, data).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, - }) } }) @@ -784,7 +774,6 @@ func connect() { c.JSON(http.StatusOK, gin.H{ "result": result, }) - } }) diff --git a/src/pages/AssessorPage/Assessor.tsx b/src/pages/AssessorPage/Assessor.tsx index cf5f935..bcd053c 100644 --- a/src/pages/AssessorPage/Assessor.tsx +++ b/src/pages/AssessorPage/Assessor.tsx @@ -153,9 +153,6 @@ export default () => { getPrintDetails(op.result11[0]) getPrintDetailsFees(op.result11[0]) getSignatureImage(employeeId()) - - const approversignId = await geteSignId(276) - getApprovedDate(approversignId, applicationNo) } const calculateTotal = (list: number[]) => { @@ -263,9 +260,9 @@ export default () => { } } - const geteSignId = async (id: number) => { + const geteSignId = async () => { try { - const response = await ofetch(API + 'get-esignid/' + id, { parseResponse: JSON.parse }) + const response = await ofetch(API + 'get-esignid/' + employeeId(), { parseResponse: JSON.parse }) const result = response.result return result } catch { @@ -274,7 +271,7 @@ export default () => { } const postTransaction = async (application: string) => { - const id = await geteSignId(employeeId()) + const id = await geteSignId() const today = new Date() const formatedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss') @@ -282,6 +279,8 @@ export default () => { method: 'POST', body: { data: parseInt(id), data2: application, data3: formatedDate }, }) + + getApprovedDate(id, application) } const getApprovedDate = async (id: number, application: string) => {