From af331da8a4b05a77f535438a57b7b05c792f95d4 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 10 11월 2021 16:00:28 +0900
Subject: [PATCH] - 세션 만료 시간 항목 추가
---
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index fef5e19..99d318e 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -17,7 +17,8 @@
makeTableConfigs : makeTableConfigs, // �뀒�씠釉� �꽕�젙
initSearch : initSearch, //寃��깋 議곌굔 珥덇린�솕
add : add, //�뾽泥� �깮�꽦
- removes : removes //�뾽泥� �궘�젣
+ removes : removes, //�뾽泥� �궘�젣
+ makeSearchConditions : makeSearchConditions //�뿊�� �떎�슫濡쒕뱶
};
// 蹂��닔
@@ -31,6 +32,11 @@
$scope.vm.search = {
name : "", // �뾽泥대챸
+ };
+
+ $scope.vm.page = {
+ selectedPage : 0,
+ selectedPageRowCount : String(10)
};
$scope.vm.responseData = {
@@ -62,35 +68,27 @@
.setDName("name")
.setDType("renderer")
.setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDRenderer("COMPANYFIELD_MODIFY"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.manager")
.setHWidth("bold")
- .setDName("name")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDName("manager")
+ .setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.tel")
.setHWidth("bold")
- .setDName("name")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDName("tel")
+ .setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.email")
.setHWidth("bold")
- .setDName("name")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDName("email")
+ .setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.desc")
.setHWidth("bold")
- .setDName("name")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDName("memo")
+ .setDAlign("text-center"));
}
// �뾽泥� 愿�由� 紐⑸줉 議고쉶
@@ -123,7 +121,7 @@
}
else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message); // 遺��꽌 紐⑸줉 議고쉶 �떎�뙣
+ SweetAlert.error($filter("translate")("companyField.failedToSelectCompanyFieldFullList"), result.data.message.message); // �뾽泥� 愿�由� 紐⑸줉 議고쉶 �떎�뙣
}
});
}
@@ -133,7 +131,7 @@
$uibModal.open({
templateUrl : 'views/companyField/companyFieldAdd.html',
size : "md",
- controller : 'companyFieldModifyController',
+ controller : 'companyFieldAddController',
backdrop : 'static',
resolve : {
parameter : function () {
@@ -182,8 +180,8 @@
// �궘�젣 �븣由�
SweetAlert.swal({
- title : $filter("translate")("managementWorkspace.deleteDepartment"), // "�뾽泥� �궘�젣"
- text : $filter("translate")("customField.wantToDeleteSelectDepartment"), // "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎."
+ title : $filter("translate")("companyField.delete"), // "�뾽泥� �궘�젣"
+ text : $filter("translate")("companyField.wantToDeleteSelectCompanyField"), // "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎."
type : "warning",
showCancelButton : true,
confirmButtonColor : "#DD6B55",
@@ -221,8 +219,15 @@
});
}
+ function makeSearchConditions() {
+ var conditions = {
+ name: $scope.vm.search.name
+ }
+ return conditions;
+ }
+
$scope.fn.makeTableConfigs();
- //$scope.fn.getPageList();
+ $scope.fn.getPageList();
}
]);
}
--
Gitblit v1.8.0