pom.xmlの余計なところの削除

team1/src/main/java/com/example/demo/controller/LendingListController.java

@@ -1,35 +0,0 @@
-package com.example.demo.controller;
-
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class LendingListController {
-	
-//	@GetMapping("/lendingList")
-//	public String show(Model model) {
-//		List<X> x = xservice.getX();
-//		model.addAttribute("Y", x);
-//		return "Y";
-//	}
-	
-	
-//	HttpSession session;
-//	
-//	@Autowired
-//	public SelectListController(HttpSession session) {
-//		this.session=session;
-//	}
-	
-//	@RequestMapping("/lendingList")
-//	public String lendList() {
-//		return "lendingList";
-//	}
-	
-//	@RequestMapping(value = lendingList, method = RequestMethod.POST)
-//	public String select( , Model model) {
-//		model.addAttribute(
-//				);
-//		return lendingList;
-//		
-//	}
-}

team1/src/main/java/com/example/demo/controller/ReturnCompleteController.java

@@ -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) {

team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java

@@ -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();
-		return new ReturnForm(1, "テスト名", date, date, date, "ISBN", "書籍名", "出版社", "特記事項");
 	}
 
 	@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();

team1/src/main/java/com/example/demo/controller/SelectBookController.java

@@ -45,32 +45,15 @@ public class SelectBookController {
     
 //     ① 書籍一覧の初期表示
 
-    @RequestMapping(value ="/selectBook", method = RequestMethod.POST)
+    @RequestMapping(value ="/selectBook", method = RequestMethod.GET)
     public String select(Model model) {
     	try {
     		//貸出可能な書籍を全権取得する
     		List<Book_collectionEntity> books = searchBook.selectAll();
     		//検索結果をmodelに登録する
     		model.addAttribute("books" , books);
-    		
+    		//書籍一覧画面を表示する
-    		//！！ここに管理者か一般ユーザか判断・でボタンを表示するための処理が必要
+    		return "book-search";
-    		
-//    		一旦コメントアウト
-//    		LoginUser loginUser = httpSession.getAttribute("loginUser");
-//    		//ログイン情報が存在しない場合はログイン画面へ
-//    		if(LoginUser == null) {
-//    			return "/login";
-//    		}
-//    		//LoginUserのisAdminUser()を呼び出す
-//    		//管理者ならtrue、一般社員ならfalse
-//    		boolean isAdmin = loginUser.isAdminUser();
-//    		//判定結果をModelに格納あうる
-//    		//HTMLでは"{isAdmin}"として使用
-//    		model.addAttribute("isAdmin",isAdmin);
-//    		// Sessionからログイン者情報を取得する
-    		
-    		return "bookList";
-
     		
     	}catch(Exception e) {
     		//httpSessionを破棄
@@ -83,44 +66,12 @@ public class SelectBookController {
     		return "error";
     	}		
     	}
-    
         // ② 検索ボタン押下時の処理
 
-    	 @RequestMapping(value ="/selectBook", method = RequestMethod.GET)
+    	 @RequestMapping(value ="/selectBook", method = RequestMethod.POST)
-    	 public String select(SearchConditionBookForm searchConditionBookForm, Model model)  {
+    	 public String ) {
-    		 try {
+    	 
-    				List<Book_collectionEntity> books = searchBook.searchByWithLike(searchConditionBookForm);
+    
-    				model.addAttribute("books", books);
+
-    				//
-    				//！！ここに管理者か一般ユーザか判断・でボタンを表示するための処理が必要？
-    				//
-//    	    		一旦コメントアウト
-//    				LoginUser loginUser = httpSession.getAttribute("loginUser");
-//    				if(LoginUser == null) {
-//    	    			return "/login";
 //      }
-//    	    		//LoginUserのisAdminUser()を呼び出す
-//    	    		//管理者ならtrue、一般社員ならfalse
-//    	    		boolean isAdmin = loginUser.isAdminUser();
-//    	    		//判定結果をModelに格納あうる
-//    	    		//HTMLでは"{isAdmin}"として使用
-//    	    		model.addAttribute("isAdmin",isAdmin);
-    				
-    				return "bookList";
-    				
-    				
-    			} catch (Exception e) {
-    				//httpSessionを破棄
-    				httpsession.invalidate();
-    				//エラー内容を出力
-    				e.printStackTrace();
-    				//ログにエラーを記録
-    				LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-    				//エラー画面へ遷移
-    				return "error";
-
-    	 }
-    	 
-    
-    	 }
 }

team1/src/main/java/com/example/demo/entity/Book_collectionEntity.java

@@ -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,63 +60,62 @@ 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) {
+	//	public static Book_collection convertFrom(Book_collection book_collection) {
-//    // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
+	//    // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
-//    return new Book_collection Entity(
+	//    return new Book_collection Entity(
-//            book_colletion.getIdBook(),
+	//            book_colletion.getIdBook(),
-//            book_colletion.getisBn(),
+	//            book_colletion.getisBn(),
-//            book_colletion.getnmBook(),
+	//            book_colletion.getnmBook(),
-//            book_colletion..getknBook(),
+	//            book_colletion..getknBook(),
-//            book_colletion.getpublisher(),
+	//            book_colletion.getpublisher(),
-//            book_colletion.getnoteText(),
+	//            book_colletion.getnoteText(),
-//            book_colletion.getflgLending(),
+	//            book_colletion.getflgLending(),
-//            book_colletion.getidUpdate(),
+	//            book_colletion.getidUpdate(),
-//            book_colletion.getdateUupdate()
+	//            book_colletion.getdateUupdate()
-//    );
+	//    );
-//
+	//
-//}
+	//}
-//public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
+	//public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
-//    EmployeeEntity employeeEntity = new EmployeeEntity();
+	//    EmployeeEntity employeeEntity = new EmployeeEntity();
-//
+	//
-//    employeeEntity.setIdBook(searchConditionEmployee.getIdBook());
+	//    employeeEntity.setIdBook(searchConditionEmployee.getIdBook());
-//    employeeEntity.setisBn(searchConditionEmployee.getisBn());
+	//    employeeEntity.setisBn(searchConditionEmployee.getisBn());
-//    employeeEntity.setnmBook(searchConditionEmployee.getnmBook());
+	//    employeeEntity.setnmBook(searchConditionEmployee.getnmBook());
 
-//    employeeEntity.setknBook(searchConditionEmployee.knBook());
+	//    employeeEntity.setknBook(searchConditionEmployee.knBook());
-//    employeeEntity.setpublisher(searchConditionEmployee.getpublisher());
+	//    employeeEntity.setpublisher(searchConditionEmployee.getpublisher());
-//    employeeEntity.setnoteText(searchConditionEmployee.getnoteText());
+	//    employeeEntity.setnoteText(searchConditionEmployee.getnoteText());
-//    employeeEntity.setflgLending(searchConditionEmployee.getflgLending());
+	//    employeeEntity.setflgLending(searchConditionEmployee.getflgLending());
-//    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();
+	////    }
-////    }
+	//    
-//    
+	//    List<book_collection> book_collectionList = new ArrayList<>();
-//    List<book_collection> book_collectionList = new ArrayList<>();
+	//    for(book_collectionEntity book_collectionEntity:employeeEntityList){
-//    for(book_collectionEntity book_collectionEntity:employeeEntityList){
+	//    	book_collection employee = book_collectionEntity.createbook_collection(book_collectionEntity);
-//    	book_collection employee = book_collectionEntity.createbook_collection(book_collectionEntity);
+	//    	book_collectionList.add(employee);
-//    	book_collectionList.add(employee);
+	//    }
-//    }
+	//    return employeeList;
-//    return employeeList;
+	//    
-//    
+	//    
-//    
+	//    public LoginUser createLoginUser() {
-//    public LoginUser createLoginUser() {
+	//        // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
-//        // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
+	//        return new LoginUser(
-//        return new LoginUser(
+	//                getidBook(),
-//                getidBook(),
+	//                getisBn(),
-//                getisBn(),
+	//                getnmBook(),
-//                getnmBook(),
+	//                getknBook(),
-//                getknBook(),
+	//                getpublisher(),
-//                getpublisher(),
+	//                getnoteText(),
-//                getnoteText(),
+	//                getflgLending(),
-//                getflgLending(),
+	//                getidUpdate(),
-//                getidUpdate(),
+	//                getdateUpdate()
-//                getdateUpdate()
+	//        );
-//        );
+	//    }
-//    }
 }

team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java

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

team1/src/main/java/com/example/demo/entity/EmployeeEntity.java

@@ -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) {

team1/src/main/java/com/example/demo/repository/Book_CollectionRepository.java

@@ -1,46 +1,11 @@
 package com.example.demo.repository;
 
-import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import com.example.demo.entity.Book_collectionEntity;
 
 @Repository
 public interface Book_CollectionRepository extends JpaRepository<Book_collectionEntity, Integer> {
-//	List<Book_collectionEntity, Integer>{
-	//このメソッドは、貸出フラグを条件にして蔵書情報を取得するためのもの
-		//①貸出フラグを指定して蔵書を取得する
-		//初期表示は" 0 : 貸出可"を表示
-		List<Book_collectionEntity> findByFlgLending(Character flgLending);
 
-		//②書籍名・出版社・特記事項で部分一致検索をする
-		//@Queryのカッコ内の"SERECT ～"で
-		
-		//Book_collectionentityを検索対象にして、"b"という名前で扱う
-				
-		// 例にする : 名前にキーワードを含む商品を検索（部分一致：LIKE）
-        // @Query("SELECT p FROM Product p WHERE LOWER(p.name) LIKE LOWER(CONCAT('%', :keyword, '%'))")
-		// List<Product> searchByNameLike(@Param("keyword") String keyword);
-		//部分一致はCONCAT
-				
-		
-		@Query("
-		SELECT b FROM Book_collectionEntity b WHERE b.flgLending = '0'
-		AND (:nmBook = '' OR b.nmBook LIKE CONCAT('%', :nmBook,'%'))
-		AND (:pubLisher = '' OR b.pubLisher LIKE CONCAT('%', :pubLisher,'%'))
-		AND (:noteText = '' OR b.noteText LIKE CONCAT('%', :noteText,'%'))
-		ORDER BY b.idBook
-		")
-		
-		List<Book_collectionEntity> searchBooks(
-		@Param("nmBook") String nmBook,
-		@Param("pubLisher") String pubLisher,
-		@Param(" noteText") String  noteText
-				);	
-	}
 }
-

team1/src/main/java/com/example/demo/service/LendingListService.java

@@ -1,27 +0,0 @@
-package com.example.demo.service;
-
-import javax.transaction.Transactional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.example.demo.entity.EmployeeEntity;
-import com.example.demo.repository.Book_CollectionRepository;
-import com.example.demo.repository.Borrow_BooksRepository;
-
-@Service
-@Transactional
-public class LendingListService {
-
-	@Autowired
-	private Book_CollectionRepository collection;
-	@Autowired
-	private Borrow_BooksRepository borrow;
-	@Autowired
-	private EmployeeEntity employee;
-	
-	public List<table> getcollectionWithborrow(){
-		return collection;
-	}
-	
-}

team1/src/main/java/com/example/demo/service/ReturnService.java

@@ -0,0 +1,65 @@
+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());
+	}
+
+}

team1/src/main/java/com/example/demo/service/S.java

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

team1/src/main/resources/templates/applicationList.html

@@ -1,162 +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>
-<h1>
-    <div class="rightSection">
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-    </div>
-</h1>
-
-<form action="selectEmployeeInfo"
-      method="post"
-      th:object="${searchConditionEmployeeForm}">
-
-    <div class="msgBox error" th:if="${messageError} != null">
-        <span class="error" th:text="${messageError.message}"></span>
-    </div>
-		<trtable>
-		    <tr>
-		        <th class="header">申請ID</th>
-		        <td>
-		            <input placeholder="申請ID"
-		                   th:field="*{idRequest}"
-		                   type="number"/>
-		        </td>
-		    </tr>
-			
-		    <tr>
-		        <th class="header">申請者名</th>
-		        <td>
-					<select th:field="*{nmApplication}">
-					    <option value=""></option>
-					    <option th:each="department : ${departmentFormList}"
-					            th:selected="${searchConditionEmployeeForm.idDepartment != null && department.idDepartment == searchConditionEmployeeForm.idDepartment}"
-					            th:text="${department.nmDepartment}"
-					            th:value="${department.idDepartment}">
-					    </option>
-					</select>
-		            <input placeholder="申請者名"
-		                   th:field="*{nmApplicant}"
-		                   type="text"/>
-		        </td>
-		    </tr>
-			
-			<tr>
-				<th class="header">書籍名</th>
-				<td>
-					<input placeholder="書籍名"
-		                   th:field="*{nmBook}"
-			               type="text"/>
-			            </td>
-			        </tr>
-		   
-		    <tr>
-		        <th class="header">申請日</th>
-		        <td>
-		            <input placeholder="申請日"
-		                   th:field="*{dateRequest}"
-		                   type="date"/>
-		        </td>
-		    </tr>
-			
-			<td>
-				<th class="header">貸出日</th>
-				<td>
-		            <input placeholder="貸出日"
-				           th:field="*{dateBorrow}"
-				           type="date"/>
-			</td>
-			</tr>
-			
-			<tr>
-			    <th class="header">返却予定日</th>
-			    <td>
-			        <input placeholder="返却予定日"
-			               th:field="*{dateScheduledReturn}"
-			               type="date"/>
-			    </td>
-			</tr>
-
-        <tr>
-            <th class="header">操作</th>
-            <td>
-                <button class="approvalButton" onclick="approvalSubmit()">承認</button>
-            </td>
-        </tr>
-    </table>
-</form>
-
-<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="${messageInfo != null}">
-    <script th:inline="javascript">
-        alert([[${messageInfo.message}]]);
-    </script>
-</th:block>
-
-<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: 60px;">申請ID</th>
-            <th style="width: 100px;">申請者名</th>
-            <th style="width: 150px;">書籍名</th>
-            <th style="width: 150px;">申請日</th>
-            <th style="width: 100px;">貸出日</th>
-            <th style="width: 70px;">返却予定日</th>
-            <th style="width: 150px;">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr th:each="employeeInfoForm : ${employeeInfoFormList}">
-            <td th:text="${employeeInfoForm.idEmployee}"></td>
-            <td th:text="${employeeInfoForm.nmEmployee}"></td>
-            <td th:text="${employeeInfoForm.knEmployee}"></td>
-            <td th:text="${employeeInfoForm.mailAddress}"></td>
-            <td th:text="${employeeInfoForm.password}"></td>
-            <td th:text="${employeeInfoForm.adminAuth}"></td>
-            <td th:text="${employeeInfoForm.nmDepartment}"></td>
-        </tr>
-        </tbody>
-    </table>
-</th:block>
-
-<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
-    <!-- 検索結果が0件の場合 -->
-    現在書籍貸出の申請はありません。
-</th:block>
-
-</body>
-<script type="text/javascript">
-
-    function clearInput() {
-        document.getElementById('idRequest').value = '';
-        document.getElementById('idApplicant').value = '';
-        document.getElementById('nmBook').value = '';
-        document.getElementById('dateRequest').value = '';
-        document.getElementById('dateBorrow').value = '';
-		document.getElementById('dateReturn').value = '';
-		document.getElementById('dateRequest').selectedIndex = 0;
-    }
-
-
-</script>
-</html>

team1/src/main/resources/templates/bookList.html

@@ -50,7 +50,7 @@
 <!--				検索結果を表示-->
             <tbody>
 <!--		booksのデータを1件ずつ取り出す-->
-             <tr th:each ="{book : ${books}">
+             <td th:each="{book : ${books}}"></td>
              <!--ISBN-->
              <td th:each="{book.isbn}"></td>
              <!--書籍名-->
@@ -63,11 +63,7 @@
              <td th:each="{book.noteText}"></td>
 			 <td>
 <!--			管理者の場合は編集ボタン-->
-<!--一般ユーザーの場合は>
+<!--一般ユーザーの場合は申請ボタン-->
-	
-	<form th:if = "${isAdmin}"
-	th:action>
-
 			 </td>
 			
 	 		</table>

team1/src/main/resources/templates/lendingList.html

@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-	
-<head>
-<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-<title>貸出中書籍一覧</title>
-</head>
-
-<body>
-	<h1>
-		<div class="rightSection">
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-		</div>
-		<a href="menu">メニューに戻る</a>
-		<h1><span>検索結果</span></h1>
-	</h1>
-	<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="">
-			<td th:text="${.idRequest}"></td>
-			<td th:text="${.}"></td>
-			<td th:text="${.}"></td>
-			<td th:text="${.dateRequest}"></td>
-			<td th:text="${.dateBorrow}"></td>
-			<td th:text="${.dateScheduledReturn}"></td>
-			<td>
-				<form action="" method="post" style="display: inline;">
-					<input name="" th:value="${}" type="hidden">
-					<input type="submit" value="返却">
-				</form>
-			</td>
-	</tbody>
-</body>
-</html>