- Dec 11, 2024
-
-
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
-
Burhan Akbar authored
Merge branch '24-as-a-user-i-would-like-to-be-able-to-view-information-about-the-nursing-home-so-that-i-can-get-2' into 'main' Resolve "As a user I would like to be able to view information about the nursing home, so that I can get details of the facilities available." Closes #24 See merge request !72
-
Burhan Akbar authored
Resolve "As a user I would like to be able to view information about the nursing home, so that I can get details of the facilities available."
-
Burhan Akbar authored
-
- Dec 10, 2024
-
-
Burhan Akbar authored
-
Burhan Akbar authored
-
Burhan Akbar authored
-
Yulong Wang authored
Merge branch '38-as-a-user-i-want-hospital-page-can-show-my-account-information-so-that-i-can-know-my-role-and' into 'main' Add user currently logged in,remove patient based on prof feedback Closes #38 See merge request !70
-
Yan0305 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
-
Yulong Wang 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
-
Yulong Wang authored
-
Mingyuan Chen 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
-
Yulong Wang authored
Merge branch '37-as-a-user-i-want-have-a-page-to-add-delete-devices-so-that-i-can-manager-devices-easily' into 'main' Add ,edit and delete device Closes #37 See merge request !69
-
Yan0305 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
-
Chen Liang authored
Merge branch '30-as-a-hospital-worker-i-want-to-add-and-delete-patients-and-care-providers-information' into 'main' Add and delete patient and nurse Closes #30 See merge request !68
-
wyl authored
-
Burhan Akbar authored
-
- Dec 09, 2024
-
-
Yan0305 authored
-
Mingyuan Chen authored
Merge branch '34-as-a-superadmin-i-want-to-be-able-to-see-my-username-and-permissions-on-the-page-so-that-i-can' into 'main' show personal detail on page Closes #34 See merge request !67
-
wyl authored
-
Burhan Akbar authored
-
- Dec 08, 2024
-
-
Mingyuan Chen authored
-
Yulong Wang authored
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
-