Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs

src/main/resources/static/js/faRpt/faRpt.js

@@ -127,7 +127,7 @@ function getFaRptEditModal(faRpt){
 }
 function saveFaRpt(faRptState){
   if(contentCheck()){
-    if(confirm("저장하시겠습니까?")){
+    if(confirm("송신하시겠습니까?")){
       $("#status").val(faRptState);
       contentFade("in");
       const formData = new FormData($("#faRptEditForm")[0]);
@@ -153,13 +153,13 @@ function saveFaRpt(faRptState){
         processData: false,
         contentType: false,
         success : function(result) {
-          alert("저장되었습니다.");
+          alert("송신 되었습니다.");
           contentFade("out");
           $("#faRptEditModal").modal('hide');
           getFaRptViewModal(result);
         },
         error : function(xhr, status) {
-          alert("저장에 실패하였습니다.")
+          alert("송신에 실패하였습니다.")
           contentFade("out");
         }
       })

src/main/resources/static/js/igActivities/fpiMgt/sri/sri.js

@@ -79,7 +79,7 @@ function saveSri(faSriState){
 
   }else{
     if(contentCheck()){
-      if(confirm("저장하시겠습니까?")){
+      if(confirm("하달하시겠습니까?")){
         save(faSriState);
       }
     }
@@ -115,7 +115,7 @@ function save(faSriState){
       if(faSriState == 'DST001'){
         alert("임시저장되었습니다.");
       }else{
-        alert("저장되었습니다.");
+        alert("하달되었습니다.");
       }
       contentFade("out");
       $("#sriEditModal").modal('hide');
@@ -125,7 +125,7 @@ function save(faSriState){
       if(faSriState == 'DST001'){
         alert("임시저장에 실패하였습니다.")
       }else{
-        alert("저장에 실패하였습니다.")
+        alert("하달에 실패하였습니다.")
       }
       contentFade("out");
     }

src/main/resources/templates/fragments/footer.html

@@ -31,7 +31,7 @@
 
 <div class="d-flex flex-wrap py-2 mt-auto" id="footerRow" th:fragment="footerFragment">
   <div class="col-auto">
-    <img src="/img/ft_logo.png" alt="사이버외사정보시스템로고" class="h-75">
+    <img src="/img/ft_logo.png" alt="외사업무포털로고" class="h-75">
   </div>
   <div class="col-auto">
     <p id="footerSiteName">외사업무포털</p>

src/main/resources/templates/igActivities/fpiMgt/monitoring/designationList.html

@@ -94,25 +94,27 @@
                 <table class="table table-sm table-bordered table-hover">
                   <thead>
                   <tr class="table-secondary">
+                    <th>순번</th>
                     <th>제목</th>
                     <th>시행일자</th>
+                    <th>첨부파일</th>
                     <th>관서</th>
                     <th>부서</th>
                     <th>작성자</th>
                     <th>작성일시</th>
-                    <th>첨부파일</th>
                     <th>상태</th>
                   </tr>
                   </thead>
                   <tbody class="table-group-divider">
-                  <tr class="designationTr" th:each="list:${mdList}">
+                  <tr class="designationTr" th:each="list,cnt:${mdList}">
+                    <td th:text="${cnt.count}"></td>
                   	<td th:text="${list.mdTitle}"></td>
                     <td th:text="${list.mdDt}"></td>
+                    <td th:text="${list.fileCnt eq null?'파일 없음':#strings.concat(list.fileCnt,' 건')}"></td>
                     <td th:text="${list.wrtOrgan}"></td>
                     <td th:text="${list.wrtPart}"></td>
                     <td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
                     <td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-                  	<td th:text="${list.fileCnt eq null?'파일 없음':#strings.concat(list.fileCnt,' 건')}"></td>
                   	<td th:text="${list.mdState}"></td>
                   	<th:block>
                   		<input type="hidden" class="mdKey" th:value="${list.mdKey}">

src/main/resources/templates/sri/sriEditModal.html

@@ -128,5 +128,5 @@
 <div class="modal-footer bg-light">
 <!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
   <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
-  <button type="button" class="btn btn-primary" id="saveSriBtn">저장</button>
+  <button type="button" class="btn btn-primary" id="saveSriBtn">하달</button>
 </div>