Merge branch 'y-ogawa'

team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java

@@ -0,0 +1,11 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * 書籍貸出承認確認用のコントローラ
+ */
+@Controller
+public class ApprovalConfirmController {
+
+}

team1/src/main/java/com/example/demo/controller/a.java

@@ -1,5 +0,0 @@
-package com.example.demo.controller;
-
-public class a {
-
-}

team1/src/main/java/com/example/demo/entity/a.java

@@ -1,5 +0,0 @@
-package com.example.demo.entity;
-
-public class a {
-
-}

team1/src/main/java/com/example/demo/service/ApprovalBorrowBooks.java

@@ -0,0 +1,5 @@
+package com.example.demo.service;
+
+public interface ApprovalBorrowBooks {
+
+}

team1/src/main/java/com/example/demo/service/Impl/ApprovalBorrowBooksImpl.java

@@ -0,0 +1,12 @@
+package com.example.demo.service.Impl;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.demo.service.ApprovalBorrowBooks;
+
+@Service
+@Transactional
+public class ApprovalBorrowBooksImpl implements ApprovalBorrowBooks{
+
+}

team1/src/main/resources/templates/approvalConfirm.html

@@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+	  <!-- 外部のスクリプトファイルを読み込む -->
+	  <script th:src="@{/js/common.js}"></script>
+	  <!-- CSSの読み込み -->
+	  <link rel="stylesheet" th:href="@{/css/all.css}">
+	  <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
+	  <title>書籍貸出承認確認</title>
+</head>
+<body>
+	<h1>登録内容確認　　　
+	    <div class="rightSection">
+	        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+	        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+	    </div>
+	</h1>
+	<!-- 変数名は変更したが、中身は変更していない -->
+	<!-- ボタンや遷移も手を付けていない -->
+	<form action="insertEmployee"
+	      id="insertForm"
+	      method="post"
+	      th:object="${insertEmployeeForm}">
+
+	    <div class="msgBox error" th:if="${messageError != null}">
+	        <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
+	    </div>
+	    <table>
+	        <tr>
+	            <th class="header">申請ID</th>
+	            <td>
+	                <label>
+	                    <input class="readOnly"
+	                           name="idRquest"
+	                           readonly="readonly"
+	                           type="text"
+	                           value="自動で設定されます"/>
+	                </label>
+	            </td>
+	        </tr>
+	        <tr>
+	            <th class="header">申請者名</th>
+	            <td>
+	                <label>
+	                    <input class="readOnly"
+	                           name="nmEmployee"
+	                           readonly="readonly"
+	                           th:value="*{nmEmployee}"
+	                           type="text"/>
+	                </label>
+	            </td>
+	        </tr>
+	        <tr>
+	            <th class="header">申請日</th>
+	            <td>
+	                <label>
+	                    <input class="readOnly"
+	                           name="dataRequest"
+	                           readonly="readonly"
+	                           th:value="*{dataRequest}"
+	                           type="text"/>
+	                </label>
+	            </td>
+	        </tr>
+	        <tr>
+	            <th class="header">ISBN</th>
+	            <td>
+	                <label>
+	                    <input class="readOnly"
+	                           name="isBn"
+	                           readonly="readonly"
+	                           th:value="*{isBn}"
+	                           type="text"/>
+	                </label>
+	            </td>
+	        </tr>
+	        <tr>
+	            <th class="header">書籍名</th>
+	            <td>
+	                <label>
+	                    <input class="readOnly"
+	                           name="nmBook"
+	                           readonly="readonly"
+	                           th:value="*{nmBook}"
+	                           type="text"/>
+	                </label>
+	            </td>
+	        </tr>
+			<tr>
+	            <th class="header">出版社</th>
+	            <td>
+	                <label>
+	                    <input class="readOnly"
+	                           name="publisher"
+	                           readonly="readonly"
+	                           th:value="*{publisher}"
+		                          type="text"/>
+		               </label>
+		           </td>
+		       </tr>
+			   <tr>
+	               <th class="header">特記事項</th>
+	               <td>
+	                  <label>
+		                 <input class="readOnly"
+		                         name="note"
+	                         readonly="readonly"
+	                         th:value="*{note}"
+	                             type="text"/>
+	                   </label>
+	               </td>
+	           </tr>
+			   <tr>
+			        <th class="header">貸出日</th>
+			             <td>
+							<label>
+			              <input class="readOnly"
+			                      name="dateBorrow"
+			                  readonly="readonly"
+							  th:value="*{dateBorrow}"
+			                       type="text"/>
+			               </label>
+			             </td>
+			    </tr>
+			    <tr>
+			        <th class="header">返却予定日</th>
+			            <td>
+			                <label>
+			                       <input class="readOnly"
+			                              name="dateScheduledReturn"
+			                              readonly="readonly"
+			                              th:value="*{date_scheduled_return}"
+			                              type="text"/>
+			                 </label>
+			           </td>
+			    </tr>
+			</table>
+	</form>
+</body>
+</html>