- >
+
| パスワード |
Date: Wed, 21 Oct 2026 09:50:19 +0900
Subject: [PATCH 02/10] =?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 @@
-
-
-
-
-
-
-
- 書籍貸出承認確認
-
-
+
+
+
+
+
+
+
+
+ 書籍貸出承認完了画面
+
+
+
+書籍貸出申請を承認しました。
+
+承認待ち一覧に戻る | メニューに戻る
+
\ 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 @@
- |
-
+