1 Commits

Author SHA1 Message Date
f5b6fcdc40 Confirm系HTML 2026-10-21 09:50:19 +09:00
12 changed files with 243 additions and 255 deletions

View File

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

View File

@@ -1,19 +1,9 @@
package com.example.demo.controller; 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.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.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import com.example.demo.form.ApprovalForm;
/** /**
* 書籍貸出承認確認用のコントローラ * 書籍貸出承認確認用のコントローラ
*/ */
@@ -21,44 +11,46 @@ import com.example.demo.form.ApprovalForm;
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; // Request request;
//
// @Autowired
// public ApprovalConfirmController(
// HttpSession httpSession,
// Request request) {
// this.httpSession = httpSession;
// this.request = request;
// }
//
// @ModelAttribute
// public ApprovalForm approvalForm() {
// return new ApprovalForm();
// }
@Autowired @RequestMapping(value = "/approvalConfirm", method = RequestMethod.POST)
public ApprovalConfirmController( public String AprrvalForm() {
HttpSession httpSession,
Request request) {
this.httpSession = httpSession;
this.request = request;
}
@ModelAttribute System.out.println("a");
public ApprovalForm approvalForm() { return "bookList";
return new ApprovalForm(); // try {
} //
//
@RequestMapping(value = "/ApprovalConfirm", method = RequestMethod.POST) // return ;
public String AprrvalForm(ApprovalForm ApprovalForm, Model model) { // } catch (Exception e) {
// // ログイン情報の破棄
try { // httpSession.invalidate();
//
// e.printStackTrace();
return a ; //
} catch (Exception e) { // // エラーログ出力
// ログイン情報の破棄 // LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
httpSession.invalidate(); // // エラー画面遷移
// return "error";
e.printStackTrace(); // }
// エラーログ出力
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
// エラー画面遷移
return "error";
}
} }
} }

View File

@@ -0,0 +1,11 @@
package com.example.demo.controller;
import org.springframework.stereotype.Controller;
/**
* 書籍貸出完了・却下処理用のコントローラ
*/
@Controller
public class ApprovalConfirmResultController {
}

View File

@@ -1,6 +1,7 @@
package com.example.demo.controller; package com.example.demo.controller;
import org.springframework.beans.factory.annotation.Autowired; import java.util.Date;
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;
@@ -8,35 +9,23 @@ 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.ReturnForm; import com.example.demo.form.ReturnForm;
import com.example.demo.service.ReturnService;
@Controller @Controller
public class ReturnConfirmController { public class ReturnConfirmController {
ReturnService rerurnService;
@Autowired
ReturnConfirmController(ReturnService rerurnService) {
this.rerurnService = rerurnService;
}
@ModelAttribute @ModelAttribute
ReturnForm returnForm() { ReturnForm returnForm() {
return new ReturnForm(); Date date = new Date();
return new ReturnForm(1, "テスト名", date, date, date, "ISBN", "書籍名", "出版社", "特記事項");
} }
@RequestMapping(value = "/returnConfirm", method = { RequestMethod.POST, RequestMethod.GET }) @RequestMapping(value = "/returnConfirm", method = { RequestMethod.POST, RequestMethod.GET })
public String returnConfirm(Model model) { public String returnConfirm(Model model) {
try { try {
//仮の値を入れる
Integer id = 1;
//申請IDを元に取得 //申請IDを元に取得
ReturnForm resultForm = rerurnService.getReturnForm(id);
resultForm.setIdRequest(id);
//returnFormに値をセット //returnFormに値をセット
//仮の値を入れる
// 画面に返す為の情報をセット // 画面に返す為の情報をセット
model.addAttribute("returnForm", resultForm); model.addAttribute("returnForm", returnForm());
return "returnConfirm"; return "returnConfirm";
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

View File

@@ -1,28 +1,15 @@
package com.example.demo.controller; package com.example.demo.controller;
import jakarta.servlet.http.HttpSession;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
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.ReturnForm; import com.example.demo.form.ReturnForm;
import com.example.demo.service.ReturnService;
//返却完了用のコントローラー //返却完了用のコントローラー
@Controller @Controller
public class ReturnCompleteController { public class returnCompleteController {
HttpSession httpSession;
ReturnService rerurnService;
@Autowired
public ReturnCompleteController(HttpSession httpSession, ReturnService rerurnService) {
this.httpSession = httpSession;
this.rerurnService = rerurnService;
}
@ModelAttribute @ModelAttribute
ReturnForm returnForm() { ReturnForm returnForm() {
@@ -34,13 +21,14 @@ public class ReturnCompleteController {
public String returnComplete(ReturnForm returnForm) { public String returnComplete(ReturnForm returnForm) {
try { try {
//セッションからIDを拾いたい System.out.println(returnForm.getNmBook());
httpSession.getAttribute("");
//いったん1ということで
int id = 1;
rerurnService.setReturn(returnForm.getIdRequest(), id);
//各種 必要な値をDBから取得,セッションからログイン者の情報
//蔵書テーブルの貸出フラグを貸出可、
//貸出テーブルのステータスを返却済、
//返却日を当日日付、
//更新者を更新した人のID、
//更新日を当日日付に更新する。
return "returnComplete"; return "returnComplete";
} catch (Exception e) { } catch (Exception e) {

View File

@@ -1,6 +1,6 @@
package com.example.demo.entity; package com.example.demo.entity;
import java.util.Date; import java.sql.Timestamp;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
@@ -23,6 +23,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
public class Book_collectionEntity { public class Book_collectionEntity {
//蔵書ID //蔵書ID
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -46,7 +47,7 @@ public class Book_collectionEntity {
private String pubLisher; private String pubLisher;
//特記事項 //特記事項
@Column(name = "note", nullable = true) @Column(name = "note text", nullable = true)
private String noteText; private String noteText;
//貸出フラグ -> charに変更する //貸出フラグ -> charに変更する
@@ -60,62 +61,63 @@ public class Book_collectionEntity {
//更新日 //更新日
@Column(name = "date_update", nullable = false) @Column(name = "date_update", nullable = false)
@LastModifiedDate @LastModifiedDate
private Date dateUpdate; private Timestamp dateUpdate;
// public static Book_collection convertFrom(Book_collection book_collection) { // public static Book_collection convertFrom(Book_collection book_collection) {
// // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。 // // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
// return new Book_collection Entity( // return new Book_collection Entity(
// book_colletion.getIdBook(), // book_colletion.getIdBook(),
// book_colletion.getisBn(), // book_colletion.getisBn(),
// book_colletion.getnmBook(), // book_colletion.getnmBook(),
// book_colletion..getknBook(), // book_colletion..getknBook(),
// book_colletion.getpublisher(), // book_colletion.getpublisher(),
// book_colletion.getnoteText(), // book_colletion.getnoteText(),
// book_colletion.getflgLending(), // book_colletion.getflgLending(),
// book_colletion.getidUpdate(), // book_colletion.getidUpdate(),
// book_colletion.getdateUupdate() // book_colletion.getdateUupdate()
// ); // );
// //
//} //}
//public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) { //public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
// EmployeeEntity employeeEntity = new EmployeeEntity(); // EmployeeEntity employeeEntity = new EmployeeEntity();
// //
// employeeEntity.setIdBook(searchConditionEmployee.getIdBook()); // employeeEntity.setIdBook(searchConditionEmployee.getIdBook());
// employeeEntity.setisBn(searchConditionEmployee.getisBn()); // employeeEntity.setisBn(searchConditionEmployee.getisBn());
// employeeEntity.setnmBook(searchConditionEmployee.getnmBook()); // employeeEntity.setnmBook(searchConditionEmployee.getnmBook());
// employeeEntity.setknBook(searchConditionEmployee.knBook()); // employeeEntity.setknBook(searchConditionEmployee.knBook());
// employeeEntity.setpublisher(searchConditionEmployee.getpublisher()); // employeeEntity.setpublisher(searchConditionEmployee.getpublisher());
// employeeEntity.setnoteText(searchConditionEmployee.getnoteText()); // employeeEntity.setnoteText(searchConditionEmployee.getnoteText());
// employeeEntity.setflgLending(searchConditionEmployee.getflgLending()); // employeeEntity.setflgLending(searchConditionEmployee.getflgLending());
// employeeEntity.setidUpdate(searchConditionEmployee.getidUpdate()); // employeeEntity.setidUpdate(searchConditionEmployee.getidUpdate());
// employeeEntity.setdateUpdate(searchConditionEmployee.getdateUupdate()); // employeeEntity.setdateUpdate(searchConditionEmployee.getdateUupdate());
//
//// public static List<book_collection> createbook_collectionList(List<EmployeeEntity> employeeEntityList) { //
//// return employeeEntityList.stream().map(EmployeeEntity::createbook_collection).toList(); //// public static List<book_collection> createbook_collectionList(List<EmployeeEntity> employeeEntityList) {
//// } //// return employeeEntityList.stream().map(EmployeeEntity::createbook_collection).toList();
// //// }
// List<book_collection> book_collectionList = new ArrayList<>(); //
// for(book_collectionEntity book_collectionEntity:employeeEntityList){ // List<book_collection> book_collectionList = new ArrayList<>();
// book_collection employee = book_collectionEntity.createbook_collection(book_collectionEntity); // for(book_collectionEntity book_collectionEntity:employeeEntityList){
// book_collectionList.add(employee); // book_collection employee = book_collectionEntity.createbook_collection(book_collectionEntity);
// } // book_collectionList.add(employee);
// return employeeList; // }
// // return employeeList;
// //
// public LoginUser createLoginUser() { //
// // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。 // public LoginUser createLoginUser() {
// return new LoginUser( // // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
// getidBook(), // return new LoginUser(
// getisBn(), // getidBook(),
// getnmBook(), // getisBn(),
// getknBook(), // getnmBook(),
// getpublisher(), // getknBook(),
// getnoteText(), // getpublisher(),
// getflgLending(), // getnoteText(),
// getidUpdate(), // getflgLending(),
// getdateUpdate() // getidUpdate(),
// ); // getdateUpdate()
// } // );
// }
} }

View File

@@ -1,5 +1,6 @@
package com.example.demo.entity; package com.example.demo.entity;
import java.security.Timestamp;
import java.util.Date; import java.util.Date;
import jakarta.persistence.Column; import jakarta.persistence.Column;
@@ -7,9 +8,8 @@ import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType; import jakarta.persistence.GenerationType;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.Table;
//import org.hibernate.annotations.Audited.Table; import org.hibernate.annotations.Audited.Table;
import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.annotation.LastModifiedDate;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@@ -97,5 +97,5 @@ public class Borrow_booksEntity {
* */ * */
@Column(name = "date_update", nullable = false) @Column(name = "date_update", nullable = false)
@LastModifiedDate @LastModifiedDate
private Date dateUpdate; private Timestamp dateUpdate;
} }

View File

@@ -1,6 +1,6 @@
package com.example.demo.entity; package com.example.demo.entity;
import java.util.Date; import java.security.Timestamp;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
@@ -81,7 +81,7 @@ public class EmployeeEntity {
*/ */
@Column(name = "date_update", nullable = false) @Column(name = "date_update", nullable = false)
@LastModifiedDate @LastModifiedDate
private Date dateUpdate; private Timestamp dateUpdate;
} }
// public static EmployeeEntity convertForm(Employee employee) { // public static EmployeeEntity convertForm(Employee employee) {

View File

@@ -1,65 +0,0 @@
package com.example.demo.service;
import java.util.Date;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.example.demo.entity.Borrow_booksEntity;
import com.example.demo.form.ReturnForm;
import com.example.demo.repository.Book_CollectionRepository;
import com.example.demo.repository.Borrow_BooksRepository;
import com.example.demo.repository.EmployeeRepository;
@Service
public class ReturnService {
Book_CollectionRepository book_CollectionRepository;
Borrow_BooksRepository borrowRepository;
EmployeeRepository employeeRepository;
@Autowired
public ReturnService(
Book_CollectionRepository book_CollectionRepository,
Borrow_BooksRepository borrowRepository,
EmployeeRepository employeeRepository) {
this.book_CollectionRepository = book_CollectionRepository;
this.borrowRepository = borrowRepository;
this.employeeRepository = employeeRepository;
}
public ReturnForm getReturnForm(int id) {
ReturnForm result = new ReturnForm();
Optional<Borrow_booksEntity> borrow = borrowRepository.findById(id);
// System.out.println(borrow);
result.setDateRequest(borrow.get().getDateRequest());//申請日
result.setDateBorrow(borrow.get().getDateBorrow());//貸出日
result.setDateScheduledReturn(borrow.get().getDateScheduledReturn());//返却予定日
var emp = employeeRepository.findById(borrow.get().getIdApplicant());
result.setNmEmployee(emp.get().getNmEmployee());//申請者名、社員名
var book = book_CollectionRepository.findById(borrow.get().getIdBook());
result.setIsBn(book.get().getIsBn());//ISBN
result.setNmBook(book.get().getNmBook());//書籍名
result.setPubLisher(book.get().getPubLisher());//出版社
result.setNoteText(book.get().getNoteText());
return result;
}
public void setReturn(int id_request, int id_employee) {
var borrow = borrowRepository.findById(id_request);
var book = book_CollectionRepository.findById(borrow.get().getIdBook());
book.get().setFlgLending('0');//「貸出フラグ」を【貸出可】
borrow.get().setStatus('0');//貸出テーブルの「ステータス」を【返却済
borrow.get().setDateReturn(new Date());//「返却日」を当日日付
borrow.get().setIdUpdate(id_employee);//「更新者」を更新した人のID
borrow.get().setDateUpdate(new Date());//「更新日」を当日日付に更新する。
borrowRepository.save(borrow.get());
book_CollectionRepository.save(book.get());
}
}

View File

@@ -1,15 +1,40 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<!-- 外部のスクリプトファイルを読み込む --> <!-- 外部のスクリプトファイルを読み込む -->
<script th:src="@{/js/common.js}"></script> <script th:src="@{/js/common.js}"></script>
<!-- CSSの読み込み --> <!-- CSSの読み込み -->
<link rel="stylesheet" th:href="@{/css/all.css}"> <link rel="stylesheet" th:href="@{/css/all.css}">
<link rel=stylesheet th:href="@{/css/style.css}" type="text/css"> <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
<title>書籍貸出承認確認</title> <title>書籍貸出承認完了画面</title>
</head> </head>
<body>
<body>
<h2>書籍貸出申請を承認しました。</h2>
<br/>
<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a> | <a href="showMenu">メニューに戻る</a>
</body> </body>
<script type="text/javascript">
function insertSubmit() {
const form = document.createElement('form');
form.setAttribute('method', 'post');
form.setAttribute('action', 'approvalConfirm');
// 動的送信用のHidden
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
const inputField = document.createElement("input");
inputField.setAttribute("type", "hidden");
inputField.setAttribute("value", "select");
form.appendChild(inputField);
// フォームをDOMに追加
document.body.appendChild(form);
form.submit();
}
</script>
</html> </html>

View File

@@ -18,10 +18,8 @@
</h1> </h1>
<!-- 変数名は変更したが、中身は変更していない --> <!-- 変数名は変更したが、中身は変更していない -->
<!-- ボタンや遷移も手を付けていない --> <!-- ボタンや遷移も手を付けていない -->
<form action="insertEmployee" <form action="approvalConfirm"
id="insertForm" method="post">
method="post"
th:object="${insertEmployeeForm}">
<div class="msgBox error" th:if="${messageError != null}"> <div class="msgBox error" th:if="${messageError != null}">
<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span> <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
@@ -135,7 +133,20 @@
</label> </label>
</td> </td>
</tr> </tr>
<tr>
<td class="btnArea" colspan="2">
<input type="submit" value="承認"/>
</td>
</tr>
<tr>
<td class="btnArea" colspan="2">
<input type="submit" value="却下"/>
</td>
</tr>
</table> </table>
<br/>
<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a>
</form> </form>
</body> </body>
</html> </html>

View File

@@ -1,15 +1,40 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<!-- 外部のスクリプトファイルを読み込む --> <!-- 外部のスクリプトファイルを読み込む -->
<script th:src="@{/js/common.js}"></script> <script th:src="@{/js/common.js}"></script>
<!-- CSSの読み込み --> <!-- CSSの読み込み -->
<link rel="stylesheet" th:href="@{/css/all.css}"> <link rel="stylesheet" th:href="@{/css/all.css}">
<link rel=stylesheet th:href="@{/css/style.css}" type="text/css"> <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
<title>書籍貸出承認確認</title> <title>書籍貸出却下画面</title>
</head> </head>
<body>
<body>
<h2>書籍貸出申請を却下しました。</h2>
<br/>
<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a> | <a href="showMenu">メニューに戻る</a>
</body> </body>
<script type="text/javascript">
function insertSubmit() {
const form = document.createElement('form');
form.setAttribute('method', 'post');
form.setAttribute('action', 'approvalConfirm');
// 動的送信用のHidden
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
const inputField = document.createElement("input");
inputField.setAttribute("type", "hidden");
inputField.setAttribute("value", "select");
form.appendChild(inputField);
// フォームをDOMに追加
document.body.appendChild(form);
form.submit();
}
</script>
</html> </html>