clean up code,

release version 2.3
Catrobat · Oct 16, 2018 · ac6ba05 · ac6ba05
1 parent 91756c3
commit ac6ba05
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 94 deletions.
diff --git 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.3-SNAPSHOT</version>
+    <version>2.3</version>
 
     <organization>
         <name>Catrobat</name>

diff --git a/src/main/resources/js/timesheet.js b/src/main/resources/js/timesheet.js
@@ -144,7 +144,7 @@ AJS.toInit(function () {
     }
     else {
         fetchData(timesheetID);
-        AJS.$("#reset-timesheet-settings").hide();
+
     }
 
     hideGoogleDocsImportButtonWhenDisabled();
@@ -364,28 +364,6 @@ function loadMostActiveTeamForUser(){
     });
 }
 
-function saveTimesheetIDOfUserInSession(selectedUser) {
-
-	var user;	
-	user = selectedUser[0];	
-
-    AJS.$.ajax({
-        type: 'GET',
-        url: restBaseUrl + 'timesheet/timesheetID/' + user,
-        contentType: "application/json",
-        success: function (timesheetID) {
-            sessionStorage.setItem('timesheetID', timesheetID); // defining the session variable
-        },
-        error: function (error) {
-            AJS.messages.error({
-                title: 'There was an error while getting timesheet data of another user.',
-                body: '<p>Reason: ' + error.responseText + '</p>'
-            });
-            console.log(error);
-        }
-    });
-}
-
 
 function fetchUsers() {
     var config = AJS.$.ajax({
@@ -408,7 +386,7 @@ function fetchUsers() {
 
     AJS.$.when(config, jsonUser, userList)
         .done(initCoordinatorTimesheetSelect)
-        .done(initTimesheetAdminTimesheetSelect)
+
         .fail(function (error) {
             AJS.messages.error({
                 title: 'There was an error while fetching user data.',

diff --git a/src/main/resources/js/timesheet/coordinator.js b/src/main/resources/js/timesheet/coordinator.js
@@ -73,14 +73,12 @@ function initCoordinatorTimesheetSelect(jsonConfig, jsonUser, userInformation) {
         for (var j = 0; j < team['coordinatorGroups'].length; j++) {
             if (team['coordinatorGroups'][j].localeCompare(userName) == 0) {
             	var teamNameForTeamInformation = team.teamName;
-            	AJS.$("#team-information-teamname").append(teamNameForTeamInformation);
                 isTeamCoordinator = true;
             }
         }
     }
 
     if (isTeamCoordinator && !isSupervisedUser && !isAdmin) {
-        initSelectTimesheetButton();
         AJS.$("#visualizationTeamSelect").show();
     } else if(isSupervisedUser && !isTeamCoordinator) {
         AJS.$("#visualizationTeamSelect").show();

diff --git a/src/main/resources/js/timesheet/functions.js b/src/main/resources/js/timesheet/functions.js
@@ -35,62 +35,6 @@ function getNameFromCategoryIndex(categoryID, timesheetData) {
     return "";
 }
 
-
-function initSelectTimesheetButton() {
-    AJS.$("#timesheet-settings").submit(function (e) {
-        e.preventDefault();
-
-        if (AJS.$("#user-select2-field").val()) {
-            selectedUser = AJS.$("#user-select2-field").val().split(',');
-        } else if (AJS.$("#approved-user-select2-field").val()) {
-            selectedUser = AJS.$("#approved-user-select2-field").val().split(',');
-        }
-
-        if(typeof selectedUser === "undefined"){
-            console.log("you have not select a user !!");
-
-            AJS.messages.error({
-                title:"Error!",
-                body: "Please select a user and try again!"
-            });
-            return;
-        }
-
-        require('aui/flag')({
-            type: 'info',
-            title: 'Page will be reloaded',
-            body: '<p>Page will be loaded soon. Please wait...</p>' +
-            'You can <a href="javascript:window.location.reload();">quick reload</a> by pressing the F5 key.',
-            close: 'auto'
-        });
-
-        var selectedUser;
-
-        // TODO: why even 2 different fields??? simplify to 1
-
-        if (selectedUser[0] !== "") {
-            saveTimesheetIDOfUserInSession(selectedUser);
-        }
-
-        //browser reload
-        window.setTimeout(function () {
-            location.reload()
-        }, 4000);
-    });
-    AJS.$("#reset-timesheet-settings").submit(function (e) {
-        e.preventDefault();
-
-        sessionStorage.removeItem('timesheetID');
-        location.reload();
-    });
-    AJS.$("#reset-timesheet-settings-coord").submit(function (e) {
-        e.preventDefault();
-
-        sessionStorage.removeItem('timesheetID');
-        location.reload();
-    });
-}
-
 function toFixed(value, precision) {
     var power = Math.pow(10, precision || 0);
     return Math.round(value * power) / power;

diff --git a/src/main/resources/js/timesheet/supervisor.js b/src/main/resources/js/timesheet/supervisor.js
@@ -24,13 +24,3 @@ function initTimesheetAdminUserList (totalUserList) {
     	allUsersList = allUsersList + "<option value=\"" + sortedUserList[i] + "\"/>";
 
 }
-
-function initTimesheetAdminTimesheetSelect(jsonConfig, jsonUser, userList) {
-    var config = jsonConfig[0];
-    var userName = jsonUser[0]['userName'];
-    var isSupervisedUser = isReadOnlyUser(userName, config);
-
-    if (isSupervisedUser || isAdmin) {
-        initSelectTimesheetButton();
-    } 
-}
diff --git a/src/main/resources/timesheet.vm b/src/main/resources/timesheet.vm
@@ -129,7 +129,6 @@
         <div class="aui-page-panel">
             <div class="aui-page-panel-inner">
                 <section class="aui-page-panel-content">
-                    <h3 id="team-information-teamname">Team: </h3>
                     <table id="team-information-table" class="aui aui-table-interactive aui-table-sortable">
                         <thead>
                         <tr>