Merge remote-tracking branch 'origin/main' into...
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
Showing
- healthcare.sql 237 additions, 0 deletionshealthcare.sql
- src/main/java/com/cardiff/client_project/controller/nursinghome/NursingHomeController.java 61 additions, 0 deletions...project/controller/nursinghome/NursingHomeController.java
- src/main/java/com/cardiff/client_project/mapper/NursingHomeMapper.java 110 additions, 0 deletions.../com/cardiff/client_project/mapper/NursingHomeMapper.java
- src/main/java/com/cardiff/client_project/pojo/dto/HospitalDTO.java 2 additions, 2 deletions...java/com/cardiff/client_project/pojo/dto/HospitalDTO.java
- src/main/java/com/cardiff/client_project/pojo/entity/NursingHome.java 24 additions, 0 deletions...a/com/cardiff/client_project/pojo/entity/NursingHome.java
- src/main/java/com/cardiff/client_project/service/NursingHomeService.java 14 additions, 0 deletions...om/cardiff/client_project/service/NursingHomeService.java
- src/main/java/com/cardiff/client_project/service/UserLogin.java 1 addition, 1 deletion...in/java/com/cardiff/client_project/service/UserLogin.java
- src/main/java/com/cardiff/client_project/service/imp/NursingHomeServiceImp.java 111 additions, 0 deletions...iff/client_project/service/imp/NursingHomeServiceImp.java
- src/main/resources/static/css/beds.css 121 additions, 24 deletionssrc/main/resources/static/css/beds.css
- src/main/resources/static/html/beds.html 74 additions, 157 deletionssrc/main/resources/static/html/beds.html
- src/main/resources/static/html/hospitalView.html 39 additions, 6 deletionssrc/main/resources/static/html/hospitalView.html
- src/main/resources/static/html/login.html 2 additions, 0 deletionssrc/main/resources/static/html/login.html
- src/main/resources/static/js/beds.js 249 additions, 45 deletionssrc/main/resources/static/js/beds.js
- src/main/resources/templates/leftView2.html 0 additions, 5 deletionssrc/main/resources/templates/leftView2.html
Loading
Please register or sign in to comment