Index: src/main/java/org/example/dormallocationsystem/Domain/Block.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Domain/Block.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Domain/Block.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -11,12 +11,12 @@ @Setter @Entity -@Table(name = "block", schema = "project") +@Table(name = "block", schema = "public") public class Block { @Id @Column(name = "block_id", nullable = false, columnDefinition = "CHAR(1)") private String blockId; - @Column(name = "num_available_rooms", nullable = false) private Integer numAvailableRooms; - + @Column(name = "num_total_rooms", nullable = false) + private Integer numTotalRooms; } Index: src/main/java/org/example/dormallocationsystem/Domain/DormDocument.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Domain/DormDocument.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Domain/DormDocument.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -10,5 +10,5 @@ @Setter @Entity -@Table(name = "dorm_document", schema = "project") +@Table(name = "dorm_document", schema = "public") public class DormDocument { @Id Index: src/main/java/org/example/dormallocationsystem/Domain/DormUser.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Domain/DormUser.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Domain/DormUser.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -8,5 +8,5 @@ @Setter @Entity -@Table(name = "dorm_user", schema = "project") +@Table(name = "dorm_user", schema = "public") public class DormUser { @Id Index: src/main/java/org/example/dormallocationsystem/Domain/Employee.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Domain/Employee.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Domain/Employee.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -11,5 +11,5 @@ @Setter @Entity -@Table(name = "employee", schema = "project") +@Table(name = "employee", schema = "public") public class Employee { @Id Index: src/main/java/org/example/dormallocationsystem/Domain/Payment.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Domain/Payment.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Domain/Payment.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -10,5 +10,5 @@ @Setter @Entity -@Table(name = "payment", schema = "project") +@Table(name = "payment", schema = "public") public class Payment { @Id @@ -25,5 +25,5 @@ private String paymentMonth; @ManyToOne - @JoinColumn(name = "student_id", nullable = false) // Foreign Key + @JoinColumn(name = "student_id", nullable = false) private Student student; } Index: src/main/java/org/example/dormallocationsystem/Domain/Room.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Domain/Room.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Domain/Room.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -8,5 +8,5 @@ @Setter @Entity -@Table(name = "room", schema = "project") +@Table(name = "room", schema = "public") public class Room { @EmbeddedId @@ -23,4 +23,4 @@ @Column(name = "capacity", nullable = false) private Integer capacity; +} -} Index: src/main/java/org/example/dormallocationsystem/Domain/Roomrequest.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Domain/Roomrequest.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Domain/Roomrequest.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -10,5 +10,5 @@ @Setter @Entity -@Table(name = "roomrequest", schema = "project") +@Table(name = "roomrequest", schema = "public") public class Roomrequest { @EmbeddedId Index: src/main/java/org/example/dormallocationsystem/Domain/Student.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Domain/Student.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Domain/Student.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -11,5 +11,5 @@ @Setter @Entity -@Table(name = "student", schema = "project") +@Table(name = "student", schema = "public") public class Student { @Id Index: src/main/java/org/example/dormallocationsystem/Domain/Studenttookroom.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Domain/Studenttookroom.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Domain/Studenttookroom.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -10,5 +10,5 @@ @Setter @Entity -@Table(name = "studenttookroom", schema = "project") +@Table(name = "studenttookroom", schema = "public") public class Studenttookroom { @EmbeddedId Index: src/main/java/org/example/dormallocationsystem/Repository/BlockRepository.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Repository/BlockRepository.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Repository/BlockRepository.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -10,3 +10,4 @@ @Repository public interface BlockRepository extends JpaRepository { + Block findByBlockId(String blockId); } Index: src/main/java/org/example/dormallocationsystem/Repository/RoomRepository.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Repository/RoomRepository.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Repository/RoomRepository.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -1,4 +1,5 @@ package org.example.dormallocationsystem.Repository; +import org.example.dormallocationsystem.Domain.Block; import org.example.dormallocationsystem.Domain.Room; import org.example.dormallocationsystem.Domain.RoomId; @@ -6,4 +7,5 @@ import org.springframework.stereotype.Repository; +import java.util.List; import java.util.Optional; @@ -11,3 +13,4 @@ public interface RoomRepository extends JpaRepository { Optional findById(RoomId roomId); + List getRoomsByBlock(Block block); } Index: src/main/java/org/example/dormallocationsystem/Repository/RoomRequestRepository.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Repository/RoomRequestRepository.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Repository/RoomRequestRepository.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -12,5 +12,5 @@ public interface RoomRequestRepository extends JpaRepository { boolean existsByStudentId(Long studentId); - List findByStudent(Student student); + Roomrequest findByStudent(Student student); } Index: src/main/java/org/example/dormallocationsystem/Service/IEmployeeService.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Service/IEmployeeService.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Service/IEmployeeService.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -13,5 +13,5 @@ void addDocumentComment(Long documentId, String comment); List getReviewedDocumentsByStudent(Long studentId); - List getRoomRequestsByStudent(Long studentId); + Roomrequest getRoomRequestsByStudent(Long studentId); void approveDocument(Long documentId, Long employeeId); void declineDocument(Long documentId, Long employeeId); Index: src/main/java/org/example/dormallocationsystem/Service/IRoomService.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Service/IRoomService.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ src/main/java/org/example/dormallocationsystem/Service/IRoomService.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,14 @@ +package org.example.dormallocationsystem.Service; + +import org.example.dormallocationsystem.Domain.Room; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +public interface IRoomService { + Map getTakenRoomsPerFloorInBlock(String blockId); + Map getFloorCapacityPercentage(String blockId); + Set getAllFloors(String blockId); + List getRoomsInFloor(String blockId, Integer floorNumber); +} Index: src/main/java/org/example/dormallocationsystem/Service/IStudentService.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Service/IStudentService.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Service/IStudentService.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -16,6 +16,9 @@ Long getStudentIdByEmail(String email); long getUploadedDocumentsCount(Long studentId); - List getRoomRequestsByStudent(Long studentId); + Roomrequest getRoomRequestsByStudent(Long studentId); List getDocumentsByStudent(Long studentId); DormUser getUserDetails(Long studentId); + Student getStudentByEmail(String email); + + boolean identicalRoomRequestByStudents(Roomrequest roomRequestStudent1, Roomrequest roomRequestStudent2); } Index: src/main/java/org/example/dormallocationsystem/Service/Impl/EmployeeServiceImpl.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Service/Impl/EmployeeServiceImpl.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Service/Impl/EmployeeServiceImpl.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -8,6 +8,6 @@ import java.time.LocalDate; -import java.util.List; -import java.util.Optional; +import java.util.*; +import java.util.stream.Collectors; @Service @@ -20,7 +20,8 @@ private final StudentTookRoomRepository studentTookRoomRepository; private final StudentRepository studentRepository; + private final BlockRepository blockRepository; private final PasswordEncoder passwordEncoder; - public EmployeeServiceImpl(DormUserRepository dormUserRepository, EmployeeRepository employeeRepository, DormDocumentRepository dormDocumentRepository, RoomRepository roomRepository, RoomRequestRepository roomRequestRepository, StudentTookRoomRepository studentTookRoomRepository, StudentRepository studentRepository, PasswordEncoder passwordEncoder) { + public EmployeeServiceImpl(DormUserRepository dormUserRepository, EmployeeRepository employeeRepository, DormDocumentRepository dormDocumentRepository, RoomRepository roomRepository, RoomRequestRepository roomRequestRepository, StudentTookRoomRepository studentTookRoomRepository, StudentRepository studentRepository, BlockRepository blockRepository, PasswordEncoder passwordEncoder) { this.dormUserRepository = dormUserRepository; this.employeeRepository = employeeRepository; @@ -30,4 +31,5 @@ this.studentTookRoomRepository = studentTookRoomRepository; this.studentRepository = studentRepository; + this.blockRepository = blockRepository; this.passwordEncoder = passwordEncoder; } @@ -72,20 +74,18 @@ if (room.getCapacity() == 0) { room.setIsAvailable(false); + Block blockToUpdate = room.getBlock(); + blockToUpdate.setNumAvailableRooms(blockToUpdate.getNumAvailableRooms() - 1); + blockRepository.save(blockToUpdate); } roomRepository.save(room); - studentTookRoomRepository.save(studentTookRoom); - List roomRequests = roomRequestRepository.findByStudent(student); - for (Roomrequest request : roomRequests) { - request.setStatus("Approved"); - roomRequestRepository.save(request); - } + Roomrequest roomrequest = roomRequestRepository.findByStudent(student); + roomrequest.setStatus("Approved"); + roomRequestRepository.save(roomrequest); return true; }else{ - List roomRequests = roomRequestRepository.findByStudent(student); - for (Roomrequest request : roomRequests) { - request.setStatus("Declined"); - roomRequestRepository.save(request); - } + Roomrequest roomrequest = roomRequestRepository.findByStudent(student); + roomrequest.setStatus("Declined"); + roomRequestRepository.save(roomrequest); } } @@ -116,5 +116,4 @@ } - @Override public List getStudentsWithDocuments() { @@ -131,7 +130,10 @@ @Override - public List getRoomRequestsByStudent(Long studentId) { + public Roomrequest getRoomRequestsByStudent(Long studentId) { Optional student = studentRepository.findById(studentId); - return student.map(roomRequestRepository::findByStudent).orElse(null); + if(student.isPresent()) { + return roomRequestRepository.findByStudent(student.get()); + } + return null; } Index: src/main/java/org/example/dormallocationsystem/Service/Impl/RoomServiceImpl.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Service/Impl/RoomServiceImpl.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ src/main/java/org/example/dormallocationsystem/Service/Impl/RoomServiceImpl.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,73 @@ +package org.example.dormallocationsystem.Service.Impl; + +import org.example.dormallocationsystem.Domain.Block; +import org.example.dormallocationsystem.Domain.Room; +import org.example.dormallocationsystem.Repository.BlockRepository; +import org.example.dormallocationsystem.Repository.RoomRepository; +import org.example.dormallocationsystem.Service.IRoomService; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +@Service +public class RoomServiceImpl implements IRoomService { + private final RoomRepository roomRepository; + private final BlockRepository blockRepository; + private final static int FLOOR_CAPACITY_ROOMS = 16; + + public RoomServiceImpl(RoomRepository roomRepository, BlockRepository blockRepository) { + this.roomRepository = roomRepository; + this.blockRepository = blockRepository; + } + + @Override + public Map getTakenRoomsPerFloorInBlock(String blockId) { + Block block = blockRepository.findByBlockId(blockId); + List rooms = roomRepository.getRoomsByBlock(block); + return rooms.stream().filter(room -> !room.getIsAvailable()).collect( + Collectors.groupingBy( + room -> extractFloorFromRoomNumber(room.getId().getRoomNumber()), + Collectors.counting() + )); + } + @Override + public Map getFloorCapacityPercentage(String blockId) { + Set floors = getAllFloors(blockId); + Map takenRooms = getTakenRoomsPerFloorInBlock(blockId); + Map floorCapacity = new HashMap<>(); + + for (Integer floor : floors) { + long taken = takenRooms.getOrDefault(floor, 0L); + double percentage = ((double) (FLOOR_CAPACITY_ROOMS - taken) / FLOOR_CAPACITY_ROOMS) * 100; + floorCapacity.put(floor, percentage); + } + + return floorCapacity; + } + + @Override + public Set getAllFloors(String blockId) { + Block blockRooms = blockRepository.findByBlockId(blockId); + return roomRepository.getRoomsByBlock(blockRooms).stream().map(room -> { + return extractFloorFromRoomNumber(room.getId().getRoomNumber()); + }).collect(Collectors.toSet()); + } + + @Override + public List getRoomsInFloor(String blockId, Integer floorNumber) { + Block block = blockRepository.findByBlockId(blockId); + List roomsInBlock = roomRepository.getRoomsByBlock(block); + return roomsInBlock.stream().filter(room -> { + int firstRoomNumber = room.getId().getRoomNumber() / 100; + return firstRoomNumber == floorNumber; + }).toList(); + } + + private int extractFloorFromRoomNumber(Integer roomNumber) { + return roomNumber / 100; + } +} Index: src/main/java/org/example/dormallocationsystem/Service/Impl/StudentServiceImpl.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Service/Impl/StudentServiceImpl.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Service/Impl/StudentServiceImpl.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -8,4 +8,5 @@ import org.springframework.web.multipart.MultipartFile; +import javax.swing.text.html.Option; import java.io.File; import java.io.IOException; @@ -16,4 +17,5 @@ import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.Optional; @@ -104,10 +106,10 @@ @Override - public List getRoomRequestsByStudent(Long studentId) { + public Roomrequest getRoomRequestsByStudent(Long studentId) { Optional student = studentRepository.findById(studentId); if (student.isPresent()) { return roomRequestRepository.findByStudent(student.get()); } else { - return Collections.emptyList(); + return null; } } @@ -121,4 +123,25 @@ public DormUser getUserDetails(Long studentId) { return dormUserRepository.findById(studentId).orElse(null); + } + + @Override + public Student getStudentByEmail(String email) { + Optional student = studentRepository.findByDormUser_Email(email); + if (student.isPresent()) { + return student.get(); + } + return null; + } + + @Override + public boolean identicalRoomRequestByStudents(Roomrequest r1, Roomrequest r2) { + return Objects.equals(r1.getId().getRoomNumber(), r2.getId().getRoomNumber()) && + Objects.equals(r1.getId().getBlockId(), r2.getId().getBlockId()) && + ( + (Objects.equals(r1.getRoomateEmail(), r2.getStudent().getDormUser().getEmail()) && + Objects.equals(r2.getRoomateEmail(), r1.getStudent().getDormUser().getEmail())) + || + Objects.equals(r1.getRoomateEmail(), r2.getRoomateEmail()) + ); } Index: src/main/java/org/example/dormallocationsystem/Web/EmployeeController.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Web/EmployeeController.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Web/EmployeeController.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -6,4 +6,5 @@ import org.example.dormallocationsystem.Service.IBlockService; import org.example.dormallocationsystem.Service.IEmployeeService; +import org.example.dormallocationsystem.Service.IRoomService; import org.example.dormallocationsystem.Service.IStudentService; import org.springframework.stereotype.Controller; @@ -11,5 +12,9 @@ import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; @Controller @@ -18,10 +23,12 @@ private final IEmployeeService employeeService; private final StudentRepository studentRepository; + private final IRoomService roomService; private final IStudentService studentService; private final IBlockService blockService; public EmployeeController(IEmployeeService employeeService, - StudentRepository studentRepository, BlockRepository blockRepository, IStudentService studentService, IBlockService blockService) { + StudentRepository studentRepository, BlockRepository blockRepository, IRoomService roomService, IStudentService studentService, IBlockService blockService) { this.employeeService = employeeService; this.studentRepository = studentRepository; + this.roomService = roomService; this.studentService = studentService; this.blockService = blockService; @@ -40,13 +47,23 @@ @GetMapping("/view-student") - public String viewStudentDetails(@RequestParam Long studentId, @RequestParam Long employeeId, Model model) { + public String viewStudentDetails(@RequestParam(required = false) Long studentId, @RequestParam Long employeeId, Model model) { Student student = studentRepository.findById(studentId).orElse(null); DormUser studentDetails = studentService.getUserDetails(studentId); List documentsToValidate = employeeService.viewDocumentsToValidate(student); List reviewedDocuments = employeeService.getReviewedDocumentsByStudent(studentId); - List studentRoomRequests = employeeService.getRoomRequestsByStudent(studentId); + Roomrequest studentRoomRequest = employeeService.getRoomRequestsByStudent(studentId); + Student roommate = studentService.getStudentByEmail(studentRoomRequest.getRoomateEmail()); boolean allDocsReviewed = employeeService.areAllDocumentsReviewed(studentId); boolean allDocsApproved = employeeService.areAllDocumentsApproved(studentId); - //TODO: CHECK IF THE DOCS ARE ALREADY VALIDATED + ROOM IS APPROVED/GIVEN + if (roommate != null) { + Roomrequest roommateRoomRequest = employeeService.getRoomRequestsByStudent(roommate.getId()); + boolean identicalRoomRequests = studentService.identicalRoomRequestByStudents(studentRoomRequest, roommateRoomRequest); + boolean areAllRoommatesDocsApproved = employeeService.areAllDocumentsApproved(roommate.getId()); + + model.addAttribute("roommateRoomRequest", roommateRoomRequest); + model.addAttribute("identicalRoomRequests", identicalRoomRequests); + model.addAttribute("areAllRoommatesDocsApproved", areAllRoommatesDocsApproved); + model.addAttribute("roommateEmail", roommate.getDormUser().getEmail()); + } model.addAttribute("studentId", studentId); model.addAttribute("fullName", studentDetails.getFirstName() + " " + studentDetails.getLastName()); @@ -54,5 +71,5 @@ model.addAttribute("reviewedDocuments", reviewedDocuments); model.addAttribute("employeeId", employeeId); - model.addAttribute("roomRequests", studentRoomRequests); + model.addAttribute("roomRequest", studentRoomRequest); model.addAttribute("allDocsReviewed", allDocsReviewed); model.addAttribute("allDocsApproved", allDocsApproved); @@ -86,8 +103,34 @@ @GetMapping("/room-request") public String getRoomRequest(@RequestParam Long studentId, Model model) { - List studentRoomRequests = employeeService.getRoomRequestsByStudent(studentId); + Roomrequest studentRoomRequests = employeeService.getRoomRequestsByStudent(studentId); model.addAttribute("blocks", blockService.getAll()); - model.addAttribute("roomRequests", studentRoomRequests); + model.addAttribute("studentId", studentId); + model.addAttribute("roomRequest", studentRoomRequests); return "room-request"; + } + + @GetMapping("/view-rooms") + public String viewRoomsPerFloor(@RequestParam Long studentId, @RequestParam Integer floorNumber, @RequestParam String blockId, Model model) { + List roomsPerFloor = roomService.getRoomsInFloor(blockId, floorNumber); + Roomrequest roomrequest = employeeService.getRoomRequestsByStudent(studentId); + model.addAttribute("roomRequest", roomrequest); + model.addAttribute("roomsPerFloor", roomsPerFloor); + model.addAttribute("studentId", studentId); + return "view-rooms"; + } + + @GetMapping("/view-floors") + public String viewFloorsForBlock(@RequestParam String blockId, @RequestParam Long studentId, Model model) { + Set allFloors = roomService.getAllFloors(blockId); + Map takenRooms = roomService.getTakenRoomsPerFloorInBlock(blockId); + Roomrequest roomrequest = employeeService.getRoomRequestsByStudent(studentId); + Map floorCapacityPercentage = roomService.getFloorCapacityPercentage(blockId); + model.addAttribute("allFloors", allFloors); + model.addAttribute("takenRooms", takenRooms); + model.addAttribute("roomRequest", roomrequest); + model.addAttribute("blockId", blockId); + model.addAttribute("studentId", studentId); + model.addAttribute("floorCapacityPercentage", floorCapacityPercentage); + return "view-floors"; } Index: src/main/java/org/example/dormallocationsystem/Web/StudentController.java =================================================================== --- src/main/java/org/example/dormallocationsystem/Web/StudentController.java (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/java/org/example/dormallocationsystem/Web/StudentController.java (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -26,5 +26,5 @@ public String studentDashboard(@RequestParam Long studentId, Model model) { // Fetch room request status - List roomRequests = studentService.getRoomRequestsByStudent(studentId); + Roomrequest roomRequest = studentService.getRoomRequestsByStudent(studentId); // Fetch document status & comments @@ -32,5 +32,5 @@ model.addAttribute("studentId", studentId); - model.addAttribute("roomRequests", roomRequests); + model.addAttribute("roomRequest", roomRequest); model.addAttribute("documents", documents); Index: src/main/resources/application.properties =================================================================== --- src/main/resources/application.properties (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/resources/application.properties (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -1,8 +1,11 @@ spring.application.name=DormAllocationSystem -spring.datasource.url = jdbc:postgresql://localhost:9999/db_202425z_va_prj_dormallocationsystem -spring.datasource.username=db_202425z_va_prj_dormallocationsystem_owner -spring.datasource.password=886e8ebb3f0a +#spring.datasource.url = jdbc:postgresql://localhost:9999/db_202425z_va_prj_dormallocationsystem +#spring.datasource.username=db_202425z_va_prj_dormallocationsystem_owner +#spring.datasource.password=886e8ebb3f0a +spring.datasource.url = jdbc:postgresql://localhost:5432/dorm_system_db +spring.datasource.username=Fice +spring.datasource.password=Fice123 spring.datasource.driver-class-name=org.postgresql.Driver -spring.jpa.properties.hibernate.default_schema=project +#spring.jpa.properties.hibernate.default_schema=project spring.jpa.show-sql=true spring.jpa.hibernate.ddl-auto=none Index: src/main/resources/templates/room-request.html =================================================================== --- src/main/resources/templates/room-request.html (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/resources/templates/room-request.html (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -47,8 +47,8 @@
    -
  • - Room Number:
    - Block ID:
    - Roommate Email:
    +
  • + Room Number:
    + Block ID:
    + Roommate Email:
@@ -56,13 +56,16 @@ Block - Number of available rooms - View + Available Rooms + Total Rooms + Capacity left + Action - - - + + + + - Select + Choose Index: src/main/resources/templates/student-dashboard.html =================================================================== --- src/main/resources/templates/student-dashboard.html (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/resources/templates/student-dashboard.html (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -77,5 +77,4 @@

Welcome to Your Dashboard

-

Your Room Requests

@@ -85,10 +84,10 @@ - - - + + + @@ -96,5 +95,4 @@
Status
- +
-

Your Documents

Index: src/main/resources/templates/student-details.html =================================================================== --- src/main/resources/templates/student-details.html (revision 7d738ec97bf0e606deb326102d549cc15cad357b) +++ src/main/resources/templates/student-details.html (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -173,5 +173,22 @@ - +
    +
  • + Room Number:
    + Block ID:
    +
    + Roommate Email:
    + + Requested roommate has identical room request: + ✔️ + ❌ +
    + + Requested roommate documents are checked: + ✔️ + ❌ +
    +
    • +

Documents to validate for student

Index: src/main/resources/templates/view-floors.html =================================================================== --- src/main/resources/templates/view-floors.html (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ src/main/resources/templates/view-floors.html (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,76 @@ + + + + + Title + + + +
    +
  • + Room Number:
    + Block ID:
    + Roommate Email:
    +
    • +
+
+ + + + + + + + + + + + + + + + +
FloorTaken RoomsCapacity (%)Select floor
+ Choose floor +
+ + Index: src/main/resources/templates/view-rooms.html =================================================================== --- src/main/resources/templates/view-rooms.html (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ src/main/resources/templates/view-rooms.html (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,58 @@ + + + + + Rooms + + + + +
+ Block: — Floor: +
+
    +
  • + Room Number:
    + Block ID:
    + Roommate Email:
    +
    • +
+ + + + + +
+ Room +
+ + Index: uploads/1755804094357_import.svg =================================================================== --- uploads/1755804094357_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755804094357_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755804094380_import.svg =================================================================== --- uploads/1755804094380_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755804094380_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755804094385_import.svg =================================================================== --- uploads/1755804094385_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755804094385_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755804094390_import.svg =================================================================== --- uploads/1755804094390_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755804094390_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755804094395_import.svg =================================================================== --- uploads/1755804094395_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755804094395_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755811333162_import.svg =================================================================== --- uploads/1755811333162_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755811333162_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755811333170_import.svg =================================================================== --- uploads/1755811333170_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755811333170_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755811333175_import.svg =================================================================== --- uploads/1755811333175_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755811333175_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755811333180_import.svg =================================================================== --- uploads/1755811333180_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755811333180_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755811333185_import.svg =================================================================== --- uploads/1755811333185_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755811333185_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755811421539_import.svg =================================================================== --- uploads/1755811421539_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755811421539_import.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755811421545_message-question.svg =================================================================== --- uploads/1755811421545_message-question.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755811421545_message-question.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755811421569_message-question-white.svg =================================================================== --- uploads/1755811421569_message-question-white.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755811421569_message-question-white.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755811421583_message-question.svg =================================================================== --- uploads/1755811421583_message-question.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755811421583_message-question.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + + Index: uploads/1755811421588_message-question-white.svg =================================================================== --- uploads/1755811421588_message-question-white.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) +++ uploads/1755811421588_message-question-white.svg (revision 9e76cb6d83081a44736f68f2a67d2cd40c87aaf6) @@ -0,0 +1,5 @@ + + + + +