[Jtimer-commits] r3032 - in branches/ng-jtimer/src/main: java/org/chorem/jtimer/entities java/org/chorem/jtimer/storage resources webapp/js webapp/partials

22 Aug 2014

Author: obruce
Date: 2014-08-22 16:54:01 +0200 (Fri, 22 Aug 2014)
New Revision: 3032

Url: http://forge.chorem.org/projects/jtimer/repository/revisions/3032

Log:
fix hidden task behaviour dans le rapport

Modified:
   branches/ng-jtimer/src/main/java/org/chorem/jtimer/entities/TimerTask.java
   branches/ng-jtimer/src/main/java/org/chorem/jtimer/storage/Storage.java
   branches/ng-jtimer/src/main/resources/jtimer-default.properties
   branches/ng-jtimer/src/main/webapp/js/controllers.js
   branches/ng-jtimer/src/main/webapp/js/entities.js
   branches/ng-jtimer/src/main/webapp/partials/reportModal.html

Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/entities/TimerTask.java
===================================================================

--- branches/ng-jtimer/src/main/java/org/chorem/jtimer/entities/TimerTask.java	2014-08-22 14:50:11 UTC (rev 3031)
+++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/entities/TimerTask.java	2014-08-22 14:54:01 UTC (rev 3032)
@@ -81,6 +81,9 @@
     /** Array of ordered tags */
     protected String[] tags;
 
+    /** boolean if hidden */
+    protected Boolean hidden;
+
     /**
      * Constructor.
      */
@@ -105,6 +108,7 @@
         this.removed = 0;
         this.path = null;
         this.tags = null;
+        this.hidden = false;
     }
 
     /**
@@ -123,6 +127,7 @@
         this.removed = 0;
         this.path = null;
         this.tags = null;
+        this.hidden = false;
     }
 
     /**
@@ -141,6 +146,7 @@
         this.removed = other.isClosed()? 1 : 0 ;
         this.path = null;
         this.tags = null;
+        this.hidden = false;
     }
 
 
@@ -280,6 +286,15 @@
         return this.tags;
     }
 
+
+    public Boolean getHidden() {
+        return hidden;
+    }
+
+    public void setHidden(Boolean hidden) {
+        this.hidden = hidden;
+    }
+
     @Override
     public String toString() {
         String res ="TimerTask {" +

Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/storage/Storage.java
===================================================================
--- branches/ng-jtimer/src/main/java/org/chorem/jtimer/storage/Storage.java	2014-08-22 14:50:11 UTC (rev 3031)
+++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/storage/Storage.java	2014-08-22 14:54:01 UTC (rev 3032)
@@ -391,6 +391,7 @@
                 task.setCreationDate(new java.util.Date((rs.getTimestamp("creationDate").getTime())));
                 task.setModificationDate(new java.util.Date(rs.getTimestamp("modificationDate").getTime()));
                 task.setTotalTime(rs.getLong("totalduration"));
+
                 tasks.add(task);
             }
 

Modified: branches/ng-jtimer/src/main/resources/jtimer-default.properties
===================================================================
--- branches/ng-jtimer/src/main/resources/jtimer-default.properties	2014-08-22 14:50:11 UTC (rev 3031)
+++ branches/ng-jtimer/src/main/resources/jtimer-default.properties	2014-08-22 14:54:01 UTC (rev 3032)
@@ -2,7 +2,7 @@
 # jTimer default properties
 ###
 # jTimer storage path
-jtimer.storage.path=/home/olivia/Bureau/jtimer/jtimer/BDDtag3
+jtimer.storage.path=/home/olivia/Bureau/jtimer/jtimer/BDDplop
 ###
 # SQL properties
 ###
@@ -92,19 +92,6 @@
   WHERE TA.taskId = TI.taskid \
   AND TA.removed > 0 \
   GROUP BY TA.taskId
-jtimer.storage.select.report.timedtasks=SELECT TA.* , sum(TI.duration) AS totalduration \
-  FROM task TA, tasktime TI \
-  WHERE TA.taskId = TI.taskid \
-  AND TI.creationDate BETWEEN ? AND ? \
-  AND TA.removed = 0 \
-  GROUP BY TA.taskId
-jtimer.storage.select.report.rootTask=SELECT TA.* AS totalduration  \
-  FROM task TA \
-  WHERE TA.taskId = TI.taskid  \
-  AND TI.creationDate BETWEEN ? AND ? \
-  AND ARRAY_LENGTH(TA.path) = 1 \
-  AND TA.removed = 0 \
-    GROUP BY TA.taskId
 jtimer.storage.select.report.byProject=SELECT TA.*, sum(TI.duration) AS totalduration  \
   FROM task TA, tasktime TI  \
   WHERE TA.taskId = TI.taskid  \

Modified: branches/ng-jtimer/src/main/webapp/js/controllers.js
===================================================================
--- branches/ng-jtimer/src/main/webapp/js/controllers.js	2014-08-22 14:50:11 UTC (rev 3031)
+++ branches/ng-jtimer/src/main/webapp/js/controllers.js	2014-08-22 14:54:01 UTC (rev 3032)
@@ -690,7 +690,7 @@
             });
 
             var children = $scope.getChildren(task);
-            $scope.hideTaskRecurse(children);
+            $scope.hideTaskRecurse(children, bool);
             save();
         });
     };

Modified: branches/ng-jtimer/src/main/webapp/js/entities.js
===================================================================
--- branches/ng-jtimer/src/main/webapp/js/entities.js	2014-08-22 14:50:11 UTC (rev 3031)
+++ branches/ng-jtimer/src/main/webapp/js/entities.js	2014-08-22 14:54:01 UTC (rev 3032)
@@ -417,7 +417,7 @@
  * @param {type} parentTaskId l'identifiant de la tache parente
  * @returns {Task}
  */
-var Task = function (name,taskId, parentTaskId, parentTags,description) {
+var Task = function (name,taskId, parentTaskId, parentTags,description,hidden) {
 
     if(taskId == undefined){
         this.taskId =generateUUID();
@@ -437,7 +437,12 @@
     this.name = name;
     this.description = description;
     this.isReported = true;
-    this.hidden = false;
+    if(hidden){
+        this.hidden = hidden;
+    }else{
+        this.hidden = false;
+    }
+
     this.alarms=[];
     if(parentTags){
         this.tags =  parentTags;

Modified: branches/ng-jtimer/src/main/webapp/partials/reportModal.html
===================================================================
--- branches/ng-jtimer/src/main/webapp/partials/reportModal.html	2014-08-22 14:50:11 UTC (rev 3031)
+++ branches/ng-jtimer/src/main/webapp/partials/reportModal.html	2014-08-22 14:54:01 UTC (rev 3032)
@@ -145,23 +145,36 @@
                                 <br/>
                             </div>
 
-                            <div class="tr" ng-show="taskData[$node.task.taskId].selftime
+                            <div class="tr" ng-if="taskData[$node.task.taskId].selftime
                             || hasSelfOrChildTime(taskData,$node,false)
-                            || ($node.task.isRoot() && getTotalProjectTime($node,0) != 0 )">
+                            || ($node.task.isRoot() && getTotalProjectTime($node,0) != 0 )
+                            ">
 
                                 <div class="td" >
                                     <span class="spacer level{{$level}}"></span>
-                                    <b ng-if="$node.task.isRoot()">Projet : {{$node.task.name}}</b>
+                                    <b ng-if="$node.task.isRoot() && !$node.task.hidden">Projet : {{$node.task.name}}</b>
+                                    <b ng-if="$node.task.isRoot() && $node.task.hidden">**Projet : {{$node.task.name}}**</b>
                                     <span ng-if="!$node.task.isRoot() && !$node.task.hidden">{{$node.task.name}} </span>
                                     <span ng-if="!$node.task.isRoot() && ($node.task.hidden && modal.showHidden)">**{{$node.task.name}}** </span>
                                 </div >
 
-                                <div class="td" ng-show="!$node.task.isRoot() && taskData[$node.task.taskId].selftime && modal.showTime && ($node.task.hidden && modal.showHidden)" >
+                                <div class="td" ng-show="!$node.task.isRoot() && taskData[$node.task.taskId].selftime
+                                                            && modal.showTime && !$node.task.hidden" >
                                     <span class="spacer level{{$level}}"></span>
                                     <span>{{taskData[$node.task.taskId].selftime |time }} </span>
 
                                 </div>
 
+
+                                <div class="td" ng-show="!$node.task.isRoot() && taskData[$node.task.taskId].selftime
+                                                            && modal.showTime && ($node.task.hidden && modal.showHidden)" >
+                                    <span class="spacer level{{$level}}"></span>
+                                    <span>{{taskData[$node.task.taskId].selftime |time }} </span>
+
+                                </div>
+
+
+                                <!--Total pour les taches root -->
                                 <div class="td" ng-show="$node.task.isRoot() && modal.showTime" >
                                     <span class="spacer level{{$level}}"></span>
                                     <b> Total : {{getTotalProjectTime($node,0) |time }} </b>
@@ -190,23 +203,30 @@
                                 <!-- If root task -->
                                 <div class="td paded-top" ng-if="$node.task.isRoot()" >
                                     <span class="spacer level{{$level}}"></span>
-                                    <b>Projet : {{$node.task.name}}</b>
+                                    <b ng-if="!$node.task.hidden">Projet : {{$node.task.name}}</b>
+                                    <b ng-if="$node.task.hidden && modal.showHidden">**Projet : {{$node.task.name}}**</b>
                                 </div >
 
                                 <div class="td paded-top" ng-show="$node.task.isRoot() && modal.showTime" >
                                     <span class="spacer level{{$level}}"></span>
-                                    <b>Total : {{getTotalPeriodTime($node,0,period) |time }} </b>
+                                    <b ng-if="!$node.task.hidden">Total : {{getTotalPeriodTime($node,0,period) |time }} </b>
+                                    <b ng-if="$node.task.hidden && modal.showHidden">
+                                        Total : {{getTotalPeriodTime($node,0,period) |time }} </b>
                                 </div>
 
+
+
                                 <!-- not root task -->
                                 <div class="td" ng-if="!$node.task.isRoot()" >
                                     <span class="spacer level{{$level}}"></span>
-                                    <span>{{$node.task.name}} </span>
+                                    <span ng-if="!$node.task.hidden">{{$node.task.name}} </span>
+                                    <span ng-if="$node.task.hidden && modal.showHidden">**{{$node.task.name}}** </span>
                                 </div >
 
                                 <div class="td" ng-show="!$node.task.isRoot() && periodTaskData[period][$node.task.taskId] && modal.showTime" >
                                     <span class="spacer level{{$level}}"></span>
-                                    <span>{{tasks[$node.task.taskId] |time }} </span>
+                                    <span ng-if="!$node.task.hidden">{{tasks[$node.task.taskId] |time }} </span>
+                                    <span ng-if="$node.task.hidden && modal.showHidden">{{tasks[$node.task.taskId] |time }} </span>
 
                                 </div>
                             </div>

    

[Jtimer-commits] r3032 - in branches/ng-jtimer/src/main: java/org/chorem/jtimer/entities java/org/chorem/jtimer/storage resources webapp/js webapp/partials

obruce＠users.chorem.org