登録確認ボタン_配置修正

book-rent/pom.xml

@@ -43,17 +43,19 @@
 <groupId>org.springframework.boot</groupId>
 <artifactId>spring-boot-starter-validation</artifactId>
 </dependency>
+<!-- webmvcから通常のwebスターターに変更 -->
 <dependency>
 <groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webmvc</artifactId>
+<artifactId>spring-boot-starter-web</artifactId>
 </dependency>
  
 <dependency>
 <groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
+<artifactId>spring-boot-devtools</artifactId> <!-- ここを修正 -->
 <scope>runtime</scope>
 <optional>true</optional>
 </dependency>
+
 <dependency>
 <groupId>com.mysql</groupId>
 <artifactId>mysql-connector-j</artifactId>
@@ -69,28 +71,13 @@
 <artifactId>spring-boot-starter-tomcat</artifactId>
 <scope>provided</scope>
 </dependency>
+		
 <dependency>
 <groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webmvc-test</artifactId>
+<artifactId>spring-boot-starter-test</artifactId>
 <scope>test</scope>
 </dependency>
 </dependencies>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -137,3 +124,4 @@
 	</build>
  
 </project>
+

book-rent/src/main/java/com/example/demo/controller/LoginController.java

@@ -70,4 +70,3 @@ public class LoginController {
         return "redirect:/login";
     }
 }
-

book-rent/src/main/java/com/example/demo/form/EmployeeForm.java

@@ -1,4 +1,5 @@
 package com.example.demo.form;
+
 /** 社員登録・編集フォーム */
 public class EmployeeForm {
 	private Integer idEmployee;
@@ -10,24 +11,72 @@ public class EmployeeForm {
 	private String flgRetirement = "0";
 
 	public void trim() {
-        nmEmployee = t(nmEmployee); knEmployee = t(knEmployee); mailAddress = t(mailAddress);
-        flgAdmin = t(flgAdmin); flgRetirement = t(flgRetirement);
-        if (password == null) password = "";
+		nmEmployee = t(nmEmployee);
+		knEmployee = t(knEmployee);
+		mailAddress = t(mailAddress);
+		flgAdmin = t(flgAdmin);
+		flgRetirement = t(flgRetirement);
+		if (password == null)
+			password = "";
 	}
-    private static String t(String s) { return s == null ? "" : s.trim(); }
 
-    public Integer getIdEmployee() { return idEmployee; }
-    public void setIdEmployee(Integer v) { this.idEmployee = v; }
-    public String getNmEmployee() { return nmEmployee; }
-    public void setNmEmployee(String v) { this.nmEmployee = v; }
-    public String getKnEmployee() { return knEmployee; }
-    public void setKnEmployee(String v) { this.knEmployee = v; }
-    public String getMailAddress() { return mailAddress; }
-    public void setMailAddress(String v) { this.mailAddress = v; }
-    public String getPassword() { return password; }
-    public void setPassword(String v) { this.password = v; }
-    public String getFlgAdmin() { return flgAdmin; }
-    public void setFlgAdmin(String v) { this.flgAdmin = v; }
-    public String getFlgRetirement() { return flgRetirement; }
-    public void setFlgRetirement(String v) { this.flgRetirement = v; }
+	private static String t(String s) {
+		return s == null ? "" : s.trim();
+	}
+
+	public Integer getIdEmployee() {
+		return idEmployee;
+	}
+
+	public void setIdEmployee(Integer v) {
+		this.idEmployee = v;
+	}
+
+	public String getNmEmployee() {
+		return nmEmployee;
+	}
+
+	public void setNmEmployee(String v) {
+		this.nmEmployee = v;
+	}
+
+	public String getKnEmployee() {
+		return knEmployee;
+	}
+
+	public void setKnEmployee(String v) {
+		this.knEmployee = v;
+	}
+
+	public String getMailAddress() {
+		return mailAddress;
+	}
+
+	public void setMailAddress(String v) {
+		this.mailAddress = v;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String v) {
+		this.password = v;
+	}
+
+	public String getFlgAdmin() {
+		return flgAdmin;
+	}
+
+	public void setFlgAdmin(String v) {
+		this.flgAdmin = v;
+	}
+
+	public String getFlgRetirement() {
+		return flgRetirement;
+	}
+
+	public void setFlgRetirement(String v) {
+		this.flgRetirement = v;
+	}
 }

book-rent/src/main/resources/templates/approvalComplete.html

@@ -9,6 +9,7 @@
 
 <body>
 	<div th:replace="~{fragments/header :: header}"></div>
+	<main class="complete-container">
 	<h1>完了</h1>
 	<div class="info" th:text="${message} ?:'書籍貸出申請を承認しました。'"></div>
 
@@ -16,7 +17,7 @@
 		<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
 		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
 	</p>
-
+	</main>
 </body>
 
 </html>

book-rent/src/main/resources/templates/approvalConfilm.html

@@ -9,66 +9,67 @@
 
 <body>
 	<div th:replace="~{fragments/header :: header}"></div>
-	<h1>
-		書籍貸出承認確認　　　
-
-	</h1>
-
-
+	<main>
+		<h1>書籍貸出承認確認</h1>
+		<div class="card">
 			<table>
 				<tr>
-			<th class="header">申請ID</th>
-			<td><input type="text" readonly="readonly" th:value="${r.idRequest}" /></td>
+					<th>申請ID</th>
+					<td th:text="${r.idRequest}"></td>
 				</tr>
 				<tr>
-			<th class="header">申請者名</th>
-			<td><input type="text" readonly="readonly" th:value="${r.nmApplicant}" /></td>
+					<th>申請者名</th>
+					<td th:text="${r.nmApplicant}"></td>
 				</tr>
 				<tr>
-			<th class="header">申請日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateRequest}" /></td>
+					<th>申請日</th>
+					<td th:text="${r.dateRequest}"></td>
 				</tr>
 				<tr>
-			<th class="header">ISBN</th>
-			<td><input type="text" readonly="readonly" th:value="${r.isbn}" /></td>
+					<th>ISBN</th>
+					<td th:text="${r.isbn}"></td>
 				</tr>
 				<tr>
-			<th class="header">書籍名</th>
-			<td><input type="text" readonly="readonly" th:value="${r.nmBook}" style="width: 300px;" /></td>
+					<th>書籍名</th>
+					<td th:text="${r.nmBook}" style="width: 700px;"></td>
 				</tr>
 				<tr>
-			<th class="header">出版社</th>
-			<td><input type="text" readonly="readonly" th:value="${r.publisher}" /></td>
+					<th>出版社</th>
+					<td th:text="${r.publisher}"></td>
 				</tr>
 				<tr>
-			<th class="header">特記事項</th>
-			<td><input type="text" readonly="readonly" th:value="${r.note}" /></td>
+					<th>特記事項</th>
+					<td th:text="${r.note}"></td>
 				</tr>
 				<tr>
-			<th class="header">貸出日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateBorrow}" /></td>
+					<th>貸出日</th>
+					<td th:text="${r.dateBorrow}"></td>
 				</tr>
 				<tr>
-			<th class="header">返却予定日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateScheduledReturn}" /></td>
+					<th>返却予定日</th>
+					<td th:text="${r.dateScheduledReturn}"></td>
 				</tr>
 			</table>
 
 			<div class="buttonSection" style="margin-top: 20px;">
 
-		<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post" style="display: inline;">
+				<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post"
+					style="display: inline;">
 					<button type="submit">承認</button>
 				</form>
 
 
 				<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
 					style="display: inline; margin-left: 10px;">
-			<button type="submit">却下</button>
+					<button type="submit" class="sub">却下</button>
 				</form>
+				<a th:href="@{/admin/applications}" style="text-decoration: none; margin-left: 10px;">
+					<button type="button" class="sub">承認待ち一覧に戻る</button>
+				</a>
 			</div>
 
-	<br>
-	<a th:href="@{/admin/applications}">承認待ち一覧へ戻る</a>
+
+
 
 			<script>
 				function logoutSubmit() {
@@ -77,6 +78,8 @@
 					}
 				}
 			</script>
+		</div>
+	</main>
 </body>
 
 </html>

book-rent/src/main/resources/templates/approvalRejected.html

@@ -9,6 +9,7 @@
 
 	<body>
 		<div th:replace="~{fragments/header :: header}"></div>
+		<main class="complete-container">
 		<h1>却下</h1>
 			<div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div>
 
@@ -17,7 +18,8 @@
 				<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
 			</p>
 
-	
+		</main>
 	</body>
 
+
 </html>

book-rent/src/main/resources/templates/complete.html

@@ -12,7 +12,7 @@
   <div class="info" th:text="${message} ?: '処理が完了しました。'"></div>
   <p>
     <a class="btn" th:href="@{${backUrl}}" th:text="${backLabel}">戻る</a>
-    <a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+<!--    <a class="btn sub" th:href="@{/menu}">メニューに戻る</a>-->
   </p>
 </main>
 </body>

book-rent/src/main/resources/templates/employeeRegistConfirm.html

@@ -0,0 +1,101 @@
+
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>社員登録確認</title>
+    <link rel="stylesheet" th:href="@{/css/style.css}">
+</head>
+
+<body>
+
+    <!-- 共通ヘッダー -->
+    <div th:replace="~{fragments/header :: header}"></div>
+
+    <main>
+        <h2>社員登録確認</h2>
+
+        <!-- エラーメッセージ -->
+        <div class="error"
+             th:if="${errors != null and !errors.isEmpty()}">
+            <p th:each="error : ${errors}"
+               th:text="${error}">
+            </p>
+        </div>
+
+        <!-- 登録内容確認 -->
+        <div class="card">
+
+            <p>以下の内容で登録します。内容を確認してください。</p>
+
+            <form th:action="@{/admin/employees/new/execute}"
+                  th:object="${form}"
+                  method="post">
+
+                <!-- 登録内容一覧 -->
+                <table>
+                    <tbody>
+                        <tr>
+                            <th>社員名</th>
+                            <td th:text="*{nmEmployee}"></td>
+                        </tr>
+
+                        <tr>
+                            <th>社員名よみ</th>
+                            <td th:text="*{knEmployee}"></td>
+                        </tr>
+
+                        <tr>
+                            <th>メールアドレス</th>
+                            <td th:text="*{mailAddress}"></td>
+                        </tr>
+
+                        <tr>
+                            <th>パスワード</th>
+                            <td>********</td>
+                        </tr>
+
+                        <tr>
+                            <th>権限</th>
+                            <td th:text="*{flgAdmin == '1' ? '管理者' : '一般'}"></td>
+                        </tr>
+                    </tbody>
+                </table>
+
+                <!-- 登録処理に必要な値を引き継ぐ -->
+                <input type="hidden" th:field="*{nmEmployee}">
+                <input type="hidden" th:field="*{knEmployee}">
+                <input type="hidden" th:field="*{mailAddress}">
+                <input type="hidden" th:field="*{password}">
+                <input type="hidden" th:field="*{flgAdmin}">
+
+                <!-- ボタン：左に戻る、右に登録 -->
+<!--                <div style="display: flex;-->
+<!--                            justify-content: space-between;-->
+<!--                            align-items: center;-->
+<!--                            width: 100%;-->
+<!--                            margin-top: 20px;">-->
+
+                    <!-- 社員情報入力に戻る -->
+					<p>
+                    <a class="btn sub"
+                       th:href="@{/admin/employees/new}">
+                        社員情報入力に戻る
+                    </a>
+
+                    <!-- 登録 -->
+                    <button type="submit" class="btn">
+                        登録
+                    </button>
+					</p>
+			
+
+            </form>
+
+        </div>
+    </main>
+
+</body>
+</html>

book-rent/src/main/resources/templates/employeeRegistInput.html

@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>社員登録</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
+</head>
+
+<body>
+
+	<!-- 共通ヘッダー -->
+	<div th:replace="~{fragments/header :: header}"></div>
+
+	<main>
+		<h2>社員登録</h2>
+
+		<!-- 入力エラー表示 -->
+		<div class="error" th:if="${errors != null and !errors.isEmpty()}">
+			<p th:each="error : ${errors}" th:text="${error}">
+			</p>
+		</div>
+
+		<!-- 社員登録フォーム -->
+		<div class="card">
+
+			<form th:action="@{/admin/employees/new/confirm}" th:object="${form}" method="post">
+
+				<!-- 社員名 -->
+				<div>
+					<label for="nmEmployee">社員名</label>
+					<input type="text" id="nmEmployee" th:field="*{nmEmployee}">
+				</div>
+
+				<!-- 社員名よみ -->
+				<div>
+					<label for="knEmployee">社員名よみ</label>
+					<input type="text" id="knEmployee" th:field="*{knEmployee}">
+				</div>
+
+				<!-- メールアドレス -->
+				<div>
+					<label for="mailAddress">メールアドレス</label>
+					<input type="email" id="mailAddress" th:field="*{mailAddress}">
+				</div>
+
+				<!-- パスワード -->
+				<div>
+					<label for="password">パスワード</label>
+					<input type="password" id="password" th:field="*{password}">
+				</div>
+				<label for="flgAdmin">管理者フラグ</label>
+				<select id="flgAdmin" name="flgAdmin">
+					<option value="0" th:selected="${form.flgAdmin == '0'}">0：一般</option>
+					<option value="1" th:selected="${form.flgAdmin == '1'}">1：管理者</option>
+				</select>
+				<p><a class="btn sub" th:href="@{/menu}">メニューへ戻る</a>
+					<button type="submit">登録確認</button>
+				</p>
+
+				<!-- 権限：枠線なし・横並び -->
+				<!--                <div style="border: none;-->
+				<!--                            display: flex;-->
+				<!--                            flex-direction: row;-->
+				<!--                            align-items: center;-->
+				<!--                            gap: 25px;-->
+				<!--                            margin: 15px 0 25px;">-->
+
+				<!--                    <label style="display: inline-flex;-->
+				<!--                                  align-items: center;-->
+				<!--                                  gap: 5px;-->
+				<!--                                  white-space: nowrap;">-->
+				<!--                        <input type="radio"-->
+				<!--                               th:field="*{flgAdmin}"-->
+				<!--                               value="1">-->
+				<!--                        管理者-->
+				<!--                    </label>-->
+
+				<!--                    <label style="display: inline-flex;-->
+				<!--                                  align-items: center;-->
+				<!--                                  gap: 5px;-->
+				<!--                                  white-space: nowrap;">-->
+				<!--                        <input type="radio"-->
+				<!--                               th:field="*{flgAdmin}"-->
+				<!--                               value="0">-->
+				<!--                        一般ユーザー-->
+				<!--                    </label>-->
+
+				<!--                </div>-->
+
+				<!--                 ボタン：左に戻る・右に確認 -->
+				<!--                <div style="display: flex;-->
+				<!--                            justify-content: space-between;-->
+				<!--                            align-items: center;-->
+				<!--                            width: 100%;-->
+				<!--                            margin-top: 20px;">-->
+
+				<!--                    <a class="btn sub"-->
+				<!--                       th:href="@{/menu}">-->
+				<!--                        メニューに戻る-->
+				<!--                    </a>-->
+
+				<!--                    <button type="submit" class="btn">-->
+				<!--                        確認-->
+				<!--                    </button>-->
+
+				<!--                </div>-->
+
+			</form>
+
+		</div>
+	</main>
+
+</body>
+
+</html>

book-rent/src/main/resources/templates/menu.html

@@ -23,3 +23,6 @@
 </main>
 </body>
 </html>
+ 
+
+ 

book-rent/src/main/resources/templates/returnComplete.html

@@ -9,6 +9,7 @@
 
 <body>
 	<div th:replace="~{fragments/header :: header}"></div>
+	<main class="complete-container">
 	<h1>返却完了</h1>
 	<div class="info" th:text="${message} ?: '書籍の返却が完了しました。'"></div>
 
@@ -16,6 +17,7 @@
 		<a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a>
 		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
 	</p>
+	</main>
 </body>
 
 </html>