Merge remote-tracking branch 'origin/main'
# Conflicts: # src/main/java/com/cardiff/client_project/controller/hospital/HospitalController.java # src/main/java/com/cardiff/client_project/service/HospitalService.java
Showing
- health_care.sql 17 additions, 1 deletionhealth_care.sql
- src/main/java/com/cardiff/client_project/config/AuthenticationFailHandler.java 0 additions, 1 deletion...diff/client_project/config/AuthenticationFailHandler.java
- src/main/java/com/cardiff/client_project/config/AuthenticationSuccessHandler.java 0 additions, 2 deletions...f/client_project/config/AuthenticationSuccessHandler.java
- src/main/java/com/cardiff/client_project/config/CustomAuthenticationEntryPoint.java 0 additions, 3 deletions...client_project/config/CustomAuthenticationEntryPoint.java
- src/main/java/com/cardiff/client_project/config/WebMvcConfiguration.java 0 additions, 1 deletion...om/cardiff/client_project/config/WebMvcConfiguration.java
- src/main/java/com/cardiff/client_project/config/WebSecurityConfig.java 0 additions, 1 deletion.../com/cardiff/client_project/config/WebSecurityConfig.java
- src/main/java/com/cardiff/client_project/controller/ViewController.java 6 additions, 2 deletions...com/cardiff/client_project/controller/ViewController.java
- src/main/java/com/cardiff/client_project/controller/hospital/HospitalController.java 46 additions, 1 deletion...lient_project/controller/hospital/HospitalController.java
- src/main/java/com/cardiff/client_project/mapper/HospitalMapper.java 144 additions, 0 deletions...ava/com/cardiff/client_project/mapper/HospitalMapper.java
- src/main/java/com/cardiff/client_project/mapper/SuperAdminMapper.java 27 additions, 20 deletions...a/com/cardiff/client_project/mapper/SuperAdminMapper.java
- src/main/java/com/cardiff/client_project/pojo/dto/HospitalDTO.java 14 additions, 0 deletions...java/com/cardiff/client_project/pojo/dto/HospitalDTO.java
- src/main/java/com/cardiff/client_project/service/HospitalService.java 12 additions, 1 deletion...a/com/cardiff/client_project/service/HospitalService.java
- src/main/java/com/cardiff/client_project/service/imp/HospitalService.java 0 additions, 4 deletions...m/cardiff/client_project/service/imp/HospitalService.java
- src/main/java/com/cardiff/client_project/service/imp/HospitalServiceImpl.java 92 additions, 0 deletions...rdiff/client_project/service/imp/HospitalServiceImpl.java
- src/main/resources/static/css/beds.css 247 additions, 0 deletionssrc/main/resources/static/css/beds.css
- src/main/resources/static/html/beds.html 174 additions, 0 deletionssrc/main/resources/static/html/beds.html
- src/main/resources/static/js/beds.js 73 additions, 0 deletionssrc/main/resources/static/js/beds.js
- src/main/resources/static/js/mainSupAdminView.js 20 additions, 1 deletionsrc/main/resources/static/js/mainSupAdminView.js
- src/main/resources/templates/mainSupAdminView.html 8 additions, 1 deletionsrc/main/resources/templates/mainSupAdminView.html
- src/test/java/com/cardiff/client_project/SuperAdminControllerTest.java 0 additions, 106 deletions.../com/cardiff/client_project/SuperAdminControllerTest.java
Loading
Please register or sign in to comment