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 @@ -
- - - - - - -