Completed merge, removed useless pages, completed Therapist homepage

pastore99 · Jan 18, 2024 · 0a6b087 · 0a6b087
1 parent f501f52
commit 0a6b087
Show file tree

Hide file tree

Showing 23 changed files with 230 additions and 461 deletions.
diff --git a/src/main/java/controller/Login.java b/src/main/java/controller/Login.java
@@ -64,7 +64,7 @@ private String setSessionAttributes(int id, HttpServletRequest request){
         else {
             session.setAttribute("type", "therapist");
             session.setAttribute("surname", personalInfo.getLastname());
-            return "JSP/homeTherapist.jsp";
+            return "JSP/homepageTherapist.jsp";
         }
     }
 }

diff --git a/src/main/webapp/CSS/RecommendationAndConditionManager.css b/src/main/webapp/CSS/RecommendationAndConditionManager.css
@@ -39,4 +39,47 @@ caption {
     outline: none;
     border-color: #145C53;
     box-shadow: 0 0 5px rgba(25, 154, 142, 0.5);
+}
+
+.buttonApprove {
+    display: inline-block;
+    padding: 8px 16px;
+    font-size: 14px;
+    font-weight: bold;
+    text-align: center;
+    text-decoration: none;
+    cursor: pointer;
+    border: 2px solid #199A8E;
+    color: #199A8E;
+    background-color: transparent;
+    border-radius: 3px;
+    transition: background-color 0.3s, color 0.3s, border-color 0.3s;
+    margin-bottom: 5px;
+}
+
+.buttonRemove {
+    display: inline-block;
+    padding: 8px 16px;
+    font-size: 14px;
+    font-weight: bold;
+    text-align: center;
+    text-decoration: none;
+    cursor: pointer;
+    border: 2px solid #f44336;
+    color: #f44336;
+    background-color: transparent;
+    border-radius: 3px;
+    transition: background-color 0.3s, color 0.3s, border-color 0.3s;
+}
+
+.buttonApprove:hover {
+    background-color: #199A8E;
+    color: #fff;
+    border-color: #fff;
+}
+
+.buttonRemove:hover {
+    background-color: #f44336;
+    color: #fff;
+    border-color: #fff;
 }
diff --git a/src/main/webapp/CSS/acceptanceExercisesAI.css b/src/main/webapp/CSS/acceptanceExercisesAI.css
@@ -15,7 +15,7 @@
 }
 
 
-table {
+#aiContent table {
     width: 100%;
     border-collapse: collapse;
     margin-top: 20px;
@@ -25,7 +25,7 @@ table {
 }
 
 
-th, td {
+#aiContent th, td {
     padding: 10px;
     text-align: center;
 }

diff --git a/src/main/webapp/CSS/homepageTherapist.css b/src/main/webapp/CSS/homepageTherapist.css
@@ -56,6 +56,7 @@ body{
 
 #navIcons > div > img{
     width: 25%;
+    cursor: pointer;
 }
 
 #logoIcon{
@@ -67,6 +68,7 @@ body{
     display: flex;
     flex-direction: column;
     margin-bottom: 40%;
+    cursor: pointer;
 }
 
 #docIcon{
@@ -168,11 +170,24 @@ tr.hoverable-row:hover {
     color: deepskyblue;
 }
 
-#scrollableDiv {
+.scrollableDiv {
     display: flex;
     align-content: center;
+    text-align: center;
+    align-items: center;
     justify-content: center;
+    flex-direction: column;
     width: 100%;
     max-height: 100%;
     overflow-y: auto;
+}
+
+#aiContainer{
+    display: none;
+    max-height: 100%;
+    overflow-y: auto;
+}
+
+#NoExercise{
+    text-align: center;
 }
diff --git a/src/main/webapp/CSS/viewPatientInfo.css b/src/main/webapp/CSS/viewPatientInfo.css
@@ -47,3 +47,13 @@
     height: 90%;
     width: 90%;
 }
+
+#exercisesDiv, #conditionsDiv{
+    max-height: 90%;
+    overflow: auto;
+}
+
+
+
+
+
diff --git a/src/main/webapp/JS/exercise.js b/src/main/webapp/JS/exercise.js
@@ -122,7 +122,7 @@ function redirect(where){
     if (USERTYPE === "patient"){
       window.location.href = "homePagePatient.jsp";
     }else if (USERTYPE === "therapist"){
-      window.location.href = "homeTherapist.jsp";
+      window.location.href = "homepageTherapist.jsp";
     }
   }
   else{

diff --git a/src/main/webapp/JS/homeTherapist.js b/src/main/webapp/JS/homeTherapist.js
diff --git a/src/main/webapp/JS/homepageTherapist.js b/src/main/webapp/JS/homepageTherapist.js
@@ -1,8 +1,12 @@
 $(document).ready(function () {
-    $("#home").click(() => redirect("homepageTherapist.jsp"));
+    $("#iaIconSelected").hide();
+    $("#homeIcon").hide();
+
+    $("#home").click(() => redirect("home"));
     $("#message").click(() => redirect("messageCenter.jsp"));
     $("#agenda").click(() => redirect("schedule.jsp"));
-    $("#profile").click(() => redirect("userArea.jsp"));
+    $("#ia").click(() => redirect("AI"));
+    $("#docInfo").click(() => redirect("userArea.jsp"));
 
 
     let tableContainer = $("#tableContainer");
@@ -28,6 +32,24 @@ $(document).ready(function () {
     });
 });
 
+function showAI(){
+    $("#homeSelectedIcon").hide();
+    $("#homeIcon").show()
+    $("#aiContainer").show();
+    $("#tableContainer").hide();
+    $("#iaIcon").hide();
+    $("#iaIconSelected").show();
+}
+
+function hideAI(){
+    $("#homeSelectedIcon").show();
+    $("#homeIcon").hide()
+    $("#aiContainer").hide();
+    $("#tableContainer").show();
+    $("#iaIcon").show();
+    $("#iaIconSelected").hide();
+}
+
 
 
 function openInvitePopup() {
@@ -40,5 +62,17 @@ function viewPatient(i){
 
 
 function redirect(where){
-    window.location.href = where;
+    if(where==="AI" || where === "home"){
+        let path = window.location.pathname.substring(window.location.pathname.lastIndexOf('/') + 1);
+        console.log(path);
+        if(path!=="homepageTherapist.jsp"){
+            window.location.href = "homepageTherapist.jsp";
+        }else if(where==="AI"){
+            showAI();
+        }else if(where === "home"){
+            hideAI();
+        }
+    }else{
+        window.location.href = where;
+    }
 }
diff --git a/src/main/webapp/JS/navbar.js b/src/main/webapp/JS/navbar.js
@@ -11,10 +11,10 @@ const profileIconS = $("#profileIconSelected")
 
 let USERTYPE
 const page =  window.location.pathname.split('/').pop()
-const homePages = ["homePagePatient.jsp", "patientReport.jsp"] //TODO: Mettere le pagine da considerare "Home"
-const messagePages = ["messageCenter.jsp"] //TODO: Mettere le pagine da considerare "Message"
-const calendarPages = ["schedule.jsp"] //TODO: Mettere le pagine da considerare "Calendar"
-const profilePages = ["userArea.jsp"] //TODO: Mettere le pagine da considerare "Profile"
+const homePages = ["homePagePatient.jsp", "patientReport.jsp", "userReport.jsp"]
+const messagePages = ["messageCenter.jsp"]
+const calendarPages = ["schedule.jsp"]
+const profilePages = ["userArea.jsp", "changePassw.jsp"]
 
 $("document").ready(()=>{
     USERTYPE = $("#userInfo").data("type");
@@ -60,7 +60,7 @@ function redirect(where){
         if (USERTYPE === "patient"){
             window.location.href = "homePagePatient.jsp";
         }else if (USERTYPE === "therapist"){
-            window.location.href = "homeTherapist.jsp";
+            window.location.href = "homepageTherapist.jsp";
         }
     }
     else{

diff --git a/src/main/webapp/JS/viewPatientInfo.js b/src/main/webapp/JS/viewPatientInfo.js
@@ -0,0 +1,34 @@
+$(document).ready(function () {
+    let canvas = document.getElementById('myChart');
+    let parentContainer = canvas.parentNode;
+
+    $("#home").click(() => redirect("homepageTherapist.jsp"));
+    $("#message").click(() => redirect("messageCenter.jsp"));
+    $("#agenda").click(() => redirect("schedule.jsp"));
+    $("#docInfo").click(() => redirect("userArea.jsp"));
+
+    canvas.width = parentContainer.offsetWidth;
+    canvas.height = parentContainer.offsetHeight;
+})
+
+function showExercises(){
+    $("#content").hide();
+    $("#conditionsDiv").hide();
+    $("#exercisesDiv").show();
+}
+
+function showCondition(){
+    $("#content").hide();
+    $("#exercisesDiv").hide();
+    $("#conditionsDiv").show();
+}
+
+function showPatient(){
+    $("#exercisesDiv").hide();
+    $("#conditionsDiv").hide();
+    $("#content").show();
+}
+
+function redirect(where){
+    window.location.href = where;
+}