diff --git a/team1/src/main/java/com/example/demo/controller/ApplicationListController.java b/team1/src/main/java/com/example/demo/controller/ApplicationListController.java new file mode 100644 index 0000000..fbbc37e --- /dev/null +++ b/team1/src/main/java/com/example/demo/controller/ApplicationListController.java @@ -0,0 +1,49 @@ +package com.example.demo.controller; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import com.example.demo.service.ReturnService; + +@Controller +public class ApplicationListController{ + + @Autowired + ReturnService returnService; + + public ApplicationListController(ReturnService returnService) { + this.returnService = returnService; + } + + //applicationListにアクセスしたときに実行されるメソッド + @RequestMapping(value = "/applicationList", method = RequestMethod.GET) + public String index(Model model) { + //サービスから一覧を取得し、getAwaitingApprovalListという名前でHTMLに渡す + model.addAttribute("applicationList", returnService.getAwaitingApprovalList()); + return "applicationList"; + } + + //メニュー画面に戻るURLへMapping + @RequestMapping(value = "/menu", method = RequestMethod.GET) + public String menu() { + return "menu"; + } + + //申請承認待ちページに遷移するためのMapping + @RequestMapping(value = "/returnApproval", method = RequestMethod.GET) + //返却確認ページにアクセスしたときに実行されるメソッド + public String returnApproval( + //URLから送られた申請IDを受け取る + @RequestParam("idRequest") Integer idRequest, Model model) { + //受け取った申請IDをidRequestという名前でModelに登録してHTMLに渡す + model.addAttribute("idRequest", idRequest); + //上記で渡すHTMLのURL + return "returnApproval"; + } + + +} + \ No newline at end of file diff --git a/team1/src/main/java/com/example/demo/controller/LendingListController.java b/team1/src/main/java/com/example/demo/controller/LendingListController.java index 77a1082..c9ecd81 100644 --- a/team1/src/main/java/com/example/demo/controller/LendingListController.java +++ b/team1/src/main/java/com/example/demo/controller/LendingListController.java @@ -35,7 +35,7 @@ public class LendingListController { public String menu() { return "menu"; } - + //書籍返却ページに遷移 @RequestMapping(value = "/returnConfirm", method = RequestMethod.GET) //返却確認ページにアクセスしたときに実行されるメソッド diff --git a/team1/src/main/java/com/example/demo/controller/MenuController.java b/team1/src/main/java/com/example/demo/controller/MenuController.java index 3a72dbf..ff74753 100644 --- a/team1/src/main/java/com/example/demo/controller/MenuController.java +++ b/team1/src/main/java/com/example/demo/controller/MenuController.java @@ -14,7 +14,7 @@ public class MenuController { // public String showmenu() { // return "menu"; // } - + @GetMapping("/menu") public String menu(HttpSession session, Model model) { Character FlgAdmin = (Character) session.getAttribute("FlgAdmin"); diff --git a/team1/src/main/resources/templates/applicationList.html b/team1/src/main/resources/templates/applicationList.html index 5365956..24510e5 100644 --- a/team1/src/main/resources/templates/applicationList.html +++ b/team1/src/main/resources/templates/applicationList.html @@ -38,7 +38,7 @@ - + @@ -59,7 +59,7 @@ - + 現在書籍貸出の申請はありません。 diff --git a/team1/src/main/resources/templates/lendingList.html b/team1/src/main/resources/templates/lendingList.html index 80ca9cb..831b048 100644 --- a/team1/src/main/resources/templates/lendingList.html +++ b/team1/src/main/resources/templates/lendingList.html @@ -6,7 +6,7 @@ 貸出中書籍一覧 - +

diff --git a/team1/src/main/resources/templates/menu.html b/team1/src/main/resources/templates/menu.html index 46f7def..6703794 100644 --- a/team1/src/main/resources/templates/menu.html +++ b/team1/src/main/resources/templates/menu.html @@ -43,5 +43,4 @@
- \ No newline at end of file