diff --git a/team1/pom.xml b/team1/pom.xml index 0d4f3c7..489cf66 100644 --- a/team1/pom.xml +++ b/team1/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent 4.1.1 - + lookup parent from repository com.example team1 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 283ea08..4b247ab 100644 --- a/team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java +++ b/team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java @@ -1,64 +1,64 @@ -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; - -/** - * 書籍貸出承認確認用のコントローラ - */ -@Controller -public class ApprovalConfirmController { - - // ログ出力用インスタンス - private final static Logger LOGGER = Logger.getLogger(ApprovalConfirmController.class.getName()); - - // エラーメッセージ用の定数フィールド - private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました!"; - - HttpSession httpSession; - ApprovalForm approvalform; - - @Autowired - public ApprovalConfirmController( - HttpSession httpSession, - ApprovalForm approvalform) { - this.httpSession = httpSession; - this.approvalform = approvalform; - } - - @ModelAttribute - public ApprovalForm approvalForm() { - return new ApprovalForm(); - } - - @RequestMapping(value = "/ApprovalConfirm", method = RequestMethod.POST) - public String AprrvalForm(ApprovalForm ApprovalForm, Model model) { - - try { - - - return; - } catch (Exception e) { - // ログイン情報の破棄 - httpSession.invalidate(); - - e.printStackTrace(); - - // エラーログ出力 - LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); - // エラー画面遷移 - return "error"; - } - } -} +//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; +// +///** +// * 書籍貸出承認確認用のコントローラ +// */ +//@Controller +//public class ApprovalConfirmController { +// +// // ログ出力用インスタンス +// private final static Logger LOGGER = Logger.getLogger(ApprovalConfirmController.class.getName()); +// +// // エラーメッセージ用の定数フィールド +// private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました!"; +// +// HttpSession httpSession; +// ApprovalForm approvalform; +// +// @Autowired +// public ApprovalConfirmController( +// HttpSession httpSession, +// ApprovalForm approvalform) { +// this.httpSession = httpSession; +// this.approvalform = approvalform; +// } +// +// @ModelAttribute +// public ApprovalForm approvalForm() { +// return new ApprovalForm(); +// } +// +// @RequestMapping(value = "/ApprovalConfirm", method = RequestMethod.POST) +// public String AprrvalForm(ApprovalForm ApprovalForm, Model model) { +// +// 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/service/Impl/ApprovalBorrowBooksImpl.java b/team1/src/main/java/com/example/demo/service/Impl/ApprovalBorrowBooksImpl.java index 65a96fe..0b11dec 100644 --- a/team1/src/main/java/com/example/demo/service/Impl/ApprovalBorrowBooksImpl.java +++ b/team1/src/main/java/com/example/demo/service/Impl/ApprovalBorrowBooksImpl.java @@ -1,31 +1,31 @@ -package com.example.demo.service.Impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.example.demo.repository.Borrow_BooksRepository; -import com.example.demo.service.ApprovalBorrowBooks; - -@Service -@Transactional -public class ApprovalBorrowBooksImpl implements ApprovalBorrowBooks { - - Borrow_BooksRepository borrowbooksRepository; - - @Autowired - public ApprovalBorrowBooksImpl(Borrow_BooksRepository borrowbooksRepository) { - this.borrowbooksRepository = borrowbooksRepository; - } - - /* 申請情報から全件取得 - * @return 取得した情報すべて - */ - public List selectAll() { - return ???Entity.create???List(???Repository.findAll()); - } - - -} \ No newline at end of file +//package com.example.demo.service.Impl; +// +//import java.util.List; +// +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Service; +//import org.springframework.transaction.annotation.Transactional; +// +//import com.example.demo.repository.Borrow_BooksRepository; +//import com.example.demo.service.ApprovalBorrowBooks; +// +//@Service +//@Transactional +//public class ApprovalBorrowBooksImpl implements ApprovalBorrowBooks { +// +// Borrow_BooksRepository borrowbooksRepository; +// +// @Autowired +// public ApprovalBorrowBooksImpl(Borrow_BooksRepository borrowbooksRepository) { +// this.borrowbooksRepository = borrowbooksRepository; +// } +// +// /* 申請情報から全件取得 +// * @return 取得した情報すべて +// */ +// public List selectAll() { +// return ???Entity.create???List(???Repository.findAll()); +// } +// +// +//} \ No newline at end of file diff --git a/team1/src/main/resources/templates/applicationList.html b/team1/src/main/resources/templates/applicationList.html index 3230bdf..819ab71 100644 --- a/team1/src/main/resources/templates/applicationList.html +++ b/team1/src/main/resources/templates/applicationList.html @@ -12,99 +12,9 @@ -

-

- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
申請ID - - -
申請者名 - - -
書籍名 - -
申請日 - -
- 貸出日 - -
返却予定日 - -
操作 - -
-
メニューに戻る @@ -112,37 +22,38 @@

検索結果

-
- - - -
- + - - + + - - + + - - - - - - - + + + + + + + + + +
申請ID申請ID 申請者名書籍名申請日書籍名申請日 貸出日返却予定日操作返却予定日操作
+
+ + +
+
@@ -154,17 +65,5 @@
- \ No newline at end of file