Merge branch...

Merge branch '35-as-a-commonadmin-i-want-to-have-a-page-where-i-can-display-the-data-so-that-i-can-quickly-find' into 'main'

Fixed an issue where id cannot be automatically sorted and location cannot be...

Closes #35

See merge request !64

src/main/java/com/cardiff/client_project/controller/admin/CommonAdminHospitalController.java

@@ -5,7 +5,6 @@ import com.cardiff.client_project.service.CommonAdminHospitalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -32,7 +31,7 @@ public class CommonAdminHospitalController {
             commonAdminHospitalService.addHospital(hospital);
             return ResponseEntity.ok("Hospital added successfully!");
         } catch (Exception e) {
-            e.printStackTrace(); // Print error log
+            e.printStackTrace();
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
                     .body("Error adding hospital: " + e.getMessage());
         }
@@ -40,27 +39,29 @@ public class CommonAdminHospitalController {
 
     @GetMapping("/currentUser")
     public ResponseEntity<String> getCurrentUser() {
-        try {
-
-            String username = SecurityContextHolder.getContext().getAuthentication().getName();
-            return ResponseEntity.ok(username);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body("Unable to fetch current user.");
-        }
+        String username = "admin";
+        return ResponseEntity.ok(username);
     }
 
-
     @PutMapping("/update")
     public ResponseEntity<String> updateHospital(@RequestBody HospitalDTO hospital) {
-        commonAdminHospitalService.updateHospital(hospital);
-        return ResponseEntity.ok("Hospital updated successfully!");
+        try {
+            commonAdminHospitalService.updateHospital(hospital);
+            return ResponseEntity.ok("Hospital updated successfully!");
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body("Error updating hospital: " + e.getMessage());
+        }
     }
 
     @DeleteMapping("/delete/{id}")
     public ResponseEntity<String> deleteHospital(@PathVariable int id) {
-        commonAdminHospitalService.deleteHospital(id);
-        return ResponseEntity.ok("Hospital deleted successfully!");
+        try {
+            commonAdminHospitalService.deleteHospital(id);
+            return ResponseEntity.ok("Hospital deleted successfully!");
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body("Failed to delete hospital: " + e.getMessage());
+        }
     }
 }

src/main/java/com/cardiff/client_project/mapper/CommonAdminHospitalMapper.java

@@ -33,4 +33,6 @@ public class CommonAdminHospitalMapper {
     }
 
 
+
+
 }

src/main/java/com/cardiff/client_project/pojo/dto/HospitalDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 public class HospitalDTO {
     private int id;
     private String name;
+    private String address;
     private String location;
     private String phone;
     private int totalBeds;

src/main/java/com/cardiff/client_project/service/imp/CommonAdminHospitalServiceImp.java

@@ -35,21 +35,20 @@ public class CommonAdminHospitalServiceImp implements CommonAdminHospitalService
 
     @Override
     public void addHospital(HospitalDTO hospital) {
-        if (hospital.getName() == null || hospital.getLocation() == null ||
+        if (hospital.getName() == null || hospital.getAddress() == null || // 修改为 address
                 hospital.getPhone() == null || hospital.getTotalBeds() <= 0 ||
                 hospital.getAvailableBeds() < 0) {
             throw new IllegalArgumentException("Invalid hospital data: Missing or incorrect fields.");
         }
 
-        String sql = "INSERT INTO hospital (name, location, phone, totalBeds, availableBeds, occupancyRate) VALUES (?, ?, ?, ?, ?, ?)";
         double occupancyRate = 1.0 - (double) hospital.getAvailableBeds() / hospital.getTotalBeds();
 
-        jdbcTemplate.update(sql, hospital.getName(), hospital.getLocation(), hospital.getPhone(),
+        String sql = "INSERT INTO hospital (name, address, phone, totalBeds, availableBeds, occupancyRate) VALUES (?, ?, ?, ?, ?, ?)";
+        jdbcTemplate.update(sql, hospital.getName(), hospital.getAddress(), hospital.getPhone(),
                 hospital.getTotalBeds(), hospital.getAvailableBeds(), occupancyRate);
     }
 
 
-
     @Override
     public void updateHospital(HospitalDTO hospital) {
         if (hospital.getId() <= 0 || hospital.getName() == null || hospital.getLocation() == null ||
@@ -68,10 +67,23 @@ public class CommonAdminHospitalServiceImp implements CommonAdminHospitalService
         }
     }
 
-
     @Override
     public void deleteHospital(int id) {
-        String sql = "DELETE FROM hospital WHERE id=?";
-        jdbcTemplate.update(sql, id);
+        // Delete the specified record.
+        String deleteSql = "DELETE FROM hospital WHERE id = ?";
+        jdbcTemplate.update(deleteSql, id);
+
+        // Reorder ID
+        String reorderSql = "SET @new_id = 0; " +
+                "UPDATE hospital SET id = (@new_id := @new_id + 1); " +
+                "ALTER TABLE hospital AUTO_INCREMENT = 1;";
+        for (String sql : reorderSql.split(";")) {
+            if (!sql.trim().isEmpty()) {
+                jdbcTemplate.execute(sql.trim());
+            }
+        }
     }
+
+
+
 }

src/main/resources/static/html/admin.html

@@ -11,12 +11,10 @@
     <div class="text-lg font-semibold">System</div>
     <a href="#" data-content="hospital">Hospital</a>
     <a href="#" data-content="patient">Nursing staff</a>
-    <a><div onclick="chooseOut()" >Sign Out</div></a>
+    <a><div onclick="chooseOut()">Sign Out</div></a>
 </nav>
 <div class="content">
-    
     <div id="user-info" style="text-align: right; padding: 10px; font-weight: bold;"></div>
-
     <div id="dynamic-content">
         <h1>Welcome to the Management System</h1>
         <p>Select an option from the sidebar to get started.</p>
@@ -29,8 +27,8 @@
         <h2 id="modal-title">Add New Hospital</h2>
         <label for="modal-name">Name</label>
         <input type="text" id="modal-name" placeholder="Enter name" />
-        <label for="modal-location">Location</label>
-        <input type="text" id="modal-location" placeholder="Enter location" />
+        <label for="modal-address">Address</label>
+        <input type="text" id="modal-address" placeholder="Enter address" />
         <label for="modal-phone">Phone</label>
         <input type="text" id="modal-phone" placeholder="Enter phone number" />
         <label for="modal-totalBeds">Total Beds</label>
@@ -47,19 +45,13 @@
 <script>
     const dynamicContent = document.getElementById("dynamic-content");
 
-    // Load the current login user information
     function loadCurrentUser() {
         fetch('/commonAdmin/hospital/currentUser')
             .then(response => {
-                if (!response.ok) {
-                    throw new Error("Failed to fetch current user.");
-                }
+                if (!response.ok) throw new Error("Failed to fetch current user.");
                 return response.text();
             })
             .then(username => {
-                if (!username) {
-                    throw new Error("No username received from server.");
-                }
                 document.getElementById('user-info').innerText = `Logged in as: ${username}`;
             })
             .catch(error => {
@@ -68,11 +60,10 @@
             });
     }
 
-    function chooseOut(){
-        window.location.href="/logout"
+    function chooseOut() {
+        window.location.href = "/logout";
     }
 
-    // Initialize load user information
     loadCurrentUser();
 
     function loadHospitalInterface() {
@@ -80,8 +71,8 @@
             <div id="toolbar">
                 <label for="searchName">Name</label>
                 <input type="text" id="searchName" placeholder="Search by name" />
-                <label for="searchLocation">Location</label>
-                <input type="text" id="searchLocation" placeholder="Search by location" />
+                <label for="searchAddress">Address</label>
+                <input type="text" id="searchAddress" placeholder="Search by address" />
                 <button id="searchButton">Search</button>
                 <button id="allButton">All</button>
                 <button id="addHospitalButton">Add Hospital</button>
@@ -91,7 +82,7 @@
                     <tr>
                         <th>ID</th>
                         <th>Name</th>
-                        <th>Location</th>
+                        <th>Address</th>
                         <th>Phone</th>
                         <th>Total Beds</th>
                         <th>Available Beds</th>
@@ -102,20 +93,7 @@
             </table>
         `;
 
-        document.getElementById('searchButton').addEventListener('click', () => {
-            const name = document.getElementById('searchName').value;
-            const location = document.getElementById('searchLocation').value;
-            loadHospitals({ name, location });
-        });
-
-        document.getElementById('allButton').addEventListener('click', () => {
-            loadHospitals();
-        });
-
-        document.getElementById('addHospitalButton').addEventListener('click', () => {
-            openAddHospitalModal();
-        });
-
+        bindToolbarEvents();
         loadHospitals();
     }
 
@@ -123,91 +101,170 @@
         document.getElementById('modal-title').innerText = "Add New Hospital";
         document.getElementById('hospital-modal').style.display = 'flex';
 
-        // Clear the input fields in the modal box
+        // Reset modal content
         document.getElementById('modal-name').value = '';
-        document.getElementById('modal-location').value = '';
+        document.getElementById('modal-address').value = '';
         document.getElementById('modal-phone').value = '';
         document.getElementById('modal-totalBeds').value = '';
         document.getElementById('modal-availableBeds').value = '';
 
-        // Bind save button event
         document.getElementById('save-hospital-btn').onclick = saveHospital;
     }
 
-    // Save new hospital information
+    function closeHospitalModal() {
+        document.getElementById('hospital-modal').style.display = 'none';
+    }
+
     function saveHospital() {
-        const name = document.getElementById('modal-name').value;
-        const location = document.getElementById('modal-location').value;
-        const phone = document.getElementById('modal-phone').value;
-        const totalBeds = document.getElementById('modal-totalBeds').value;
-        const availableBeds = document.getElementById('modal-availableBeds').value;
-
-        const newHospital = {
-            name,
-            location,
-            phone,
-            totalBeds: parseInt(totalBeds, 10),
-            availableBeds: parseInt(availableBeds, 10),
+        const hospitalData = {
+            name: document.getElementById('modal-name').value.trim(),
+            address: document.getElementById('modal-address').value.trim(),
+            phone: document.getElementById('modal-phone').value.trim(),
+            totalBeds: parseInt(document.getElementById('modal-totalBeds').value, 10),
+            availableBeds: parseInt(document.getElementById('modal-availableBeds').value, 10),
         };
 
+        if (!hospitalData.name || !hospitalData.address || !hospitalData.phone ||
+            isNaN(hospitalData.totalBeds) || isNaN(hospitalData.availableBeds)) {
+            alert("All fields are required!");
+            return;
+        }
+
         fetch('/commonAdmin/hospital/add', {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(newHospital),
-        })
-            .then((response) => {
-                if (response.ok) {
-                    alert("Hospital added successfully!");
-                    document.getElementById('hospital-modal').style.display = 'none';
-                    loadHospitals();
-                } else {
-                    throw new Error("Failed to add hospital");
-                }
-            })
-            .catch((error) => {
-                console.error(error);
-                alert("An error occurred while adding the hospital.");
-            });
+            body: JSON.stringify(hospitalData),
+        }).then(response => {
+            if (response.ok) {
+                alert("Hospital saved successfully!");
+                closeHospitalModal();
+                loadHospitals();
+            } else {
+                return response.text().then(text => { throw new Error(text); });
+            }
+        }).catch(error => {
+            console.error("Error adding hospital:", error);
+            alert("Failed to save hospital: " + error.message);
+        });
     }
 
     function loadHospitals(filters = {}) {
         const query = new URLSearchParams(filters).toString();
         fetch(`/commonAdmin/hospital/all?${query}`)
-            .then((response) => response.json())
-            .then((data) => {
+            .then(response => response.json())
+            .then(data => {
                 const tableBody = document.getElementById('table-body');
                 tableBody.innerHTML = '';
-                data.forEach((hospital) => {
+
+                data.forEach(hospital => {
                     const row = document.createElement('tr');
                     row.innerHTML = `
                         <td>${hospital.id}</td>
                         <td>${hospital.name}</td>
-                        <td>${hospital.location}</td>
+                        <td>${hospital.address}</td>
                         <td>${hospital.phone}</td>
                         <td>${hospital.totalBeds}</td>
                         <td>${hospital.availableBeds}</td>
                         <td>
-                            <button data-id="${hospital.id}" class="editButton">Edit</button>
-                            <button data-id="${hospital.id}" class="deleteButton">Delete</button>
+                            <button class="editButton" data-id="${hospital.id}">Edit</button>
+                            <button class="deleteButton" data-id="${hospital.id}">Delete</button>
                         </td>
                     `;
                     tableBody.appendChild(row);
                 });
 
-                document.querySelectorAll('.editButton').forEach(button => {
-                    button.addEventListener('click', handleEditHospital);
-                });
+                bindRowEvents();
+            })
+            .catch(error => console.error("Error loading hospitals:", error));
+    }
 
-                document.querySelectorAll('.deleteButton').forEach(button => {
-                    button.addEventListener('click', handleDeleteHospital);
-                });
+    function handleDeleteHospital(event) {
+        const id = event.target.getAttribute('data-id');
+
+        if (confirm(`Are you sure you want to delete the hospital with ID ${id}?`)) {
+            fetch(`/commonAdmin/hospital/delete/${id}`, { method: 'DELETE' })
+                .then(response => {
+                    if (response.ok) {
+                        alert("Deleted successfully!");
+                        loadHospitals();
+                    } else {
+                        throw new Error("Failed to delete hospital.");
+                    }
+                })
+                .catch(error => console.error("Error deleting hospital:", error));
+        }
+    }
+
+    function handleEditHospital(event) {
+        const id = event.target.getAttribute('data-id');
+
+        fetch(`/commonAdmin/hospital/${id}`)
+            .then(response => response.json())
+            .then(hospital => {
+                document.getElementById('modal-title').innerText = "Edit Hospital";
+                document.getElementById('modal-name').value = hospital.name;
+                document.getElementById('modal-address').value = hospital.address;
+                document.getElementById('modal-phone').value = hospital.phone;
+                document.getElementById('modal-totalBeds').value = hospital.totalBeds;
+                document.getElementById('modal-availableBeds').value = hospital.availableBeds;
+                document.getElementById('hospital-modal').style.display = 'flex';
+
+                document.getElementById('save-hospital-btn').onclick = () => updateHospital(id);
             })
-            .catch((error) => console.error(error));
+            .catch(error => console.error("Error fetching hospital details:", error));
+    }
+
+    function updateHospital(id) {
+        const hospitalData = {
+            id,
+            name: document.getElementById('modal-name').value.trim(),
+            address: document.getElementById('modal-address').value.trim(),
+            phone: document.getElementById('modal-phone').value.trim(),
+            totalBeds: parseInt(document.getElementById('modal-totalBeds').value, 10),
+            availableBeds: parseInt(document.getElementById('modal-availableBeds').value, 10),
+        };
+
+        if (!hospitalData.name || !hospitalData.address || !hospitalData.phone ||
+            isNaN(hospitalData.totalBeds) || isNaN(hospitalData.availableBeds)) {
+            alert("All fields are required!");
+            return;
+        }
+
+        fetch('/commonAdmin/hospital/update', {
+            method: 'PUT',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(hospitalData),
+        }).then(response => {
+            if (response.ok) {
+                alert("Hospital updated successfully!");
+                closeHospitalModal();
+                loadHospitals();
+            } else {
+                return response.text().then(text => { throw new Error(text); });
+            }
+        }).catch(error => {
+            console.error("Error updating hospital:", error);
+            alert("Failed to update hospital: " + error.message);
+        });
+    }
+
+    function bindToolbarEvents() {
+        document.getElementById('addHospitalButton').addEventListener('click', openAddHospitalModal);
+    }
+
+    function bindRowEvents() {
+        document.querySelectorAll('.deleteButton').forEach(button => {
+            button.addEventListener('click', handleDeleteHospital);
+        });
+
+        document.querySelectorAll('.editButton').forEach(button => {
+            button.addEventListener('click', handleEditHospital);
+        });
     }
 
-    // Initializes the loading of the hospital management interface
+    document.getElementById('close-hospital-modal').addEventListener('click', closeHospitalModal);
     document.querySelectorAll(".sidebar a").forEach(link => {
-        link.addEventListener("click", function (event) {
+        link.addEventListener("click", function(event) {
             event.preventDefault();
             const contentKey = this.getAttribute("data-content");
             if (contentKey === "hospital") {