Merge branch 'a-takayama'

team1/pom.xml

@@ -74,6 +74,11 @@
 			<artifactId>spring-boot-starter-webmvc-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.example</groupId>
+			<artifactId>HelloSpring</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
  
 	<build>

team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java

@@ -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;
-//	ApprovalForm approvalform;
+	Request request;
-//
+
-//	@Autowired
+	@Autowired
-//	public ApprovalConfirmController(
+	public ApprovalConfirmController(
-//			HttpSession httpSession,
+			HttpSession httpSession,
-//			ApprovalForm approvalform) {
+			Request request) {
-//		this.httpSession = httpSession;
+		this.httpSession = httpSession;
-//		this.approvalform = approvalform;
+		this.request = request;
-//	}
+	}
-//
+
-//	@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;
+			return a ;
-//		} 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";
-//		}
+		}
-//	}
+	}
-//}
+}

team1/src/main/java/com/example/demo/controller/SelectBookController.java

@@ -0,0 +1,77 @@
+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 ) {
+    	 
+    
+
+//      }
+}

team1/src/main/java/com/example/demo/form/SearchConditionBookForm.java

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

team1/src/main/java/com/example/demo/repository/Borrow_BooksRepository.java

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

team1/src/main/java/com/example/demo/service/ApprovalBorrowBooks.java

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

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

@@ -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());
-//	}
+	}
-//	
+	
-//	
+	
-//}
+}

team1/src/main/java/com/example/demo/service/SearchBook.java

@@ -0,0 +1,16 @@
+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);
+
+}

team1/src/main/resources/templates/applicationList.html

@@ -1,69 +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>
-    <div class="rightSection">
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-    </div>
-
-<div class="header-spacing"></div>
-<a href="showMenu">メニューに戻る</a>
-
-<div class="header-spacing"></div>
-<h1><span>検索結果</span></h1>
-
-<div class="header-spacing"></div>
-<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
-    <!-- 検索結果が1件以上ある場合 -->
-    <table class="table-grid table-striped table-hover">
-        <thead>
-        <tr>
-            <th style="width: 100px;">申請ID</th>
-            <th style="width: 100px;">申請者名</th>
-            <th style="width: 100px;">書籍名</th>
-            <th style="width: 100px;">申請日</th>
-            <th style="width: 100px;">貸出日</th>
-            <th style="width: 100px;">返却予定日</th>
-            <th style="width: 100px;">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr th:each="employeeInfoForm : ${employeeInfoFormList}">
-            <td th:text="${employeeInfoForm.idRequest}"></td>
-            <td th:text="${employeeInfoForm.nmApplicant}"></td>
-            <td th:text="${employeeInfoForm.nmBook}"></td>
-            <td th:text="${employeeInfoForm.dateRequest}"></td>
-            <td th:text="${employeeInfoForm.dateBorrow}"></td>
-            <td th:text="${employeeInfoForm.dateReturn}"></td>
-            <td th:text="${employeeInfoForm.dateRequest}"></td>
-			
-			
-						<td>
-							<form action="/approve" method="get">
-								<input name="idRequest" th:value="${employeeInfoForm.idRequest}" type="hidden">
-								<input type="submit" value="承認">
-							</form>
-						</td>
-        </tr>
-        </tbody>
-    </table>
-</th:block>
-
-<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
-    <!-- 検索結果が0件の場合 -->
-    現在書籍貸出の申請はありません。
-</th:block>
-
-</body>
-
-</html>

team1/src/main/resources/templates/approvalComplete.html

@@ -0,0 +1,15 @@
+<!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>

team1/src/main/resources/templates/approvalRejected.html

@@ -0,0 +1,15 @@
+<!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>

team1/src/main/resources/templates/bookList.html

@@ -0,0 +1,72 @@
+<!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>