From 7f5a837be19d55a9d813cfe041d8563132cdfde3 Mon Sep 17 00:00:00 2001
From: Brunner-Leo <46557560+Brunner-Leo@users.noreply.github.com>
Date: Fri, 7 May 2021 08:53:54 +0200
Subject: [PATCH] ATLDEV-304 Refactor user information (#48)

---
 pom.xml                                       |   2 +-
 .../jira/timesheet/rest/UserRest.java         |  49 +++-
 .../timesheet/services/TimesheetService.java  |   6 +
 .../services/impl/TimesheetServiceImpl.java   |  12 +
 src/main/resources/js/user_information.js     | 260 ++++++++----------
 src/main/resources/user_information.vm        | 184 +++++++++----
 .../MySampleDatabaseUpdater.java              |  26 +-
 .../jira/timesheet/rest/UserRestTest.java     |  65 ++++-
 8 files changed, 397 insertions(+), 207 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6435ea94..34243edd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.catrobat.jira</groupId>
     <artifactId>timesheet</artifactId>
-    <version>2.4.1</version>
+    <version>2.4.2</version>
 
     <organization>
         <name>International Catrobat Association</name>
diff --git a/src/main/java/org/catrobat/jira/timesheet/rest/UserRest.java b/src/main/java/org/catrobat/jira/timesheet/rest/UserRest.java
index e79f7550..ecc7e9e0 100644
--- a/src/main/java/org/catrobat/jira/timesheet/rest/UserRest.java
+++ b/src/main/java/org/catrobat/jira/timesheet/rest/UserRest.java
@@ -43,6 +43,7 @@
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.sql.Time;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -126,18 +127,20 @@ public Response getUsers(@Context HttpServletRequest request) {
     @Path("/getUserInformation")
     @Produces(MediaType.APPLICATION_JSON)
     public Response getUserInformation(@Context HttpServletRequest request) {
-
-        logger.debug("1 /getUserInformation reached");
-        Date date = new Date();
-
         Response response = permissionService.checkRootPermission();
         if (response != null) {
             return response;
         }
+        List<JsonUserInformation> jsonUserInformationList = timesheetsToJson(timesheetService.all());
+
+        return Response.ok(jsonUserInformationList).build();
+    }
 
+    private List<JsonUserInformation> timesheetsToJson(List<Timesheet> timesheetList)
+    {
         List<JsonUserInformation> jsonUserInformationList = new ArrayList<>();
 
-        for (Timesheet timesheet : timesheetService.all()) {
+        for (Timesheet timesheet : timesheetList) {
 
             ApplicationUser u = ComponentAccessor.getUserManager().getUserByKey(timesheet.getUserKey());
             if (u == null) {
@@ -191,15 +194,43 @@ public Response getUserInformation(@Context HttpServletRequest request) {
 
             jsonUserInformationList.add(jsonUserInformation);
         }
+        return jsonUserInformationList;
+    }
 
-        Date date1 = new Date();
-        long diffInMillies = date1.getTime() - date.getTime();
-        TimeUnit timeUnit = TimeUnit.SECONDS;
-        logger.debug("2 /getUserInformation diffInMillies/diffInSeconds: " + diffInMillies + "/" + timeUnit.convert(diffInMillies, TimeUnit.MILLISECONDS));
+    @GET
+    @Path("/getUserInformation/{State}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getUserInformationWithState(@Context HttpServletRequest request, @PathParam("State") String state) {
+        Response response = permissionService.checkRootPermission();
+        if (response != null) {
+            return response;
+        }
+        List<JsonUserInformation> jsonUserInformationList = timesheetsToJson(timesheetService.allWithState(state));
 
         return Response.ok(jsonUserInformationList).build();
     }
 
+    @GET
+    @Path("/getUserInformationStats")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getUserInformationStats(@Context HttpServletRequest request) {
+        Response response = permissionService.checkRootPermission();
+        if (response != null) {
+            return response;
+        }
+
+        List<String> states = Arrays.asList("ACTIVE", "INACTIVE", "AUTO_INACTIVE", "INACTIVE_OFFLINE", "DISABLED", "DONE");
+
+        List<Integer> userInformationStats = new ArrayList<>();
+
+        for (String state : states) {
+            userInformationStats.add(timesheetService.getStateAmount(state));
+        }
+
+        return Response.ok(userInformationStats).build();
+    }
+
+
     @GET
     @Path("/getUsersForCoordinator/{currentTimesheetID}")
     @Produces(MediaType.APPLICATION_JSON)
diff --git a/src/main/java/org/catrobat/jira/timesheet/services/TimesheetService.java b/src/main/java/org/catrobat/jira/timesheet/services/TimesheetService.java
index d3f7f7cc..f221cee7 100644
--- a/src/main/java/org/catrobat/jira/timesheet/services/TimesheetService.java
+++ b/src/main/java/org/catrobat/jira/timesheet/services/TimesheetService.java
@@ -57,6 +57,12 @@ Timesheet add(String userKey, String displayName,
     @NotNull
     List<Timesheet> all();
 
+    @NotNull
+    List<Timesheet> allWithState(String state);
+
+    @NotNull
+    int getStateAmount(String state);
+
     @Nullable
     Timesheet updateTimesheetEnableState(int timesheetID, Boolean isEnabled) throws ServiceException;
 
diff --git a/src/main/java/org/catrobat/jira/timesheet/services/impl/TimesheetServiceImpl.java b/src/main/java/org/catrobat/jira/timesheet/services/impl/TimesheetServiceImpl.java
index 7bce6dd8..8e8d5abc 100644
--- a/src/main/java/org/catrobat/jira/timesheet/services/impl/TimesheetServiceImpl.java
+++ b/src/main/java/org/catrobat/jira/timesheet/services/impl/TimesheetServiceImpl.java
@@ -132,6 +132,18 @@ public List<Timesheet> all() {
         return newArrayList(ao.find(Timesheet.class));
     }
 
+    @NotNull
+    @Override
+    public List<Timesheet> allWithState(String state) {
+        return newArrayList(ao.find(Timesheet.class, "STATE = ?", state));
+    }
+
+    @NotNull
+    @Override
+    public int getStateAmount(String state) {
+        return ao.find(Timesheet.class, "STATE = ?", state).length;
+    }
+
     @Nullable
     @Override
     public Timesheet updateTimesheetEnableState(int timesheetID, Boolean isEnabled) throws ServiceException {
diff --git a/src/main/resources/js/user_information.js b/src/main/resources/js/user_information.js
index 3d717843..4dd768c1 100644
--- a/src/main/resources/js/user_information.js
+++ b/src/main/resources/js/user_information.js
@@ -40,11 +40,6 @@ AJS.toInit(function () {
     }
 
     function populateTable(userInformation) {
-        AJS.$(".loadingDiv").show();
-        AJS.$("#user-information-table-content").empty();
-        AJS.$("#done-user-info-table-content").empty();
-        AJS.$("#disabled-user-info-table-content").empty();
-
         //sort by username
         userInformation.sort(dynamicSort("userName"));
 
@@ -82,55 +77,55 @@ AJS.toInit(function () {
 
             var current_state = userInformation[i].state;
             var current_state_color = "black";
+            var table = "";
 
             switch(current_state){
                 case "ACTIVE":
                     current_state_color = "green";
+                    table = "#active-user-table-content";
                     break;
                 case "DISABLED":
                     current_state_color = "red";
+                    table = "#disabled-user-table-content";
                     break;
                 case "INACTIVE" :
                     current_state_color = "goldenRod";
+                    table = "#inactive-user-table-content";
                     break;
                 case "AUTO_INACTIVE":
                     current_state_color = "goldenRod";
+                    table = "#autoinactive-user-table-content";
                     break;
                 case "DONE":
                     current_state_color = "grey";
+                    table = "#done-user-table-content";
+                    break;
+                case "INACTIVE_OFFLINE":
+                    current_state_color = "goldenRod";
+                    table = "#inactiveoffline-user-table-content";
                     break;
             }
 
-        	var enabledColumn = "</td><td headers='ti-actions'>" + dropdown;
-        	var row = "<tr>" +
-            "<td headers='ti-users' class='users'>" +
+            var enabledColumn = "</td><td headers='ti-actions'>" + dropdown;
+            var row = "<tr id='tr" + timesheetId + "'>" +
+                "<td headers='ti-users' class='users'>" +
                 "<a href='#' class='view-profile-link' data-user-name='" + userInformation[i].userName + "'>" + userInformation[i].userName + "</a> "+
-            "</td><td headers='ti-team' class='team'>" + userInformation[i].teams +
+                "</td><td headers='ti-team' class='team'>" + userInformation[i].teams +
                 "</td><td headers='ti-state' class='state' id='state"+ timesheetId + "' style='color:" + current_state_color + "';>" + userInformation[i].state +
-            "</td><td headers='ti-inactive-end-date' class='inactive-end'>" + inactiveEndDate +
-            "</td><td headers='ti-remaining-hours' class='remaining-hours'>" + userInformation[i].remainingHours +
-            "</td><td headers='ti-target-total-hours' class='ti-target-total-hours'>" + userInformation[i].targetTotalHours +
-            "</td><td headers='ti-total-hours' class='total-hours'>" + userInformation[i].totalHours +
-            "</td><td headers='ti-hours-per-half-year' class='hours-half-year'>" + userInformation[i].hoursPerHalfYear +
-            "</td><td headers='ti-hours-per-monitoring-period' class='hours-half-year'>" + userInformation[i].hoursPerMonitoringPeriod +
-            "</td><td headers='ti-first-entry-date' class='latest-date'>" + firstEntryDate +
-            "</td><td headers='ti-latest-entry-date' class='latest-date'>" + latestEntryDate +
-            "</td><td headers='ti-latest-entry-description' class='latest-description'>" + userInformation[i].latestEntryDescription +
+                "</td><td headers='ti-inactive-end-date' class='inactive-end'>" + inactiveEndDate +
+                "</td><td headers='ti-remaining-hours' class='remaining-hours'>" + userInformation[i].remainingHours +
+                "</td><td headers='ti-target-total-hours' class='ti-target-total-hours'>" + userInformation[i].targetTotalHours +
+                "</td><td headers='ti-total-hours' class='total-hours'>" + userInformation[i].totalHours +
+                "</td><td headers='ti-hours-per-half-year' class='hours-half-year'>" + userInformation[i].hoursPerHalfYear +
+                "</td><td headers='ti-hours-per-monitoring-period' class='hours-half-year'>" + userInformation[i].hoursPerMonitoringPeriod +
+                "</td><td headers='ti-first-entry-date' class='latest-date'>" + firstEntryDate +
+                "</td><td headers='ti-latest-entry-date' class='latest-date'>" + latestEntryDate +
+                "</td><td headers='ti-latest-entry-description' class='latest-description'>" + userInformation[i].latestEntryDescription +
                 enabledColumn +  "</td></tr>";
-        	
-        	if (userInformation[i].state === "DONE") {
-        		AJS.$("#done-user-info-table-content").append(row);
-        	}
-        	else if (userInformation[i].state === "DISABLED") {
-        		AJS.$("#disabled-user-info-table-content").append(row);
-        	}
-        	else {
-        		AJS.$("#user-information-table-content").append(row);
-        	}
-
-            var timesheetID = userInformation[i].timesheetID;
-
-            setupDropdownButton(timesheetID, enabled);
+
+            AJS.$(table).append(row);
+
+            setupDropdownButton(userInformation[i].timesheetID, enabled);
         }
 
         AJS.$(".view-timesheet-button").on("click", function (e) {
@@ -144,53 +139,6 @@ AJS.toInit(function () {
 
             window.open(AJS.params.baseURL + "/secure/ViewProfile.jspa?name=" + user_name, "_blank");
         });
-
-        AJS.$("#user-information-table").trigger("update");
-        AJS.$("#disabled-users-table").trigger("update");
-        AJS.$("#done-users-table").trigger("update");
-
-        AJS.$("#timesheet-user-statistics").empty();
-
-        var numberTotal = 0;
-        var numberActive = 0;
-        var numberInActive = 0;
-        var numberAutoInActive = 0;
-        var numberInActiveOffline = 0;
-        var numberDisabled = 0;
-        var numberDone = 0;
-
-        for (var i = 0; i < userInformation.length; i++) {
-
-        	numberTotal++;
-
-        	if (userInformation[i].state === "ACTIVE")
-        		numberActive++;
-        	else if (userInformation[i].state === "INACTIVE")
-        		numberInActive++;
-        	else if (userInformation[i].state === "AUTO_INACTIVE")
-        		numberAutoInActive++;
-        	else if (userInformation[i].state === "INACTIVE_OFFLINE")
-        		numberInActiveOffline++;
-        	else if (userInformation[i].state === "DISABLED")
-        		numberDisabled++;
-        	else if (userInformation[i].state === "DONE")
-        		numberDone++;
-
-        }
-
-        var row = "<tr><td>" + "Total Number of Timesheets: " + numberTotal + "</td>" +
-        				"<td>" + "Active Timesheets: " + numberActive + "</td>" +
-                  		"<td>" + "Auto Inactive Timesheets: " + numberAutoInActive + "</td>" +
-                  		"<td>" + "Inactive Timesheets: " + numberInActive + "</td>" +
-                  "</tr>" +
-
-                  "<tr><td>" + "Disabled Timesheets: " + numberDisabled + "</td>" +
-                  		"<td>" + "InactiveOffline Timesheets: " + numberInActiveOffline + "</td>" +
-                  		"<td>" + "Done Timesheets: " + numberDone + "</td>" +
-                  "</tr>";
-
-        AJS.$("#timesheet-user-statistics").append(row);
-
         AJS.$(".loadingDiv").hide();
     }
 
@@ -243,11 +191,8 @@ AJS.toInit(function () {
 
                 setupDropdownButton(timesheetID, enabled);
 
-                if (enabled) {
-                    AJS.$("#state" + timesheetID).text("ACTIVE");
-                } else {
-                    AJS.$("#state" + timesheetID).text("DISABLED");
-                }
+                AJS.$("#tr" + timesheetID).remove();
+
                 AJS.$(".loadingDiv").hide();
             },
             error: function (error) {
@@ -262,76 +207,70 @@ AJS.toInit(function () {
         });
     }
 
-    function updateTimesheetStatus() {
-
-        var data = [];
-
-        for (var i = 0; i < users.length; i++) {
-            var tempData = {};
-            tempData.timesheetID = users[i].timesheetID;
-            var tmpCheckBox = AJS.$("#checkBox" + users[i].timesheetID);
-            tempData.isEnabled = tmpCheckBox.prop("checked");
-
-            data.push(tempData);
-        }
-
+    function populateTableWrapper(state) {
         AJS.$(".loadingDiv").show();
-        AJS.$.ajax({
-            url: restBaseUrl + 'timesheets/updateEnableStates',
-            type: "POST",
-            contentType: "application/json",
-            data: JSON.stringify(data),
-            processData: false,
-            success: function () {
-            	if(fetchingErrorMessage)
-            		fetchingErrorMessage.closeMessage();
-            	if(errorMessage)
-            		errorMessage.closeMessage();
-                AJS.messages.success({
-                    title: "Success!",
-                    body: "Timesheet 'enabled states' updated.",
-                    fadeout: true,
-                    delay: 5000,
-                    duration: 5000
-                });
-                AJS.$(".loadingDiv").hide();
-            },
-            error: function (error) {
-            	if(errorMessage)
-            		errorMessage.closeMessage();
-                errorMessage = AJS.messages.error({
-                    title: "Error!",
-                    body: error.responseText
-                });
-                AJS.$(".loadingDiv").hide();
-            }
-        });
-    }
-
-    function fetchData() {
         var userInformationFetched = AJS.$.ajax({
             type: 'GET',
-            url: restBaseUrl + 'user/getUserInformation',
+            url: restBaseUrl + 'user/getUserInformation/' + state,
             contentType: "application/json"
         });
+        AJS.$.when(userInformationFetched)
+            .done(populateTable)
+            .fail(function (error) {
+                if(fetchingErrorMessage)
+                    fetchingErrorMessage.closeMessage();
+                fetchingErrorMessage = AJS.messages.error({
+                    title: 'There was an error while fetching the required data.',
+                    body: '<p>Reason: ' + error.responseText + '</p>'
+                });
+                console.log(error);
+            });
+    }
 
-        var monitoringFetched = AJS.$.ajax({
+    function populateStatsWrapper() {
+        AJS.$(".loadingDiv").show();
+        var stateAmounts = AJS.$.ajax({
             type: 'GET',
-            url: restBaseUrl + 'monitoring/getMonitoring',
-            contentType: "application/json"
+            url: restBaseUrl + 'user/getUserInformationStats',
+            contentType: "text/plain"
         });
 
-        AJS.$.when(userInformationFetched)
-            .done(populateTable)
+        AJS.$.when(stateAmounts)
+            .done(populateStats)
             .fail(function (error) {
-            	if(fetchingErrorMessage)
-            		fetchingErrorMessage.closeMessage();
+                if(fetchingErrorMessage)
+                    fetchingErrorMessage.closeMessage();
                 fetchingErrorMessage = AJS.messages.error({
                     title: 'There was an error while fetching the required data.',
                     body: '<p>Reason: ' + error.responseText + '</p>'
                 });
                 console.log(error);
             });
+    }
+
+    function populateStats(amounts) {
+        var sum = 0;
+        var style = " style=\"text-align:right\"";
+        var stat_list = ["Active", "Inactive", "Auto-Inactive",
+            "Inactive-Offline", "Disabled", "Done", "Total Number of Timesheets"]
+
+        for (var i = 0; i < amounts.length; i++) {
+            console.log(amounts[i]);
+            var row_stat = "<tr><td>" + stat_list[i] + "</td><td" + style + ">" + amounts[i] +  "</td></tr>";
+            AJS.$("#timesheet-user-statistics").append(row_stat);
+            sum += amounts[i];
+        }
+
+        AJS.$("#timesheet-user-statistics-total").append("<tr><th>" + stat_list[stat_list.length - 1] + "</th><th" + style + ">" + sum +  "</th></tr>");
+        AJS.$(".loadingDiv").hide();
+    }
+
+    function fetchMonitoring() {
+        var monitoringFetched = AJS.$.ajax({
+            type: 'GET',
+            url: restBaseUrl + 'monitoring/getMonitoring',
+            contentType: "application/json"
+        });
 
         AJS.$.when(monitoringFetched)
             .fail(function (error) {
@@ -345,5 +284,48 @@ AJS.toInit(function () {
             });
     }
 
-    fetchData();
+    function setupClickListeners() {
+        AJS.$(".loadingDiv").hide();
+
+        AJS.$("#li-stats-tab").click(function(){
+            AJS.$("#timesheet-user-statistics").empty()
+            AJS.$("#timesheet-user-statistics-total").empty()
+            populateStatsWrapper();
+        })
+
+        AJS.$("#li-active-tab").click(function(){
+            AJS.$("#active-user-table-content").empty()
+            populateTableWrapper("ACTIVE");
+        })
+
+        AJS.$("#li-inactive-tab").click(function(){
+            AJS.$("#inactive-user-table-content").empty()
+            populateTableWrapper("INACTIVE");
+        })
+
+        AJS.$("#li-autoinactive-tab").click(function(){
+            AJS.$("#autoinactive-user-table-content").empty()
+            populateTableWrapper("AUTO_INACTIVE");
+        })
+
+        AJS.$("#li-inactiveoffline-tab").click(function(){
+            AJS.$("#inactiveoffline-user-table-content").empty()
+            populateTableWrapper("INACTIVE_OFFLINE");
+        })
+
+        AJS.$("#li-disabled-tab").click(function(){
+            AJS.$("#disabled-user-table-content").empty()
+            populateTableWrapper("DISABLED");
+        })
+
+        AJS.$("#li-done-tab").click(function(){
+            AJS.$("#done-user-table-content").empty()
+            populateTableWrapper("DONE");
+        })
+    }
+
+    setupClickListeners();
+    populateStatsWrapper();
+    fetchMonitoring();
+
 });
diff --git a/src/main/resources/user_information.vm b/src/main/resources/user_information.vm
index 0bc4f7c7..c4854e84 100644
--- a/src/main/resources/user_information.vm
+++ b/src/main/resources/user_information.vm
@@ -20,30 +20,11 @@
     <meta name="decorator" content="atl.admin"/>
     <meta name="application-base-url" content="$applicationProperties.getBaseUrl()">
     $webResourceManager.requireResource("org.catrobat.jira.timesheet:user-information-resources")
-
 </head>
 
 <body class="aui-layout aui-theme-default">
 
-	<script type="application/javascript">
-	    function showDoneUsers() {
-	        document.getElementById("done-users-table").style.visibility = "visible";
-	    }
-	</script>
-	
-	<script type="application/javascript">
-	    function showDisabledUsers() {
-	        document.getElementById("disabled-users-table").style.visibility = "visible";
-	    }
-	</script>
-	
-	<script type="application/javascript">
-	    function showActiveInactiveUsers() {
-	        document.getElementById("user-information-table").style.visibility = "visible";
-	    }
-	</script>
-
-	<script type="application/javascript">
+<script type="application/javascript">
 		function searchFunction(element, tablename, id) {
 		  // Declare variables
 		  var input, filter, table, tr, td, i;
@@ -70,50 +51,64 @@
 
 	<h1><b>Timesheet - User Information</b></h1>
 	<div id="aui-message-bar"></div>
-	<div class="loadingDiv"><aui-spinner></aui-spinner></div>
+    <div class="loadingDiv"><aui-spinner></aui-spinner></div>
 		
 #*Tabs view*#
 
 <div class="aui-tabs horizontal-tabs" id="table-header">
 
     <ul class="tabs-menu nav nav-tabs" id="tabs">
-    	<li class="menu-item active-tab">
-            <a href="#tabs-statistic"><strong>Statistic</strong></a>
+    	<li class="menu-item active-tab" id="li-stats-tab">
+            <a href="#tabs-statistic"><strong>Statistics</strong></a>
+        </li>
+        <li class="menu-item" id="li-active-tab">
+            <a href="#tabs-active-users"><strong>Active</strong></a>
         </li>
-        <li class="menu-item">
-            <a href="#tabs-users" onclick="showActiveInactiveUsers();"><strong>Active & Inactive</strong></a>
+        <li class="menu-item" id="li-inactive-tab">
+            <a href="#tabs-inactive-users"><strong>Inactive</strong></a>
         </li>
-        <li class="menu-item">
-            <a href="#tabs-disabled-users" onclick="showDisabledUsers();">Disabled Timesheets</a>
+        <li class="menu-item" id="li-autoinactive-tab">
+            <a href="#tabs-autoinactive-users"><strong>Auto-Inactive</strong></a>
         </li>
-        <li class="menu-item">
-            <a href="#tabs-done-users" onclick="showDoneUsers();">Done Timesheets</a>
+        <li class="menu-item" id="li-inactiveoffline-tab">
+            <a href="#tabs-inactiveoffline-users"><strong>Inactive-Offline</strong></a>
+        </li>
+        <li class="menu-item" id="li-disabled-tab">
+            <a href="#tabs-disabled-users">Disabled</a>
+        </li>
+        <li class="menu-item" id="li-done-tab">
+            <a href="#tabs-done-users">Done</a>
         </li>
     </ul>
 
-#*content of the first tab User Statistics*#
-    <div class="tabs-pane active-pane" id="tabs-statistic">     
-        
-            <h2><b> Timesheet User Statistics</b></h2>
-            
+    #*content of the tab Statistic*#
+    <div class="tabs-pane active-pane" id="tabs-statistic">
             <p>
-            <table id ="user-information-statistics-table" border="2" frame="void" cellspacing="5" cellpadding="5">
-              <tbody id="timesheet-user-statistics">
-                #* will be filled out by JavaScript *#
-              </tbody>
+            <table id ="user-information-statistics-table" frame="void" cellspacing="5" cellpadding="5" class="aui aui-table-list" style="width: 400px;">
+                <thead>
+                    <tr>
+                        <th>Status</th>
+                        <th style="text-align: right;">Number of Timesheets</th>
+                    </tr>
+                </thead>
+                <tbody id="timesheet-user-statistics">
+                    #* will be filled out by JavaScript *#
+                </tbody>
+                <tfoot id="timesheet-user-statistics-total">
+                    #* will be filled out by JavaScript *#
+                </tfoot>
             </table>
 
    </div>
 
+    #*enum State {ACTIVE, INACTIVE, AUTO_INACTIVE, INACTIVE_OFFLINE, DISABLED, DONE}*#
 
-#*content of the tab Active & Inactive*#
-    <div class="tabs-pane" id="tabs-users">     
-		                
-        <h2><b> Active and Inactive Timesheets</b></h2>
+    #*content of the tab Active*#
+    <div class="tabs-pane" id="tabs-active-users">
         <p>
-        <input type="text" id="searchInputNamesActive" onkeyup="searchFunction('searchInputNamesActive', 'user-information-table', 0)" placeholder="Search for Users or Teams...">
+        <input type="text" id="searchInputNamesActive" onkeyup="searchFunction('searchInputNamesActive', 'active-user-table', 0)" placeholder="Search for Users or Teams...">
         <p>
-        <table id="user-information-table" class="aui aui-table-interactive aui-table-sortable">
+        <table id="active-user-table" class="aui aui-table-interactive aui-table-sortable">
             <thead>
             <tr>
                 <th id="ti-users">User</th>
@@ -131,17 +126,101 @@
                 <th id="ti-actions">Actions</th>
             </tr>
             </thead>
-            <tbody class="list" id="user-information-table-content">
+            <tbody class="list" id="active-user-table-content">
             #* will be filled out by JavaScript *#
             </tbody>
         </table>		                		                	                
    </div>
 
+    #*content of the tab Inactive*#
+    <div class="tabs-pane" id="tabs-inactive-users">
+        <p>
+            <input type="text" id="searchInputNamesInactive" onkeyup="searchFunction('searchInputNamesInactive', 'inactive-users-table', 0)" placeholder="Search for Users or Teams...">
+        <p>
+        <table id="inactive-users-table" class="aui aui-table-interactive aui-table-sortable">
+            <thead>
+            <tr>
+                <th id="ti-users">User</th>
+                <th id="ti-team">Team</th>
+                <th id="ti-state">State</th>
+                <th id="ti-inactive-end-date">Inactive End Date</th>
+                <th id="ti-remaining-hours">Remaining Hours</th>
+                <th id="ti-target-total-hours">Target Total Hours</th>
+                <th id="ti-total-hours">Finished Hours</th>
+                <th id="ti-hours-per-half-year">Hours last Half Year</th>
+                <th id="ti-hours-per-monitoring-period">Hours ($monitoringPeriod)</th>
+                <th id="ti-first-entry-date">Date of the First Entry</th>
+                <th id="ti-latest-entry-date">Date of the Latest Entry</th>
+                <th id="ti-latest-entry-description">Description of the Latest Entry</th>
+                <th id="ti-actions">Actions</th>
+            </tr>
+            </thead>
+            <tbody class="list" id="inactive-user-table-content">
+                #* will be filled out by JavaScript *#
+            </tbody>
+        </table>
+    </div>
 
-#* content of the 2nd tab "Disabled Users"*#
+    #*content of the tab Auto-inactive*#
+    <div class="tabs-pane" id="tabs-autoinactive-users">
+        <p>
+            <input type="text" id="searchInputNamesAutoinactive" onkeyup="searchFunction('searchInputNamesAutoinactive', 'autoinactive-users-table', 0)" placeholder="Search for Users or Teams...">
+        <p>
+        <table id="autoinactive-users-table" class="aui aui-table-interactive aui-table-sortable">
+            <thead>
+            <tr>
+                <th id="ti-users">User</th>
+                <th id="ti-team">Team</th>
+                <th id="ti-state">State</th>
+                <th id="ti-inactive-end-date">Inactive End Date</th>
+                <th id="ti-remaining-hours">Remaining Hours</th>
+                <th id="ti-target-total-hours">Target Total Hours</th>
+                <th id="ti-total-hours">Finished Hours</th>
+                <th id="ti-hours-per-half-year">Hours last Half Year</th>
+                <th id="ti-hours-per-monitoring-period">Hours ($monitoringPeriod)</th>
+                <th id="ti-first-entry-date">Date of the First Entry</th>
+                <th id="ti-latest-entry-date">Date of the Latest Entry</th>
+                <th id="ti-latest-entry-description">Description of the Latest Entry</th>
+                <th id="ti-actions">Actions</th>
+            </tr>
+            </thead>
+            <tbody class="list" id="autoinactive-user-table-content">
+                #* will be filled out by JavaScript *#
+            </tbody>
+        </table>
+    </div>
 
-    <div class="tabs-pane" id="tabs-disabled-users">   
-		<h2><b>Disabled Users</b></h2>
+    #*content of the tab Inactive-Offline*#
+    <div class="tabs-pane" id="tabs-inactiveoffline-users">
+        <p>
+            <input type="text" id="searchInputNamesInactiveoffline" onkeyup="searchFunction('searchInputNamesInactiveoffline', 'inactiveoffline-users-table', 0)" placeholder="Search for Users or Teams...">
+        <p>
+        <table id="inactiveoffline-users-table" class="aui aui-table-interactive aui-table-sortable">
+            <thead>
+            <tr>
+                <th id="ti-users">User</th>
+                <th id="ti-team">Team</th>
+                <th id="ti-state">State</th>
+                <th id="ti-inactive-end-date">Inactive End Date</th>
+                <th id="ti-remaining-hours">Remaining Hours</th>
+                <th id="ti-target-total-hours">Target Total Hours</th>
+                <th id="ti-total-hours">Finished Hours</th>
+                <th id="ti-hours-per-half-year">Hours last Half Year</th>
+                <th id="ti-hours-per-monitoring-period">Hours ($monitoringPeriod)</th>
+                <th id="ti-first-entry-date">Date of the First Entry</th>
+                <th id="ti-latest-entry-date">Date of the Latest Entry</th>
+                <th id="ti-latest-entry-description">Description of the Latest Entry</th>
+                <th id="ti-actions">Actions</th>
+            </tr>
+            </thead>
+            <tbody class="list" id="inactiveoffline-user-table-content">
+                #* will be filled out by JavaScript *#
+            </tbody>
+        </table>
+    </div>
+
+    #*content of the tab Disabled*#
+    <div class="tabs-pane" id="tabs-disabled-users">
         <p>
         <input type="text" id="searchInputNamesDisabled" onkeyup="searchFunction('searchInputNamesDisabled', 'disabled-users-table', 0)" placeholder="Search for Users or Teams...">
         <p>
@@ -163,17 +242,14 @@
                 <th id="ti-actions">Actions</th>
             </tr>
             </thead>
-            <tbody class="list" id="disabled-user-info-table-content">
+            <tbody class="list" id="disabled-user-table-content">
             #* will be filled out by JavaScript *#
             </tbody>
         </table>
     </div>
 
-
-#*    content of the 3rd tab "Done Users"*#
+    #*content of the tab Done*#
     <div class="tabs-pane" id="tabs-done-users">
-    
-		<h2><b>Done Users </b></h2>
         <p>
         <input type="text" id="searchInputNamesDone" onkeyup="searchFunction('searchInputNamesDone', 'done-users-table', 0)" placeholder="Search for Users or Teams...">
         <p>
@@ -195,7 +271,7 @@
                 <th id="ti-enabled">Timesheet Enabled</th>
             </tr>
             </thead>
-            <tbody class="list" id="done-user-info-table-content">
+            <tbody class="list" id="done-user-table-content">
             #* will be filled out by JavaScript *#
             </tbody>
         </table>
diff --git a/src/test/java/ut/org/catrobat/jira/timesheet/activeobjects/MySampleDatabaseUpdater.java b/src/test/java/ut/org/catrobat/jira/timesheet/activeobjects/MySampleDatabaseUpdater.java
index e0174aab..1c22765e 100644
--- a/src/test/java/ut/org/catrobat/jira/timesheet/activeobjects/MySampleDatabaseUpdater.java
+++ b/src/test/java/ut/org/catrobat/jira/timesheet/activeobjects/MySampleDatabaseUpdater.java
@@ -23,11 +23,33 @@ public void update(EntityManager em) throws Exception {
         em.migrate(TimesheetEntry.class);
 
         Timesheet chrisSheet = em.create(Timesheet.class,
-            new DBParam("USER_KEY", "chris")
+            new DBParam("USER_KEY", "chris"),
+            new DBParam("STATE", Timesheet.State.ACTIVE)
         );
 
         Timesheet jsonSheet = em.create(Timesheet.class,
-            new DBParam("USER_KEY", "joh")
+            new DBParam("USER_KEY", "joh"),
+            new DBParam("STATE", Timesheet.State.INACTIVE)
+        );
+
+        em.create(Timesheet.class,
+                new DBParam("USER_KEY", "flo"),
+                new DBParam("STATE", Timesheet.State.AUTO_INACTIVE)
+        );
+
+        em.create(Timesheet.class,
+                new DBParam("USER_KEY", "leo"),
+                new DBParam("STATE", Timesheet.State.INACTIVE_OFFLINE)
+        );
+
+        em.create(Timesheet.class,
+                new DBParam("USER_KEY", "bob"),
+                new DBParam("STATE", Timesheet.State.DISABLED)
+        );
+
+        em.create(Timesheet.class,
+                new DBParam("USER_KEY", "mike"),
+                new DBParam("STATE", Timesheet.State.DONE)
         );
 
         Team scratchTeam = em.create(Team.class,
diff --git a/src/test/java/ut/org/catrobat/jira/timesheet/rest/UserRestTest.java b/src/test/java/ut/org/catrobat/jira/timesheet/rest/UserRestTest.java
index ddb47332..efcf6eff 100644
--- a/src/test/java/ut/org/catrobat/jira/timesheet/rest/UserRestTest.java
+++ b/src/test/java/ut/org/catrobat/jira/timesheet/rest/UserRestTest.java
@@ -65,6 +65,10 @@ public class UserRestTest {
     private ApplicationUser user2;
     private ApplicationUser chris;
     private ApplicationUser joh;
+    private ApplicationUser flo;
+    private ApplicationUser leo;
+    private ApplicationUser bob;
+    private ApplicationUser mike;
     private String timesheetId = "125";
 
 
@@ -109,9 +113,17 @@ public void setUp() throws Exception {
         PowerMockito.when(ComponentAccessor.getGroupManager()).thenReturn(groupManager);
         chris = mock(ApplicationUser.class);
         joh = mock(ApplicationUser.class);
+        flo = mock(ApplicationUser.class);
+        leo = mock(ApplicationUser.class);
+        bob = mock(ApplicationUser.class);
+        mike = mock(ApplicationUser.class);
         when(userMock.getUsername()).thenReturn("userMock");
         when(userManager.getUserByKey("chris")).thenReturn(chris);
         when(userManager.getUserByKey("joh")).thenReturn(joh);
+        when(userManager.getUserByKey("flo")).thenReturn(flo);
+        when(userManager.getUserByKey("leo")).thenReturn(leo);
+        when(userManager.getUserByKey("bob")).thenReturn(bob);
+        when(userManager.getUserByKey("mike")).thenReturn(mike);
         when(userManager.getUserByName("chris")).thenReturn(chris);
         when(userManager.getUserByName("joh")).thenReturn(joh);
         when(chris.getUsername()).thenReturn("chris");
@@ -123,6 +135,55 @@ public void setUp() throws Exception {
         Mockito.when(permissionServiceMock.checkUserPermission()).thenReturn(null);
     }
 
+
+    @Test
+    public void testUserInformationStates() {
+        when(permissionServiceMock.checkRootPermission()).thenReturn(null);
+        Response response = spyUserRest.getUserInformationWithState(httpRequestMock, "ACTIVE");
+        List<JsonUserInformation> list = (List<JsonUserInformation>) response.getEntity();
+        assertEquals(1, list.size());
+        assertEquals(Timesheet.State.ACTIVE, list.get(0).getState());
+
+        response = spyUserRest.getUserInformationWithState(httpRequestMock, "INACTIVE");
+        list = (List<JsonUserInformation>) response.getEntity();
+        assertEquals(1, list.size());
+        assertEquals(Timesheet.State.INACTIVE, list.get(0).getState());
+
+        response = spyUserRest.getUserInformationWithState(httpRequestMock, "AUTO_INACTIVE");
+        list = (List<JsonUserInformation>) response.getEntity();
+        assertEquals(1, list.size());
+        assertEquals(Timesheet.State.AUTO_INACTIVE, list.get(0).getState());
+
+        response = spyUserRest.getUserInformationWithState(httpRequestMock, "INACTIVE_OFFLINE");
+        list = (List<JsonUserInformation>) response.getEntity();
+        assertEquals(1, list.size());
+        assertEquals(Timesheet.State.INACTIVE_OFFLINE, list.get(0).getState());
+
+        response = spyUserRest.getUserInformationWithState(httpRequestMock, "DISABLED");
+        list = (List<JsonUserInformation>) response.getEntity();
+        assertEquals(1, list.size());
+        assertEquals(Timesheet.State.DISABLED, list.get(0).getState());
+
+        response = spyUserRest.getUserInformationWithState(httpRequestMock, "DONE");
+        list = (List<JsonUserInformation>) response.getEntity();
+        assertEquals(1, list.size());
+        assertEquals(Timesheet.State.DONE, list.get(0).getState());
+    }
+
+    @Test
+    public void testUserInformationCount() {
+        when(permissionServiceMock.checkRootPermission()).thenReturn(null);
+        Response response = spyUserRest.getUserInformationStats(httpRequestMock);
+        List<Integer> counts = (List<Integer>) response.getEntity();
+        assertEquals(6, counts.size());
+        assertEquals(1, (int) counts.get(0));
+        assertEquals(1, (int) counts.get(1));
+        assertEquals(1, (int) counts.get(2));
+        assertEquals(1, (int) counts.get(3));
+        assertEquals(1, (int) counts.get(4));
+        assertEquals(1, (int) counts.get(5));
+    }
+
     @Test
     public void testGetUsersUnauthorized() {
         doReturn(false).when(permissionServiceMock).isTimesheetAdmin(userMock);
@@ -182,7 +243,7 @@ public void testUserInformationForDeletedUser() {
         when(permissionServiceMock.checkRootPermission()).thenReturn(null);
 
         Response response = spyUserRest.getUserInformation(httpRequestMock);
-        assertEquals(1, ((List<JsonUserInformation>) response.getEntity()).size());
+        assertEquals(5, ((List<JsonUserInformation>) response.getEntity()).size());
     }
 
     @Test
@@ -201,7 +262,7 @@ public void testUsersForCoordinatorWithDeletedUser() throws PermissionException
     public void testUserInformation() {
         when(permissionServiceMock.checkRootPermission()).thenReturn(null);
         Response response = spyUserRest.getUserInformation(httpRequestMock);
-        assertEquals(2, ((List<JsonUserInformation>)response.getEntity()).size());
+        assertEquals(6, ((List<JsonUserInformation>)response.getEntity()).size());
     }
 
     @Test