- Feb 24, 2025
-
-
Yulong Wang authored
-
Yulong Wang authored
-
wyl authored
-
wyl authored
-
wyl authored
-
wyl authored
Merge remote-tracking branch 'origin/main' into 34-as-a-superadmin-i-want-to-be-able-to-see-my-username-and-permissions-on-the-page-so-that-i-can # Conflicts: # src/main/java/com/cardiff/client_project/service/imp/CommonAdminHospitalServiceImp.java
-
wyl authored
-
- Feb 17, 2025
-
-
Yulong Wang authored
-
- Dec 12, 2024
-
-
wyl authored
-
Burhan Akbar authored
# Conflicts: # src/main/resources/static/html/CHApprovalSystem.html
-
Burhan Akbar authored
-
Burhan Akbar authored
-
Burhan Akbar authored
-
Burhan Akbar authored
-
Burhan Akbar authored
Merge branch '32-as-an-admin-i-want-to-approve-or-reject-a-care-provider-from-being-shown-on-the-website-after-it' into 'main' As an admin, to approve and reject the care provider. front end page Closes #32 See merge request !73
-
Yan Sun authored
Merge branch '27-as-a-user-i-would-like-to-be-able-to-add-nursing-homes-information-so-that-the-system-can-record' into 'main' Resolve "As a user I would like to be able to add nursing homes information, so that the system can record new facilities." Closes #27 See merge request !82
-
Burhan Akbar authored
Merge branch 'ba' into '27-as-a-user-i-would-like-to-be-able-to-add-nursing-homes-information-so-that-the-system-can-record' # Conflicts: # src/main/java/com/cardiff/client_project/controller/nursinghome/NursingHomeController.java # src/main/java/com/cardiff/client_project/service/NursingHomeService.java # src/main/java/com/cardiff/client_project/service/imp/NursingHomeServiceImp.java
-
- Dec 11, 2024
-
-
Burhan Akbar authored
See merge request !78
-
Yulong Wang authored
Merge branch '26-as-a-commonadmin-i-hope-i-am-able-to-manipulate-hospital-and-caregiver-data-in-the-system-so' into 'main' Improve the add and edit functions of the hospital section. Closes #26 See merge request !79
-
Mingyuan Chen authored
-
Chen Liang authored
-
Burhan Akbar authored
-
Burhan Akbar authored
Add and delete hospital See merge request !78
-
Burhan Akbar authored
Add and delete hospital See merge request !78
-
Burhan Akbar authored
-
Yulong Wang authored
-
Yulong Wang authored
-
Yulong Wang authored
update system Closes #24 See merge request !77
-
wyl authored
-
wyl authored
Merge remote-tracking branch 'origin/main' into 34-as-a-superadmin-i-want-to-be-able-to-see-my-username-and-permissions-on-the-page-so-that-i-can # Conflicts: # src/main/resources/application-dev.yml # src/main/resources/static/js/beds.js
-
Yulong Wang authored
-
Yulong Wang authored
Merge branch '19-as-a-commonadmin-i-hope-i-can-hava-page-to-show-the-hospital-and-nursing-staff-information-so' into 'main' Connect to the database nurse form and display nurse data normally. Closes #19 See merge request !76
-
Mingyuan Chen authored
-
Mingyuan Chen authored
# Conflicts: # src/main/java/com/cardiff/client_project/pojo/dto/HospitalDTO.java
-
Burhan Akbar authored
-
Add and delete hospital added navigation See merge request !75
-
Burhan Akbar authored
Add and delete hospital See merge request !75
-
Burhan Akbar authored
-
Burhan Akbar authored
-
wyl authored
Merge remote-tracking branch 'origin/main' into 34-as-a-superadmin-i-want-to-be-able-to-see-my-username-and-permissions-on-the-page-so-that-i-can # Conflicts: # src/main/resources/application-dev.yml
-