Skip to content

Dashboad Assignee Filter(Filter by Employee) #377

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

Merged
suraj-yadav0 merged 4 commits into from
Oct 12, 2026
Merged

Dashboad Assignee Filter(Filter by Employee) #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34c2c99
feat(dashboard): add multi-employee filtering, cross-account aggregat…
parvathyabnair Oct 9, 2026
438d470
Fix(Dashboard): resolve employee filtering, cross-server user ID isol…
parvathyabnair Oct 9, 2026
0d413ab
Fix(dashbaord): test_delegateLayoutAndClick Failure & Clear Filter an…
parvathyabnair Oct 12, 2026
faa1a73
Fix delegate re-render in assignee filter test
suraj-yadav0 Oct 12, 2026
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
36 changes: 25 additions & 11 deletions models/Main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
.import "database.js" as DBCommon
.import QtQuick.LocalStorage 2.7 as Sql
.import "accounts.js" as Account
.import "../models/dbinit.js" as DbInit

/* Name: get_quadrant_current_week
* This function will return total of spent time for current week based on quadrants from timesheet entries
* 4 quadrants are as following
* 0 -> Urgent and Important
* 1 -> Import but not Urgent
* 2 -> Not Important but Urgent
* 3 -> Not Important and Not Urgent
*/

.import "../models/dbinit.js" as DbInit
* This function will return total of spent time for current week based on quadrants from timesheet entries
* 4 quadrants are as following
* 0 -> Urgent and Important
* 1 -> Import but not Urgent
* 2 -> Not Important but Urgent
* 3 -> Not Important and Not Urgent
*/
DbInit.initializeDatabase();

function get_quadrant_difference() {
Expand Down Expand Up @@ -74,7 +74,7 @@ function get_quadrant_current_month() {
* return format {<project name>: <spent hours>}
*/

function get_projects_spent_hours(account, startDate, endDate) {
function get_projects_spent_hours(account, startDate, endDate, userId) {
var project_details = [];

try {
Expand Down Expand Up @@ -121,6 +121,13 @@ function get_projects_spent_hours(account, startDate, endDate) {
conditions.push("DATE(a.record_date) <= DATE(?)");
params.push(endDate);
}
if (userId !== undefined && userId !== null && userId !== -1 && userId !== "-1") {
var userFilter = Account.buildUserFilterSQL(userId, account, "a");
if (userFilter.clause) {
conditions.push(userFilter.clause);
params = params.concat(userFilter.params);
}
}

query += "WHERE " + conditions.join(" AND ") + " ";
query += "GROUP BY p.account_id, p.id, p.name, parent.name, s.name ORDER BY total DESC";
Expand Down Expand Up @@ -148,7 +155,7 @@ function get_projects_spent_hours(account, startDate, endDate) {
* return format {<task name>: <spent hours>}
*/

function get_tasks_spent_hours(account, startDate, endDate) {
function get_tasks_spent_hours(account, startDate, endDate, userId) {
var task_details = {};

try {
Expand Down Expand Up @@ -186,6 +193,13 @@ function get_tasks_spent_hours(account, startDate, endDate) {
conditions.push("DATE(a.record_date) <= DATE(?)");
params.push(endDate);
}
if (userId !== undefined && userId !== null && userId !== -1 && userId !== "-1") {
var userFilterTask = Account.buildUserFilterSQL(userId, account, "a");
if (userFilterTask.clause) {
conditions.push(userFilterTask.clause);
params = params.concat(userFilterTask.params);
}
}

query += "WHERE " + conditions.join(" AND ") + " ";
query += "GROUP BY a.task_id, t.name ORDER BY total DESC";
Expand Down
Loading
Loading