Compare commits
5 Commits
9c03505d0f
...
s-ikeda
| Author | SHA1 | Date | |
|---|---|---|---|
| 15d510df3b | |||
| 43f91b4116 | |||
| f091771efc | |||
| bb9fdcca5e | |||
| ba81a9b50f |
@@ -74,11 +74,6 @@
|
||||
<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>
|
||||
|
||||
@@ -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;
|
||||
Request request;
|
||||
|
||||
@Autowired
|
||||
public ApprovalConfirmController(
|
||||
HttpSession httpSession,
|
||||
Request request) {
|
||||
this.httpSession = httpSession;
|
||||
this.request = request;
|
||||
}
|
||||
|
||||
@ModelAttribute
|
||||
public ApprovalForm approvalForm() {
|
||||
return new ApprovalForm();
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/ApprovalConfirm", method = RequestMethod.POST)
|
||||
public String AprrvalForm(ApprovalForm ApprovalForm, Model model) {
|
||||
|
||||
try {
|
||||
|
||||
|
||||
return a ;
|
||||
} 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";
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
@@ -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 ) {
|
||||
|
||||
|
||||
|
||||
// }
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.example.demo.repository;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@@ -8,4 +10,9 @@ import com.example.demo.entity.Borrow_booksEntity;
|
||||
@Repository
|
||||
public interface Borrow_BooksRepository extends JpaRepository<Borrow_booksEntity, Integer> {
|
||||
|
||||
/*
|
||||
* 申請者IDで検索
|
||||
* */
|
||||
Optional<Borrow_booksEntity> findByIdApplicant(Integer idApplicant);
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
package com.example.demo.service;
|
||||
|
||||
public interface ApprovalBorrowBooks {
|
||||
|
||||
}
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
//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());
|
||||
// }
|
||||
//
|
||||
//
|
||||
//}
|
||||
@@ -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);
|
||||
|
||||
}
|
||||
69
team1/src/main/resources/templates/applicationList.html
Normal file
69
team1/src/main/resources/templates/applicationList.html
Normal file
@@ -0,0 +1,69 @@
|
||||
<!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>
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
Reference in New Issue
Block a user