RM-90121 Add filters

axelor · Feb 3, 2025 · 8608145 · 8608145
1 parent 33f924c
commit 8608145
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/axelor-project/src/main/resources/views/Dashboard.xml b/axelor-project/src/main/resources/views/Dashboard.xml
@@ -357,10 +357,12 @@
     <view name="project-task-dashboard-grid" type="grid"/>
     <view name="project-task-form" type="form"/>
     <view-param name="popup" value="true"/>
-    <domain> (date(self.taskDate) &lt;= date(:toDate) and date(self.taskDate) &lt;= date(:fromDate) )
+    <domain> (date(self.taskDate) &lt;= date(:toDate) and date(self.taskDate) &lt;= date(:fromDate)
+      )
       and
       (self.project=:project OR :project IS NULL) and
-      (self.assignedTo.employee =:employee OR :employee IS
+      (self.assignedTo.employee =:employee OR
+      :employee IS
       NULL)
 
     </domain>
@@ -376,7 +378,16 @@
       (date(self.endDateTime) &lt;= date(:toDate) and date(self.endDateTime)
       &gt;= date(:fromDate) ))
       and
-      (self.project=:project OR :project IS NULL)</domain>
+      (self.project=:project OR :project IS NULL)
+      and
+      (self.employee
+      =:employee OR :employee IS
+      NULL)
+    </domain>
+
+
+
+
   </action-view>
   <action-view name="project-allocation-line-action"
     model="com.axelor.apps.hr.db.AllocationLine" title="Project allocation lines">