From 174f843618a69caf430ec6e72ca1326ef68d755e Mon Sep 17 00:00:00 2001 From: m_ozawa <26-m-ozawa-swnet@it-college.co.jp> Date: Mon, 19 Oct 2026 16:21:10 +0900 Subject: [PATCH 1/7] =?UTF-8?q?bookList.html=E3=80=80=E9=80=94=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/bookList.html | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 book-rent/src/main/resources/templates/bookList.html diff --git a/book-rent/src/main/resources/templates/bookList.html b/book-rent/src/main/resources/templates/bookList.html new file mode 100644 index 0000000..043c10a --- /dev/null +++ b/book-rent/src/main/resources/templates/bookList.html @@ -0,0 +1,38 @@ + + + + + + 書籍一覧 + + + +
+
+ +
+ + + + + + + + + + + + + +
書籍名
出版社
+
+ + メニューに戻る +

検索結果

+ + + + + + + \ No newline at end of file From 3e0f27f7c04b435aa83e10cd6b8c966426618733 Mon Sep 17 00:00:00 2001 From: o-matsuda <26-o-matsuda-stellatecnica@it-college.co.jp> Date: Tue, 20 Oct 2026 14:26:19 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B8=E7=B1=8D=E7=99=BB=E9=8C=B2?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=88=E3=83=AD=E3=83=BC=E3=83=A9=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/AdminBookController.java | 57 ++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java b/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java index 4dd8b4d..ae96190 100644 --- a/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java +++ b/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java @@ -1,5 +1,60 @@ package com.example.demo.controller; -public class AdminBookController { +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.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import com.example.demo.form.BookForm; +import com.example.demo.service.BookAdminService; + +@Controller +public class AdminBookController { + private final static Logger LOGGER = Logger.getLogger(AdminBookController.class.getName()); + private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました!"; + + HttpSession httpsession; + BookAdminService bookadmin; + + @Autowired + public AdminBookController(HttpSession httpsession, BookAdminService bookadmin) { + this.httpsession = httpsession; + this.bookadmin = bookadmin; + } + + //書籍登録入力画面を表示する + @RequestMapping(value = "/bookRegistConfirm", method = { RequestMethod.GET, RequestMethod.POST }) + public String showbookAdmin(Model model) { + try { + model.addAttribute("BookForm", new BookForm()); + return "boolRegistConfirm"; + } catch (Exception e) { + httpsession.invalidate(); + e.printStackTrace(); + LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); + return "/bookRegistInput"; + } + } + + //書籍登録を実行する + @PostMapping("/bookRegistComplete") + public String insertDepartmentResult(@ModelAttribute("BookForm") BookForm bookform, Model model) { + try { + bookadmin.register(bookform, null); + return "forward:/bookRegistComplete"; + } catch (Exception e) { + httpsession.invalidate(); + e.printStackTrace(); + LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); + return "/bookRegistInput"; + } + } } From 6b2c08c0313ec62081078734de0faec322d1bc3e Mon Sep 17 00:00:00 2001 From: m_ozawa <26-m-ozawa-swnet@it-college.co.jp> Date: Tue, 20 Oct 2026 15:23:08 +0900 Subject: [PATCH 3/7] 2 --- .../demo/controller/BookController.java | 3 +- .../main/resources/templates/bookList.html | 119 ++++++++++++++---- 2 files changed, 97 insertions(+), 25 deletions(-) diff --git a/book-rent/src/main/java/com/example/demo/controller/BookController.java b/book-rent/src/main/java/com/example/demo/controller/BookController.java index 5344892..1be9cca 100644 --- a/book-rent/src/main/java/com/example/demo/controller/BookController.java +++ b/book-rent/src/main/java/com/example/demo/controller/BookController.java @@ -1,5 +1,6 @@ package com.example.demo.controller; -public class BookController { +public class BookController { + } diff --git a/book-rent/src/main/resources/templates/bookList.html b/book-rent/src/main/resources/templates/bookList.html index 043c10a..3a56306 100644 --- a/book-rent/src/main/resources/templates/bookList.html +++ b/book-rent/src/main/resources/templates/bookList.html @@ -7,32 +7,103 @@ + +
+
-
- -
- - - - - - - - - - - - - -
書籍名
出版社
-
- - メニューに戻る -

検索結果

- - - +
+ +
+ + + + + + + + + + + + + + + + + + +
書籍名
出版社
特記事項
+ +
+ メニューに戻る +
+

検索結果

+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
蔵書IDISBN書籍名書籍名よみ出版社特記事項操作
+ +
+ + +
+ +
+ + +
+
+
+ + + 検索結果はありません。 + +
+ \ No newline at end of file From 0754c4507eff0b09472ed1c1d00662d0de2300e2 Mon Sep 17 00:00:00 2001 From: m_ozawa <26-m-ozawa-swnet@it-college.co.jp> Date: Tue, 20 Oct 2026 15:27:39 +0900 Subject: [PATCH 4/7] mm --- .../demo/controller/BookController.java | 8 +- .../main/resources/templates/bookList.html | 181 +++++++++--------- 2 files changed, 94 insertions(+), 95 deletions(-) diff --git a/book-rent/src/main/java/com/example/demo/controller/BookController.java b/book-rent/src/main/java/com/example/demo/controller/BookController.java index 228a728..8fa56a3 100644 --- a/book-rent/src/main/java/com/example/demo/controller/BookController.java +++ b/book-rent/src/main/java/com/example/demo/controller/BookController.java @@ -1,10 +1,10 @@ package com.example.demo.controller; -<<<<<<< HEAD -public class BookController { + + -======= + import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @@ -35,5 +35,5 @@ public class BookController { model.addAttribute("note", note); return "bookList"; } ->>>>>>> b128e9259883a00e9d25fdaae48e3fe54ddd290a + } diff --git a/book-rent/src/main/resources/templates/bookList.html b/book-rent/src/main/resources/templates/bookList.html index e80fbd0..2c3c73f 100644 --- a/book-rent/src/main/resources/templates/bookList.html +++ b/book-rent/src/main/resources/templates/bookList.html @@ -4,110 +4,110 @@ 書籍一覧 -<<<<<<< HEAD + - +
-
-
- -
+ +
+ +
- - - - - - - - - - - - - - - - - - -
書籍名
出版社
特記事項
-
-
- メニューに戻る -
-

検索結果

-
- - - -
- + + + + + + + + + + + + + + + + + + +
書籍名
出版社
特記事項
+ +
+ メニューに戻る +
+

検索結果

+
+ + + +
+ - - - - - - - - - - - - - - - - - - - - - - - - - -
蔵書IDISBN書籍名書籍名よみ出版社特記事項操作
- -
- - -
- -
- - -
-
-
- - - 検索結果はありません。 - + + + + + + + + + + + + + + + + + + + + + + + + + +
蔵書IDISBN書籍名書籍名よみ出版社特記事項操作
+ +
+ + +
+ +
+ + +
+
+
+ + + 検索結果はありません。 +
-======= - + + @@ -166,6 +166,5 @@ ->>>>>>> b128e9259883a00e9d25fdaae48e3fe54ddd290a \ No newline at end of file From 40c08ea6b4d45d38bf9666f30d51c08706ad1fff Mon Sep 17 00:00:00 2001 From: o-matsuda <26-o-matsuda-stellatecnica@it-college.co.jp> Date: Tue, 20 Oct 2026 16:10:36 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B8=E7=B1=8D=E7=99=BB=E9=8C=B2?= =?UTF-8?q?=E3=81=AEHTML=E9=80=94=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/bookRegistConfirm.html | 42 +++++++-------- .../resources/templates/bookRegistInput.html | 52 ++++++++++--------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/book-rent/src/main/resources/templates/bookRegistConfirm.html b/book-rent/src/main/resources/templates/bookRegistConfirm.html index a2e409e..fe8bb99 100644 --- a/book-rent/src/main/resources/templates/bookRegistConfirm.html +++ b/book-rent/src/main/resources/templates/bookRegistConfirm.html @@ -4,37 +4,35 @@ 書籍登録画面 - + +
- - - - - - - - - + + + + + + + + + - 登録 + 登録
ISBN - 書籍名 - - 書籍名よみ - - 出版社 - - 特記事項 - - 書籍名 + + 書籍名よみ + + 出版社 + + 特記事項 + +
書籍情報入力に戻る \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/bookRegistInput.html b/book-rent/src/main/resources/templates/bookRegistInput.html index 74a14f2..6a469ff 100644 --- a/book-rent/src/main/resources/templates/bookRegistInput.html +++ b/book-rent/src/main/resources/templates/bookRegistInput.html @@ -4,39 +4,41 @@ 書籍登録画面 - + +
- - - - - - - - - - - - 申請確認 -
ISBN - - 書籍名 - - 書籍名よみ - - 出版社 - - 特記事項 - -
- 書籍一覧に戻る + + + + + + + + + + + + + 申請確認 +
ISBN + + 書籍名 + + 書籍名よみ + + 出版社 + + 特記事項 + +
+ 書籍一覧に戻る \ No newline at end of file From 879d7235e0eac9d875108f5bccdd796b334d52b2 Mon Sep 17 00:00:00 2001 From: m_ozawa <26-m-ozawa-swnet@it-college.co.jp> Date: Tue, 20 Oct 2026 16:10:51 +0900 Subject: [PATCH 6/7] =?UTF-8?q?10/20=20=E4=BD=9C=E6=A5=AD=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/bookList.html | 105 +----------------- 1 file changed, 1 insertion(+), 104 deletions(-) diff --git a/book-rent/src/main/resources/templates/bookList.html b/book-rent/src/main/resources/templates/bookList.html index 2c3c73f..0193cfc 100644 --- a/book-rent/src/main/resources/templates/bookList.html +++ b/book-rent/src/main/resources/templates/bookList.html @@ -4,110 +4,7 @@ 書籍一覧 - - - - - -
-
- -
- -
- - - - - - - - - - - - - - - - - - - -
書籍名
出版社
特記事項
- -
- メニューに戻る -
-

検索結果

-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
蔵書IDISBN書籍名書籍名よみ出版社特記事項操作
- -
- - -
- -
- - -
-
-
- - - 検索結果はありません。 - -
- - - - + From abb1cda6bf30e9ae328a6cdbb5b8884f1a199bf7 Mon Sep 17 00:00:00 2001 From: o-matsuda <26-o-matsuda-stellatecnica@it-college.co.jp> Date: Wed, 21 Oct 2026 10:26:08 +0900 Subject: [PATCH 7/7] =?UTF-8?q?employeeupdate.html=E9=80=94=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/bookRegistConfirm.html | 38 ---------------- .../resources/templates/bookRegistInput.html | 44 ------------------- .../templates/employeeUpdateConfirm.html | 44 +++++++++++++++++++ .../templates/employeeUpdateInput.html | 41 +++++++++++++++++ 4 files changed, 85 insertions(+), 82 deletions(-) delete mode 100644 book-rent/src/main/resources/templates/bookRegistConfirm.html delete mode 100644 book-rent/src/main/resources/templates/bookRegistInput.html create mode 100644 book-rent/src/main/resources/templates/employeeUpdateConfirm.html create mode 100644 book-rent/src/main/resources/templates/employeeUpdateInput.html diff --git a/book-rent/src/main/resources/templates/bookRegistConfirm.html b/book-rent/src/main/resources/templates/bookRegistConfirm.html deleted file mode 100644 index fe8bb99..0000000 --- a/book-rent/src/main/resources/templates/bookRegistConfirm.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - 書籍登録画面 - - - - - - -
- - - - - - - - - - - - - - - 登録 -
ISBN書籍名 - - 書籍名よみ - - 出版社 - - 特記事項 - -
- 書籍情報入力に戻る \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/bookRegistInput.html b/book-rent/src/main/resources/templates/bookRegistInput.html deleted file mode 100644 index 6a469ff..0000000 --- a/book-rent/src/main/resources/templates/bookRegistInput.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - 書籍登録画面 - - - - -
- -
- - - - - - - - - - - - - - - - 申請確認 -
ISBN - - 書籍名 - - 書籍名よみ - - 出版社 - - 特記事項 - -
- 書籍一覧に戻る - - - \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/employeeUpdateConfirm.html b/book-rent/src/main/resources/templates/employeeUpdateConfirm.html new file mode 100644 index 0000000..b93133e --- /dev/null +++ b/book-rent/src/main/resources/templates/employeeUpdateConfirm.html @@ -0,0 +1,44 @@ + + + + + + 書籍情報確認 + + + + +
+
+

社員情報確認

+
+ +

社員編集

+ + + + + + + + + + + + + + + + + +
社員名
社員名よみ
メールアドレス
パスワード
+ + + + +
+
+ + + + \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/employeeUpdateInput.html b/book-rent/src/main/resources/templates/employeeUpdateInput.html new file mode 100644 index 0000000..101af09 --- /dev/null +++ b/book-rent/src/main/resources/templates/employeeUpdateInput.html @@ -0,0 +1,41 @@ + + + + + + 社員更新情報入力 + + + + +
+
+

社員更新情報入力

+
+
+
+

社員更新

+ + + + + + + + + + 管理者 + 一般ユーザー + 所属 + 退職 + +

+ メールアドレスの入力に戻る +

+ +
+ +
+ + + \ No newline at end of file