#1216 - filter tasks based on locations

avniproject · Dec 20, 2023 · 7558574 · 7558574
1 parent 9720608
commit 7558574
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 18 deletions.
diff --git a/packages/openchs-android/integrationTest/ReportCardServiceIntegrationTest.js b/packages/openchs-android/integrationTest/ReportCardServiceIntegrationTest.js
@@ -1,5 +1,6 @@
 import BaseIntegrationTest from "./BaseIntegrationTest";
 import {
+    Comment,
     CommentThread,
     Concept,
     CustomFilter,
@@ -10,7 +11,9 @@ import {
     ProgramEnrolment,
     ReportCard,
     StandardReportCardType,
-    Comment, TaskType, Task, TaskStatus
+    Task,
+    TaskStatus,
+    TaskType
 } from "openchs-models";
 import TestSubjectFactory from "../test/model/txn/TestSubjectFactory";
 import TestObsFactory from "../test/model/TestObsFactory";
@@ -34,6 +37,8 @@ import TestCommentThreadFactory from "../test/model/comment/TestCommentThreadFac
 import TestTaskTypeFactory from "../test/model/TestTaskTypeFactory";
 import TestTaskFactory from "../test/model/TestTaskFactory";
 import TestTaskStatusFactory from "../test/model/TestTaskStatusFactory";
+import TaskService from "../src/service/task/TaskService";
+import TaskFilter from "../src/model/TaskFilter";
 
 function getCount(test, card, reportFilters) {
     let reportCardCount = test.reportCardService.getReportCardCount(card, reportFilters);
@@ -227,17 +232,31 @@ class ReportCardServiceIntegrationTest extends BaseIntegrationTest {
     }
 
     getCountForTaskCardType() {
-        let taskTypeCard;
+        let callTaskTypeCard, openSubjectTaskTypeCard;
         this.executeInWrite((db) => {
-            const taskTypeCardType = db.create(StandardReportCardType, TestStandardReportCardTypeFactory.create({name: StandardReportCardType.type.CallTasks}));
-            taskTypeCard = db.create(ReportCard, TestReportCardFactory.create({name: "callTaskTypeCard", standardReportCardType: taskTypeCardType}));
-            const taskType = db.create(TaskType, TestTaskTypeFactory.create());
-            const taskStatus = db.create(TaskStatus, TestTaskStatusFactory.create({taskType: taskType}));
-            db.create(Task, TestTaskFactory.create({taskType: taskType, taskStatus: taskStatus, subject: this.subject1}));
+            const callTaskCardType = db.create(StandardReportCardType, TestStandardReportCardTypeFactory.create({name: StandardReportCardType.type.CallTasks}));
+            const openSubjectTaskCardType = db.create(StandardReportCardType, TestStandardReportCardTypeFactory.create({name: StandardReportCardType.type.OpenSubjectTasks}));
+            callTaskTypeCard = db.create(ReportCard, TestReportCardFactory.create({name: "callTaskTypeCard", standardReportCardType: callTaskCardType}));
+            openSubjectTaskTypeCard = db.create(ReportCard, TestReportCardFactory.create({name: "callTaskTypeCard", standardReportCardType: openSubjectTaskCardType}));
+            const callTaskType = db.create(TaskType, TestTaskTypeFactory.create({type: TaskType.TaskTypeName.Call}));
+            const openSubjectTaskType = db.create(TaskType, TestTaskTypeFactory.create({type: TaskType.TaskTypeName.OpenSubject}));
+            const callTaskStatus = db.create(TaskStatus, TestTaskStatusFactory.create({taskType: callTaskType}));
+            const openSubjectTaskStatus = db.create(TaskStatus, TestTaskStatusFactory.create({taskType: openSubjectTaskType}));
+            db.create(Task, TestTaskFactory.create({taskType: callTaskType, taskStatus: callTaskStatus, subject: this.subject1}));
+            db.create(Task, TestTaskFactory.create({taskType: openSubjectTaskType, taskStatus: openSubjectTaskStatus, subject: this.subject1}));
         });
-        assert.equal(1, getCount(this, taskTypeCard, []));
-        assert.equal(1, getCount(this, taskTypeCard, [this.addressSelected]));
-        assert.equal(0, getCount(this, taskTypeCard, [this.address2Selected]));
+        assert.equal(1, getCount(this, callTaskTypeCard, []));
+        assert.equal(1, getCount(this, callTaskTypeCard, [this.addressSelected]));
+        assert.equal(0, getCount(this, callTaskTypeCard, [this.address2Selected]));
+        assert.equal(1, getCount(this, openSubjectTaskTypeCard, []));
+        assert.equal(1, getCount(this, openSubjectTaskTypeCard, [this.addressSelected]));
+        assert.equal(0, getCount(this, openSubjectTaskTypeCard, [this.address2Selected]));
+
+        const taskService = this.getService(TaskService);
+        const taskFilter = TaskFilter.createNoCriteriaFilter(TaskType.TaskTypeName.Call);
+        assert.equal(1, taskService.getFilteredTasks(taskFilter, []).length);
+        assert.equal(1, taskService.getFilteredTasks(taskFilter, [this.addressSelected]).length);
+        assert.equal(0, taskService.getFilteredTasks(taskFilter, [this.address2Selected]).length);
     }
 
     getResultForApprovalCardsType() {

diff --git a/packages/openchs-android/src/action/customDashboard/CustomDashboardActions.js b/packages/openchs-android/src/action/customDashboard/CustomDashboardActions.js
@@ -75,7 +75,7 @@ class CustomDashboardActions {
         const newState = {...state};
         const reportCard = context.get(EntityService).findByUUID(action.reportCardUUID, ReportCard.schema.name);
         if (reportCard.isStandardTaskType()) {
-            action.goToTaskLists(reportCard.standardReportCardType.getTaskTypeType());
+            action.goToTaskLists(reportCard.standardReportCardType.getTaskTypeType(), state.ruleInput.ruleInputArray);
         } else {
             const {result, status} = context.get(ReportCardService).getReportCardResult(reportCard, state.ruleInput.ruleInputArray);
             const standardReportCardType = reportCard.standardReportCardType;

diff --git a/packages/openchs-android/src/action/task/TaskListActions.js b/packages/openchs-android/src/action/task/TaskListActions.js
@@ -22,7 +22,7 @@ class TaskListActions {
         const taskTypes = taskTypeService.findAllByTaskType(action.filter.taskType.type);
         newState.filter.taskType = taskTypes[0];
 
-        newState.results = taskService.getFilteredTasks(newState.filter);
+        newState.results = taskService.getFilteredTasks(newState.filter, action.reportFilters);
         return newState;
     }
 

diff --git a/packages/openchs-android/src/model/DashboardReportFilters.js b/packages/openchs-android/src/model/DashboardReportFilters.js
@@ -12,6 +12,7 @@ export class DashboardReportFilter {
     filterValue;
 
     static getAddressFilter(reportFilters) {
+        if (_.isNil(reportFilters)) return null;
         return _.find(reportFilters, (x: DashboardReportFilter) => x.type === CustomFilter.type.Address);
     }
 }

diff --git a/packages/openchs-android/src/service/task/TaskService.js b/packages/openchs-android/src/service/task/TaskService.js
@@ -28,8 +28,9 @@ class TaskService extends BaseService {
         return entities.sorted('scheduledOn', true);
     }
 
-    getFilteredTasks(taskFilter: TaskFilter) {
-        let tasks = getIncompleteTasks(this, taskFilter.taskType.type);
+    getFilteredTasks(taskFilter: TaskFilter, reportFilters) {
+        const addressFilter = DashboardReportFilter.getAddressFilter(reportFilters);
+        let tasks = RealmQueryService.filterBasedOnAddress(Task.schema.name, getIncompleteTasks(this, taskFilter.taskType.type), addressFilter);
         if (taskFilter.taskStatuses.length > 0)
             tasks = tasks.filtered(BaseService.orFilterCriteria(taskFilter.taskStatuses, "taskStatus.uuid"));
 

diff --git a/packages/openchs-android/src/views/customDashboard/CustomDashboardView.js b/packages/openchs-android/src/views/customDashboard/CustomDashboardView.js
@@ -169,11 +169,12 @@ class CustomDashboardView extends AbstractComponent {
         this.dispatchAction(Actions.LOAD_INDICATOR, {loading: true});
         return setTimeout(() => this.dispatchAction(Actions.ON_CARD_PRESS, {
             reportCardUUID,
-            goToTaskLists: (taskTypeType) => {
+            goToTaskLists: (taskTypeType, reportFilters) => {
                 TypedTransition.from(this).with({
                     taskTypeType: taskTypeType,
                     backFunction: this.onBackPress.bind(this),
-                    indicatorActionName: Actions.LOAD_INDICATOR
+                    indicatorActionName: Actions.LOAD_INDICATOR,
+                    reportFilters: reportFilters
                 }).to(TaskListView);
             },
             onApprovalItemsResults: (results, status, viewName, approvalStatus_status, reportFilters) => TypedTransition.from(this).with({

diff --git a/packages/openchs-android/src/views/task/TaskListView.js b/packages/openchs-android/src/views/task/TaskListView.js
@@ -64,7 +64,8 @@ class TaskListView extends AbstractComponent {
     static paramTypes = {
         backFunction: PropTypes.func,
         taskTypeType: PropTypes.string.isRequired,
-        indicatorActionName: PropTypes.string
+        indicatorActionName: PropTypes.string,
+        reportFilters: PropTypes.object
     };
 
     constructor(props, context) {
@@ -79,7 +80,7 @@ class TaskListView extends AbstractComponent {
     UNSAFE_componentWillMount() {
         setTimeout(() => {
             super.UNSAFE_componentWillMount();
-            this.dispatchAction(Actions.ON_LOAD, {filter: TaskFilter.createNoCriteriaFilter(this.props.params.taskTypeType)});
+            this.dispatchAction(Actions.ON_LOAD, {filter: TaskFilter.createNoCriteriaFilter(this.props.params.taskTypeType), reportFilters: this.props.params.reportFilters});
             this.dispatchAction(this.props.params.indicatorActionName, {loading: false});
         }, 0);
     }