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

# Conflicts:
#	src/main/resources/static/html/CHApprovalSystem.html

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

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

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

See merge request !78

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

Add and delete hospital

See merge request !78

Add and delete hospital

See merge request !78

update system

Closes #24

See merge request !77

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

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

# Conflicts:
#	src/main/java/com/cardiff/client_project/pojo/dto/HospitalDTO.java

Burhan Akbar authored 4 months ago and Burhan Akbar committed 4 months ago

Add and delete hospital
added navigation
See merge request !75