naming for task templates reworked

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/tasks/Task.java

@@ -2,8 +2,6 @@ package unipotsdam.gf.modules.tasks;
 
 import unipotsdam.gf.modules.states.ProjectPhase;
 
-import java.sql.Timestamp;
-
 public class Task {
     // as in "Feedback"
 
@@ -21,7 +19,7 @@ public class Task {
     }
 
     private TaskName taskName;
-    private Boolean hasRenderModell;
+    private Boolean hasRenderModel;
 
     // relevant for time based warnings
     private Long eventCreated;
@@ -33,6 +31,10 @@ public class Task {
 
     private String link;
 
+    private String userEmail;
+    private String projectName;
+    private Progress progress;
+
     public String getUserEmail() {
         return userEmail;
     }
@@ -41,8 +43,6 @@ public class Task {
         this.userEmail = userEmail;
     }
 
-    private String userEmail;
-
     public String getProjectName() {
         return projectName;
     }
@@ -51,9 +51,6 @@ public class Task {
         this.projectName = projectName;
     }
 
-    private String projectName;
-
-    private String progress;
 
     public Task() {
     }
@@ -130,20 +127,20 @@ public class Task {
         this.link = link;
     }
 
-    public String getProgress() {
+    public Progress getProgress() {
         return progress;
     }
 
-    public void setProgress(String progress) {
+    public void setProgress(Progress progress) {
         this.progress = progress;
     }
 
 
-    public Boolean getHasRenderModell() {
-        return hasRenderModell;
+    public Boolean getHasRenderModel() {
+        return hasRenderModel;
     }
 
-    public void setHasRenderModell(Boolean hasRenderModell) {
-        this.hasRenderModell = hasRenderModell;
+    public void setHasRenderModel(Boolean hasRenderModel) {
+        this.hasRenderModel = hasRenderModel;
     }
 }

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/tasks/TaskDAO.java

@@ -61,7 +61,7 @@ public class TaskDAO {
         task.setLink(vereinfachtesResultSet.getString("taskUrl"));
         task.setProjectName(vereinfachtesResultSet.getString("projectName"));
         task.setGroupTask(vereinfachtesResultSet.getBoolean("groupTask"));
-        task.setProgress(vereinfachtesResultSet.getString("progress"));
+        task.setProgress(Progress.valueOf(vereinfachtesResultSet.getString("progress")));
         task.setEventCreated(vereinfachtesResultSet.getLong("created"));
         task.setDeadline(vereinfachtesResultSet.getLong("due"));
         task.setPhase(ProjectPhase.valueOf(vereinfachtesResultSet.getString("phase")));

gemeinsamforschen/src/main/webapp/project/js/tasks-student.js

@@ -14,7 +14,10 @@ function fillTasks(projectName, userEmail){
         type: 'GET',
         success: function (response) {
             let tmplObject = fillObjectWithTasks(response);
-            $('#taskTemplate').tmpl(tmplObject).appendTo('#projects');
+            for (let task in tmplObject){
+                $('#taskTemplate').tmpl(tmplObject[task]).appendTo('#projects');
+            }
+
             for (let projectName in response){
                 if (response.hasOwnProperty(projectName)) {
                     $('#project_' + response[projectName]).on('click', function () {
@@ -30,11 +33,25 @@ function fillTasks(projectName, userEmail){
         }
     });
 }
-function fillObjectwithTasks(){
+function fillObjectWithTasks(response){
     let tempObject=[];
     for (let task in response){
-        if (response.hasOwnProperty(project))
-            tmplObject.push({projectName: response[project]});
+        if (response.hasOwnProperty(task))
+            tmplObject.push({
+                taskType: response[task].taskType,
+                taskData: response[task].taskData,
+                taskName: response[task].taskName,
+                hasRenderModel: response[task].hasRenderModel,
+                eventCreated: response[task].eventCreated,
+                deadline: response[task].deadline,
+                groupTask: response[task].groupTask,
+                importance: response[task].importance,
+                phase: response[task].phase,
+                link: response[task].link,
+                userEmail: response[task].userEmail,
+                projectName: response[task].projectName,
+                progress: response[task].progress
+            });
     }
     return tempObject;
-}
+}
\ No newline at end of file

gemeinsamforschen/src/main/webapp/project/tasks-student.jsp

@@ -27,23 +27,28 @@
             ea rebum.
         </p>
     </div>
+
     <script id="taskTemplate" type="text/x-jQuery-tmpl">
-        <a id="project_${projectName}">
-            <h1>${projectName}</h1>
-        </a>
-    </script>
-    <!-- Aufgabe -->
-    <div class="card ">
-        <div class="col span_s_of_2 icon infotask">
+        <div class="card">
+            <div class="col span_s_of_2 icon ${taskType}">
 
-        </div>
+            </div>
 
-        <div class="col span_l_of_2">
-            <h4>Du wurdest einer Forschungsgruppe hinzugefügt</h4>
+            <div class="col span_l_of_2">
+                <h4>Du wurdest einer Forschungsgruppe hinzugefügt</h4>
+            </div>
+            <div style="clear:left"></div>
+            </div>
+            <a id="project_${projectName}">
+                <h1>${projectName}</h1>
+            </a>
         </div>
 
+    </script>
+
+    <!-- Aufgabe -->
+    <div class="card ">
 
-        <div style="clear:left"></div>
 
     </div>