diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
index f2a3f805..b97e7a24 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
@@ -55,11 +55,8 @@
-
-
+
+
@@ -142,15 +139,20 @@ $(document).ready(function(){
ctrl.dataset.onDatasetChange = (obj, option) => {
var t = $P.getGridTemplate();
var trs = Apply.fromDataset.getTbody(ctrl.dataset, t.found, t.notFound, t.replacer);
- $P.renderLayoutList(obj["Total"], ctrl.dataset.length, trs, option);
+ $P.renderLayoutList(obj?.Paging?.totalSize, ctrl.dataset.length, trs, option);
- Apply.fromDataset.paging(ctrl.dataset, obj, $P.findn("layoutPaging"), $P.findn("layoutPagingInfo"));
+ $P.pagingSupport.setPagingInfo(obj);
};
ctrl.dataset.onCurrentChange = (dataItem) => {
Apply.fromDataset.currentRow(ctrl.dataset, dataItem, $P.findn("layoutTbody"));
}
+ $P.pagingSupport = new FimsPagingSupport({
+ doq: $P,
+ linkContainer: "[name='layoutPaging']"
+ });
+
/**************************************************************************
* pageObject.function
**************************************************************************/
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
index e6714526..d70bfe8d 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
@@ -161,18 +161,13 @@
-
-
-
+
+
-
-
-
+
+
@@ -415,11 +410,9 @@ $(document).ready(function(){
var t = $P.getGridTemplate("photoInspection");
var trs = Apply.fromDataset.getTbody(ctrl.dataset, t.found, t.notFound, t.replacer);
- $P.renderInspectionDataList(obj["Total"], ctrl.dataset.length, trs, "photoInspection", option);
+ $P.renderInspectionDataList(obj?.Paging?.totalSize, ctrl.dataset.length, trs, "photoInspection", option);
- Apply.fromDataset.paging(ctrl.dataset, obj,
- $P.findn("photoInspectionPaging"), $P.findn("photoInspectionPagingInfo")
- );
+ $P.pagingSupport0.setPagingInfo(obj);
};
ctrl.dataset.onCurrentChange = (dataItem) => {
@@ -440,6 +433,11 @@ $(document).ready(function(){
$P.showPhoto(dataKey,nextDataKey,curDataVhrno,nextDataVhrno);
}
+ $P.pagingSupport0 = new FimsPagingSupport({
+ doq: $P,
+ linkContainer: "[name='photoInspectionPaging']"
+ });
+
//동일차량검사 datasetControl 인스턴스
var alt = newCrdn02010Alt($P);
alt.defaultFetchSize = FETCH_XS;
@@ -450,11 +448,9 @@ $(document).ready(function(){
var t = $P.getGridTemplate("sameVehicleInspectionMain");
var trs = Apply.fromDataset.getTbody(alt.dataset, t.found, t.notFound, t.replacer);
- $P.renderInspectionDataList(obj["Total"], alt.dataset.length, trs, "sameVehicleInspectionMain", option);
+ $P.renderInspectionDataList(obj?.Paging?.totalSize, alt.dataset.length, trs, "sameVehicleInspectionMain", option);
- Apply.fromDataset.paging(alt.dataset, obj,
- $P.findn("sameVehicleInspectionMainPaging"), $P.findn("sameVehicleInspectionMainPagingInfo")
- );
+ $P.pagingSupport1.setPagingInfo(obj);
};
alt.dataset.onCurrentChange = (dataItem) => {
@@ -466,6 +462,11 @@ $(document).ready(function(){
}
}
+ $P.pagingSupport1 = new FimsPagingSupport({
+ doq: $P,
+ linkContainer: "[name='sameVehicleInspectionMainPaging']"
+ });
+
var shift = newCrdn02010Shift($P);
shift.dataset.onDatasetChange = (obj, option) => {
@@ -1038,8 +1039,8 @@ $(document).ready(function(){
$P.$findn("btnReset").on('click', () => $P.fnReset()); //초기화버튼
$P.$findn("btnPhotoInspection").on('click', () => {
- $(".area-photoinspection").show();
- $(".area-samevehicleinspection").hide();
+ $(".area-photoinspection").removeAttr("hidden");
+ $(".area-samevehicleinspection").attr("hidden","hidden");
$P.$findn('btnPhotoInspection').addClass("active");
$P.$findn('btnSameVehicleInspection').removeClass("active");
@@ -1047,8 +1048,8 @@ $(document).ready(function(){
});
$P.$findn("btnSameVehicleInspection").on('click', () => {
- $(".area-samevehicleinspection").show();
- $(".area-photoinspection").hide();
+ $(".area-samevehicleinspection").removeAttr("hidden");
+ $(".area-photoinspection").attr("hidden","hidden");
$P.$findn("btnSameVehicleInspection").addClass("active");
$P.$findn("btnPhotoInspection").removeClass("active");
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp
index da31fff2..776242f5 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp
@@ -46,11 +46,8 @@
-
-
+
+