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 a2b6bad..3a72dbf 100644 --- a/team1/src/main/java/com/example/demo/controller/MenuController.java +++ b/team1/src/main/java/com/example/demo/controller/MenuController.java @@ -1,15 +1,24 @@ -//package com.example.demo.controller; -// -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestMethod; -// -// -//@Controller -//public class MenuController { -// +package com.example.demo.controller; + +import jakarta.servlet.http.HttpSession; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + + +@Controller +public class MenuController { + // @RequestMapping(value = "/menu", method = RequestMethod.GET) // public String showmenu() { // return "menu"; // } -//} + + @GetMapping("/menu") + public String menu(HttpSession session, Model model) { + Character FlgAdmin = (Character) session.getAttribute("FlgAdmin"); + model.addAttribute("FlgAdmin", FlgAdmin); + return "menu"; + } +} diff --git a/team1/src/main/resources/templates/applicationList.html b/team1/src/main/resources/templates/applicationList.html index 78c0050..5365956 100644 --- a/team1/src/main/resources/templates/applicationList.html +++ b/team1/src/main/resources/templates/applicationList.html @@ -2,161 +2,68 @@ - - - - - - - 検索 + + + + + + + 検索 -

-
- -
-

+
+ +
-
+
+ メニューに戻る -
- -
- - - 申請ID - - - - - - - 申請者名 - - - - - - - - 書籍名 - - - - - - - 申請日 - - - - - - - 貸出日 - - - - - - - 返却予定日 - - - - +
+

検索結果

- - 操作 - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + -
-メニューに戻る -
-

検索結果

+ + + +
申請ID申請者名書籍名申請日貸出日返却予定日操作
+   
+       +       +   
+
+
-
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
申請ID申請者名書籍名申請日貸出日返却予定日操作
-
- - - - 現在書籍貸出の申請はありません。 - + + + 現在書籍貸出の申請はありません。 + - \ No newline at end of file diff --git a/team1/src/main/resources/templates/menu.html b/team1/src/main/resources/templates/menu.html index 064a1f4..46f7def 100644 --- a/team1/src/main/resources/templates/menu.html +++ b/team1/src/main/resources/templates/menu.html @@ -9,37 +9,38 @@

- +

- - - - + + + + - - - - - - - - - - - + +
+ + + + + + + + +