2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

貸出申請承認の作業完了しました

Browse Source
This commit is contained in:
小川　悠里
2026-10-23 10:27:10 +09:00
parent a80e99da7f
commit 06d0d4b019
5 changed files with 129 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java
View File

@@ -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());
// HttpSession httpSession;
ReturnService returnService;
// エラーメッセージ用の定数フィールド
// 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() {
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";
// }
@Autowired
ApprovalConfirmController(ReturnService returnService) {
this.returnService = returnService;
}
@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";
}
}
}

64
team1/src/main/java/com/example/demo/controller/ApprovalConfirmResultController.java
View File

@@ -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";
}
}
}

10
team1/src/main/resources/templates/approvalComplete.html
View File

@@ -2,14 +2,8 @@
<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>
<body>

60
team1/src/main/resources/templates/approvalConfirm.html
View File

@@ -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">
<title>書籍貸出承認確認</title>
<meta charset="UTF-8">
<title>書籍貸出承認確認</title>
</head>
<body>
<h1>登録内容確認　　　
<div class="rightSection">
<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
</h1>
<!-- 変数名は変更したが、中身は変更していない -->
<!-- ボタンや遷移も手を付けていない -->
<form action="approvalConfirm"
method="post">
<div style="text-align: right;">
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
<form action ="approvalComplete"
method="post"
th:object="${returnForm}">
<div class="msgBox error" th:if="${messageError != null}">
<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
</div>
<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,7 +117,7 @@
<input class="readOnly"
name="dateScheduledReturn"
readonly="readonly"
th:value="*{date_scheduled_return}"
th:field="*{dateScheduledReturn}"
type="text"/>
</label>
</td>
@@ -147,6 +136,5 @@
<br/>
<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a>
</form>
</body>
</body>
</html>

10
team1/src/main/resources/templates/approvalRejected.html
View File

@@ -2,14 +2,8 @@
<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>
<body>