diff --git a/handlers/dev/md.polakelainan.handlers.go b/handlers/dev/md.polakelainan.handlers.go index a1dcd2f..ecd6661 100644 --- a/handlers/dev/md.polakelainan.handlers.go +++ b/handlers/dev/md.polakelainan.handlers.go @@ -201,16 +201,18 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainan(c echo.Context) error ) // filter kelainan component - kelainanFilterComponent := customtextfieldsearch.MainCustomTextFieldSearchV2(searchID, + kelainanFilterComponent := customtextfieldsearch.MainCustomTextFieldSearchV3(searchID, "search", "Cari Grup Kelainan", "text", "/dev/md/searchkelainan", "input changed delay:500ms, search", - "#"+paginationID, "", "", "outerHTML", "#tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogDeleteID") + "#"+paginationID, "#loadingcontent", "", "outerHTML", "#tableDetailID, #tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogDeleteID", + masterkelainan.BeforeRequestContent(), + masterkelainan.AfterRequestContent()) // pagination kelainan component - kelainanPaginationComponent := pagination.PaginationV2( + kelainanPaginationComponent := pagination.PaginationV3( totalpage, 1, "/dev/md/kelainanpagination", @@ -218,6 +220,8 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainan(c echo.Context) error "#tableID, #searchID, #"+searchID+", #paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "#"+paginationID, "outerHTML", "", "", + masterkelainan.BeforeRequestContent(), + masterkelainan.AfterRequestContent(), ) // modal delete form @@ -273,16 +277,18 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainan(c echo.Context) error ) // filter kelainan detail component - kelainanDetailFilterCmp := customtextfieldsearch.MainCustomTextFieldSearchV2(searchDetailID, + kelainanDetailFilterCmp := customtextfieldsearch.MainCustomTextFieldSearchV3(searchDetailID, "searchdetail", "Cari Kelainan/Klasifikasi", "text", "/dev/md/searchkelainandetail", "input changed delay:500ms, searchdetail", - "#"+paginationDetailID, "", "", "none", "#tableDetailID, #paginationDetailID, #searchDetailID, #selectedID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID") + "#"+paginationDetailID, "#loadingcontentdetail", "", "none", "#tableDetailID, #paginationDetailID, #searchDetailID, #selectedID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID", + masterkelainan.BeforeRequestContentDetail(), + masterkelainan.AfterRequestContentDetail()) // pagination kelainan detail component - kelainanDetailPaginationCmp := pagination.PaginationV2( + kelainanDetailPaginationCmp := pagination.PaginationV3( totalPageDetail, 1, "/dev/md/kelainandetailpagination", @@ -290,6 +296,8 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainan(c echo.Context) error "#tableDetailID, #searchDetailID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID, #"+searchDetailID+", #paginationDetailID", "#"+paginationDetailID, "outerHTML", "", "", + masterkelainan.BeforeRequestContentDetail(), + masterkelainan.AfterRequestContentDetail(), ) // component modal add kelainan detail @@ -461,12 +469,15 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainanSearch(c echo.Context) "#"+tableDetailID, ) - kelainanPaginationComponent := pagination.PaginationV2(totalpage, + kelainanPaginationComponent := pagination.PaginationV3(totalpage, 1, "/dev/md/kelainanpagination", paginationID, "#tableID, #searchID, #"+searchID+", #paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", - "#"+paginationID, "outerHTML", "", "") + "#"+paginationID, "outerHTML", "", "", + masterkelainan.BeforeRequestContent(), + masterkelainan.AfterRequestContent(), + ) retval := []templ.Component{contentKelainanComponent, kelainanPaginationComponent} @@ -517,12 +528,15 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainanPagination(c echo.Cont "#"+tableDetailID, ) - kelainanPaginationComponent := pagination.PaginationV2(totalpage, + kelainanPaginationComponent := pagination.PaginationV3(totalpage, page, "/dev/md/kelainanpagination", paginationID, "#tableID, #searchID, #"+searchID+", #paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", - "#"+paginationID, "outerHTML", "", "") + "#"+paginationID, "outerHTML", "", "", + masterkelainan.BeforeRequestContent(), + masterkelainan.AfterRequestContent(), + ) retval := []templ.Component{contentKelainanComponent, kelainanPaginationComponent} @@ -658,12 +672,15 @@ func (lh *MasterKelainanHandler) AddKelainan(c echo.Context) error { ) // New pagination - kelainanPaginationComponent := pagination.PaginationV2(totalpage, + kelainanPaginationComponent := pagination.PaginationV3(totalpage, currPage, "/dev/md/kelainanpagination", paginationID, "#tableID, #searchID, #"+searchID+", #paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", - "#"+paginationID, "outerHTML", "", "true") + "#"+paginationID, "outerHTML", "", "true", + masterkelainan.BeforeRequestContent(), + masterkelainan.AfterRequestContent(), + ) toastSuccess := customtoastv2.CustomToastV2Show("Success", "Success add kelainan "+name, "success") @@ -813,7 +830,7 @@ func (lh *MasterKelainanHandler) HandleDeleteKelainan(c echo.Context) error { ) //pagination component - kelainanPaginationComponent := pagination.PaginationV2( + kelainanPaginationComponent := pagination.PaginationV3( totalPage, currPage, "/dev/md/kelainanpagination", @@ -821,6 +838,8 @@ func (lh *MasterKelainanHandler) HandleDeleteKelainan(c echo.Context) error { "#tableID, #searchID, #"+searchID+", #paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableDetailID", "#"+paginationID, "outerHTML", "", "true", + masterkelainan.BeforeRequestContent(), + masterkelainan.AfterRequestContent(), ) newForm := masterkelainan.DeleteConfirmationBody( @@ -999,7 +1018,7 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainanDetail(c echo.Context) ) // pagination kelainan detail component - kelainanDetailPaginationCmp := pagination.PaginationV2( + kelainanDetailPaginationCmp := pagination.PaginationV3( totalPageDetail, 1, "/dev/md/kelainandetailpagination", @@ -1007,6 +1026,8 @@ func (lh *MasterKelainanHandler) HandlerShowMasterKelainanDetail(c echo.Context) "#selectedID, #tableDetailID, #searchDetailID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID, #"+searchDetailID+", #paginationDetailID", "#"+paginationDetailID, "outerHTML", "", "true", + masterkelainan.BeforeRequestContentDetail(), + masterkelainan.AfterRequestContentDetail(), ) return utils.ViewMulti(c, []templ.Component{selectid, contentKelainanDetailCmp, kelainanDetailPaginationCmp}) @@ -1044,13 +1065,15 @@ func (lh *MasterKelainanHandler) HandlerShowMdKelainanDetailSearch(c echo.Contex "#dialogDetailDeleteBodyID, #dialogDetailDeleteID, #tableDetailID", ) - kelainanDetailPaginationCmp := pagination.PaginationV2( + kelainanDetailPaginationCmp := pagination.PaginationV3( totalpagedetail, 1, "/dev/md/kelainandetailpagination", paginationDetailID, "#selectedID, #tableDetailID, #searchDetailID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID, #"+searchDetailID+", #paginationDetailID", "#"+paginationDetailID, "outerHTML", "", "true", + masterkelainan.BeforeRequestContentDetail(), + masterkelainan.AfterRequestContentDetail(), ) retVal := []templ.Component{contentKelainanDetailCmp, kelainanDetailPaginationCmp} @@ -1103,12 +1126,14 @@ func (lh *MasterKelainanHandler) HandlerShowMdKelainanDetailPagination(c echo.Co "#dialogDetailDeleteBodyID, #dialogDetailDeleteID, #tableDetailID", ) - kelainanPaginationCmp := pagination.PaginationV2(totalpgaedetail, + kelainanPaginationCmp := pagination.PaginationV3(totalpgaedetail, page, "/dev/md/kelainandetailpagination", paginationDetailID, "#selectedID, #tableDetailID, #searchDetailID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID, #"+searchDetailID+", #paginationDetailID", "#"+paginationDetailID, "outerHTML", "", "", + masterkelainan.BeforeRequestContentDetail(), + masterkelainan.AfterRequestContentDetail(), ) retval := []templ.Component{contentKelainanDetailCmp, kelainanPaginationCmp} @@ -1295,12 +1320,15 @@ func (lh *MasterKelainanHandler) HandlerAddKelainanDetail(c echo.Context) error ) // new pagination - kelainanDetailPaginationCmp := pagination.PaginationV2(totalpage, + kelainanDetailPaginationCmp := pagination.PaginationV3(totalpage, currPage, "/dev/md/kelainandetailpagination", paginationDetailID, "#tableDetailID, #searchDetailID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID, #"+searchDetailID+", #paginationDetailID", - "#"+paginationDetailID, "outerHTML", "", "true") + "#"+paginationDetailID, "outerHTML", "", "true", + masterkelainan.BeforeRequestContentDetail(), + masterkelainan.AfterRequestContentDetail(), + ) toastSuccess := customtoastv2.CustomToastV2Show("Success", "Success add kelainan "+nameKelainanDetail, "success") @@ -1467,7 +1495,7 @@ func (lh *MasterKelainanHandler) HandlerDeleteKelainanDetail(c echo.Context) err "#dialogDetailDeleteBodyID, #dialogDetailDeleteID, #tableDetailID", ) - kelainanDetailPaginationCmp := pagination.PaginationV2( + kelainanDetailPaginationCmp := pagination.PaginationV3( totalpage, currPage, "/dev/md/kelainandetailpagination", @@ -1475,6 +1503,8 @@ func (lh *MasterKelainanHandler) HandlerDeleteKelainanDetail(c echo.Context) err "#tableDetailID, #searchDetailID, #"+searchDetailID+", #paginationDetailID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID", "#"+paginationDetailID, "outerHTML", "", "true", + masterkelainan.BeforeRequestContentDetail(), + masterkelainan.AfterRequestContentDetail(), ) newForm := masterkelainan.DeleteConfirmationBodyDetail( diff --git a/views/dev/mdpolakelainan/masterkelainan.templ b/views/dev/mdpolakelainan/masterkelainan.templ index 46b05ff..5d61add 100644 --- a/views/dev/mdpolakelainan/masterkelainan.templ +++ b/views/dev/mdpolakelainan/masterkelainan.templ @@ -125,10 +125,19 @@ templ ContentMasterKelainan( >Add New - @tablecontent - @paginationComponent - @modalAddform - @modalDeleteForm +