From fd5c5de8afa743a52c4f4a95e561d36ac2dabd7b Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Wed, 26 Jun 2024 18:46:21 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=99=94=EB=A9=B4?=
 =?UTF-8?q?=EC=97=90=20=EA=B8=B0=EA=B4=80,=EC=82=AC=EC=9A=A9=EC=9E=90?=
 =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94=20=EC=A0=80=EC=9E=A5=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/MainController.java    |  5 +-
 src/main/webapp/WEB-INF/jsp/login.jsp         | 72 ++++++++++++-------
 2 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/MainController.java b/src/main/java/cokr/xit/fims/MainController.java
index 4fbd4cef..616ba8fa 100644
--- a/src/main/java/cokr/xit/fims/MainController.java
+++ b/src/main/java/cokr/xit/fims/MainController.java
@@ -31,7 +31,10 @@ public class MainController extends cokr.xit.base.web.MainController {
 
 	@Override
 	public ModelAndView loginPage() {
-		return new ModelAndView("login");
+		ModelAndView mav = new ModelAndView("login");
+		List<DataObject> instList = fimsOgdpBean.selectAllInstList();
+		mav.addObject("instList", instList);
+		return mav;
 	}
 
 	@Override
diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp
index d3f4c771..179b40f5 100644
--- a/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -54,8 +54,14 @@
 		<form id="formAuthentication" method="post">
 			<div class="input_wrap">
 				<div class="input-group">
-					<select id="institute" name="institute" class="form-select mb-2 h-px-40 no-max-w">
-						<option value="default">기본</option>
+					<select id="institute" name="institute" required title="기관명" class="form-select mb-2 h-px-40 no-max-w">
+						<option value="">[기관 선택]</option>
+						<option value="default">시스템관리</option>
+						<c:forEach items="${instList}" var="item">
+							<option value="${item.INST_CD}"
+							<c:if test="${item.USER_USE_YN == 'N'}"> disabled </c:if>
+							>${item.INST_NM}</option>
+						</c:forEach>
 					</select>
 				</div>
 				<div class="input-group">
@@ -67,6 +73,10 @@
 						required title="비밀번호 입력" class="typePassword required form-control inp-long" placeholder="비밀번호" autocomplete="false" />
 					<span class="input-group-text cursor-pointer"><i class="bx bxs-lock"></i></span>
 				</div>
+				<div class="mt-3 form-chcek">
+	            	<input id="remember" type="checkbox" class="form-check-input">
+	            	<label class="form-check-label">로그인 정보 유지</label>
+	            </div>
 				<div class="input_wrap2">
 					<!-- 
 					<a href="#" onclick="javascript:fn_FindId(); return false;">아이디 찾기</a>
@@ -88,24 +98,26 @@
 <template id="selectInstDialogTemplate">
 	<select class="form-select form-control-sm" id="selectInst">
 		<option value="">선택</option>
+		<c:forEach items="${instList}" var="item">
+			<option value="${item.INST_CD}">${item.INST_NM}</option>
+		</c:forEach>
 	</select>
 </template>
 
 <jsp:include page="/WEB-INF/jsp/include/tail.jsp" />
 
 <script type="text/javascript">
-var INST_LIST = [];
 
 ${functions}
 
 function login() {
-	if (!$("#formAuthentication input").validInputs()) return;
+	if (!$("#formAuthentication input,select").validInputs()) return;
 	
 	var params = {
 		account:$("#userId").val(),
 		password:$("#password").val(),
-		institute:$("#institute").val()
-		<%--, rememberCredentials:true--%>
+		institute:$("#institute").val(),
+		rememberCredentials: $("#remember").prop("checked")
 	};
 	
 	json.post({
@@ -154,11 +166,6 @@ function fnOpenSignup(){
 		content : document.getElementById("selectInstDialogTemplate").innerHTML,
 		size : "sm",
 		init : () => {
-			var options = "";
-			for(var i=0; i < INST_LIST.length; i++){
-				options += "<option value='"+INST_LIST[i].INST_CD+"'>"+INST_LIST[i].INST_NM+"</option>";
-			}
-			$("#selectInst").append(options);
 		},
 		onOK : () => {
 			if($("#selectInst").val() == ""){
@@ -205,24 +212,35 @@ function fn_FindPw(){
 
 $(function(){
 	$("#formAuthentication input").onEnterPress(login);
-	if ($("#userId").val())
-		$("#password").focus();
 	
-	ajax.get({
-		url : wctx.url("/instList.do"),
-		data : { },
-		success : (resp) => {
-			INST_LIST = resp.instList;
-			
-			var options = "";
-			for(var i=0; i < INST_LIST.length; i++){
-				options += "<option value='"+INST_LIST[i].INST_CD+"'>"+INST_LIST[i].INST_NM+"</option>";
-			}
-			$("#institute").append(options);
-			
-			$("#institute").val(<%= systemInst %>);
+	let sysInst = "<%= systemInst %>";
+	let cookieInst = "${cookie['userInstitute'].getValue()}";
+	let cookieUserId = "${cookie['userAccount'].getValue()}";
+	let hasCookie = (cookieInst != "" && cookieUserId != "");
+	let selectValue = "";
+	let isSelectable = false;
+
+	if(hasCookie){
+		selectValue = cookieInst;
+		isSelectable = $("#institute option[value='"+selectValue+"']").not("[disabled]").length;
+		if(isSelectable){
+			$("#institute").val(cookieInst);
+			$("#userId").val(cookieUserId);
+			$("#remember").prop("checked", true);
+			$("#password").focus();
+			return;
 		}
-	});
+	}
+	
+	selectValue = sysInst;
+	isSelectable = $("#institute option[value='"+selectValue+"']").not("[disabled]").length;
+	if(isSelectable){
+		$("#institute").val(selectValue);
+		$("#userId").focus();
+	} else {
+		$("#institute").focus();
+	}
+	
 });
 
 </script>