fix

pastore99 · Jan 11, 2024 · 1c8ae1c · 1c8ae1c
1 parent 05a5b24
commit 1c8ae1c
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 22 deletions.
diff --git a/src/main/java/model/DAO/DAOExercise.java b/src/main/java/model/DAO/DAOExercise.java
@@ -174,7 +174,7 @@ public List<Exercise> retrieveAllPatientExerciseDone(int userID) {
     }
 
     public List<Exercise> retrievePatientExerciseDone(int patientID) {
-        String query = "SELECT InsertionDate, Evaluation\n" +
+        String query = "SELECT *\n" +
                 "FROM exercise\n" +
                 "WHERE ID_user = ? AND Evaluation IS NOT NULL\n" +
                 "ORDER BY InsertionDate;";

diff --git a/src/main/webapp/CSS/view_patient.css b/src/main/webapp/CSS/view_patient.css
@@ -110,6 +110,18 @@
     border-radius: 29px;
 }
 
+.singolo-paziente .overlap-5-2 {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    width: 552px;
+    height: 248px;
+    top: 51vh;
+    left: 42vw;
+    border-radius: 29px;
+}
+
 .singolo-paziente .overlap-5 .errorProgress {
     text-align: center;
     display: flex;

diff --git a/src/main/webapp/JSP/viewPatient.jsp b/src/main/webapp/JSP/viewPatient.jsp
@@ -80,27 +80,26 @@
     <div class="button-chat"><img class="iconly-light-chat" src="../images/homeTherapist/iconly-light-chat.svg" /></div>
     <!--Progress-->
     <div class="text-wrapper-10">Andamento</div>
-    <div class="overlap-5">
+
         <%
-            try {
-                ExerciseManager exerciseManager=new ExerciseManager();
-                List<Exercise> exercises = exerciseManager.retrievePatientExerciseDone(patientId);
-                if (exercises == null || exercises.isEmpty()) {
-                %>
-                <p class="errorProgress">Nessun esercizio eseguito</p>
-                <%
-                }else{
-                String labels = "";
-                String data = "";
-                for (Exercise exercise : exercises) {
-                    labels += "'" + exercise.getInsertionDate() + "', ";
-                    data += exercise.getEvaluation() + ", ";
-                }
-                labels = labels.substring(0, labels.length() - 2);
-                data = data.substring(0, data.length() - 2);
+            ExerciseManager exerciseManager = new ExerciseManager();
+            List<Exercise> exercises = exerciseManager.retrievePatientExerciseDone(patientId);
+            if (exercises == null || exercises.isEmpty()) {
+        %>
+        <div class="overlap-5"><p class="errorProgress">Nessun esercizio svolto</p></div>
+        <%
+        } else {
+            String labels = "";
+            String data = "";
+            for (Exercise exercise : exercises) {
+                labels += "'" + exercise.getInsertionDate() + "', ";
+                data += exercise.getEvaluation() + ", ";
+            }
+            labels = labels.substring(0, labels.length() - 2);
+            data = data.substring(0, data.length() - 2);
         %>
         <!-- Create Chart -->
-        <canvas id="myChart" width="400" height="200"></canvas>
+        <div class="overlap-5-2"><canvas id="myChart" width="400" height="200"></canvas></div>
         <script>
             var ctx = document.getElementById('myChart').getContext('2d');
             var myChart = new Chart(ctx, {
@@ -117,17 +116,21 @@
                 },
                 options: {
                     scales: {
+                        x: [{
+                            display: false, // Hide the x-axis
+                        }],
                         y: {
+                            title: {
+                                display: true,
+                                text: 'Valutazione'
+                            },
                             beginAtZero: true
                         }
                     }
                 }
             });
         </script>
         <%
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
             }
         %>
     </div>