Release/v1.3.4

.github/workflows/qml-tests.yml

@@ -0,0 +1,56 @@
+name: QML Tests
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+      - 'release/**'
+      - 'refactor/**'
+      - 'fix/**'
+    paths:
+      - 'qml/**'
+      - 'tests/qml/**'
+      - 'models/**'
+      - '.github/workflows/qml-tests.yml'
+  pull_request:
+    branches:
+      - main
+      - dev
+      - 'release/**'
+    paths:
+      - 'qml/**'
+      - 'tests/qml/**'
+      - 'models/**'
+      - '.github/workflows/qml-tests.yml'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  qml-component-tests:
+    name: QML Component Tests
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Install Clickable
+        run: |
+          python -m pip install --upgrade pip
+          pip install clickable-ut
+
+      - name: Prepare build directory
+        run: mkdir -p build/x86_64-linux-gnu/app
+
+      - name: Run QML Component Tests
+        run: |
+          clickable test --non-interactive --arch amd64

.github/workflows/tests.yml

@@ -0,0 +1,46 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+      - 'release/**'
+      - 'refactor/**'
+      - 'fix/**'
+  pull_request:
+    branches:
+      - main
+      - dev
+      - 'release/**'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  backend-unit-tests:
+    name: Python Unit Tests (Python ${{ matrix.python-version }})
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        python-version: ['3.10', '3.12']
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pytest urllib3 requests
+
+      - name: Run Backend Unit Tests
+        run: |
+          pytest tests/python -v

clickable.yaml

@@ -2,6 +2,7 @@ clickable_minimum_required: 8.0.0
 builder: cmake
 kill: qmlscene
 skip_review: true
+test: qmltestrunner -input tests/qml -import tests/qml
 dependencies_target:
   - libatomic1
 dependencies_host:

manifest.json.in

@@ -18,7 +18,7 @@
             "push-helper": "ubtms-push-helper.json"
         }
     },
-    "version": "1.3.3",
+    "version": "1.3.4",
     "maintainer": "CIT Services <info@cit-services.eu>",
     "framework" : "@CLICK_FRAMEWORK@"
 }

models/Main.js

@@ -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() {
@@ -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 {
@@ -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";
@@ -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 {
@@ -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";