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

Compare commits

base: 2026_0910_AI_5G_Java_MUN:s-ikeda
Branches Tags
2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:m-endo 2026_0910_AI_5G_Java_MUN:y-ogawa 2026_0910_AI_5G_Java_MUN:y-nakano 2026_0910_AI_5G_Java_MUN:a-takayama 2026_0910_AI_5G_Java_MUN:s-ohasi 2026_0910_AI_5G_Java_MUN:service 2026_0910_AI_5G_Java_MUN:s-ikeda 2026_0910_AI_5G_Java_MUN:s-sakiyama
..
compare: 2026_0910_AI_5G_Java_MUN:2bdce3b11aa786c983406755c972b074432591b5
Branches Tags
2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:m-endo 2026_0910_AI_5G_Java_MUN:y-ogawa 2026_0910_AI_5G_Java_MUN:y-nakano 2026_0910_AI_5G_Java_MUN:a-takayama 2026_0910_AI_5G_Java_MUN:s-ohasi 2026_0910_AI_5G_Java_MUN:service 2026_0910_AI_5G_Java_MUN:s-ikeda 2026_0910_AI_5G_Java_MUN:s-sakiyama

4 Commits
s-ikeda ... 2bdce3b11a

Author SHA1 Message Date
y-ogawa
2bdce3b11a no message 2026-10-20 15:46:56 +09:00
y-ogawa
8659fa44c2 no message 2026-10-20 15:37:28 +09:00
y-ogawa
75fcb36b12 Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into y-ogawa 2026-10-20 15:12:49 +09:00
y-ogawa
17831e01bd no message 2026-10-20 15:12:31 +09:00
8 changed files with 135 additions and 171 deletions
Expand all files Collapse all files

5
team1/pom.xml
View File

@@ -74,6 +74,11 @@
<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>
</dependencies> </dependencies>
<build> <build>

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

@@ -1,64 +1,64 @@
//package com.example.demo.controller; package com.example.demo.controller;
//
//import java.util.logging.Level; import java.util.logging.Level;
//import java.util.logging.Logger; import java.util.logging.Logger;
//
//import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.HttpSession;
//
//import org.springframework.beans.factory.annotation.Autowired; 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;
//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; import com.example.demo.form.ApprovalForm;
//
///** /**
// * 書籍貸出承認確認用のコントローラ * 書籍貸出承認確認用のコントローラ
// */ */
//@Controller @Controller
//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;
// ApprovalForm approvalform; Request request;
//
// @Autowired @Autowired
// public ApprovalConfirmController( public ApprovalConfirmController(
// HttpSession httpSession, HttpSession httpSession,
// ApprovalForm approvalform) { Request request) {
// this.httpSession = httpSession; this.httpSession = httpSession;
// this.approvalform = approvalform; this.request = request;
// } }
//
// @ModelAttribute @ModelAttribute
// public ApprovalForm approvalForm() { public ApprovalForm approvalForm() {
// return new ApprovalForm(); return new ApprovalForm();
// } }
//
// @RequestMapping(value = "/ApprovalConfirm", method = RequestMethod.POST) @RequestMapping(value = "/ApprovalConfirm", method = RequestMethod.POST)
// public String AprrvalForm(ApprovalForm ApprovalForm, Model model) { public String AprrvalForm(ApprovalForm ApprovalForm, Model model) {
//
// try { try {
//
//
// return; return a ;
// } catch (Exception e) { } catch (Exception e) {
// // ログイン情報の破棄 // ログイン情報の破棄
// httpSession.invalidate(); httpSession.invalidate();
//
// e.printStackTrace(); e.printStackTrace();
//
// // エラーログ出力 // エラーログ出力
// LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
// // エラー画面遷移 // エラー画面遷移
// return "error"; return "error";
// } }
// } }
//} }

7
team1/src/main/java/com/example/demo/repository/Borrow_BooksRepository.java
View File

@@ -1,7 +1,5 @@
package com.example.demo.repository; package com.example.demo.repository;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@@ -10,9 +8,4 @@ import com.example.demo.entity.Borrow_booksEntity;
@Repository @Repository
public interface Borrow_BooksRepository extends JpaRepository<Borrow_booksEntity, Integer> { public interface Borrow_BooksRepository extends JpaRepository<Borrow_booksEntity, Integer> {
/*
* 申請者IDで検索
* */
Optional<Borrow_booksEntity> findByIdApplicant(Integer idApplicant);
} }

5
team1/src/main/java/com/example/demo/service/ApprovalBorrowBooks.java Normal file
View File

@@ -0,0 +1,5 @@
package com.example.demo.service;
public interface ApprovalBorrowBooks {
}

62
team1/src/main/java/com/example/demo/service/Impl/ApprovalBorrowBooksImpl.java
View File

@@ -1,31 +1,31 @@
//package com.example.demo.service.Impl; package com.example.demo.service.Impl;
//
//import java.util.List; import java.util.List;
//
//import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
//import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
//
//import com.example.demo.repository.Borrow_BooksRepository; import com.example.demo.repository.Borrow_BooksRepository;
//import com.example.demo.service.ApprovalBorrowBooks; import com.example.demo.service.ApprovalBorrowBooks;
//
//@Service @Service
//@Transactional @Transactional
//public class ApprovalBorrowBooksImpl implements ApprovalBorrowBooks { public class ApprovalBorrowBooksImpl implements ApprovalBorrowBooks {
//
// Borrow_BooksRepository borrowbooksRepository; Borrow_BooksRepository borrowbooksRepository;
//
// @Autowired @Autowired
// public ApprovalBorrowBooksImpl(Borrow_BooksRepository borrowbooksRepository) { public ApprovalBorrowBooksImpl(Borrow_BooksRepository borrowbooksRepository) {
// this.borrowbooksRepository = borrowbooksRepository; this.borrowbooksRepository = borrowbooksRepository;
// } }
//
// /* 申請情報から全件取得 /* 申請情報から全件取得
// * @return 取得した情報すべて * @return 取得した情報すべて
// */ */
// public List<???> selectAll() { public List<???> selectAll() {
// return ???Entity.create???List(???Repository.findAll()); return ???Entity.create???List(???Repository.findAll());
// } }
//
//
//} }

69
team1/src/main/resources/templates/applicationList.html
View File

@@ -1,69 +0,0 @@
<!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>
</head>
<body>
<div class="rightSection">
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
<div class="header-spacing"></div>
<a href="showMenu">メニューに戻る</a>
<div class="header-spacing"></div>
<h1><span>検索結果</span></h1>
<div class="header-spacing"></div>
<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
<!-- 検索結果が1件以上ある場合 -->
<table class="table-grid table-striped table-hover">
<thead>
<tr>
<th style="width: 100px;">申請ID</th>
<th style="width: 100px;">申請者名</th>
<th style="width: 100px;">書籍名</th>
<th style="width: 100px;">申請日</th>
<th style="width: 100px;">貸出日</th>
<th style="width: 100px;">返却予定日</th>
<th style="width: 100px;">操作</th>
</tr>
</thead>
<tbody>
<tr th:each="employeeInfoForm : ${employeeInfoFormList}">
<td th:text="${employeeInfoForm.idRequest}"></td>
<td th:text="${employeeInfoForm.nmApplicant}"></td>
<td th:text="${employeeInfoForm.nmBook}"></td>
<td th:text="${employeeInfoForm.dateRequest}"></td>
<td th:text="${employeeInfoForm.dateBorrow}"></td>
<td th:text="${employeeInfoForm.dateReturn}"></td>
<td th:text="${employeeInfoForm.dateRequest}"></td>
<td>
<form action="/approve" method="get">
<input name="idRequest" th:value="${employeeInfoForm.idRequest}" type="hidden">
<input type="submit" value="承認">
</form>
</td>
</tr>
</tbody>
</table>
</th:block>
<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
<!-- 検索結果が0件の場合 -->
現在書籍貸出の申請はありません。
</th:block>
</body>
</html>

15
team1/src/main/resources/templates/approvalComplete.html Normal file
View File

@@ -0,0 +1,15 @@
<!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>
</head>
<body>
</body>
</html>

15
team1/src/main/resources/templates/approvalRejected.html Normal file
View File

@@ -0,0 +1,15 @@
<!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>
</head>
<body>
</body>
</html>