10 Commits

Author SHA1 Message Date
e72fd9feb7 エラー表示のHTMLです 2026-10-23 13:19:27 +09:00
a22189ba6e 修正版です 2026-10-23 13:07:33 +09:00
06d0d4b019 貸出申請承認の作業完了しました 2026-10-23 10:27:10 +09:00
s-sakiyama
a80e99da7f serviceクラスに貸し出しの承認却下を追加 2026-10-22 11:17:28 +09:00
s-sakiyama
40733ad01f Merge commit '3576a7613759dfb052516b073c567c2c3359f8d4' 2026-10-22 09:13:48 +09:00
s-sakiyama
3576a76137 返却の更新部分をserviceに追加 2026-10-21 15:36:24 +09:00
s-sakiyama
5489761a8b Merge commit '6b7c6d3abf535706c2ffe42bc692da90e2b49bd4' 2026-10-21 14:11:41 +09:00
s-sakiyama
53fd6ae2db serviceの作成及び仕様 2026-10-21 14:10:37 +09:00
s-sakiyama
6b7c6d3abf Entityの型、インポートの変更 2026-10-21 14:03:22 +09:00
s-sakiyama
02eb671aab Serviceの追加 2026-10-21 10:36:30 +09:00
12 changed files with 373 additions and 241 deletions

View File

@@ -1,56 +1,53 @@
package com.example.demo.controller; package com.example.demo.controller;
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.ReturnForm;
import com.example.demo.service.ReturnService;
/** /**
* 書籍貸出承認確認用のコントローラ * 書籍貸出承認確認用のコントローラ
*/ */
@Controller @Controller
public class ApprovalConfirmController { public class ApprovalConfirmController {
// ログ出力用インスタンス
// private final static Logger LOGGER = Logger.getLogger(ApprovalConfirmController.class.getName());
// エラーメッセージ用の定数フィールド
// private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました!";
// HttpSession httpSession; // HttpSession httpSession;
// Request request; ReturnService returnService;
//
// @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) @Autowired
public String AprrvalForm() { ApprovalConfirmController(ReturnService returnService) {
this.returnService = returnService;
}
System.out.println("a"); @ModelAttribute
return "bookList"; ReturnForm returnForm() {
// try { return new ReturnForm();
// }
//
// return ; @RequestMapping(value = "/approvalConfirm", method = { RequestMethod.POST, RequestMethod.GET })
// } catch (Exception e) { public String ApporvalForm(Model model) {
// // ログイン情報の破棄 //System.out.println("a");
// httpSession.invalidate(); try {
// //仮の値を入れる 貸出テーブルのID
// e.printStackTrace(); Integer id = 1;
// //申請IDを元に取得
// // エラーログ出力 ReturnForm approvalresultForm = returnService.getReturnForm(id);
// LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); approvalresultForm.setIdRequest(id);
// // エラー画面遷移
// return "error"; //returnFormに値をセット
// } // 画面に返す為の情報をセット
model.addAttribute("returnForm", approvalresultForm);
return "approvalConfirm";
} catch (Exception e) {
e.printStackTrace();
return "error";
} }
} }
}

View File

@@ -1,11 +1,73 @@
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.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import com.example.demo.form.ReturnForm;
import com.example.demo.service.ReturnService;
/** /**
* 書籍貸出完了・却下処理用のコントローラ * 書籍貸出承認完了・却下処理用のコントローラ
*/ */
@Controller @Controller
public class ApprovalConfirmResultController { public class ApprovalConfirmResultController {
HttpSession httpSession;
ReturnService returnService;
@Autowired
public ApprovalConfirmResultController(HttpSession httpSession, ReturnService returnService) {
this.httpSession = httpSession;
this.returnService = returnService;
}
@ModelAttribute
ReturnForm returnForm() {
return new ReturnForm();
}
//承認完了画面表示処理
@RequestMapping(value = "/approvalComplete", method = RequestMethod.POST)
public String approvalComplete(ReturnForm returnForm) {
try {
//セッションからIDを拾いたい
httpSession.getAttribute("");
//いったん1ということで
int id = 1;
returnService.setReturnComplete(returnForm.getIdRequest(), id);
return "approvalComplete";
} catch (Exception e) {
e.printStackTrace();
return "error";
}
}
//却下完了画面表示処理
@RequestMapping(value = "/approvalRejected", method = RequestMethod.POST)
public String approvalRejected(ReturnForm returnForm) {
try {
//セッションからIDを拾いたい
httpSession.getAttribute("");
//いったん1ということで
int id = 1;
returnService.setReturnRejected(returnForm.getIdRequest(), id);
return "approvalRejected";
} catch (Exception e) {
e.printStackTrace();
return "error";
}
}
} }

View File

@@ -1,15 +1,28 @@
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() {
@@ -21,14 +34,13 @@ public class returnCompleteController {
public String returnComplete(ReturnForm returnForm) { public String returnComplete(ReturnForm returnForm) {
try { try {
System.out.println(returnForm.getNmBook()); //セッションからIDを拾いたい
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,7 +1,6 @@
package com.example.demo.controller; package com.example.demo.controller;
import java.util.Date; 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;
@@ -9,23 +8,35 @@ 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() {
Date date = new Date(); return new ReturnForm();
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 {
//申請IDを元に取得
//returnFormに値をセット
//仮の値を入れる //仮の値を入れる
Integer id = 1;
//申請IDを元に取得
ReturnForm resultForm = rerurnService.getReturnForm(id);
resultForm.setIdRequest(id);
//returnFormに値をセット
// 画面に返す為の情報をセット // 画面に返す為の情報をセット
model.addAttribute("returnForm", returnForm()); model.addAttribute("returnForm", resultForm);
return "returnConfirm"; return "returnConfirm";
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

View File

@@ -1,6 +1,6 @@
package com.example.demo.entity; package com.example.demo.entity;
import java.sql.Timestamp; import java.util.Date;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
@@ -23,7 +23,6 @@ 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)
@@ -47,7 +46,7 @@ public class Book_collectionEntity {
private String pubLisher; private String pubLisher;
//特記事項 //特記事項
@Column(name = "note text", nullable = true) @Column(name = "note", nullable = true)
private String noteText; private String noteText;
//貸出フラグ -> charに変更する //貸出フラグ -> charに変更する
@@ -61,7 +60,7 @@ public class Book_collectionEntity {
//更新日 //更新日
@Column(name = "date_update", nullable = false) @Column(name = "date_update", nullable = false)
@LastModifiedDate @LastModifiedDate
private Timestamp dateUpdate; private Date dateUpdate;
// public static Book_collection convertFrom(Book_collection book_collection) { // public static Book_collection convertFrom(Book_collection book_collection) {
// // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。 // // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
@@ -92,7 +91,6 @@ public class Book_collectionEntity {
// 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) { //// public static List<book_collection> createbook_collectionList(List<EmployeeEntity> employeeEntityList) {
//// return employeeEntityList.stream().map(EmployeeEntity::createbook_collection).toList(); //// return employeeEntityList.stream().map(EmployeeEntity::createbook_collection).toList();

View File

@@ -1,6 +1,5 @@
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;
@@ -8,8 +7,9 @@ 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 Timestamp dateUpdate; private Date dateUpdate;
} }

View File

@@ -1,6 +1,6 @@
package com.example.demo.entity; package com.example.demo.entity;
import java.security.Timestamp; import java.util.Date;
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 Timestamp dateUpdate; private Date dateUpdate;
} }
// public static EmployeeEntity convertForm(Employee employee) { // public static EmployeeEntity convertForm(Employee employee) {

View File

@@ -0,0 +1,97 @@
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());
}
//貸出承認
public void setReturnComplete(int id_request, int id_employee) {
var borrow = borrowRepository.findById(id_request);
var book = book_CollectionRepository.findById(borrow.get().getIdBook());
borrow.get().setStatus('2');//貸出テーブルの「ステータス」を【貸出中】
borrow.get().setDateApproval(new Date());//「承認日」を当日日付
borrow.get().setIdUpdate(id_employee);//「更新者」を更新した人のID
borrow.get().setDateUpdate(new Date());//「更新日」を当日日付に更新する。
borrowRepository.save(borrow.get());
book_CollectionRepository.save(book.get());
}
//却下
//貸出テーブルの「ステータス」を【却下】、「更新者」を却下した人のID、「更新日」を当日日付に更新する。
//また、蔵書テーブルの「貸出フラグ」を【貸出可】に更新する。
public void setReturnRejected(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('9');//貸出テーブルの「ステータス」を【却下】
borrow.get().setIdUpdate(id_employee);//「更新者」を却下した人のID
borrow.get().setDateUpdate(new Date());//「更新日」を当日日付に更新する。
borrowRepository.save(borrow.get());
book_CollectionRepository.save(book.get());
}
}

View File

@@ -2,39 +2,16 @@
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="UTF-8">
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> <title>書籍貸出承認画面</title>
<!-- 外部のスクリプトファイルを読み込む -->
<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> </head>
<div style="text-align: right;">
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
<body> <body>
<h2>書籍貸出申請を承認しました。</h2> <h2>書籍貸出申請を承認しました。</h2>
<br/> <br/>
<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a> | <a href="showMenu">メニューに戻る</a> <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

@@ -1,39 +1,28 @@
<!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 charset="UTF-8">
<!-- 外部のスクリプトファイルを読み込む -->
<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> <title>書籍貸出承認確認</title>
</head> </head>
<body> <body>
<h1>登録内容確認    <div style="text-align: right;">
<div class="rightSection">
<span class="loginInfo">ログイン者名:<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button> <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div> </div>
</h1>
<!-- 変数名は変更したが、中身は変更していない -->
<!-- ボタンや遷移も手を付けていない -->
<form action="approvalConfirm"
method="post">
<div class="msgBox error" th:if="${messageError != null}"> <form action ="approvalComplete"
<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span> method="post"
</div> th:object="${returnForm}">
<table> <table>
<tr> <tr>
<th class="header">申請ID</th> <th class="header">申請ID</th>
<td> <td>
<label> <label>
<input class="readOnly" <input class="readOnly"
name="idRquest" name="idRequest"
readonly="readonly" readonly="readonly"
type="text" th:field="*{idRequest}"
value="自動で設定されます"/> type="text"/>
</label> </label>
</td> </td>
</tr> </tr>
@@ -44,7 +33,7 @@
<input class="readOnly" <input class="readOnly"
name="nmEmployee" name="nmEmployee"
readonly="readonly" readonly="readonly"
th:value="*{nmEmployee}" th:field="*{nmEmployee}"
type="text"/> type="text"/>
</label> </label>
</td> </td>
@@ -54,9 +43,9 @@
<td> <td>
<label> <label>
<input class="readOnly" <input class="readOnly"
name="dataRequest" name="dateRequest"
readonly="readonly" readonly="readonly"
th:value="*{dataRequest}" th:field="*{dateRequest}"
type="text"/> type="text"/>
</label> </label>
</td> </td>
@@ -68,7 +57,7 @@
<input class="readOnly" <input class="readOnly"
name="isBn" name="isBn"
readonly="readonly" readonly="readonly"
th:value="*{isBn}" th:field="*{isBn}"
type="text"/> type="text"/>
</label> </label>
</td> </td>
@@ -80,7 +69,7 @@
<input class="readOnly" <input class="readOnly"
name="nmBook" name="nmBook"
readonly="readonly" readonly="readonly"
th:value="*{nmBook}" th:field="*{nmBook}"
type="text"/> type="text"/>
</label> </label>
</td> </td>
@@ -90,9 +79,9 @@
<td> <td>
<label> <label>
<input class="readOnly" <input class="readOnly"
name="publisher" name="pubLisher"
readonly="readonly" readonly="readonly"
th:value="*{publisher}" th:field="*{pubLisher}"
type="text"/> type="text"/>
</label> </label>
</td> </td>
@@ -102,9 +91,9 @@
<td> <td>
<label> <label>
<input class="readOnly" <input class="readOnly"
name="note" name="noteText"
readonly="readonly" readonly="readonly"
th:value="*{note}" th:field="*{noteText}"
type="text"/> type="text"/>
</label> </label>
</td> </td>
@@ -116,7 +105,7 @@
<input class="readOnly" <input class="readOnly"
name="dateBorrow" name="dateBorrow"
readonly="readonly" readonly="readonly"
th:value="*{dateBorrow}" th:field="*{dateBorrow}"
type="text"/> type="text"/>
</label> </label>
</td> </td>
@@ -128,25 +117,24 @@
<input class="readOnly" <input class="readOnly"
name="dateScheduledReturn" name="dateScheduledReturn"
readonly="readonly" readonly="readonly"
th:value="*{date_scheduled_return}" th:field="*{dateScheduledReturn}"
type="text"/> type="text"/>
</label> </label>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="btnArea" colspan="2"> <td class="btn" colspan="2">
<input type="submit" value="承認"/> <input type="submit" name="action" formaction="approvalComplete" value="承認"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="btnArea" colspan="2"> <td class="btn" colspan="2">
<input type="submit" value="却下"/> <input type="submit" name="action" formaction="approvalRejected" value="却下"/>
</td> </td>
</tr> </tr>
</table> </table>
<br/> <br/>
<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a> <a href="javascript:insertSubmit()">承認待ち一覧に戻る</a>
</form> </form>
</body> </body>
</html> </html>

View File

@@ -2,39 +2,15 @@
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="UTF-8">
<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> <title>書籍貸出却下画面</title>
</head> </head>
<div style="text-align: right;">
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
<body> <body>
<h2>書籍貸出申請を却下しました。</h2> <h2>書籍貸出申請を却下しました。</h2>
<br/> <br/>
<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a> | <a href="showMenu">メニューに戻る</a> <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

@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>エラー</title>
</head>
<body>
<h1>エラーが発生しました。</h1>
<div>ログインからやり直してください。</div>
<a href="login">ログイン</a>
</body>
</html>