2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: 2026_0910_AI_5G_Java_MUN:y-nakano
Branches Tags
2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:m-endo 2026_0910_AI_5G_Java_MUN:y-ogawa 2026_0910_AI_5G_Java_MUN:y-nakano 2026_0910_AI_5G_Java_MUN:a-takayama 2026_0910_AI_5G_Java_MUN:s-ohasi 2026_0910_AI_5G_Java_MUN:service 2026_0910_AI_5G_Java_MUN:s-ikeda 2026_0910_AI_5G_Java_MUN:s-sakiyama
..
compare: 2026_0910_AI_5G_Java_MUN:s-ikeda
Branches Tags
2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:m-endo 2026_0910_AI_5G_Java_MUN:y-ogawa 2026_0910_AI_5G_Java_MUN:y-nakano 2026_0910_AI_5G_Java_MUN:a-takayama 2026_0910_AI_5G_Java_MUN:s-ohasi 2026_0910_AI_5G_Java_MUN:service 2026_0910_AI_5G_Java_MUN:s-ikeda 2026_0910_AI_5G_Java_MUN:s-sakiyama

4 Commits
y-nakano ... s-ikeda

Author SHA1 Message Date
s-ikeda
15d510df3b エラー修正 2026-10-22 16:06:36 +09:00
s-ikeda
43f91b4116 HTML一部修正 2026-10-22 15:16:01 +09:00
s-ikeda
f091771efc コントローラー作成、HTML修正等 2026-10-22 11:22:10 +09:00
s-ikeda
bb9fdcca5e エラー解消後編集 2026-10-21 13:23:51 +09:00
29 changed files with 157 additions and 1143 deletions
Expand all files Collapse all files

49
team1/src/main/java/com/example/demo/controller/ApplicationListController.java
View File

@@ -1,49 +0,0 @@
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";
}
}

128
team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java
View File

@@ -1,64 +1,64 @@
package com.example.demo.controller; //package com.example.demo.controller;
//
import java.util.logging.Level; //import java.util.logging.Level;
import java.util.logging.Logger; //import java.util.logging.Logger;
//
import jakarta.servlet.http.HttpSession; //import jakarta.servlet.http.HttpSession;
//
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; //import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; //import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute; //import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; //import org.springframework.web.bind.annotation.RequestMethod;
//
import com.example.demo.form.ApprovalForm; //import com.example.demo.form.ApprovalForm;
//
/** ///**
* 書籍貸出承認確認用のコントローラ // * 書籍貸出承認確認用のコントローラ
*/ // */
@Controller //@Controller
public class ApprovalConfirmController { //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; // HttpSession httpSession;
Request request; // ApprovalForm approvalform;
//
@Autowired // @Autowired
public ApprovalConfirmController( // public ApprovalConfirmController(
HttpSession httpSession, // HttpSession httpSession,
Request request) { // ApprovalForm approvalform) {
this.httpSession = httpSession; // this.httpSession = httpSession;
this.request = request; // this.approvalform = approvalform;
} // }
//
@ModelAttribute // @ModelAttribute
public ApprovalForm approvalForm() { // public ApprovalForm approvalForm() {
return new ApprovalForm(); // return new ApprovalForm();
} // }
//
@RequestMapping(value = "/ApprovalConfirm", method = RequestMethod.POST) // @RequestMapping(value = "/ApprovalConfirm", method = RequestMethod.POST)
public String AprrvalForm(ApprovalForm ApprovalForm, Model model) { // public String AprrvalForm(ApprovalForm ApprovalForm, Model model) {
//
try { // try {
//
//
return a ; // return;
} catch (Exception e) { // } catch (Exception e) {
// ログイン情報の破棄 // // ログイン情報の破棄
httpSession.invalidate(); // httpSession.invalidate();
//
e.printStackTrace(); // e.printStackTrace();
//
// エラーログ出力 // // エラーログ出力
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); // LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
// エラー画面遷移 // // エラー画面遷移
return "error"; // return "error";
} // }
} // }
} //}

82
team1/src/main/java/com/example/demo/controller/LendingController.java
View File

@@ -1,82 +0,0 @@
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 main.java.com.example.rhizome.aop.aspect.PermissionCheck;
import main.java.com.example.rhizome.aop.aspect.SessionCheck;
import main.java.com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
/**
* 書籍貸出申請に関する処理を制御するコントローラ
*/
@Controller
public class LendingController {
// ログ出力用インスタンス
private final static Logger LOGGER = Logger.getLogger(LendingController.class.getName());
// エラーメッセージ用の定数フィールド
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
HttpSession httpSession;
//コンストラクタ注入（一番最初に動く処理）
@Autowired
public LendingController(HttpSession httpSession) {
this.httpSession = httpSession;
}
//画面を開くための初期化（！formクラス名要確認！）
@ModelAttribute
public LendingForm lendingForm() {
return new LendingForm();
}
@PermissionCheck
@SessionCheck
@RequestMapping(value = "反応するURLを記載", method = RequestMethod.POST)
public String confirmLending(@ModelAttribute("lendingForm") LendingForm lendingForm, Model model) {
try {
// HTML側の th:object="${lendingForm}" に渡すデータをセット
model.addAllAttribute("lendingForm", lendingForm);
// 貸出申請確認画面のHTML名を返す
return "applicationConform";
} catch (Exception e) {
//ログイン情報の破棄
httpSession.invalidate();
e.printStackTrace();
// エラーログ出力
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
// エラー画面遷移
return TransitionTargetPageNameKeyword.ERROR_HTML;
}
}
/**
* 書籍貸出申請 実行処理
*
* @param lendingForm 確認画面の隠しフィールド(hidden)から引き継いだデータ
* @param model ビューにデータを渡すためのコンテナ
* @return 遷移先の画面
*/
@PermissionCheck
@SessionCheck
@RequestMapping(value = "反応するURLを記載", method = RequestMethod.POST)
public String executeLending(@ModelAttribute("lendingForm") LendingForm lendingForm, Model model) {
final String LENDING_COMPLETE = "書籍申請完了しました";
}
try {
}catch
}

58
team1/src/main/java/com/example/demo/controller/LendingListController.java
View File

@@ -1,58 +0,0 @@
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 LendingListController {
@Autowired
ReturnService returnService;
public LendingListController(ReturnService returnService) {
this.returnService = returnService;
}
//貸出中書籍一覧を表示
@RequestMapping(value = "/lendingList", method = RequestMethod.GET)
//lendingListにアクセスしたときに実行されるメソッド
public String index(Model model) {
//サービスと連携する処理
//サービスから一覧を取得し、borrowListという名前でHTMLに渡す
model.addAttribute("borrowList", returnService.getBorrowList());
//表示するHTML
return "lendingList";
}
//メニューに戻る
@RequestMapping(value = "/menu", method = RequestMethod.GET)
public String menu() {
return "menu";
}
//書籍返却ページに遷移
@RequestMapping(value = "/returnConfirm", method = RequestMethod.GET)
//返却確認ページにアクセスしたときに実行されるメソッド
public String returnConfirm(
//URLから送られた申請IDを受け取る
@RequestParam("idRequest") Integer idRequest, Model model) {
//受け取った申請IDをidRequestという名前でHTMLに渡す
model.addAttribute("idRequest", idRequest);
//上記で渡すHTMLのURL
return "returnConfirm";
}
//@GetMapping("/lendingList")//登録されているデータを取得する役割を果たす
// public String show(Model model) {
// List<X> x = xservice.getX();
// model.addAttribute("Y", x);
// return LendingListService.select;
// }
//
}

24
team1/src/main/java/com/example/demo/controller/MenuController.java
View File

@@ -1,24 +0,0 @@
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";
}
}

35
team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java
View File

@@ -1,35 +0,0 @@
package com.example.demo.controller;
import java.util.Date;
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.ReturnForm;
@Controller
public class ReturnConfirmController {
@ModelAttribute
ReturnForm returnForm() {
Date date = new Date();
return new ReturnForm(1, "テスト名", date, date, date, "ISBN", "書籍名", "出版社", "特記事項");
}
@RequestMapping(value = "/returnConfirm", method = { RequestMethod.POST, RequestMethod.GET })
public String returnConfirm(Model model) {
try {
//申請IDを元に取得
//returnFormに値をセット
//仮の値を入れる
// 画面に返す為の情報をセット
model.addAttribute("returnForm", returnForm());
return "returnConfirm";
} catch (Exception e) {
e.printStackTrace();
return "エラー画面";
}
}
}

77
team1/src/main/java/com/example/demo/controller/SelectBookController.java
View File

@@ -1,77 +0,0 @@
package com.example.demo.controller;
import java.util.List;
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.entity.Book_collectionEntity;
import com.example.demo.form.SearchConditionBookForm;
import com.example.demo.service.SearchBook;
@Controller
public class SelectBookController {
// ログ出力用インスタンス
private final static Logger LOGGER = Logger.getLogger(SelectBookController.class.getName());
// エラーメッセージ用の定数フィールド
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
HttpSession httpsession;
SearchBook searchBook;
@Autowired
public SelectBookController(HttpSession httpSession, SearchBook searchBook) {
this.httpsession = httpSession;
this.searchBook = searchBook;
}
//空の検索条件Form
@ModelAttribute
public SearchConditionBookForm searchConditionBookForm() {
return new SearchConditionBookForm();
}
// ① 書籍一覧の初期表示
@RequestMapping(value ="/selectBook", method = RequestMethod.GET)
public String select(Model model) {
try {
//貸出可能な書籍を全権取得する
List<Book_collectionEntity> books = searchBook.selectAll();
//検索結果をmodelに登録する
model.addAttribute("books" , books);
//書籍一覧画面を表示する
return "book-search";
}catch(Exception e) {
//httpSessionを破棄
httpsession.invalidate();
//エラー内容を出力
e.printStackTrace();
//ログにエラーを記録
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
//エラー画面へ遷移
return "error";
}
}
// ② 検索ボタン押下時の処理
@RequestMapping(value ="/selectBook", method = RequestMethod.POST)
public String ) {
// }
}

40
team1/src/main/java/com/example/demo/controller/returnCompleteController.java
View File

@@ -1,40 +0,0 @@
package com.example.demo.controller;
import org.springframework.stereotype.Controller;
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.ReturnForm;
//返却完了用のコントローラー
@Controller
public class returnCompleteController {
@ModelAttribute
ReturnForm returnForm() {
return new ReturnForm();
}
//返却完了画面表示処理
@RequestMapping(value = "/returnComplete", method = RequestMethod.POST)
public String returnComplete(ReturnForm returnForm) {
try {
System.out.println(returnForm.getNmBook());
//各種　必要な値をDBから取得,セッションからログイン者の情報
//蔵書テーブルの貸出フラグを貸出可、
//貸出テーブルのステータスを返却済、
//返却日を当日日付、
//更新者を更新した人のID、
//更新日を当日日付に更新する。
return "returnComplete";
} catch (Exception e) {
e.printStackTrace();
return "エラー画面";
}
}
}

36
team1/src/main/java/com/example/demo/form/ReturnForm.java
View File

@@ -1,36 +0,0 @@
package com.example.demo.form;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ReturnForm {
//申請ID
private Integer idRequest;
//申請者名//社員名
private String nmEmployee;
//申請日
@DateTimeFormat(pattern = "yyyy-mm-dd")
private Date dateRequest;
//貸出日
@DateTimeFormat(pattern = "yyyy-mm-dd")
private Date dateBorrow;
//返却予定日
@DateTimeFormat(pattern = "yyyy-mm-dd")
private Date dateScheduledReturn;
//ISBN
private String isBn;
//書籍名
private String nmBook;
//出版社
private String pubLisher;
//特記事項
private String noteText;
}

18
team1/src/main/java/com/example/demo/form/SearchConditionBookForm.java
View File

@@ -1,18 +0,0 @@
package com.example.demo.form;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class SearchConditionBookForm {
//書籍名
private String nmBook;
//出版社
private String pubLisher;
//特記事項
private String noteText;
}

18
team1/src/main/java/com/example/demo/model/LeadingListModel.java
View File

@@ -1,18 +0,0 @@
package com.example.demo.model;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
public class LeadingListModel {
//データの保持
private final Integer idRequest;
private final String nmBook;
private final String nmEmployee;
private final Date dateRequest;
private final Date dateBorrow;
private final Date dateScheduledReturn;
}

7
team1/src/main/java/com/example/demo/repository/Borrow_BooksRepository.java
View File

@@ -1,5 +1,7 @@
package com.example.demo.repository; package com.example.demo.repository;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@@ -8,4 +10,9 @@ import com.example.demo.entity.Borrow_booksEntity;
@Repository @Repository
public interface Borrow_BooksRepository extends JpaRepository<Borrow_booksEntity, Integer> { public interface Borrow_BooksRepository extends JpaRepository<Borrow_booksEntity, Integer> {
/*
* 申請者IDで検索
* */
Optional<Borrow_booksEntity> findByIdApplicant(Integer idApplicant);
} }

5
team1/src/main/java/com/example/demo/service/ApprovalBorrowBooks.java
View File

@@ -1,5 +0,0 @@
package com.example.demo.service;
public interface ApprovalBorrowBooks {
}

62
team1/src/main/java/com/example/demo/service/Impl/ApprovalBorrowBooksImpl.java
View File

@@ -1,31 +1,31 @@
package com.example.demo.service.Impl; //package com.example.demo.service.Impl;
//
import java.util.List; //import java.util.List;
//
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; //import org.springframework.transaction.annotation.Transactional;
//
import com.example.demo.repository.Borrow_BooksRepository; //import com.example.demo.repository.Borrow_BooksRepository;
import com.example.demo.service.ApprovalBorrowBooks; //import com.example.demo.service.ApprovalBorrowBooks;
//
@Service //@Service
@Transactional //@Transactional
public class ApprovalBorrowBooksImpl implements ApprovalBorrowBooks { //public class ApprovalBorrowBooksImpl implements ApprovalBorrowBooks {
//
Borrow_BooksRepository borrowbooksRepository; // Borrow_BooksRepository borrowbooksRepository;
//
@Autowired // @Autowired
public ApprovalBorrowBooksImpl(Borrow_BooksRepository borrowbooksRepository) { // public ApprovalBorrowBooksImpl(Borrow_BooksRepository borrowbooksRepository) {
this.borrowbooksRepository = borrowbooksRepository; // this.borrowbooksRepository = borrowbooksRepository;
} // }
//
/* 申請情報から全件取得 // /* 申請情報から全件取得
* @return 取得した情報すべて // * @return 取得した情報すべて
*/ // */
public List<???> selectAll() { // public List<???> selectAll() {
return ???Entity.create???List(???Repository.findAll()); // return ???Entity.create???List(???Repository.findAll());
} // }
//
//
} //}

34
team1/src/main/java/com/example/demo/service/LendingListService.java
View File

@@ -1,34 +0,0 @@
//package com.example.demo.service;
//
//import java.util.List;
//
//import jakarta.transaction.Transactional;
//
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//
//import com.example.demo.model.LeadingListModel;
//import com.example.demo.repository.Borrow_BooksRepository;
//
//@Service
//@Transactional
//public class LendingListService {
//
// @Autowired
// Borrow_BooksRepository borrowrepo;
//
// public LendingListService(Borrow_BooksRepository borrowrepo) {
// this.borrowrepo = borrowrepo;
// }
//
// //貸出中書籍の一覧を取得したい
// public List<LeadingListModel>getBorrowList(){
// //リポジトリに取得を託す。取得したらコントローラーに返す
// return borrowrepo.findLendingList();
// }
//
// public List<LeadingListDto> getBorrowList(){
// List<Borrow_booksEntity> borrowentity = Borrow_BooksRepository.findAll();
// leadinglistdto.status(equals("2"));
// }
//}

5
team1/src/main/java/com/example/demo/service/S.java
View File

@@ -1,5 +0,0 @@
package com.example.demo.service;
public class S {
}

16
team1/src/main/java/com/example/demo/service/SearchBook.java
View File

@@ -1,16 +0,0 @@
package com.example.demo.service;
import java.util.List;
import com.example.demo.entity.Book_collectionEntity;
import com.example.demo.form.SearchConditionBookForm;
public interface SearchBook {
//貸出可能な書籍を全件取得する
List<Book_collectionEntity> selectAll();
//書籍名・出版社・特記事項を条件に検索する
List<Book_collectionEntity> searchByWithLike(SearchConditionBookForm form);
}

51
team1/src/main/resources/templates/application.html
View File

@@ -1,51 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<!--書籍貸出申請画面-->
<head>
<meta charset="UTF-8">
<title>書籍貸出申請</title>
</head>
<body>
<!--右上にログイン者名、ログアウトボタン配置-->
<div class="rightSection">
<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
<!--クラス名確認すること（現在仮入力）-->
<form action="confirmLending" id="lendingForm" method="post" th:object="${lendingForm}">
<table>
<!--蔵書ID、書籍名はreadonlyにて固定-->
<tr>
<th class="header">蔵書ID</th>
<td><input type="text" th:field="*{id_book}" readonly="readonly"></td>
</tr>
<tr>
<th class="header">書籍名</th>
<td><input type="text" th:field="*{nm_book}" readonly="readonly"></td>
</tr>
<tr>
<!--input type ="date"にてカレンダー入力表示-->
<th class="header">貸出日</th>
<td><input type="date" th:field="*{date_borrow}"></td>
</tr>
<tr>
<th class="header">返却予定日</th>
<td><input type="date" th:field="*{date_scheduled_return}"></td>
</tr>
<tr>
<td class="btnArea" colspan="2">
<input type="submit" value="申請確認" />
</td>
</tr>
</table>
</form>
<!--書籍一覧に戻る処理、URL確認を行う-->
<a th:href="@{/bookList}"> 書籍一覧に戻る</a>
</body>
</html>

29
team1/src/main/resources/templates/applicationComplete.html
View File

@@ -1,29 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<!--書籍貸出申請完了画面-->
<head>
<meta charset="UTF-8">
<title>書籍貸出申請完了</title>
</head>
<body>
<!--右上にログイン者名、ログアウトボタン配置-->
<div class="rightSection">
<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
<!--見出し表示-->
<h1>書籍申請完了しました</h1>
<!--書籍一覧に戻る処理、URL確認を行う-->
<a th:href="@{/bookList}"> 書籍一覧に戻る</a>
<!--メニュー画面に戻る処理、URL確認を行う-->
<a th:href="@{/menu}">メニューに戻る</a>
</body>
</html>

55
team1/src/main/resources/templates/applicationConfirm.html
View File

@@ -1,55 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<!--書籍貸出申請確認画面-->
<head>
<meta charset="UTF-8">
<title>書籍貸出申請確認</title>
</head>
<body>
<!--右上にログイン者名、ログアウトボタン配置-->
<div class="rightSection">
<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
<form th:action="@{/executeLending}" id="lendingConfirmForm" method="post" th:object="${lendingForm}">
<!--Java側へデータを引き継ぐための隠しフィールド（必須） -->
<input type="hidden" th:field="*{id_book}" />
<input type="hidden" th:field="*{nm_book}" />
<input type="hidden" th:field="*{date_borrow}" />
<input type="hidden" th:field="*{date_scheduled_return}" />
<table>
<tr>
<!-- 以下4項目<span>タグを用いてテキスト表示として画面に固定表示 -->
<th class="header">蔵書ID</th>
<td><span th:text="*{id_book}"></span></td>
</tr>
<tr>
<th class="header">書籍名</th>
<td><span th:text="*{nm_book}"></span></td>
</tr>
<tr>
<th class="header">貸出日</th>
<td><span th:text="${#temporals.format(lendingForm.date_borrow, 'yyyy/MM/dd')}"></span></td>
</tr>
<tr>
<th class="header">返却予定日</th>
<td><span th:text="${#temporals.format(lendingForm.date_scheduled_return, 'yyyy/MM/dd')}"></span></td>
</tr>
<tr>
<td class="btnArea" colspan="2">
<!-- 申請確定 -->
<input type="submit" value="申請" />
</td>
</tr>
</table>
</form>
<!--申請情報入力に戻る処理-->
<a th:href="@{/applicationConfirm}"> 申請情報入力に戻る</a>
</body>
</html>

28
team1/src/main/resources/templates/applicationList.html
View File

@@ -16,14 +16,14 @@
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button> <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div> </div>
<div class="header-spacing"></div> <div class="header-spacing"></div>
<a href="showMenu">メニューに戻る</a> <a href="showMenu">メニューに戻る</a>
<div class="header-spacing"></div> <div class="header-spacing"></div>
<h1><span>検索結果</span></h1> <h1><span>検索結果</span></h1>
<div class="header-spacing"></div> <div class="header-spacing"></div>
<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}"> <th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
<!-- 検索結果が1件以上ある場合 --> <!-- 検索結果が1件以上ある場合 -->
<table class="table-grid table-striped table-hover"> <table class="table-grid table-striped table-hover">
<thead> <thead>
@@ -38,7 +38,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr th:each="employeeInfoForm : ${applicationList}"> <tr th:each="employeeInfoForm : ${employeeInfoFormList}">
<td th:text="${employeeInfoForm.idRequest}"></td> <td th:text="${employeeInfoForm.idRequest}"></td>
<td th:text="${employeeInfoForm.nmApplicant}"></td> <td th:text="${employeeInfoForm.nmApplicant}"></td>
<td th:text="${employeeInfoForm.nmBook}"></td> <td th:text="${employeeInfoForm.nmBook}"></td>
@@ -49,20 +49,20 @@
<td> <td>
  <form action="/approve" method="get"> <form action="/approve" method="get">
     <input name="idRequest" th:value="${employeeInfoForm.idRequest}" type="hidden"> <input name="idRequest" th:value="${employeeInfoForm.idRequest}" type="hidden">
     <input type="submit" value="承認"> <input type="submit" value="承認">
  </form> </form>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</th:block> </th:block>
<th:block th:if="${applicationList == null or borrowList.isEmpty()}"> <th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
<!-- 検索結果が0件の場合 --> <!-- 検索結果が0件の場合 -->
現在書籍貸出の申請はありません。 現在書籍貸出の申請はありません。
</th:block> </th:block>
</body> </body>

15
team1/src/main/resources/templates/approvalComplete.html
View File

@@ -1,15 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<!-- 外部のスクリプトファイルを読み込む -->
<script th:src="@{/js/common.js}"></script>
<!-- CSSの読み込み -->
<link rel="stylesheet" th:href="@{/css/all.css}">
<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
<title>書籍貸出承認確認</title>
</head>
<body>
</body>
</html>

15
team1/src/main/resources/templates/approvalRejected.html
View File

@@ -1,15 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<!-- 外部のスクリプトファイルを読み込む -->
<script th:src="@{/js/common.js}"></script>
<!-- CSSの読み込み -->
<link rel="stylesheet" th:href="@{/css/all.css}">
<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
<title>書籍貸出承認確認</title>
</head>
<body>
</body>
</html>

72
team1/src/main/resources/templates/bookList.html
View File

@@ -1,72 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>書籍一覧・検索</title>
</head>
<body>
<!--ログアウトボタン-->
<a href="@{/logout}">ログアウト</a>
<h2>書籍一覧・検索</h2>
<!--Controllerと@{/selectBook}合わせる-->
<form th:action ="@{/selectBook}" th:object = "${}"method="post">
<table>
<!-- 書籍名-->
<tr>
<th class="header">書籍名</th>
<td><input type="text" th:field="*{nmBook}"/></td>
</tr>
<!-- 出版社-->
<tr>
<th class="header">出版社</th>
<td><input type="text" th:field="*{pubLisher}"></td>
</tr>
<!-- 特記事項-->
<tr>
<th class="header">特記事項</th>
<td><input type="text" th:field="*{noteText}"></td>
</tr>
<button type="submit">検索</button>
</form>
<!-- メニュー画面へ戻る-->
<a th:href = "@{/menu}">メニューに戻る </a>
<h3>検索結果</h3>
<!-- 検索結果一覧-->
<table border="1">
<thead>
<tr>
<th>ISBN</th>
<th>書籍名</th>
<th>書籍名よみ</th>
<th>出版社</th>
<th>特記事項</th>
<th style="width: 150px;">操作</th">
</tr>
</thead>
<!-- 検索結果を表示-->
<tbody>
<!-- booksのデータを1件ずつ取り出す-->
<td th:each="{book : ${books}}"></td>
<!--ISBN-->
<td th:each="{book.isbn}"></td>
<!--書籍名-->
<td th:each="{book.nmBook}"></td>
<!--書籍名よみ-->
<td th:each="{book.kmBook}"></td>
<!--出版社-->
<td th:each="{book.pubLisher}"></td>
<!--特記事項-->
<td th:each="{book.noteText}"></td>
<td>
<!-- 管理者の場合は編集ボタン-->
<!--一般ユーザーの場合は申請ボタン-->
</td>
</table>
</form>
</body>
</html>

54
team1/src/main/resources/templates/lendingList.html
View File

@@ -1,54 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>貸出中書籍一覧</title>
</head>
<body>
<h1>
<div class="rightSection">
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
</h1>
<a href="menu">メニューに戻る</a>
<h1><span>検索結果</span></h1>
<table>
<thead>
<tr>
<th style="width: 150px;">申請ID</th>
<th style="width: 150px;">申請者名</th>
<th style="width: 150px;">書籍名</th>
<th style="width: 150px;">申請日</th>
<th style="width: 150px;">貸出日</th>
<th style="width: 150px;">返却予定日</th>
<th style="width: 150px;">操作</th>
</tr>
</thead>
<tbody>
<tr th:each="borrow : ${borrowList}">
<td th:text="${borrow.idRequest}"></td>
<td th:text="${borrow.nmEmployee}"></td>
<td th:text="${borrow.nmBook}"></td>
<td th:text="${borrow.dateRequest}"></td>
<td th:text="${borrow.dateBorrow}"></td>
<td th:text="${borrow.dateScheduledReturn}"></td>
<td>
<!--返却フォーム-->
<form action="/returnConfirm" method="get">
<!--送信するデータ名、送信する値、送信する指定-->
<input name="idRequest" th:value="${borrow.idRequest}" type="hidden">
<input type="submit" value="返却">
</form>
</td>
</tr>
</tbody>
</table>
<br>
<th:block th:if="${borrowList == null or borrowList.isEmpty()}">
貸出中の書籍はありません
</th:block>
</body>
</html>

46
team1/src/main/resources/templates/menu.html
View File

@@ -1,46 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>メニュー</title>
</head>
<body>
<h1>
<div class="rightSection">
<button class="logoutButton" th:onclick="logoutSubmit()">ログアウト</button>
</div>
</h1>
<!-- 管理者フラグのチェック処理-->
<!-- 一般ユーザー向けのメニュー-->
<table class="menuClass">
<tr>
<td>
<a class="menuClass" th:href="@{/bookList}"><i class="fas fa-search"></i>書籍検索</a>
</td>
</tr>
</table>
<!-- 管理者向けのメニュー-->
<div th:if="${FlgAdmin == '1'}">
<table class="menuClass">
<tr>
<td>
<a class="menuClass" href="@{/application}"><i
class="fas fa-search"></i>書籍貸出申請一覧</a>
</td>
</tr>
<tr>
<td>
<a class="menuClass" href="@{/lendingList}"><i class="fas fa-search"></i>貸出中書籍一覧</a>
</td>
</tr>
</table>
</div>
</body>
</html>

22
team1/src/main/resources/templates/returnComplete.html
View File

@@ -1,22 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>書籍返却完了</title>
</head>
<div style="text-align: right;">
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
<h2 style="text-align: center;">書籍の返却が完了しました</h2>
<div style="text-align: center;">
<!-- コントローラーのメソッド名-->
<a href="lendingList">貸出中書籍一覧に戻る</a>　|　<a href="showMenu">メニューに戻る</a>
</div>
</body>
</html>

137
team1/src/main/resources/templates/returnConfirm.html
View File

@@ -1,137 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>書籍返却確認</title>
</head>
<body>
<div style="text-align: right;">
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
<form action ="returnComplete"
method="post"
th:object="${returnForm}">
<table style="margin:auto">
<tr>
<th class="header">申請ID</th>
<td>
<label>
<input class="readOnly"
name="idRequest"
readonly="readonly"
th:field="*{idRequest}"
type="text" />
</label>
</td>
</tr>
<tr>
<th class="header">申請者名</th>
<td>
<label>
<input class="readOnly"
name="nmEmployee"
readonly="readonly"
th:field="*{nmEmployee}"
type="text" />
</label>
</td>
</tr>
<tr>
<th class="header">申請日</th>
<td>
<label>
<input class="readOnly"
name="dateRequest"
readonly="readonly"
th:field="*{dateRequest}"
type="text" />
</label>
</td>
</tr>
<tr>
<th class="header">ISBN</th>
<td>
<label>
<input class="readOnly"
name="isBn"
readonly="readonly"
th:field="*{isBn}"
type="text" />
</label>
</td>
</tr>
<tr>
<th class="header">書籍名</th>
<td>
<label>
<input class="readOnly"
name="nmBook"
readonly="readonly"
th:field="*{nmBook}"
type="text" />
</label>
</td>
</tr>
<tr>
<th class="header">出版社</th>
<td>
<label>
<input class="readOnly"
name="pubLisher"
readonly="readonly"
th:field="*{pubLisher}"
type="text" />
</label>
</td>
</tr>
<tr>
<th class="header">特記事項</th>
<td>
<label>
<input class="readOnly"
name="noteText"
readonly="readonly"
th:field="*{noteText}"
type="text" />
</label>
</td>
</tr>
<tr>
<th class="header">貸出日</th>
<td>
<label>
<input class="readOnly"
name="dateBorrow"
readonly="readonly"
th:field="*{dateBorrow}"
type="text" />
</label>
</td>
</tr>
<tr>
<th class="header">返却予定日</th>
<td>
<label>
<input class="readOnly"
name="dateScheduledReturn"
readonly="readonly"
th:field="*{dateScheduledReturn}"
type="text" />
</label>
</td>
</tr>
<tr style="text-align: right;">
<td>
<input type="submit" value="返却"/>
</td>
</tr>
</table>
<!-- コントローラーのメソッド名-->
<a href="lendingList">貸出中書籍一覧に戻る</a>
</form>
</body>
</html>