From 7a3c7e41f258575d69e549a4e342e5b8d4c4d54e Mon Sep 17 00:00:00 2001 From: Hanan Askarim Date: Mon, 3 Jun 2024 15:36:53 +0700 Subject: [PATCH] hapus edit --- handlers/dev/masterkelainan.handlers.go | 298 +----------------- handlers/routes.go | 3 - services/dev/masterkelainan.services.go | 50 --- views/dev/masterkelainan/masterkelainan.templ | 12 - .../masterkelainan/masterkelainan_templ.go | 29 +- .../dev/masterkelainan/mdkelainantable.templ | 31 -- .../masterkelainan/mdkelainantable_templ.go | 104 +----- 7 files changed, 33 insertions(+), 494 deletions(-) diff --git a/handlers/dev/masterkelainan.handlers.go b/handlers/dev/masterkelainan.handlers.go index 8b04470..cbf7ac9 100644 --- a/handlers/dev/masterkelainan.handlers.go +++ b/handlers/dev/masterkelainan.handlers.go @@ -25,7 +25,6 @@ type MasterKelainanService interface { GetListMasterKelainan(search string, currentPage int, rowPerPage int) ([]models.Kelainan, int, error) GetKelainanByID(id string) (models.Kelainan, error) AddKelainan(name string) (models.Kelainan, error) - EditKelainan(id string, name string) (models.Kelainan, error) DeleteKelainan(id string) (models.Kelainan, error) GetListMasterKelainanDetail(id string, searchdetail string, currentPage int, rowPerPage int) ([]models.KelainanDetail, int, error) AddKelainanDetail(name string, nameclassification string, selectedid string) (models.KelainanDetail, error) @@ -115,8 +114,6 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainan(c echo.Context) error searchID := utils.GenerateRandomID("searchid") dialogAddID := utils.GenerateRandomID("dialogaddID") dialogAddBodyID := utils.GenerateRandomID("dialogaddbodyID") - dialogEditID := utils.GenerateRandomID("dialogEditID") - dialogEditBodyID := utils.GenerateRandomID("dialogEditBodyID") dialogDeleteID := utils.GenerateRandomID("dialogDeleteID") dialogDeleteBodyID := utils.GenerateRandomID("dialogDeletebodyID") @@ -179,7 +176,7 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainan(c echo.Context) error Link: "/dev/kelainan/add", HxTarget: "#" + dialogAddBodyID, HxSwap: "outerHTML", - HxInclude: "#tableID, #paginationID, #searchID, #dialogAddBodyID, #dialogAddID, #" + searchID + ", #currpage" + paginationID + ",#dialogDeleteBodyID, #dialogDeleteID, #dialogEditBodyID, #dialogEditID", + HxInclude: "#tableID, #paginationID, #searchID, #dialogAddBodyID, #dialogAddID, #" + searchID + ", #currpage" + paginationID + ",#dialogDeleteBodyID, #dialogDeleteID, #dialogEditID", ModalID: dialogAddID, ModalTitle: "New - Grup Kelainan", DialogBody: dialogAddBodyCmp, @@ -190,14 +187,10 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainan(c echo.Context) error // component table listing kelainan contentKelainanComponent := masterkelainan.TableKelainan( dataKelainan, tableID, - "/dev/kelainan/openedit", - "#"+dialogEditBodyID, - "outerHTML", - "#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "/dev/kelainan/opendelete", "#"+dialogDeleteBodyID, "outerHTML", - "#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", + "#dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "/dev/kelainan/selected", "#"+tableDetailID, ) @@ -209,7 +202,7 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainan(c echo.Context) error "text", "/dev/searchkelainan", "input changed delay:500ms, search", - "#"+paginationID, "", "", "outerHTML", "#tableID, #paginationID, #searchID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID") + "#"+paginationID, "", "", "outerHTML", "#tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogDeleteID") // pagination kelainan component kelainanPaginationComponent := pagination.PaginationV2( @@ -217,49 +210,11 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainan(c echo.Context) error 1, "/dev/kelainanpagination", paginationID, - "#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", + "#tableID, #searchID, #"+searchID+", #paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "#"+paginationID, "outerHTML", "", "", ) - // modal edit form - dialogEditBodyComponent := masterkelainan.BodyFormKelainan( - models.CustomTextFieldv2Prm{ - Label: "Nama Grup Kelainan", - Name: "kelainanname", - Placeholder: "Nama Grup Kelainan", - Type: "text", ID: "kelainaninputname"}, - models.CustomTextFieldv2Prm{ - Label: "Nama Grup Kelainan", - Name: "kelainanid", - Placeholder: "Nama Grup Kelainan", - Type: "hidden", ID: "kelainaninputid"}, - dialogEditBodyID, masterkelainan.JsHideModal("")) - modalActioEditComponent := masterkelainan.ActionFormKelainan( - "/dev/kelainan/closeeditform", - "#"+dialogEditBodyID, - "outerHTML", - "#"+dialogEditID) - btnCloaseModalEdit := masterkelainan.BtnCloseFormKelainan( - "/dev/kelainan/closeeditform", - "#"+dialogEditBodyID, - "outerHTML", - "#"+dialogEditID) - modalEditFormComponent := masterkelainan.KelainanForm( - models.KelainanFormComponent{ - IDComponent: "formkelainan", - Link: "/dev/kelainan/edit", - HxTarget: "#" + dialogEditBodyID, - HxSwap: "outerHTML", - HxInclude: "#tableID, #paginationID, #searchID, #dialogEditBodyID, #dialogEditID, #" + searchID + ", #currpage" + paginationID + ",#dialogDeleteBodyID, #dialogDeleteID", - ModalID: dialogEditID, - ModalTitle: "New - Grup Kelainan", - DialogBody: dialogEditBodyComponent, - DialogAction: modalActioEditComponent, - ButtonCLose: btnCloaseModalEdit, - }, - ) - // modal delete form dialogDeleteBodyComponent := masterkelainan.BodyFormKelainan( models.CustomTextFieldv2Prm{ @@ -289,7 +244,7 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainan(c echo.Context) error Link: "/dev/kelainan/delete", HxTarget: "#" + dialogDeleteBodyID, HxSwap: "outerHTML", - HxInclude: "#tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogDeleteID, #" + searchID + ", #currpage" + paginationID + ",#dialogEditBodyID, #dialogEditID", + HxInclude: "#tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogDeleteID, #" + searchID + ", #currpage" + paginationID, ModalID: dialogDeleteID, ModalTitle: "Konfirmasi", DialogBody: dialogDeleteBodyComponent, @@ -432,8 +387,6 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainan(c echo.Context) error // content, css, js content := masterkelainan.ContentMasterKelainan( tableID, paginationID, searchID, dialogAddID, dialogAddBodyID, - dialogEditID, - dialogEditBodyID, dialogDeleteID, dialogDeleteBodyID, tableDetailID, @@ -448,7 +401,6 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainan(c echo.Context) error kelainanFilterComponent, kelainanPaginationComponent, modaladdcomponent, - modalEditFormComponent, modalDeleteFormComponent, contentKelainanDetailCmp, kelainanDetailFilterCmp, @@ -477,7 +429,6 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainanSearch(c echo.Context) tableID := c.QueryParam("tableID") tableDetailID := c.QueryParam("tableDetailID") paginationID := c.QueryParam("paginationID") - dialogEditBodyID := c.QueryParam("dialogEditBodyID") dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID") logger, _ := zap.NewProduction() @@ -493,14 +444,10 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainanSearch(c echo.Context) contentKelainanComponent := masterkelainan.TableKelainan( dataKelainan, tableID, - "/dev/kelainan/openedit", - "#"+dialogEditBodyID, - "outerHTML", - "#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "/dev/kelainan/opendelete", "#"+dialogDeleteBodyID, "outerHTML", - "#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", + "#dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "/dev/kelainan/selected", "#"+tableDetailID, ) @@ -509,7 +456,7 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainanSearch(c echo.Context) 1, "/dev/kelainanpagination", paginationID, - "#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", + "#tableID, #searchID, #"+searchID+", #paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "#"+paginationID, "outerHTML", "", "") retval := []templ.Component{contentKelainanComponent, kelainanPaginationComponent} @@ -526,7 +473,6 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainanPagination(c echo.Cont tableDetailID := c.QueryParam("tableDetailID") searchID := c.QueryParam("searchID") paginationID := c.QueryParam("paginationID") - dialogEditBodyID := c.QueryParam("dialogEditBodyID") dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID") page, err := strconv.Atoi(pageparam) if err != nil { @@ -550,14 +496,10 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainanPagination(c echo.Cont contentKelainanComponent := masterkelainan.TableKelainan( dataKelainan, tableID, - "/dev/kelainan/openedit", - "#"+dialogEditBodyID, - "outerHTML", - "#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "/dev/kelainan/opendelete", "#"+dialogDeleteBodyID, "outerHTML", - "#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", + "#dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "/dev/kelainan/selected", "#"+tableDetailID, ) @@ -566,7 +508,7 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainanPagination(c echo.Cont page, "/dev/kelainanpagination", paginationID, - "#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", + "#tableID, #searchID, #"+searchID+", #paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "#"+paginationID, "outerHTML", "", "") retval := []templ.Component{contentKelainanComponent, kelainanPaginationComponent} @@ -587,7 +529,6 @@ func (lh *MasterKelainanHandler) AddKelainan(c echo.Context) error { currPagePrm := c.FormValue("currpage" + paginationID) dialogAddBodyID := c.FormValue("dialogAddBodyID") dialogAddID := c.FormValue("dialogAddID") - dialogEditBodyID := c.FormValue("dialogEditBodyID") dialogDeleteBodyID := c.FormValue("dialogDeleteBodyID") currPage, err := strconv.Atoi(currPagePrm) @@ -691,14 +632,10 @@ func (lh *MasterKelainanHandler) AddKelainan(c echo.Context) error { // New table listing contentKelainanComponent := masterkelainan.TableKelainan( dataKelainanList, tableID, - "/dev/kelainan/openedit", - "#"+dialogEditBodyID, - "outerHTML", - "#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "/dev/kelainan/opendelete", "#"+dialogDeleteBodyID, "outerHTML", - "#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", + "#dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "/dev/kelainan/selected", "#"+tableDetailID, ) @@ -708,7 +645,7 @@ func (lh *MasterKelainanHandler) AddKelainan(c echo.Context) error { currPage, "/dev/kelainanpagination", paginationID, - "#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", + "#tableID, #searchID, #"+searchID+", #paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "#"+paginationID, "outerHTML", "", "true") toastSuccess := customtoastv2.CustomToastV2Show("Success", "Success add kelainan "+name, "success") @@ -736,210 +673,6 @@ func (lh *MasterKelainanHandler) HandleCloseFormAdd(c echo.Context) error { return utils.View(c, newForm) } -func (lh *MasterKelainanHandler) HandleOpenEditForm(c echo.Context) error { - id := c.QueryParam("id") - dialogEditID := c.QueryParam("dialogEditID") - dialogEditBodyID := c.QueryParam("dialogEditBodyID") - - dataKelainan, err := lh.MasterKelainanService.GetKelainanByID(id) - if err != nil { - newForm := masterkelainan.BodyFormKelainan( - models.CustomTextFieldv2Prm{ - Label: "Nama Grup Kelainan", - Name: "kelainanname", - Placeholder: "Nama Grup Kelainan", - Type: "text", - ID: "kelainaninputname"}, - models.CustomTextFieldv2Prm{Label: "Nama Grup Kelainan", - Name: "kelainanid", - Placeholder: "Nama Grup Kelainan", - Type: "hidden", - ID: "kelainaninputid"}, - dialogEditBodyID, masterkelainan.JsHideModal("")) - return utils.ViewMulti(c, []templ.Component{customtoastv2.CustomToastV2Show("Error", "Get kelainan grup error", "danger"), newForm}) - } - newForm := masterkelainan.BodyFormKelainan( - models.CustomTextFieldv2Prm{ - Label: "Nama Grup Kelainan", - Name: "kelainanname", - Placeholder: "Nama Grup Kelainan", - Value: dataKelainan.Mcu_KelainanGroupName, - Type: "text", - ID: "kelainaninputname"}, - models.CustomTextFieldv2Prm{Label: "Nama Grup Kelainan", - Name: "kelainanid", - Placeholder: "Nama Grup Kelainan", - Value: strconv.Itoa(dataKelainan.Mcu_KelainanGroupID), - Type: "hidden", - ID: "kelainaninputid"}, - dialogEditBodyID, masterkelainan.JsShowModal("#"+dialogEditID)) - return utils.View(c, newForm) -} - -func (lh *MasterKelainanHandler) HandleCloseFormEdit(c echo.Context) error { - dialogEditBodyID := c.FormValue("dialogEditBodyID") - newForm := masterkelainan.BodyFormKelainan( - models.CustomTextFieldv2Prm{ - Label: "Nama Grup Kelainan", - Name: "kelainanname", - Placeholder: "Nama Grup Kelainan", - Type: "text", - ID: "kelainaninputname"}, - models.CustomTextFieldv2Prm{Label: "Nama Grup Kelainan", - Name: "kelainanid", - Placeholder: "Nama Grup Kelainan", - Type: "hidden", - ID: "kelainaninputid"}, - dialogEditBodyID, masterkelainan.JsHideModal("")) - return utils.View(c, newForm) -} - -func (lh *MasterKelainanHandler) HandleEditKelainan(c echo.Context) error { - - logger, _ := zap.NewProduction() - defer logger.Sync() - - //prm form editkelainan - name := c.FormValue("kelainanname") - id := c.FormValue("kelainanid") - tableID := c.FormValue("tableID") - tableDetailID := c.FormValue("tableDetailID") - paginationID := c.FormValue("paginationID") - searchID := c.FormValue("searchID") - search := c.FormValue("search") - currPagePrm := c.FormValue("currpage" + paginationID) - dialogEditID := c.FormValue("dialogEditID") - dialogEditBodyID := c.FormValue("dialogEditBodyID") - dialogDeleteBodyID := c.FormValue("dialogDeleteBodyID") - - currPage, err := strconv.Atoi(currPagePrm) - if err != nil { - return err - } - logger.Info("EDIT KELAINAN", - zap.Any("nama", name), - zap.Any("tableid", tableID), - zap.Any("search", search), - zap.Any("currpage", currPage), - ) - - // form validation - nameValidation := "" - if strings.TrimSpace(name) == "" { - nameValidation = "Nama grup kelainan tidak boleh kosong" - } - if nameValidation != "" { - newForm := masterkelainan.BodyFormKelainan( - models.CustomTextFieldv2Prm{ - Label: "Nama Grup Kelainan", - Name: "kelainanname", - Placeholder: "Nama Grup Kelainan", - Type: "text", - Value: name, - ID: "kelainaninputname", - ErrorMsg: nameValidation}, - models.CustomTextFieldv2Prm{Label: "Nama Grup Kelainan", - Name: "kelainanid", - Placeholder: "Nama Grup Kelainan", - Type: "hidden", - ID: "kelainaninputid"}, - dialogEditBodyID, masterkelainan.JsHideModal("")) - - return utils.ViewMulti(c, []templ.Component{ - customtoastv2.CustomToastV2Show("Warning", nameValidation, "warning"), newForm}) - - } - - // edit kelainan service - dataKelainan, err := lh.MasterKelainanService.EditKelainan(id, name) - - if err != nil { - logger.Info("Error", - zap.Any("Error", err), - zap.Any("name", name), - ) - - newForm := masterkelainan.BodyFormKelainan( - models.CustomTextFieldv2Prm{ - Label: "Nama Grup Kelainan", - Name: "kelainanname", - Placeholder: "Nama Grup Kelainan", - Type: "text", - Value: name, - ID: "kelainaninputname", - }, - models.CustomTextFieldv2Prm{Label: "Nama Grup Kelainan", - Name: "kelainanid", - Placeholder: "Nama Grup Kelainan", - Type: "hidden", - ID: "kelainaninputid"}, - dialogEditBodyID, masterkelainan.JsHideModal("")) - return utils.ViewMulti(c, []templ.Component{ - customtoastv2.CustomToastV2Show("Error", err.Error(), "danger"), newForm}) - } - logger.Info("EDIT KELAINAN", - zap.Any("reutn", dataKelainan), - zap.Any("name", name), - ) - - // get list kelainan for table - dataKelainanList, totalPage, err := lh.MasterKelainanService.GetListMasterKelainan(search, currPage, 5) - if err != nil { - defer logger.Sync() - logger.Info("ERROR GET KELAINAN", - zap.Any("error", err), - ) - fmt.Println(dataKelainan) - return err - } - - // Table component - tableComponent := masterkelainan.TableKelainan( - dataKelainanList, - tableID, - "/dev/kelainan/openedit", - "#"+dialogEditBodyID, - "outerHTML", - "#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", - "/dev/kelainan/opendelete", - "#"+dialogDeleteBodyID, - "outerHTML", - "#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", - "/dev/kelainan/selected", - "#"+tableDetailID, - ) - - // pagination component - kelainanPaginationComponent := pagination.PaginationV2( - totalPage, - currPage, - "/dev/kelainanpagination", - paginationID, - "#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", - "#"+paginationID, - "outerHTML", "", "true", - ) - - newForm := masterkelainan.BodyFormKelainan( - models.CustomTextFieldv2Prm{ - Label: "Nama Grup Kelainan", - Name: "kelainanname", - Placeholder: "Nama Grup Kelainan", - ErrorMsg: nameValidation, - Type: "text"}, - models.CustomTextFieldv2Prm{ - Label: "Nama Grup Kelainan", - Name: "kelainanid", - Placeholder: "Nama Grup Kelainan", - Type: "hidden", ID: "kelainaninputid"}, - dialogEditBodyID, masterkelainan.JsHideModal("#"+dialogEditID)) - toastSuccess := customtoastv2.CustomToastV2Show("Success", "Berhasil edit Kelainan Grup "+name, "success") - - retval := []templ.Component{toastSuccess, tableComponent, kelainanPaginationComponent, newForm} - - return utils.ViewMulti(c, retval) -} - func (lh *MasterKelainanHandler) HandleOpenDeleteForm(c echo.Context) error { id := c.QueryParam("id") dialogDeleteID := c.QueryParam("dialogDeleteID") @@ -993,7 +726,6 @@ func (lh *MasterKelainanHandler) HandleDeleteKelainan(c echo.Context) error { currPagePrm := c.FormValue("currpage" + paginationID) // dialogAddBodyID := c.FormValue("dialogAddBodyID") dialogDeleteID := c.FormValue("dialogDeleteID") - dialogEditBodyID := c.FormValue("dialogEditBodyID") dialogDeleteBodyID := c.FormValue("dialogDeleteBodyID") currPage, err := strconv.Atoi(currPagePrm) @@ -1051,14 +783,10 @@ func (lh *MasterKelainanHandler) HandleDeleteKelainan(c echo.Context) error { //table component tableComponent := masterkelainan.TableKelainan(dataKelainanList, tableID, - "/dev/kelainan/openedit", - "#"+dialogEditBodyID, - "outerHTML", - "#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "/dev/kelainan/opendelete", "#"+dialogDeleteBodyID, "outerHTML", - "#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", + "#dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "/dev/kelainan/selected", "#"+tableDetailID, ) @@ -1069,7 +797,7 @@ func (lh *MasterKelainanHandler) HandleDeleteKelainan(c echo.Context) error { currPage, "/dev/kelainanpagination", paginationID, - "#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", + "#tableID, #searchID, #"+searchID+", #paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "#"+paginationID, "outerHTML", "", "true", ) diff --git a/handlers/routes.go b/handlers/routes.go index b67db8d..83fe85a 100644 --- a/handlers/routes.go +++ b/handlers/routes.go @@ -220,9 +220,6 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) { dev.GET("/kelainanpagination", devKLhandlers.HandlerShowMasterKelainanPagination) dev.POST("/kelainan/closeaddform", devKLhandlers.HandleCloseFormAdd) dev.POST("/kelainan/add", devKLhandlers.AddKelainan) - dev.GET("/kelainan/openedit", devKLhandlers.HandleOpenEditForm) - dev.POST("/kelainan/closeeditform", devKLhandlers.HandleCloseFormEdit) - dev.POST("/kelainan/edit", devKLhandlers.HandleEditKelainan) dev.GET("/kelainan/opendelete", devKLhandlers.HandleOpenDeleteForm) dev.POST("/kelainan/closedeleteform", devKLhandlers.HandleCloseFormDelete) dev.POST("/kelainan/delete", devKLhandlers.HandleDeleteKelainan) diff --git a/services/dev/masterkelainan.services.go b/services/dev/masterkelainan.services.go index 5e97a3b..2fbc201 100644 --- a/services/dev/masterkelainan.services.go +++ b/services/dev/masterkelainan.services.go @@ -190,56 +190,6 @@ func (su *ServicesMasterKelainan) AddKelainan(name string) (models.Kelainan, err return data, nil } -func (su *ServicesMasterKelainan) EditKelainan(id string, name string) (models.Kelainan, error) { - logger, _ := zap.NewProduction() - var data models.Kelainan - var datacek []models.Kelainan - - qryCek := `SELECT Mcu_KelainanGroupName FROM mcu_kelainangroup - WHERE Mcu_KelainanGroupName = ? AND Mcu_KelainanGroupIsActive = 'Y' - AND Mcu_KelainanGroupID <> ?` - err := dbx.Handlex.Select(&datacek, qryCek, name, id) - - if err != nil { - defer logger.Sync() - logger.Error("Error cek data by name", - zap.Any("datacek", datacek), - ) - return data, fmt.Errorf("QUERY_FAILED") - } - if len(datacek) > 0 { - defer logger.Sync() - logger.Error("Name already taken by another data", - zap.String("name", name), - ) - return data, fmt.Errorf("name sudah dipakai") - } - qry := `UPDATE mcu_kelainangroup - SET Mcu_KelainanGroupName = ?, - Mcu_KelainanGroupLastUpdated = NOW() - WHERE Mcu_KelainanGroupID = ?` - rst := dbx.Handlex.MustExec(qry, name, id) - _, err = rst.RowsAffected() - if err != nil { - defer logger.Sync() - logger.Error("Error Update Kelainan", - zap.String("name", name), - ) - return data, fmt.Errorf("QUERY_FAILED") - } - - data, err = su.GetKelainanByID(id) - if err != nil { - defer logger.Sync() - logger.Error("Error get kelainan by id", - zap.String("name", name), - ) - return data, fmt.Errorf("QUERY_FAILED") - } - - return data, nil -} - func (su *ServicesMasterKelainan) DeleteKelainan(id string) (models.Kelainan, error) { logger, _ := zap.NewProduction() var data models.Kelainan diff --git a/views/dev/masterkelainan/masterkelainan.templ b/views/dev/masterkelainan/masterkelainan.templ index fb088d0..46b05ff 100644 --- a/views/dev/masterkelainan/masterkelainan.templ +++ b/views/dev/masterkelainan/masterkelainan.templ @@ -12,8 +12,6 @@ templ ContentMasterKelainan( searchID string, dialogAddID string, dialogAddBodyID string, - dialogEditID string, - dialogEditBodyID string, dialogDeleteID string, dialogDeleteBodyID string, tableDetailID string, @@ -28,7 +26,6 @@ templ ContentMasterKelainan( filterComponent templ.Component, paginationComponent templ.Component, modalAddform templ.Component, - modalEditForm templ.Component, modalDeleteForm templ.Component, tabledetailcontent templ.Component, filterDetailComponent templ.Component, @@ -57,14 +54,6 @@ templ ContentMasterKelainan( Name: "dialogAddBodyID", Type: "hidden", Value: dialogAddBodyID}) - @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditID", - Name: "dialogEditID", - Type: "hidden", - Value: dialogEditID}) - @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditBodyID", - Name: "dialogEditBodyID", - Type: "hidden", - Value: dialogEditBodyID}) @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteID", Name: "dialogDeleteID", Type: "hidden", @@ -139,7 +128,6 @@ templ ContentMasterKelainan( @tablecontent @paginationComponent @modalAddform - @modalEditForm @modalDeleteForm
diff --git a/views/dev/masterkelainan/masterkelainan_templ.go b/views/dev/masterkelainan/masterkelainan_templ.go index ecebec7..14df85f 100644 --- a/views/dev/masterkelainan/masterkelainan_templ.go +++ b/views/dev/masterkelainan/masterkelainan_templ.go @@ -22,8 +22,6 @@ func ContentMasterKelainan( searchID string, dialogAddID string, dialogAddBodyID string, - dialogEditID string, - dialogEditBodyID string, dialogDeleteID string, dialogDeleteBodyID string, tableDetailID string, @@ -38,7 +36,6 @@ func ContentMasterKelainan( filterComponent templ.Component, paginationComponent templ.Component, modalAddform templ.Component, - modalEditForm templ.Component, modalDeleteForm templ.Component, tabledetailcontent templ.Component, filterDetailComponent templ.Component, @@ -97,20 +94,6 @@ func ContentMasterKelainan( if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditID", - Name: "dialogEditID", - Type: "hidden", - Value: dialogEditID}).Render(ctx, templ_7745c5c3_Buffer) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditBodyID", - Name: "dialogEditBodyID", - Type: "hidden", - Value: dialogEditBodyID}).Render(ctx, templ_7745c5c3_Buffer) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteID", Name: "dialogDeleteID", Type: "hidden", @@ -205,7 +188,7 @@ func ContentMasterKelainan( var templ_7745c5c3_Var2 string templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs("#" + dialogAddID) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\masterkelainan\masterkelainan.templ`, Line: 126, Col: 39} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\masterkelainan\masterkelainan.templ`, Line: 115, Col: 39} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2)) if templ_7745c5c3_Err != nil { @@ -218,7 +201,7 @@ func ContentMasterKelainan( var templ_7745c5c3_Var3 string templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs("#" + dialogAddID) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\masterkelainan\masterkelainan.templ`, Line: 135, Col: 38} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\masterkelainan\masterkelainan.templ`, Line: 124, Col: 38} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) if templ_7745c5c3_Err != nil { @@ -240,10 +223,6 @@ func ContentMasterKelainan( if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = modalEditForm.Render(ctx, templ_7745c5c3_Buffer) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } templ_7745c5c3_Err = modalDeleteForm.Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err @@ -263,7 +242,7 @@ func ContentMasterKelainan( var templ_7745c5c3_Var4 string templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs("#" + dialogDetailAddID) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\masterkelainan\masterkelainan.templ`, Line: 156, Col: 45} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\masterkelainan\masterkelainan.templ`, Line: 144, Col: 45} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) if templ_7745c5c3_Err != nil { @@ -276,7 +255,7 @@ func ContentMasterKelainan( var templ_7745c5c3_Var5 string templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs("#" + dialogDetailAddID) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\masterkelainan\masterkelainan.templ`, Line: 165, Col: 44} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\masterkelainan\masterkelainan.templ`, Line: 153, Col: 44} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) if templ_7745c5c3_Err != nil { diff --git a/views/dev/masterkelainan/mdkelainantable.templ b/views/dev/masterkelainan/mdkelainantable.templ index 369805f..684fb33 100644 --- a/views/dev/masterkelainan/mdkelainantable.templ +++ b/views/dev/masterkelainan/mdkelainantable.templ @@ -8,10 +8,6 @@ import ( templ TableKelainan(data []models.Kelainan, tableID string, - hxGetEdit string, - hxTargetEdit string, - hxSwapEdit string, - hxIncludeEdit string, hxGetDelete string, hxTargetDelete string, hxSwapDelete string, @@ -23,10 +19,6 @@ templ TableKelainan(data []models.Kelainan, @tablecomponent.TableV3([]string{"NO", "GRUP KELAINAN", "AKSI"}, []string{"10%", "60%", "30%"}, TableRow(data, - hxGetEdit, - hxTargetEdit, - hxSwapEdit, - hxIncludeEdit, hxGetDelete, hxTargetDelete, hxSwapDelete, @@ -51,10 +43,6 @@ script HandleAfterRequesX(idx string) { } templ TableRow(data []models.Kelainan, - hxGetEdit string, - hxTargetEdit string, - hxSwapEdit string, - hxIncludeEdit string, hxGetDelete string, hxTargetDelete string, hxSwapDelete string, @@ -82,10 +70,6 @@ templ TableRow(data []models.Kelainan, { v.Mcu_KelainanGroupName } @TableAction(v.Mcu_KelainanGroupID, - hxGetEdit, - hxTargetEdit, - hxSwapEdit, - hxIncludeEdit, hxGetDelete, hxTargetDelete, hxSwapDelete, @@ -98,27 +82,12 @@ templ TableRow(data []models.Kelainan, templ TableAction( id int, - hxGetEdit string, - hxTargetEdit string, - hxSwapEdit string, - hxIncludeEdit string, hxGetDelete string, hxTargetDelete string, hxSwapDelete string, hxIncludeDelete string, ) {
- Edit\r Hapus\r
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err