diff --git a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.html b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.html
index 173fa6ff6cf19d6f45cb7da699f3de7a62aff043..705b1b1275f3d96c968de32ee9811b5d00504c8d 100644
--- a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.html
+++ b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.html
@@ -121,6 +121,12 @@
<mat-datepicker #picker></mat-datepicker>
</mat-form-field>
</div>
+ <ng-container *ngIf="pdFilters.length">
+ <ng-container *ngFor="let filter of pdFilters">
+ <app-pd-filters [pdFilter]="filter" (filterChanged)="pdFilterChanged($event)"></app-pd-filters>
+ </ng-container>
+ </ng-container>
+
<div class="d-flex flex-dc ml-auto mt-12">
<button type="button" class="sb-field sb-btn sb-btn-normal sb-btn-primary reset-filter flex-as-flex-end" (click)="resetFilter()">{{resourceService?.frmelmnts?.btn?.resetFilters}}</button>
<mat-form-field *ngIf="!noResult && (tabIndex == 1)" appearance="fill" class="sb-mat__dropdown custom_mat_dd">
diff --git a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.spec.data.ts b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.spec.data.ts
index e8bb7a68f2da197337acdf32321ff617477e07b0..62d7933c5b19a1f5817d5e6e4448fd274f82f703 100644
--- a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.spec.data.ts
+++ b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.spec.data.ts
@@ -119,6 +119,33 @@ export let mockData = {
datasetId: "ml-observation-status-report",
roles: ["PM"],
},
+ {
+ name: "Filtered task detail report",
+ encrypt: true,
+ datasetId: "ml-filtered-task-detail-exhaust",
+ roles: ["PROGRAM_MANAGER"],
+ configurableFilters: true,
+ uiFilters: [
+ {
+ label: "Minimum no. of tasks in the project",
+ controlType: "number",
+ reference: "task_count",
+ defaultValue: 5,
+ },
+ {
+ label: "Minimum no. of task evidence",
+ controlType: "number",
+ reference: "task_evidence_count",
+ defaultValue: 2,
+ },
+ {
+ label: "Minimum no. of project evidence",
+ controlType: "number",
+ reference: "project_evidence_count",
+ defaultValue: 1,
+ },
+ ],
+ },
],
observation_with_rubric: [
{
@@ -2888,6 +2915,90 @@ export let mockData = {
},
],
},
+ selectedReportWithConfigurableFilters: {
+ name: "Filtered task detail report",
+ encrypt: true,
+ datasetId: "ml-filtered-task-detail-exhaust",
+ roles: ["PROGRAM_MANAGER"],
+ configurableFilters: true,
+ filters: [
+ {
+ type: "equals",
+ dimension: "private_program",
+ value: "false",
+ },
+ {
+ type: "equals",
+ dimension: "sub_task_deleted_flag",
+ value: "false",
+ },
+ {
+ type: "equals",
+ dimension: "task_deleted_flag",
+ value: "false",
+ },
+ {
+ type: "equals",
+ dimension: "project_deleted_flag",
+ value: "false",
+ },
+ {
+ type: "equals",
+ dimension: "program_id",
+ value: "$programId",
+ },
+ {
+ type: "equals",
+ dimension: "solution_id",
+ value: "$solutionId",
+ },
+ {
+ type: "equals",
+ dimension: "district_externalId",
+ value: "$district_externalId",
+ },
+ {
+ type: "equals",
+ dimension: "organisation_id",
+ value: "$organisation_id",
+ },
+ {
+ type: "greaterthan",
+ dimension: "task_count",
+ value: "$task_count",
+ },
+ {
+ type: "greaterthan",
+ dimension: "task_evidence_count",
+ value: "$task_evidence_count",
+ },
+ {
+ type: "greaterthan",
+ dimension: "project_evidence_count",
+ value: "$project_evidence_count",
+ },
+ ],
+ uiFilters: [
+ {
+ label: "Minimum no. of tasks in the project",
+ controlType: "number",
+ reference: "task_count",
+ defaultValue: 5,
+ },
+ {
+ label: "Minimum no. of task evidence",
+ controlType: "number",
+ reference: "task_evidence_count",
+ defaultValue: 2,
+ },
+ {
+ label: "Minimum no. of project evidence",
+ controlType: "number",
+ reference: "project_evidence_count",
+ defaultValue: 1,
+ },
+ ],
+ },
multipleDataDownloaded: [
{
loaded: true,
@@ -3633,548 +3744,548 @@ export let mockData = {
loaded: true,
},
],
- charts:[
+ charts: [
{
- "chartConfig": {
- "id": "Big_Number",
- "bigNumbers": [
- {
- "footer": " ",
- "header": "Unique users who submitted form",
- "dataExpr": "Total Unique Users"
- },
- {
- "footer": " ",
- "header": "Unique Users who started form",
- "dataExpr": "Unique Users who started form"
- },
- {
- "footer": " ",
- "header": "Total submissions",
- "dataExpr": "Total submissions"
- },
- {
- "footer": " ",
- "header": "Total entities observed",
- "dataExpr": "Total entities observed"
- }
- ],
- "dataSource": {
- "ids": [
- "ml_total_unique_users_api_testo_pabitra_new1_one",
- "ml_unique_users_who_started_form_new_new_api_test_pabitra_new1_final_nine",
- "total_entities_observed_new_new_new_api_test_pabitra_new1_final_three",
- "ml_total_submissions_api_test_pabitra_new1_final_two"
- ],
- "commonDimension": "Date"
- }
- },
- "downloadUrl": [
- {
- "id": "ml_total_unique_users_api_testo_pabitra_new1_one",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_total_unique_users_api_testo_pabitra_new1_one.json"
- },
- {
- "id": "ml_total_submissions_api_test_pabitra_new1_final_two",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_total_submissions_api_test_pabitra_new1_final_two.json"
- },
- {
- "id": "total_entities_observed_new_new_new_api_test_pabitra_new1_final_three",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/total_entities_observed_new_new_new_api_test_pabitra_new1_final_three.json"
- },
- {
- "id": "ml_district_wise_unique_users_who_submitted_form_api_test_pabitra_new1_final_four",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_district_wise_unique_users_who_submitted_form_api_test_pabitra_new1_final_four.json"
- },
- {
- "id": "district_wise_no_of_submissions_vs_observation_status_new_new_new_api_test_pabitra_new1_final_five",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/district_wise_no_of_submissions_vs_observation_status_new_new_new_api_test_pabitra_new1_final_five.json"
- },
- {
- "id": "ml_criteria_wise_unique_entities_at_each_level_api_test_p_new1_final_six",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_criteria_wise_unique_entities_at_each_level_api_test_p_new1_final_six.json"
- },
- {
- "id": "ml_district_wise_unique_entities_observed_new_new_api_test_pabitra_new1_final_seven",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_district_wise_unique_entities_observed_new_new_api_test_pabitra_new1_final_seven.json"
- },
- {
- "id": "ml_domain_wise_unique_entities_at_each_level_new_new_new_new_api_test_new_pabitra_new1_final_eight",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_domain_wise_unique_entities_at_each_level_new_new_new_new_api_test_new_pabitra_new1_final_eight.json"
- },
- {
- "id": "ml_unique_users_who_started_form_new_new_api_test_pabitra_new1_final_nine",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_unique_users_who_started_form_new_new_api_test_pabitra_new1_final_nine.json"
- }
- ],
- "chartData": [
- {
- "district_externalId": "b617e607-0a5b-45a0-9894-7a325ffa45c7",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "KRISHNA",
- "Total Unique Users": "1.0"
- },
- {
- "district_externalId": "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "organisation_name": "unknown",
- "organisation_id": "unknown",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "ANANTAPUR",
- "Total Unique Users": "2.0"
- },
- {
- "district_externalId": "b5c35cfc-6c1e-4266-94ef-a425c43c7f4e",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "CHITTOOR",
- "Total Unique Users": "2.0"
- },
- {
- "district_externalId": "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "ANANTAPUR",
- "Total Unique Users": "7.0"
- },
- {
- "district_externalId": "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "organisation_name": "KirubaOrg2.1",
- "organisation_id": "0127920475840593920",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "ANANTAPUR",
- "Total Unique Users": "1.0"
- },
- null,
- {
- "district_externalId": "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Total entities observed": "10.0",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "ANANTAPUR"
- },
- {
- "district_externalId": "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Total entities observed": "2.0",
- "organisation_name": "unknown",
- "organisation_id": "unknown",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "ANANTAPUR"
- },
- {
- "district_externalId": "b5c35cfc-6c1e-4266-94ef-a425c43c7f4e",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Total entities observed": "2.0",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "CHITTOOR"
- },
- {
- "district_externalId": "b617e607-0a5b-45a0-9894-7a325ffa45c7",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Total entities observed": "1.0",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "KRISHNA"
- },
- {
- "district_externalId": "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Total entities observed": "1.0",
- "organisation_name": "KirubaOrg2.1",
- "organisation_id": "0127920475840593920",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "ANANTAPUR"
- },
- {
- "district_externalId": "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "organisation_name": "unknown",
- "organisation_id": "unknown",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "ANANTAPUR",
- "Total submissions": "6.0"
- },
- {
- "district_externalId": "b5c35cfc-6c1e-4266-94ef-a425c43c7f4e",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "CHITTOOR",
- "Total submissions": "2.0"
- },
- {
- "district_externalId": "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "organisation_name": "KirubaOrg2.1",
- "organisation_id": "0127920475840593920",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "ANANTAPUR",
- "Total submissions": "3.0"
- },
- {
- "district_externalId": "b617e607-0a5b-45a0-9894-7a325ffa45c7",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "KRISHNA",
- "Total submissions": "2.0"
- },
- {
- "district_externalId": "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "parent_channel": "SHIKSHALOKAM",
- "district_name": "ANANTAPUR",
- "Total submissions": "19.0"
- }
+ chartConfig: {
+ id: "Big_Number",
+ bigNumbers: [
+ {
+ footer: " ",
+ header: "Unique users who submitted form",
+ dataExpr: "Total Unique Users",
+ },
+ {
+ footer: " ",
+ header: "Unique Users who started form",
+ dataExpr: "Unique Users who started form",
+ },
+ {
+ footer: " ",
+ header: "Total submissions",
+ dataExpr: "Total submissions",
+ },
+ {
+ footer: " ",
+ header: "Total entities observed",
+ dataExpr: "Total entities observed",
+ },
],
- "lastUpdatedOn": 1658135572000
+ dataSource: {
+ ids: [
+ "ml_total_unique_users_api_testo_pabitra_new1_one",
+ "ml_unique_users_who_started_form_new_new_api_test_pabitra_new1_final_nine",
+ "total_entities_observed_new_new_new_api_test_pabitra_new1_final_three",
+ "ml_total_submissions_api_test_pabitra_new1_final_two",
+ ],
+ commonDimension: "Date",
+ },
+ },
+ downloadUrl: [
+ {
+ id: "ml_total_unique_users_api_testo_pabitra_new1_one",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_total_unique_users_api_testo_pabitra_new1_one.json",
+ },
+ {
+ id: "ml_total_submissions_api_test_pabitra_new1_final_two",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_total_submissions_api_test_pabitra_new1_final_two.json",
+ },
+ {
+ id: "total_entities_observed_new_new_new_api_test_pabitra_new1_final_three",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/total_entities_observed_new_new_new_api_test_pabitra_new1_final_three.json",
+ },
+ {
+ id: "ml_district_wise_unique_users_who_submitted_form_api_test_pabitra_new1_final_four",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_district_wise_unique_users_who_submitted_form_api_test_pabitra_new1_final_four.json",
+ },
+ {
+ id: "district_wise_no_of_submissions_vs_observation_status_new_new_new_api_test_pabitra_new1_final_five",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/district_wise_no_of_submissions_vs_observation_status_new_new_new_api_test_pabitra_new1_final_five.json",
+ },
+ {
+ id: "ml_criteria_wise_unique_entities_at_each_level_api_test_p_new1_final_six",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_criteria_wise_unique_entities_at_each_level_api_test_p_new1_final_six.json",
+ },
+ {
+ id: "ml_district_wise_unique_entities_observed_new_new_api_test_pabitra_new1_final_seven",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_district_wise_unique_entities_observed_new_new_api_test_pabitra_new1_final_seven.json",
+ },
+ {
+ id: "ml_domain_wise_unique_entities_at_each_level_new_new_new_new_api_test_new_pabitra_new1_final_eight",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_domain_wise_unique_entities_at_each_level_new_new_new_new_api_test_new_pabitra_new1_final_eight.json",
+ },
+ {
+ id: "ml_unique_users_who_started_form_new_new_api_test_pabitra_new1_final_nine",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_unique_users_who_started_form_new_new_api_test_pabitra_new1_final_nine.json",
+ },
+ ],
+ chartData: [
+ {
+ district_externalId: "b617e607-0a5b-45a0-9894-7a325ffa45c7",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "KRISHNA",
+ "Total Unique Users": "1.0",
+ },
+ {
+ district_externalId: "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ organisation_name: "unknown",
+ organisation_id: "unknown",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "ANANTAPUR",
+ "Total Unique Users": "2.0",
+ },
+ {
+ district_externalId: "b5c35cfc-6c1e-4266-94ef-a425c43c7f4e",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "CHITTOOR",
+ "Total Unique Users": "2.0",
+ },
+ {
+ district_externalId: "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "ANANTAPUR",
+ "Total Unique Users": "7.0",
+ },
+ {
+ district_externalId: "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ organisation_name: "KirubaOrg2.1",
+ organisation_id: "0127920475840593920",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "ANANTAPUR",
+ "Total Unique Users": "1.0",
+ },
+ null,
+ {
+ district_externalId: "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Total entities observed": "10.0",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "ANANTAPUR",
+ },
+ {
+ district_externalId: "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Total entities observed": "2.0",
+ organisation_name: "unknown",
+ organisation_id: "unknown",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "ANANTAPUR",
+ },
+ {
+ district_externalId: "b5c35cfc-6c1e-4266-94ef-a425c43c7f4e",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Total entities observed": "2.0",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "CHITTOOR",
+ },
+ {
+ district_externalId: "b617e607-0a5b-45a0-9894-7a325ffa45c7",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Total entities observed": "1.0",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "KRISHNA",
+ },
+ {
+ district_externalId: "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Total entities observed": "1.0",
+ organisation_name: "KirubaOrg2.1",
+ organisation_id: "0127920475840593920",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "ANANTAPUR",
+ },
+ {
+ district_externalId: "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ organisation_name: "unknown",
+ organisation_id: "unknown",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "ANANTAPUR",
+ "Total submissions": "6.0",
+ },
+ {
+ district_externalId: "b5c35cfc-6c1e-4266-94ef-a425c43c7f4e",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "CHITTOOR",
+ "Total submissions": "2.0",
+ },
+ {
+ district_externalId: "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ organisation_name: "KirubaOrg2.1",
+ organisation_id: "0127920475840593920",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "ANANTAPUR",
+ "Total submissions": "3.0",
+ },
+ {
+ district_externalId: "b617e607-0a5b-45a0-9894-7a325ffa45c7",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "KRISHNA",
+ "Total submissions": "2.0",
+ },
+ {
+ district_externalId: "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ parent_channel: "SHIKSHALOKAM",
+ district_name: "ANANTAPUR",
+ "Total submissions": "19.0",
+ },
+ ],
+ lastUpdatedOn: 1658135572000,
},
{
- "chartConfig": {
- "id": "district_wise_no_of_submissions_vs_observation_status_new_new_new_api_test_pabitra_new1_final_five",
- "colors": [
- {
- "borderColor": "rgb(0, 199, 134)",
- "borderWidth": 2,
- "backgroundColor": "rgba(0, 199, 134, 0.3)"
- },
- {
- "borderColor": "rgb(255, 161, 29)",
- "borderWidth": 2,
- "backgroundColor": "rgba(255, 161, 29, 0.3)"
- },
- {
- "borderColor": "rgb(255, 69, 88)",
- "borderWidth": 2,
- "backgroundColor": "rgba(255, 69, 88, 0.3)"
- },
- {
- "borderColor": "rgb(242, 203, 28)",
- "borderWidth": 2,
- "backgroundColor": "rgba(242, 203, 28, 0.3)"
- },
- {
- "borderColor": "rgb(55, 70, 73)",
- "borderWidth": 2,
- "backgroundColor": "rgba(55, 70, 73, 0.3)"
- }
- ],
- "filters": [
- {
- "reference": "district_name",
- "controlType": "multi-select",
- "displayName": "District"
+ chartConfig: {
+ id: "district_wise_no_of_submissions_vs_observation_status_new_new_new_api_test_pabitra_new1_final_five",
+ colors: [
+ {
+ borderColor: "rgb(0, 199, 134)",
+ borderWidth: 2,
+ backgroundColor: "rgba(0, 199, 134, 0.3)",
+ },
+ {
+ borderColor: "rgb(255, 161, 29)",
+ borderWidth: 2,
+ backgroundColor: "rgba(255, 161, 29, 0.3)",
+ },
+ {
+ borderColor: "rgb(255, 69, 88)",
+ borderWidth: 2,
+ backgroundColor: "rgba(255, 69, 88, 0.3)",
+ },
+ {
+ borderColor: "rgb(242, 203, 28)",
+ borderWidth: 2,
+ backgroundColor: "rgba(242, 203, 28, 0.3)",
+ },
+ {
+ borderColor: "rgb(55, 70, 73)",
+ borderWidth: 2,
+ backgroundColor: "rgba(55, 70, 73, 0.3)",
+ },
+ ],
+ filters: [
+ {
+ reference: "district_name",
+ controlType: "multi-select",
+ displayName: "District",
+ },
+ {
+ reference: "organisation_name",
+ controlType: "multi-select",
+ displayName: "Organisation",
+ },
+ ],
+ options: {
+ title: {
+ text: "District-wise submissions Vs observation status",
+ display: true,
+ fontSize: 16,
+ },
+ legend: {
+ display: true,
+ },
+ scales: {
+ xAxes: [
+ {
+ stacked: true,
+ scaleLabel: {
+ display: true,
+ labelString: "district_name",
},
- {
- "reference": "organisation_name",
- "controlType": "multi-select",
- "displayName": "Organisation"
- }
+ },
],
- "options": {
- "title": {
- "text": "District-wise submissions Vs observation status",
- "display": true,
- "fontSize": 16
- },
- "legend": {
- "display": true
+ yAxes: [
+ {
+ ticks: {
+ precision: 0,
+ beginAtZero: true,
},
- "scales": {
- "xAxes": [
- {
- "stacked": true,
- "scaleLabel": {
- "display": true,
- "labelString": "district_name"
- }
- }
- ],
- "yAxes": [
- {
- "ticks": {
- "precision": 0,
- "beginAtZero": true
- },
- "stacked": true,
- "scaleLabel": {
- "display": true,
- "labelString": "No. of submissions"
- }
- }
- ]
- },
- "tooltips": {
- "mode": "x-axis",
- "intersect": false,
- "bodySpacing": 5,
- "titleSpacing": 5
- },
- "responsive": true,
- "showLastUpdatedOn": true
- },
- "datasets": [
- {
- "label": "Submitted",
- "dataExpr": "Completed"
- },
- {
- "label": "Started",
- "dataExpr": "Started"
+ stacked: true,
+ scaleLabel: {
+ display: true,
+ labelString: "No. of submissions",
},
- {
- "label": "In Progress",
- "dataExpr": "In Progress"
- }
+ },
],
- "chartType": "bar",
- "dataSource": {
- "ids": [
- "district_wise_no_of_submissions_vs_observation_status_new_new_new_api_test_pabitra_new1_final_five"
- ],
- "commonDimension": "district_name"
- },
- "labelsExpr": "district_name"
+ },
+ tooltips: {
+ mode: "x-axis",
+ intersect: false,
+ bodySpacing: 5,
+ titleSpacing: 5,
+ },
+ responsive: true,
+ showLastUpdatedOn: true,
},
- "downloadUrl": [
- {
- "id": "ml_total_unique_users_api_testo_pabitra_new1_one",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_total_unique_users_api_testo_pabitra_new1_one.json"
- },
- {
- "id": "ml_total_submissions_api_test_pabitra_new1_final_two",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_total_submissions_api_test_pabitra_new1_final_two.json"
- },
- {
- "id": "total_entities_observed_new_new_new_api_test_pabitra_new1_final_three",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/total_entities_observed_new_new_new_api_test_pabitra_new1_final_three.json"
- },
- {
- "id": "ml_district_wise_unique_users_who_submitted_form_api_test_pabitra_new1_final_four",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_district_wise_unique_users_who_submitted_form_api_test_pabitra_new1_final_four.json"
- },
- {
- "id": "district_wise_no_of_submissions_vs_observation_status_new_new_new_api_test_pabitra_new1_final_five",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/district_wise_no_of_submissions_vs_observation_status_new_new_new_api_test_pabitra_new1_final_five.json"
- },
- {
- "id": "ml_criteria_wise_unique_entities_at_each_level_api_test_p_new1_final_six",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_criteria_wise_unique_entities_at_each_level_api_test_p_new1_final_six.json"
- },
- {
- "id": "ml_district_wise_unique_entities_observed_new_new_api_test_pabitra_new1_final_seven",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_district_wise_unique_entities_observed_new_new_api_test_pabitra_new1_final_seven.json"
- },
- {
- "id": "ml_domain_wise_unique_entities_at_each_level_new_new_new_new_api_test_new_pabitra_new1_final_eight",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_domain_wise_unique_entities_at_each_level_new_new_new_new_api_test_new_pabitra_new1_final_eight.json"
- },
- {
- "id": "ml_unique_users_who_started_form_new_new_api_test_pabitra_new1_final_nine",
- "path": "/reports/fetch/60a245158eee6c5040d16a4a/ml_unique_users_who_started_form_new_new_api_test_pabitra_new1_final_nine.json"
- }
- ],
- "chartData": [
- {
- "Started": "4.0",
- "district_externalId": "f3e5b768-9008-4073-baf5-1dffc3c12b0b",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "In Progress": "0.0",
- "Completed": "0.0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Rating Pending": "0.0",
- "organisation_name": "unknown",
- "organisation_id": "unknown",
- "Date": "2022-07-17",
- "district_name": "unknown"
- },
- {
- "Started": "1.0",
- "district_externalId": "87422ed0-d2dd-4672-9d6b-10a4b565dfe3",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "In Progress": "0.0",
- "Completed": "0.0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Rating Pending": "0.0",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "district_name": "GUNTUR"
- },
- {
- "Started": "1.0",
- "district_externalId": "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "In Progress": "2.0",
- "Completed": "3.0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Rating Pending": "0.0",
- "organisation_name": "KirubaOrg2.1",
- "organisation_id": "0127920475840593920",
- "Date": "2022-07-17",
- "district_name": "ANANTAPUR"
- },
- {
- "Started": "9.0",
- "district_externalId": "b5c35cfc-6c1e-4266-94ef-a425c43c7f4e",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "In Progress": "3.0",
- "Completed": "2.0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Rating Pending": "1.0",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "district_name": "CHITTOOR"
- },
- {
- "Started": "26.0",
- "district_externalId": "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "In Progress": "7.0",
- "Completed": "19.0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Rating Pending": "1.0",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "district_name": "ANANTAPUR"
- },
- {
- "Started": "3.0",
- "district_externalId": "b617e607-0a5b-45a0-9894-7a325ffa45c7",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "In Progress": "0.0",
- "Completed": "2.0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Rating Pending": "0.0",
- "organisation_name": "Staging Custodian Organization",
- "organisation_id": "0126796199493140480",
- "Date": "2022-07-17",
- "district_name": "KRISHNA"
- },
- {
- "Started": "1.0",
- "district_externalId": "b5c35cfc-6c1e-4266-94ef-a425c43c7f4e",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "In Progress": "0.0",
- "Completed": "0.0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Rating Pending": "0.0",
- "organisation_name": "unknown",
- "organisation_id": "unknown",
- "Date": "2022-07-17",
- "district_name": "CHITTOOR"
- },
- {
- "Started": "1.0",
- "district_externalId": "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
- "Program name": "Observation led projects testing",
- "program_id": "607d320de9cce45e22ce90c0",
- "In Progress": "0.0",
- "Completed": "6.0",
- "Observation name": "Leadership Self Assessment(Percentage)",
- "solution_id": "60a245158eee6c5040d16a4a",
- "Rating Pending": "0.0",
- "organisation_name": "unknown",
- "organisation_id": "unknown",
- "Date": "2022-07-17",
- "district_name": "ANANTAPUR"
- }
+ datasets: [
+ {
+ label: "Submitted",
+ dataExpr: "Completed",
+ },
+ {
+ label: "Started",
+ dataExpr: "Started",
+ },
+ {
+ label: "In Progress",
+ dataExpr: "In Progress",
+ },
],
- "lastUpdatedOn": 1658121421000
- }
-]
+ chartType: "bar",
+ dataSource: {
+ ids: [
+ "district_wise_no_of_submissions_vs_observation_status_new_new_new_api_test_pabitra_new1_final_five",
+ ],
+ commonDimension: "district_name",
+ },
+ labelsExpr: "district_name",
+ },
+ downloadUrl: [
+ {
+ id: "ml_total_unique_users_api_testo_pabitra_new1_one",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_total_unique_users_api_testo_pabitra_new1_one.json",
+ },
+ {
+ id: "ml_total_submissions_api_test_pabitra_new1_final_two",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_total_submissions_api_test_pabitra_new1_final_two.json",
+ },
+ {
+ id: "total_entities_observed_new_new_new_api_test_pabitra_new1_final_three",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/total_entities_observed_new_new_new_api_test_pabitra_new1_final_three.json",
+ },
+ {
+ id: "ml_district_wise_unique_users_who_submitted_form_api_test_pabitra_new1_final_four",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_district_wise_unique_users_who_submitted_form_api_test_pabitra_new1_final_four.json",
+ },
+ {
+ id: "district_wise_no_of_submissions_vs_observation_status_new_new_new_api_test_pabitra_new1_final_five",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/district_wise_no_of_submissions_vs_observation_status_new_new_new_api_test_pabitra_new1_final_five.json",
+ },
+ {
+ id: "ml_criteria_wise_unique_entities_at_each_level_api_test_p_new1_final_six",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_criteria_wise_unique_entities_at_each_level_api_test_p_new1_final_six.json",
+ },
+ {
+ id: "ml_district_wise_unique_entities_observed_new_new_api_test_pabitra_new1_final_seven",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_district_wise_unique_entities_observed_new_new_api_test_pabitra_new1_final_seven.json",
+ },
+ {
+ id: "ml_domain_wise_unique_entities_at_each_level_new_new_new_new_api_test_new_pabitra_new1_final_eight",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_domain_wise_unique_entities_at_each_level_new_new_new_new_api_test_new_pabitra_new1_final_eight.json",
+ },
+ {
+ id: "ml_unique_users_who_started_form_new_new_api_test_pabitra_new1_final_nine",
+ path: "/reports/fetch/60a245158eee6c5040d16a4a/ml_unique_users_who_started_form_new_new_api_test_pabitra_new1_final_nine.json",
+ },
+ ],
+ chartData: [
+ {
+ Started: "4.0",
+ district_externalId: "f3e5b768-9008-4073-baf5-1dffc3c12b0b",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "In Progress": "0.0",
+ Completed: "0.0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Rating Pending": "0.0",
+ organisation_name: "unknown",
+ organisation_id: "unknown",
+ Date: "2022-07-17",
+ district_name: "unknown",
+ },
+ {
+ Started: "1.0",
+ district_externalId: "87422ed0-d2dd-4672-9d6b-10a4b565dfe3",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "In Progress": "0.0",
+ Completed: "0.0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Rating Pending": "0.0",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ district_name: "GUNTUR",
+ },
+ {
+ Started: "1.0",
+ district_externalId: "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "In Progress": "2.0",
+ Completed: "3.0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Rating Pending": "0.0",
+ organisation_name: "KirubaOrg2.1",
+ organisation_id: "0127920475840593920",
+ Date: "2022-07-17",
+ district_name: "ANANTAPUR",
+ },
+ {
+ Started: "9.0",
+ district_externalId: "b5c35cfc-6c1e-4266-94ef-a425c43c7f4e",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "In Progress": "3.0",
+ Completed: "2.0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Rating Pending": "1.0",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ district_name: "CHITTOOR",
+ },
+ {
+ Started: "26.0",
+ district_externalId: "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "In Progress": "7.0",
+ Completed: "19.0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Rating Pending": "1.0",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ district_name: "ANANTAPUR",
+ },
+ {
+ Started: "3.0",
+ district_externalId: "b617e607-0a5b-45a0-9894-7a325ffa45c7",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "In Progress": "0.0",
+ Completed: "2.0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Rating Pending": "0.0",
+ organisation_name: "Staging Custodian Organization",
+ organisation_id: "0126796199493140480",
+ Date: "2022-07-17",
+ district_name: "KRISHNA",
+ },
+ {
+ Started: "1.0",
+ district_externalId: "b5c35cfc-6c1e-4266-94ef-a425c43c7f4e",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "In Progress": "0.0",
+ Completed: "0.0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Rating Pending": "0.0",
+ organisation_name: "unknown",
+ organisation_id: "unknown",
+ Date: "2022-07-17",
+ district_name: "CHITTOOR",
+ },
+ {
+ Started: "1.0",
+ district_externalId: "2f76dcf5-e43b-4f71-a3f2-c8f19e1fce03",
+ "Program name": "Observation led projects testing",
+ program_id: "607d320de9cce45e22ce90c0",
+ "In Progress": "0.0",
+ Completed: "6.0",
+ "Observation name": "Leadership Self Assessment(Percentage)",
+ solution_id: "60a245158eee6c5040d16a4a",
+ "Rating Pending": "0.0",
+ organisation_name: "unknown",
+ organisation_id: "unknown",
+ Date: "2022-07-17",
+ district_name: "ANANTAPUR",
+ },
+ ],
+ lastUpdatedOn: 1658121421000,
+ },
+ ],
};
diff --git a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.spec.ts b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.spec.ts
index cc450609342ed47f44923595e61de1e3d0e53512..d1d9be9269a31aa4f2f29af479a8663632f347ac 100644
--- a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.spec.ts
+++ b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.spec.ts
@@ -524,6 +524,19 @@ describe('DatasetsComponent', () => {
expect(component.reportChanged).toHaveBeenCalled();
});
+ it('should update the selected report data for Filtered task detail report ', () => {
+ jest.spyOn(component,'reportChanged');
+ component.reportChanged(mockData.selectedReportWithConfigurableFilters)
+ expect(component.selectedReport).toBe(mockData.selectedReportWithConfigurableFilters);
+ expect(component.reportChanged).toHaveBeenCalled();
+ });
+
+ it('should call pdFilterChanged method', () => {
+ jest.spyOn(component,'pdFilterChanged');
+ component.pdFilterChanged({task_count:5});
+ expect(component.pdFilterChanged).toHaveBeenCalledWith({task_count:5});
+ });
+
it('should request the csv', () => {
jest.spyOn(component,'csvRequest');
jest.spyOn(component,'submitRequest');
diff --git a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.ts b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.ts
index 8448cdeceda519e5d0f8788a35fb5e4a61c5dbf6..537d9230e1df3906a19ac05df11d3b87d1047cf9 100644
--- a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.ts
+++ b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.ts
@@ -13,6 +13,12 @@ import * as moment from 'moment';
import html2canvas from 'html2canvas';
import * as jspdf from 'jspdf';
const PRE_DEFINED_PARAMETERS = ['$slug', 'hawk-eye'];
+export interface ConfigFilter{
+ label: string,
+ controlType: string,
+ reference: string,
+ defaultValue: number
+}
@Component({
selector: 'app-datasets',
templateUrl: './program-datasets.component.html',
@@ -94,6 +100,8 @@ export class DatasetsComponent implements OnInit, OnDestroy {
maxStartDate: any; //Start date - has to be one day less than end date
displayFilters:any = {};
loadash = _;
+ pdFilters:ConfigFilter[] = [];
+ configuredFilters:any = {}
constructor(
activatedRoute: ActivatedRoute,
public layoutService: LayoutService,
@@ -249,6 +257,7 @@ export class DatasetsComponent implements OnInit, OnDestroy {
this.solutions = [];
this.reportTypes = [];
this.onDemandReportData = [];
+ this.resetConfigFilters();
this.getSolutionList(program[0]);
this.displayFilters['Program'] = [program[0].name]
this.reportForm.controls.programName.setValue($event.value);
@@ -261,6 +270,7 @@ export class DatasetsComponent implements OnInit, OnDestroy {
this.noResult = false;
this.districts = []
this.organisations = [];
+ this.resetConfigFilters();
this.globalDistrict = this.globalOrg = undefined;
if (this.programSelected && this.reportForm.value && this.reportForm.value['solution']) {
const solution = this.solutions.filter(data => {
@@ -517,6 +527,7 @@ export class DatasetsComponent implements OnInit, OnDestroy {
this.showPopUpModal = true;
this.globalDistrict = this.globalOrg = undefined;
this.timeRangeInit();
+ this.resetConfigFilters();
}
loadReports() {
@@ -543,8 +554,30 @@ export class DatasetsComponent implements OnInit, OnDestroy {
}
reportChanged(selectedReportData) {
+ this.resetConfigFilters();
this.selectedReport = selectedReportData;
+ if(this.selectedReport.configurableFilters){
+ this.pdFilters = this.selectedReport.uiFilters;
+ this.pdFilters.map(filter => {
+ this.configuredFilters[filter['reference']] = filter['defaultValue'] as number -1
+ })
+ }
}
+
+ resetConfigFilters(){
+ this.pdFilters = [];
+ this.configuredFilters = {};
+ }
+
+ pdFilterChanged($event){
+ const [reference, value]= [Object.keys($event),Object.values($event)] ;
+ if([0,null].includes(value[0] as number) || value[0] < 0){
+ this.configuredFilters[reference[0]] = undefined;
+ }else{
+ this.configuredFilters[reference[0]] = value[0] as number -1;
+ }
+ }
+
addFilters() {
let filterKeysObj = {
program_id: _.get(this.reportForm, 'controls.programName.value'),
@@ -552,9 +585,12 @@ export class DatasetsComponent implements OnInit, OnDestroy {
programId: _.get(this.reportForm, 'controls.programName.value'),
solutionId: _.get(this.reportForm, 'controls.solution.value'),
district_externalId: _.get(this.reportForm, 'controls.districtName.value') || undefined,
- organisation_id: _.get(this.reportForm, 'controls.organisationName.value') || undefined
+ organisation_id: _.get(this.reportForm, 'controls.organisationName.value') || undefined,
+ ...this.configuredFilters
}
+
let keys = Object.keys(filterKeysObj);
+
this.selectedReport['filters'].map(data => {
keys.filter(key => {
return data.dimension == key && (data.value = filterKeysObj[key]);
diff --git a/src/app/client/src/app/modules/program-dashboard/program-dashboard.module.ts b/src/app/client/src/app/modules/program-dashboard/program-dashboard.module.ts
index a60e3acafd1141a73c21cfdc60619c2931be305d..ed597ee6797860120f9433c27b10d90a0984f904 100644
--- a/src/app/client/src/app/modules/program-dashboard/program-dashboard.module.ts
+++ b/src/app/client/src/app/modules/program-dashboard/program-dashboard.module.ts
@@ -25,6 +25,9 @@ import { MatDatepickerModule } from '@angular/material/datepicker';
import { SbBignumberComponent } from './shared/sb-bignumber/sb-bignumber.component';
import { SbTableComponent } from './shared/sb-table/sb-table.component';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
+import { PdFiltersComponent } from './shared/pd-filters/pd-filters.component';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
const TIME_RANGE_DATE_FORMAT = {
parse: {
@@ -45,7 +48,8 @@ const TIME_RANGE_DATE_FORMAT = {
SbChartComponent,
FilterChartPipe,
SbBignumberComponent,
- SbTableComponent
+ SbTableComponent,
+ PdFiltersComponent
],
imports: [
CommonModule,
@@ -56,6 +60,8 @@ const TIME_RANGE_DATE_FORMAT = {
TelemetryModule,
FormsModule,
ReactiveFormsModule,
+ MatFormFieldModule,
+ MatInputModule,
programDashboardRoutingModule,
MatCheckboxModule,
MatTabsModule,
diff --git a/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.html b/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..3c7dabd4d169846562d2a11149019633af64ff5f
--- /dev/null
+++ b/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.html
@@ -0,0 +1,19 @@
+<form class="d-flex flex-dr" [formGroup]="pdFiltersFormGroup">
+ <div class="d-flex flex-dc">
+ <label>{{ pdFilter.label }}</label>
+ <ng-container *ngIf="pdFilter.controlType === 'number'">
+ <mat-form-field
+ appearance="fill"
+ class="sb-mat__dropdown custom_mat_dd"
+ >
+ <input
+ matInput
+ type="number"
+ [formControlName]="pdFilter.reference"
+ [value]="pdFilter.defaultValue"
+ (input)="inputChange()"
+ />
+ </mat-form-field>
+ </ng-container>
+ </div>
+</form>
diff --git a/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.spec.ts b/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..db6720e321f86a17a069803b101d7fe40f97c404
--- /dev/null
+++ b/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.spec.ts
@@ -0,0 +1,49 @@
+import { FormBuilder } from "@angular/forms";
+import { PdFiltersComponent } from "./pd-filters.component";
+
+describe("PdFiltersComponent", () => {
+ let component: PdFiltersComponent;
+ let formBuilder;
+
+ beforeAll(() => {
+ component = new PdFiltersComponent(formBuilder);
+ component.pdFilter = {
+ "label": "Minimum no. of tasks in the project",
+ "controlType": "number",
+ "reference": "task_count",
+ "defaultValue": 5
+ }
+ });
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it("should create", () => {
+ expect(component).toBeTruthy();
+ });
+
+ it('should call ngOnInit',() => {
+ jest.spyOn(component,'ngOnInit');
+ component.fb = new FormBuilder;
+ component.ngOnInit();
+ expect(component.ngOnInit).toHaveBeenCalled()
+ });
+
+ it('should generate form',() => {
+ jest.spyOn(component,'generateForm');
+ component.fb = new FormBuilder;
+ component.generateForm();
+ expect(component.generateForm).toHaveBeenCalled()
+ });
+
+ it('should call inputChange method', () => {
+ jest.spyOn(component,'inputChange');
+ component.pdFiltersFormGroup.patchValue({
+ task_count:5
+ });
+ component.inputChange();
+ expect(component.inputChange).toHaveBeenCalled();
+ });
+
+});
diff --git a/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.ts b/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8da95651877dc9a59da42f144ed050958712d643
--- /dev/null
+++ b/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.ts
@@ -0,0 +1,31 @@
+import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import { FormBuilder, FormGroup } from "@angular/forms";
+import * as _ from "lodash-es";
+
+@Component({
+ selector: "app-pd-filters",
+ templateUrl: "./pd-filters.component.html"
+})
+export class PdFiltersComponent implements OnInit {
+ @Input() pdFilter: any;
+ @Output() filterChanged = new EventEmitter();
+ pdFiltersFormGroup: FormGroup;
+
+ constructor(public fb: FormBuilder) {}
+
+ ngOnInit(): void {
+ this.generateForm();
+ }
+
+ generateForm() {
+ this.pdFiltersFormGroup = this.fb.group({});
+ this.pdFiltersFormGroup.addControl(
+ _.get(this.pdFilter, "reference"),
+ this.fb.control("")
+ );
+ }
+
+ inputChange() {
+ this.filterChanged.emit(this.pdFiltersFormGroup.value);
+ }
+}