Compare commits
10 Commits
09f451e7f6
...
y-ogawa
| Author | SHA1 | Date | |
|---|---|---|---|
| e72fd9feb7 | |||
| a22189ba6e | |||
| 06d0d4b019 | |||
|
|
a80e99da7f | ||
|
|
40733ad01f | ||
|
|
3576a76137 | ||
|
|
5489761a8b | ||
|
|
53fd6ae2db | ||
|
|
6b7c6d3abf | ||
|
|
02eb671aab |
@@ -1,56 +1,53 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
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.ReturnForm;
|
||||
import com.example.demo.service.ReturnService;
|
||||
|
||||
/**
|
||||
* 書籍貸出承認確認用のコントローラ
|
||||
*/
|
||||
@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();
|
||||
// }
|
||||
ReturnService returnService;
|
||||
|
||||
@RequestMapping(value = "/approvalConfirm", method = RequestMethod.POST)
|
||||
public String AprrvalForm() {
|
||||
@Autowired
|
||||
ApprovalConfirmController(ReturnService returnService) {
|
||||
this.returnService = returnService;
|
||||
}
|
||||
|
||||
System.out.println("a");
|
||||
return "bookList";
|
||||
// try {
|
||||
//
|
||||
//
|
||||
// return ;
|
||||
// } catch (Exception e) {
|
||||
// // ログイン情報の破棄
|
||||
// httpSession.invalidate();
|
||||
//
|
||||
// e.printStackTrace();
|
||||
//
|
||||
// // エラーログ出力
|
||||
// LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
|
||||
// // エラー画面遷移
|
||||
// return "error";
|
||||
// }
|
||||
@ModelAttribute
|
||||
ReturnForm returnForm() {
|
||||
return new ReturnForm();
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/approvalConfirm", method = { RequestMethod.POST, RequestMethod.GET })
|
||||
public String ApporvalForm(Model model) {
|
||||
//System.out.println("a");
|
||||
try {
|
||||
//仮の値を入れる 貸出テーブルのID
|
||||
Integer id = 1;
|
||||
//申請IDを元に取得
|
||||
ReturnForm approvalresultForm = returnService.getReturnForm(id);
|
||||
approvalresultForm.setIdRequest(id);
|
||||
|
||||
//returnFormに値をセット
|
||||
// 画面に返す為の情報をセット
|
||||
model.addAttribute("returnForm", approvalresultForm);
|
||||
return "approvalConfirm";
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return "error";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,11 +1,73 @@
|
||||
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.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
|
||||
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";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,15 +1,28 @@
|
||||
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.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
|
||||
public class returnCompleteController {
|
||||
public class ReturnCompleteController {
|
||||
|
||||
HttpSession httpSession;
|
||||
ReturnService rerurnService;
|
||||
|
||||
@Autowired
|
||||
public ReturnCompleteController(HttpSession httpSession, ReturnService rerurnService) {
|
||||
this.httpSession = httpSession;
|
||||
this.rerurnService = rerurnService;
|
||||
}
|
||||
|
||||
@ModelAttribute
|
||||
ReturnForm returnForm() {
|
||||
@@ -21,14 +34,13 @@ public class returnCompleteController {
|
||||
public String returnComplete(ReturnForm returnForm) {
|
||||
|
||||
try {
|
||||
System.out.println(returnForm.getNmBook());
|
||||
//セッションからIDを拾いたい
|
||||
httpSession.getAttribute("");
|
||||
//いったん1ということで
|
||||
int id = 1;
|
||||
|
||||
rerurnService.setReturn(returnForm.getIdRequest(), id);
|
||||
|
||||
//各種 必要な値をDBから取得,セッションからログイン者の情報
|
||||
//蔵書テーブルの貸出フラグを貸出可、
|
||||
//貸出テーブルのステータスを返却済、
|
||||
//返却日を当日日付、
|
||||
//更新者を更新した人のID、
|
||||
//更新日を当日日付に更新する。
|
||||
return "returnComplete";
|
||||
|
||||
} catch (Exception e) {
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
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 com.example.demo.form.ReturnForm;
|
||||
import com.example.demo.service.ReturnService;
|
||||
|
||||
@Controller
|
||||
public class ReturnConfirmController {
|
||||
|
||||
ReturnService rerurnService;
|
||||
|
||||
@Autowired
|
||||
ReturnConfirmController(ReturnService rerurnService) {
|
||||
this.rerurnService = rerurnService;
|
||||
}
|
||||
|
||||
@ModelAttribute
|
||||
ReturnForm returnForm() {
|
||||
Date date = new Date();
|
||||
return new ReturnForm(1, "テスト名", date, date, date, "ISBN", "書籍名", "出版社", "特記事項");
|
||||
return new ReturnForm();
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/returnConfirm", method = { RequestMethod.POST, RequestMethod.GET })
|
||||
public String returnConfirm(Model model) {
|
||||
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";
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.Date;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
@@ -23,7 +23,6 @@ import lombok.NoArgsConstructor;
|
||||
@AllArgsConstructor
|
||||
public class Book_collectionEntity {
|
||||
|
||||
|
||||
//蔵書ID
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@@ -47,7 +46,7 @@ public class Book_collectionEntity {
|
||||
private String pubLisher;
|
||||
|
||||
//特記事項
|
||||
@Column(name = "note text", nullable = true)
|
||||
@Column(name = "note", nullable = true)
|
||||
private String noteText;
|
||||
|
||||
//貸出フラグ -> charに変更する
|
||||
@@ -61,7 +60,7 @@ public class Book_collectionEntity {
|
||||
//更新日
|
||||
@Column(name = "date_update", nullable = false)
|
||||
@LastModifiedDate
|
||||
private Timestamp dateUpdate;
|
||||
private Date dateUpdate;
|
||||
|
||||
// public static Book_collection convertFrom(Book_collection book_collection) {
|
||||
// // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
|
||||
@@ -92,7 +91,6 @@ public class Book_collectionEntity {
|
||||
// employeeEntity.setidUpdate(searchConditionEmployee.getidUpdate());
|
||||
// employeeEntity.setdateUpdate(searchConditionEmployee.getdateUupdate());
|
||||
|
||||
|
||||
//
|
||||
//// public static List<book_collection> createbook_collectionList(List<EmployeeEntity> employeeEntityList) {
|
||||
//// return employeeEntityList.stream().map(EmployeeEntity::createbook_collection).toList();
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
import java.security.Timestamp;
|
||||
import java.util.Date;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
@@ -8,8 +7,9 @@ import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
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 lombok.AllArgsConstructor;
|
||||
@@ -97,5 +97,5 @@ public class Borrow_booksEntity {
|
||||
* */
|
||||
@Column(name = "date_update", nullable = false)
|
||||
@LastModifiedDate
|
||||
private Timestamp dateUpdate;
|
||||
private Date dateUpdate;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
import java.security.Timestamp;
|
||||
import java.util.Date;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
@@ -81,7 +81,7 @@ public class EmployeeEntity {
|
||||
*/
|
||||
@Column(name = "date_update", nullable = false)
|
||||
@LastModifiedDate
|
||||
private Timestamp dateUpdate;
|
||||
private Date dateUpdate;
|
||||
}
|
||||
|
||||
// public static EmployeeEntity convertForm(Employee employee) {
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2,39 +2,16 @@
|
||||
<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>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍貸出承認画面</title>
|
||||
</head>
|
||||
|
||||
<div style="text-align: right;">
|
||||
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
|
||||
</div>
|
||||
<body>
|
||||
<h2>書籍貸出申請を承認しました。</h2>
|
||||
<br/>
|
||||
<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a> | <a href="showMenu">メニューに戻る</a>
|
||||
</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>
|
||||
@@ -1,39 +1,28 @@
|
||||
<!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">
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍貸出承認確認</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>登録内容確認
|
||||
<div class="rightSection">
|
||||
<span class="loginInfo">ログイン者名:<span th:text="${session.loginUser.nmEmployee}"></span></span>
|
||||
<div style="text-align: right;">
|
||||
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
|
||||
</div>
|
||||
</h1>
|
||||
<!-- 変数名は変更したが、中身は変更していない -->
|
||||
<!-- ボタンや遷移も手を付けていない -->
|
||||
<form action="approvalConfirm"
|
||||
method="post">
|
||||
|
||||
<div class="msgBox error" th:if="${messageError != null}">
|
||||
<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
|
||||
</div>
|
||||
<form action ="approvalComplete"
|
||||
method="post"
|
||||
th:object="${returnForm}">
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<th class="header">申請ID</th>
|
||||
<td>
|
||||
<label>
|
||||
<input class="readOnly"
|
||||
name="idRquest"
|
||||
name="idRequest"
|
||||
readonly="readonly"
|
||||
type="text"
|
||||
value="自動で設定されます"/>
|
||||
th:field="*{idRequest}"
|
||||
type="text"/>
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -44,7 +33,7 @@
|
||||
<input class="readOnly"
|
||||
name="nmEmployee"
|
||||
readonly="readonly"
|
||||
th:value="*{nmEmployee}"
|
||||
th:field="*{nmEmployee}"
|
||||
type="text"/>
|
||||
</label>
|
||||
</td>
|
||||
@@ -54,9 +43,9 @@
|
||||
<td>
|
||||
<label>
|
||||
<input class="readOnly"
|
||||
name="dataRequest"
|
||||
name="dateRequest"
|
||||
readonly="readonly"
|
||||
th:value="*{dataRequest}"
|
||||
th:field="*{dateRequest}"
|
||||
type="text"/>
|
||||
</label>
|
||||
</td>
|
||||
@@ -68,7 +57,7 @@
|
||||
<input class="readOnly"
|
||||
name="isBn"
|
||||
readonly="readonly"
|
||||
th:value="*{isBn}"
|
||||
th:field="*{isBn}"
|
||||
type="text"/>
|
||||
</label>
|
||||
</td>
|
||||
@@ -80,7 +69,7 @@
|
||||
<input class="readOnly"
|
||||
name="nmBook"
|
||||
readonly="readonly"
|
||||
th:value="*{nmBook}"
|
||||
th:field="*{nmBook}"
|
||||
type="text"/>
|
||||
</label>
|
||||
</td>
|
||||
@@ -90,9 +79,9 @@
|
||||
<td>
|
||||
<label>
|
||||
<input class="readOnly"
|
||||
name="publisher"
|
||||
name="pubLisher"
|
||||
readonly="readonly"
|
||||
th:value="*{publisher}"
|
||||
th:field="*{pubLisher}"
|
||||
type="text"/>
|
||||
</label>
|
||||
</td>
|
||||
@@ -102,9 +91,9 @@
|
||||
<td>
|
||||
<label>
|
||||
<input class="readOnly"
|
||||
name="note"
|
||||
name="noteText"
|
||||
readonly="readonly"
|
||||
th:value="*{note}"
|
||||
th:field="*{noteText}"
|
||||
type="text"/>
|
||||
</label>
|
||||
</td>
|
||||
@@ -116,7 +105,7 @@
|
||||
<input class="readOnly"
|
||||
name="dateBorrow"
|
||||
readonly="readonly"
|
||||
th:value="*{dateBorrow}"
|
||||
th:field="*{dateBorrow}"
|
||||
type="text"/>
|
||||
</label>
|
||||
</td>
|
||||
@@ -128,25 +117,24 @@
|
||||
<input class="readOnly"
|
||||
name="dateScheduledReturn"
|
||||
readonly="readonly"
|
||||
th:value="*{date_scheduled_return}"
|
||||
th:field="*{dateScheduledReturn}"
|
||||
type="text"/>
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="btnArea" colspan="2">
|
||||
<input type="submit" value="承認"/>
|
||||
<td class="btn" colspan="2">
|
||||
<input type="submit" name="action" formaction="approvalComplete" value="承認"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="btnArea" colspan="2">
|
||||
<input type="submit" value="却下"/>
|
||||
<td class="btn" colspan="2">
|
||||
<input type="submit" name="action" formaction="approvalRejected" value="却下"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<br/>
|
||||
<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a>
|
||||
</form>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -2,39 +2,15 @@
|
||||
<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">
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍貸出却下画面</title>
|
||||
</head>
|
||||
|
||||
<div style="text-align: right;">
|
||||
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
|
||||
</div>
|
||||
<body>
|
||||
<h2>書籍貸出申請を却下しました。</h2>
|
||||
<br/>
|
||||
<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a> | <a href="showMenu">メニューに戻る</a>
|
||||
</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>
|
||||
14
team1/src/main/resources/templates/error.html
Normal file
14
team1/src/main/resources/templates/error.html
Normal 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>
|
||||
Reference in New Issue
Block a user