Statistics

src/main/webapp/app/css/style.css

@@ -36,7 +36,7 @@ h2 {
     height: 30px;
 }
 #personal-block {
-    height: 10px;
+    height: 180px;
 }
 #form {
     text-align: center;
@@ -112,4 +112,10 @@ a {
 #rbtnUser {
     margin-right: 100px;
 }
+div#metrics {
+    float: right;
+    margin-right: 40px;
+    font-family: "Segoe UI", Arial, sans-serif;
+    margin-bottom: 10px;
+}
 

src/main/webapp/app/findgoals.jsp

@@ -64,7 +64,6 @@
             <td>{{daysLeft}}</td>
         </tr>
     </table>
-
 </div>
 </body>
 </html>

src/main/webapp/app/js/commons.js

@@ -50,10 +50,35 @@ function switchPersonalData() {
         block.classList.add("w3-hide");
     }
 }
-
 function displayError(response, expected) {
     if (response.status !== expected) {
         alert("Something went wrong! error: " + response.status.toString());
         history.go(-1);
     }
-}
+}
+function generateMetrics(goals) {
+    var completed = 0;
+    var overdue = 0;
+    var open = 0;
+    for (var i = 0; i < goals.length; i++) {
+        var goal = goals[i];
+        switch (goal.goalStatus) {
+            case "ACHIEVED":
+                completed++;
+                break;
+            case "OVERDUE":
+                overdue++;
+                break;
+            default:
+                open++;
+        }
+    }
+    var obj = "<table>" +
+        "<tr><td><h4>Statistics</h4></td></tr>" +
+        "<tr><td>" + "Goals Total: " + goals.length + "</td></tr>" +
+        "<tr><td>" + "Goals Achieved: " + completed + "</td></tr>" +
+        "<tr><td>" + "Goals Overdue: " + overdue + "</td></tr>" +
+        "<tr><td>" + "Goals Open: " + open + "</td></tr>" +
+        "</table>";
+    document.getElementById("metrics").innerHTML = obj;
+}

src/main/webapp/app/js/start-page.js

@@ -39,5 +39,6 @@ function showUserGoals() {
             };
         }
         w3DisplayData("goals-list", tabledata);
+        generateMetrics(goals);
     });
-}
+}

src/main/webapp/app/js/user-page.js

@@ -33,6 +33,7 @@ function setDataToFields(userDto) {
     if (list.length > 0) {
         tabledata = {"goals": list};
         w3DisplayData("goals-list", tabledata);
+        generateMetrics(list);
     } else {
         document.getElementById("hidden").classList.remove("w3-hide");
         document.getElementById("goals-list").classList.add("w3-hide");
@@ -48,4 +49,4 @@ function getQueryVariable(variable) {
         }
     }
     return (false);
-}
+}

src/main/webapp/app/start.jsp

@@ -32,6 +32,7 @@
     </div>
     <div id="personal-block" class="w3-hide">
         <h3 id="phone_email"></h3>
+        <div id="metrics"></div>
     </div>
     <table id="goals-list" class="w3-table-all w3-hoverable">
         <tr class="w3-brown">

src/main/webapp/app/user.jsp

@@ -32,6 +32,7 @@
     </div>
     <div id="personal-block" class="w3-hide">
         <h3 id="email-and-phone">{{email}} | {{phone}}</h3>
+        <div id="metrics"></div>
     </div>
     <p id="hidden" class="w3-hide w3-display-middle w3-xlarge">At the moment this user has no goals.</p>
     <table id="goals-list" class="w3-table-all w3-hoverable">

src/test/java/lv/ctco/javaschool/goal/boundary/GoalApiTest.java

@@ -452,4 +452,41 @@ private GoalFormDto setupGoalFormDto() {
         result.setDeadline(LocalDate.of(2918, 1, 1));
         return result;
     }
+
+    @Test
+    @DisplayName("test setStatusAchieved: changes status")
+    void testSetStatusAchieved() {
+        Long id = goal.getId();
+        goal.setStatus(GoalStatus.OVERDUE);
+        when(userStore.getCurrentUser())
+                .thenReturn(user1);
+        when(goalStore.getGoalById(id))
+                .thenReturn(Optional.of(goal));
+        goalApi.setStatusAchieved(id);
+        assertThat(goal.getStatus(), is(GoalStatus.ACHIEVED));
+    }
+
+    @Test
+    @DisplayName("test setStatusAchieved: throws ValidationException wrong user")
+    void testSetStatusAchievedThrowsExceptionIfWrongUser() {
+        Long id = goal.getId();
+        goal.setStatus(GoalStatus.OVERDUE);
+        when(userStore.getCurrentUser())
+                .thenReturn(user2);
+        when(goalStore.getGoalById(id))
+                .thenReturn(Optional.of(goal));
+        assertThrows(ValidationException.class, () -> goalApi.setStatusAchieved(id));
+    }
+
+    @Test
+    @DisplayName("test setStatusAchieved: throws ValidationException no goal")
+    void testSetStatusAchievedThrowsExceptionIfNoGoal() {
+        Long id = goal.getId();
+        goal.setStatus(GoalStatus.OPEN);
+        when(userStore.getCurrentUser())
+                .thenReturn(user2);
+        when(goalStore.getGoalById(id))
+                .thenReturn(Optional.empty());
+        assertThrows(ValidationException.class, () -> goalApi.setStatusAchieved(id));
+    }
 }