From f5b6fcdc4013e1ebf6c5735541b8163ec3fffb5e Mon Sep 17 00:00:00 2001
From: y-ogawa <26-y-ogawa-tmn@it-college.co.jp>
Date: Wed, 21 Oct 2026 09:50:19 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Confirm=E7=B3=BBHTML?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApprovalConfirmController.java | 80 +++++++++----------
 .../ApprovalConfirmResultController.java      | 11 +++
 .../resources/templates/approvalComplete.html | 45 ++++++++---
 .../resources/templates/approvalConfirm.html  | 21 +++--
 .../resources/templates/approvalRejected.html | 45 ++++++++---
 5 files changed, 133 insertions(+), 69 deletions(-)
 create mode 100644 team1/src/main/java/com/example/demo/controller/ApprovalConfirmResultController.java

diff --git a/team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java b/team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java
index 19609f5..99f280c 100644
--- a/team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java
+++ b/team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java
@@ -1,19 +1,9 @@
 package com.example.demo.controller;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import jakarta.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.example.demo.form.ApprovalForm;
-
 /**
  * 書籍貸出承認確認用のコントローラ
  */
@@ -21,44 +11,46 @@ import com.example.demo.form.ApprovalForm;
 public class ApprovalConfirmController {
 
 	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(ApprovalConfirmController.class.getName());
+//	private final static Logger LOGGER = Logger.getLogger(ApprovalConfirmController.class.getName());
 
 	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+//	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	HttpSession httpSession;
-	Request request;
+//	HttpSession httpSession;
+//	Request request;
+//
+//	@Autowired
+//	public ApprovalConfirmController(
+//			HttpSession httpSession,
+//			Request request) {
+//		this.httpSession = httpSession;
+//		this.request = request;
+//	}
+//
+//	@ModelAttribute
+//	public ApprovalForm approvalForm() {
+//		return new ApprovalForm();
+//	}
 
-	@Autowired
-	public ApprovalConfirmController(
-			HttpSession httpSession,
-			Request request) {
-		this.httpSession = httpSession;
-		this.request = request;
-	}
-
-	@ModelAttribute
-	public ApprovalForm approvalForm() {
-		return new ApprovalForm();
-	}
-
-	@RequestMapping(value = "/ApprovalConfirm", method = RequestMethod.POST)
-	public String AprrvalForm(ApprovalForm ApprovalForm, Model model) {
+	@RequestMapping(value = "/approvalConfirm", method = RequestMethod.POST)
+	public String AprrvalForm() {
 		
-		try {
-
-			
-			return a ;
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-
-			e.printStackTrace();
-
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return "error";
-		}
+		System.out.println("a");
+		return "bookList";
+//		try {
+//
+//			
+//			return  ;
+//		} catch (Exception e) {
+//			// ログイン情報の破棄
+//			httpSession.invalidate();
+//
+//			e.printStackTrace();
+//
+//			// エラーログ出力
+//			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+//			// エラー画面遷移
+//			return "error";
+//		}
 	}
 }
diff --git a/team1/src/main/java/com/example/demo/controller/ApprovalConfirmResultController.java b/team1/src/main/java/com/example/demo/controller/ApprovalConfirmResultController.java
new file mode 100644
index 0000000..01741be
--- /dev/null
+++ b/team1/src/main/java/com/example/demo/controller/ApprovalConfirmResultController.java
@@ -0,0 +1,11 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * 書籍貸出完了・却下処理用のコントローラ
+ */
+@Controller
+public class ApprovalConfirmResultController {
+
+}
diff --git a/team1/src/main/resources/templates/approvalComplete.html b/team1/src/main/resources/templates/approvalComplete.html
index a462f51..bc7189b 100644
--- a/team1/src/main/resources/templates/approvalComplete.html
+++ b/team1/src/main/resources/templates/approvalComplete.html
@@ -1,15 +1,40 @@
 <!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>
 
+<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>
+<h2>書籍貸出申請を承認しました。</h2>
+<br/>
+<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a>　|　<a href="showMenu">メニューに戻る</a>
 </body>
+<script type="text/javascript">
+    function insertSubmit() {
+        const form = document.createElement('form');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', 'approvalConfirm');
+
+        // 動的送信用のHidden
+        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+        const inputField = document.createElement("input");
+        inputField.setAttribute("type", "hidden");
+        inputField.setAttribute("value", "select");
+
+        form.appendChild(inputField);
+
+        // フォームをDOMに追加
+        document.body.appendChild(form);
+
+        form.submit();
+    }
+</script>
 </html>
\ No newline at end of file
diff --git a/team1/src/main/resources/templates/approvalConfirm.html b/team1/src/main/resources/templates/approvalConfirm.html
index 06c1604..966e313 100644
--- a/team1/src/main/resources/templates/approvalConfirm.html
+++ b/team1/src/main/resources/templates/approvalConfirm.html
@@ -18,10 +18,8 @@
 	</h1>
 	<!-- 変数名は変更したが、中身は変更していない -->
 	<!-- ボタンや遷移も手を付けていない -->
-	<form action="insertEmployee"
-	      id="insertForm"
-	      method="post"
-	      th:object="${insertEmployeeForm}">
+	<form action="approvalConfirm"
+	      method="post">
 
 	    <div class="msgBox error" th:if="${messageError != null}">
 	        <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
@@ -135,7 +133,20 @@
 			                 </label>
 			           </td>
 			    </tr>
-			</table>
+				<tr>
+				    <td class="btnArea" colspan="2">
+				        <input type="submit" value="承認"/>
+				    </td>
+				</tr>
+				<tr>
+				    <td class="btnArea" colspan="2">
+				        <input type="submit" value="却下"/>
+				    </td>
+				</tr>
+			</table>	
+			<br/>
+			<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a>	
 	</form>
+	
 </body>
 </html>
\ No newline at end of file
diff --git a/team1/src/main/resources/templates/approvalRejected.html b/team1/src/main/resources/templates/approvalRejected.html
index a462f51..79a8dbf 100644
--- a/team1/src/main/resources/templates/approvalRejected.html
+++ b/team1/src/main/resources/templates/approvalRejected.html
@@ -1,15 +1,40 @@
 <!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>
 
+<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>
+<h2>書籍貸出申請を却下しました。</h2>
+<br/>
+<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a>　|　<a href="showMenu">メニューに戻る</a>
 </body>
+<script type="text/javascript">
+    function insertSubmit() {
+        const form = document.createElement('form');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', 'approvalConfirm');
+
+        // 動的送信用のHidden
+        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+        const inputField = document.createElement("input");
+        inputField.setAttribute("type", "hidden");
+        inputField.setAttribute("value", "select");
+
+        form.appendChild(inputField);
+
+        // フォームをDOMに追加
+        document.body.appendChild(form);
+
+        form.submit();
+    }
+</script>
 </html>
\ No newline at end of file

From 1cf896b986939f496622c6d5e3fd735687b0e1cc Mon Sep 17 00:00:00 2001
From: m-endo <26-s-i-tm-nets@it-college.jp>
Date: Wed, 21 Oct 2026 11:14:41 +0900
Subject: [PATCH 2/2] =?UTF-8?q?HTML=E4=B8=80=E9=83=A8=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E3=80=81LendingForm=E3=82=AF=E3=83=A9=E3=82=B9=E4=BD=9C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/controller/LendingController.java    | 22 +++--
 .../com/example/demo/form/LendingForm.java    | 83 +++++++++++++++++++
 .../main/resources/templates/application.html | 13 ++-
 .../templates/applicationComplete.html        | 13 +--
 .../templates/applicationConfirm.html         | 11 ++-
 5 files changed, 123 insertions(+), 19 deletions(-)
 create mode 100644 team1/src/main/java/com/example/demo/form/LendingForm.java

diff --git a/team1/src/main/java/com/example/demo/controller/LendingController.java b/team1/src/main/java/com/example/demo/controller/LendingController.java
index 2c44fd6..ab7ea82 100644
--- a/team1/src/main/java/com/example/demo/controller/LendingController.java
+++ b/team1/src/main/java/com/example/demo/controller/LendingController.java
@@ -63,6 +63,7 @@ public class LendingController {
 		}
 
 	}
+
 	/**
 	* 書籍貸出申請 実行処理
 	* 
@@ -71,12 +72,23 @@ public class LendingController {
 	* @return 遷移先の画面
 	*/
 	@PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = "反応するURLを記載", method = RequestMethod.POST)
+	@SessionCheck
+	@RequestMapping(value = "反応するURLを記載", method = RequestMethod.POST)
 	public String executeLending(@ModelAttribute("lendingForm") LendingForm lendingForm, Model model) {
 		final String LENDING_COMPLETE = "書籍申請完了しました";
+		try
+
+		{
+
+		} catch (Exception e) {
+			// ログイン情報の破棄
+			httpSession.invalidate();
+			e.printStackTrace();
+
+			// エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			// エラー画面遷移
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
 	}
-	try {
-		
-	}catch
 }
diff --git a/team1/src/main/java/com/example/demo/form/LendingForm.java b/team1/src/main/java/com/example/demo/form/LendingForm.java
new file mode 100644
index 0000000..ecd438e
--- /dev/null
+++ b/team1/src/main/java/com/example/demo/form/LendingForm.java
@@ -0,0 +1,83 @@
+package com.example.demo.form;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LendingForm {
+	/**
+	 * 蔵書ID
+	 */
+	private String id_book;
+	/**
+	 * 書籍名
+	 */
+	private String nm_book;
+
+	//貸出日と返却予定日にアノテーションで日付や時刻の表示形式を指定
+
+	/**
+	 * 貸出日
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	//LocalDate型にて日付（年・月・日）を取り扱う
+	private LocalDate date_borrow;
+
+	/**
+	 * 返却予定日
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate date_scheduled_return;
+
+	//isNullメソッドを作り、未入力になってないか入力チェックを行う
+	/**
+	 * 日付用の null 判定メソッド
+	 */
+	private static boolean isNull(LocalDate date) {
+		return null == date;
+	}
+
+	//画面でエラーが出た場合の表示
+	//エラーが出た場合、リストに文言を追加する
+	public List<String> validateParameter() {
+		final String DATE_BORROW_NULL = "貸出日 が未入力です。";
+		final String DATE_RETURN_NULL = "返却予定日 が未入力です。";
+		final String DATE_ORDER_ERROR = "返却予定日 には、貸出日以降の日付を選択してください。";
+
+		List<String> error = new ArrayList<>();
+
+		// 1.「貸出日」が未入力（null）かどうかをチェックする
+		if (date_borrow == null) {
+			//errorリストの中にメッセージ"貸出日が未入力です"を入れる
+			error.add(DATE_BORROW_NULL);
+		}
+
+		// 2.「返却予定日」が未入力（null）かどうかをチェック
+		if (date_scheduled_return == null) {
+			//errorリストの中にメッセージ"返却予定日 が未入力です。"を入れる
+			error.add(DATE_RETURN_NULL);
+		}
+
+		// 
+		// 3「両方ともnullではない（入力されている）」ときのみ日付の前後を比較する
+		if (date_borrow != null && date_scheduled_return != null) {
+
+			// 返却予定日が貸出日より過去の場合のエラー
+			if (date_scheduled_return.isBefore(date_borrow)) {
+				//errorリストの中にメッセージ"返却予定日 には、貸出日以降の日付を選択してください。"を入れる
+				error.add(DATE_ORDER_ERROR);
+			}
+		}
+
+		return error;
+	}
+}
\ No newline at end of file
diff --git a/team1/src/main/resources/templates/application.html b/team1/src/main/resources/templates/application.html
index bbdd703..f23d059 100644
--- a/team1/src/main/resources/templates/application.html
+++ b/team1/src/main/resources/templates/application.html
@@ -16,9 +16,9 @@
 	</div>
 
 	<!--クラス名確認すること（現在仮入力）-->
-	<form action="confirmLending" id="lendingForm" method="post" th:object="${lendingForm}">
+	<form th:action="@{/confirmLending}" id="lendingForm" method="post" th:object="${lendingForm}">
 		<table>
-			<!--蔵所ID、書籍名はreadonlyにて固定-->
+			<!--蔵書ID、書籍名はreadonlyにて固定-->
 			<tr>
 				<th class="header">蔵書ID</th>
 				<td><input type="text" th:field="*{id_book}" readonly="readonly"></td>
@@ -29,12 +29,17 @@
 			</tr>
 			<tr>
 				<!--input type ="date"にてカレンダー入力表示-->
+				<!--required属性を追加、未入力をブラウザ側ではじく-->
+				<!--Thymeleafにてエラー表示エリアを作成-->
 				<th class="header">貸出日</th>
-				<td><input type="date" th:field="*{date_borrow}"></td>
+				<td><input type="date" th:field="*{date_borrow}" required></td>
+				<span th:if="${#fields.hasErrors('date_borrow')}" th:errors="*{date_borrow}" style="color:red;"></span>
 			</tr>
 			<tr>
 				<th class="header">返却予定日</th>
-				<td><input type="date" th:field="*{date_scheduled_return}"></td>
+				<td><input type="date" th:field="*{date_scheduled_return}" required></td>
+				<span th:if="${#fields.hasErrors('date_scheduled_return')}" th:errors="*{date_scheduled_return}"
+					style="color:red;"></span>
 			</tr>
 			<tr>
 				<td class="btnArea" colspan="2">
diff --git a/team1/src/main/resources/templates/applicationComplete.html b/team1/src/main/resources/templates/applicationComplete.html
index 3c829ff..868a6fb 100644
--- a/team1/src/main/resources/templates/applicationComplete.html
+++ b/team1/src/main/resources/templates/applicationComplete.html
@@ -16,14 +16,15 @@
 	</div>
 
 	<!--見出し表示-->
-	<h1>書籍申請完了しました</h1>
+	<h1>書籍貸出申請完了しました</h1>
 
-	<!--書籍一覧に戻る処理、URL確認を行う-->
-	<a th:href="@{/bookList}"> 書籍一覧に戻る</a>
-
-	<!--メニュー画面に戻る処理、URL確認を行う-->
-	<a th:href="@{/menu}">メニューに戻る</a>
+	<div class="navigation-links">
+		<!--書籍一覧に戻る処理、URL確認を行う-->
+		<a th:href="@{/bookList}"> 書籍一覧に戻る</a>
 
+		<!--メニュー画面に戻る処理、URL確認を行う-->
+		<a th:href="@{/menu}">メニューに戻る</a>
+	</div>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/team1/src/main/resources/templates/applicationConfirm.html b/team1/src/main/resources/templates/applicationConfirm.html
index 42196dd..2f90bf7 100644
--- a/team1/src/main/resources/templates/applicationConfirm.html
+++ b/team1/src/main/resources/templates/applicationConfirm.html
@@ -34,11 +34,11 @@
 			</tr>
 			<tr>
 				<th class="header">貸出日</th>
-				<td><span th:text="${#temporals.format(lendingForm.date_borrow, 'yyyy/MM/dd')}"></span></td>
+				<td><span th:text="${#temporals.format(*{date_borrow}, 'yyyy/MM/dd')}"></span></td>
 			</tr>
 			<tr>
 				<th class="header">返却予定日</th>
-				<td><span th:text="${#temporals.format(lendingForm.date_scheduled_return, 'yyyy/MM/dd')}"></span></td>
+				<td><span th:text="${#temporals.format(*{date_scheduled_return}, 'yyyy/MM/dd')}"></span></td>
 			</tr>
 			<tr>
 				<td class="btnArea" colspan="2">
@@ -48,8 +48,11 @@
 			</tr>
 		</table>
 	</form>
-	<!--申請情報入力に戻る処理-->
-	<a th:href="@{/applicationConfirm}"> 申請情報入力に戻る</a>
+	<!--申請情報入力(一つ前の画面)に戻る処理-->
+	<!--ブラウザバック処理（history.back()）を記述-->
+	<div class="link-return-area">
+		<a class="back-link" onclick="history.back()">申請情報入力に戻る</a>
+	</div>
 </body>
 
 </html>
\ No newline at end of file