Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RM-90121 Add employee filter #13921

Open
wants to merge 5 commits into
base: wip
Choose a base branch
from
+26 −4
Open

RM-90121 Add employee filter #13921

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c99578b
RM-90121 Add filter
mea-axelor Jan 31, 2025
33f924c
RM-90121 fix
mea-axelor Feb 2, 2025
8608145
RM-90121 Add filters
mea-axelor Feb 2, 2025
7a8df8d
RM-90121 Add the filter to allocation lines chart
mea-axelor Feb 3, 2025
4df3052
RM-90121 Add the employee domain
mea-axelor Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions axelor-project/src/main/resources/views/Dashboard.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,9 @@
<search-fields>
<field name="project" target="com.axelor.apps.project.db.Project" title="Project"
type="reference" colSpan="12"/>
<field name="employee" target="com.axelor.apps.hr.db.Employee" title="Employee"
type="reference" colSpan="12"
domain="date(self.hireDate) &lt;= date(CURRENT_DATE()) and( date(self.leavingDate) &gt;= date(CURRENT_DATE()) or self.leavingDate is NULL )"/>
<field type="date" name="fromDate" title="From Date" required="true"/>
<field type="date" name="toDate" title="To Date" required="true"/>
</search-fields>
Expand All @@ -355,9 +358,15 @@
<view name="project-task-dashboard-grid" type="grid"/>
<view name="project-task-form" type="form"/>
<view-param name="popup" value="true"/>
<domain> (self.taskDate &lt;= :toDate and self.taskDate &gt;= :fromDate )
<domain> (date(self.taskDate) &lt;= date(:toDate) and date(self.taskDate) &gt;= date(:fromDate)
)
and
(self.project=:project OR :project IS NULL)</domain>
(self.project=:project OR :project IS NULL) and
(self.assignedTo.employee =:employee OR
:employee IS
NULL)

</domain>
</action-view>

<action-view name="project-planning-time-dashboard-action"
Expand All @@ -370,7 +379,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">
Expand All @@ -384,6 +402,10 @@
date(self.period.toDate)
&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>
</object-views>