diff --git a/handlers/dev/employeeanalytic.handlers.go b/handlers/dev/employeeanalytic.handlers.go index 4c1ead4..34a3f1a 100644 --- a/handlers/dev/employeeanalytic.handlers.go +++ b/handlers/dev/employeeanalytic.handlers.go @@ -71,7 +71,7 @@ func (ea *EmployeeAnalyticHandler) HandleShowEmployeeAnalyticScreen(c echo.Conte 1, "/dev/employeeanalytic/changepage", paginationID, - "#listID, #paginationID, #searchID, #startdateID, #enddateID,", + "#listID, #paginationID, #searchID, #startdateID, #enddateID", "#"+paginationID, "outerHTML", "", "", dev_employeeanalytic.BeforeRequestContent(), @@ -134,7 +134,7 @@ func (ea *EmployeeAnalyticHandler) HandlePagination(c echo.Context) error { page, "/dev/employeeanalytic/changepage", paginationID, - "#searchID, #startdateID, #enddateID, #listID, #paginationID", + "#listID, #paginationID, #searchID, #startdateID, #enddateID", "#"+paginationID, "outerHTML", "", "", dev_employeeanalytic.BeforeRequestContent(), @@ -167,7 +167,7 @@ func (ea *EmployeeAnalyticHandler) HandleFilter(c echo.Context) error { totalPage, 1, "/dev/employeeanalytic/changepage", paginationID, - "#searchID, #startdateID, #enddateID, #listID, #paginationID", + "#listID, #paginationID, #searchID, #startdateID, #enddateID", "#"+paginationID, "outerHTML", "", "", dev_employeeanalytic.BeforeRequestContent(), dev_employeeanalytic.AfterRequestContent(), diff --git a/services/dev/employeeanalytic.services.go b/services/dev/employeeanalytic.services.go index a825a94..569ae1a 100644 --- a/services/dev/employeeanalytic.services.go +++ b/services/dev/employeeanalytic.services.go @@ -107,8 +107,8 @@ func (ea *EmployeeAnalyticServices) ListingEmployeeAnalytic(search string, start Mgm_McuNumber, Mgm_McuNumberNational, Mgm_McuNote, - Mgm_McuStartDate, - Mgm_McuEndDate, + DATE_FORMAT(Mgm_McuStartDate, '%d-%m-%Y') AS Mgm_McuStartDate, + DATE_FORMAT(Mgm_McuEndDate, '%d-%m-%Y') AS Mgm_McuEndDate, Mgm_McuIsActive FROM mgm_mcu WHERE Mgm_McuIsActive = 'Y'