diff --git a/batch-models/src/main/scala/org/ekstep/analytics/exhaust/OnDemandDruidExhaustJob.scala b/batch-models/src/main/scala/org/ekstep/analytics/exhaust/OnDemandDruidExhaustJob.scala index 2d0486b2..be799502 100644 --- a/batch-models/src/main/scala/org/ekstep/analytics/exhaust/OnDemandDruidExhaustJob.scala +++ b/batch-models/src/main/scala/org/ekstep/analytics/exhaust/OnDemandDruidExhaustJob.scala @@ -191,7 +191,6 @@ object OnDemandDruidExhaustJob extends BaseReportsJob with Serializable with IJo ("interval" -> intervalEndDateUpd) reportConf = reportConf ++ Map("dateRange" -> updatedDateRange) } - println(JSONUtils.serialize(reportConf)) val updatedMetrics:List[Map[String, AnyRef]] = reportConf.getOrElse("metrics", List()).asInstanceOf[List[Map[String,AnyRef]]].map( met => { val updatedDruidQuery:Map[String,AnyRef] = met.get("druidQuery").get.asInstanceOf[Map[String,AnyRef]] + ("filters"->requestParamsBody.get("filters").get.asInstanceOf[List[Map[String,AnyRef]]]) val updatedMet: Map[String, AnyRef] = (met ++ Map("druidQuery"->updatedDruidQuery)) diff --git a/ml_reports/ml-obs-question-detail-exhaust/.999700F9A860E7A42DA968FBECDF3F22_20220726.csv.crc b/ml_reports/ml-obs-question-detail-exhaust/.999700F9A860E7A42DA968FBECDF3F22_20220726.csv.crc deleted file mode 100644 index 1f644091..00000000 Binary files a/ml_reports/ml-obs-question-detail-exhaust/.999700F9A860E7A42DA968FBECDF3F22_20220726.csv.crc and /dev/null differ diff --git a/ml_reports/ml-obs-question-detail-exhaust/.999700F9A860E7A42DA968FBECDF3F22_20220726.zip.crc b/ml_reports/ml-obs-question-detail-exhaust/.999700F9A860E7A42DA968FBECDF3F22_20220726.zip.crc deleted file mode 100644 index 54f48afe..00000000 Binary files a/ml_reports/ml-obs-question-detail-exhaust/.999700F9A860E7A42DA968FBECDF3F22_20220726.zip.crc and /dev/null differ diff --git a/ml_reports/ml-obs-question-detail-exhaust/999700F9A860E7A42DA968FBECDF3F22_20220726.csv b/ml_reports/ml-obs-question-detail-exhaust/999700F9A860E7A42DA968FBECDF3F22_20220726.csv deleted file mode 100644 index f1b19b5d..00000000 --- a/ml_reports/ml-obs-question-detail-exhaust/999700F9A860E7A42DA968FBECDF3F22_20220726.csv +++ /dev/null @@ -1,10 +0,0 @@ -UUID,User Sub Type,Declared State,District,Block,School ID,School Name,Organisation Name,Program Name,Program ID,Observation Name,Observation ID,observation_submission_id,Question_external_id,Question,Question_response_label,Question score,Evidences,Remarks -7a8fa12b-75a7-41c5-9180-538f5ea123sd,hm,Andhra Pradesh,ANANTAPUR,AGALI,28226200815,APMS AGALI,Staging Custodian Organization,3.8.0 testing program,PGM-3542-4.0.0_testing_program,School Needs Assessment - Primary,96e4f796-8d6c-11eb-abd8-441ca9966jhgj-OBSERVATION-TEMPLATE_CHILD_V2,60e848e9f1252714cff1c1a5,P1_1616678305996-1616679757968,No of girls in the school,10,Null,Null,Null -7a8fa12b-75a7-41c5-9180-538f5ea123sd,hm,Andhra Pradesh,ANANTAPUR,AGALI,28226200815,APMS AGALI,Staging Custodian Organization,3.8.0 testing program,PGM-3542-4.0.0_testing_program,School Needs Assessment - Primary,96e4f796-8d6c-11eb-abd8-441ca9966jhgj-OBSERVATION-TEMPLATE_CHILD_V2,60e848e9f1252714cff1c1a5,P2_1616678305996-1616679757968,No of boys in the school,5,Null,Null,Null -7a8fa12b-75a7-41c5-9180-538f5ea123sd,hm,Andhra Pradesh,ANANTAPUR,AGALI,28226200815,APMS AGALI,Staging Custodian Organization,3.8.0 testing program,PGM-3542-4.0.0_testing_program,School Needs Assessment - Primary,96e4f796-8d6c-11eb-abd8-441ca9966jhgj-OBSERVATION-TEMPLATE_CHILD_V2,60e848e9f1252714cff1c1a5,P3_1616678305996-1616679757968,No of toilets in the school,1,Null,Null,Null -7a8fa12b-75a7-41c5-9180-538f5ea123sd,hm,Andhra Pradesh,ANANTAPUR,AGALI,28226200815,APMS AGALI,Staging Custodian Organization,3.8.0 testing program,PGM-3542-4.0.0_testing_program,School Needs Assessment - Primary,96e4f796-8d6c-11eb-abd8-441ca9966jhgj-OBSERVATION-TEMPLATE_CHILD_V2,60e848e9f1252714cff1c1a5,P47_1616678305996-1616679757968,Tick the following which are available:,Newspaper Stands,Null,Null,Null -7a8fa12b-75a7-41c5-9180-538f5ea5191a,hm,Andhra Pradesh,ANANTAPUR,AGALI,28226200815,APMS AGALI,Staging Custodian Organization,3.8.0 testing program,PGM-3542-3.8.0_testing_program,School Needs Assessment - Primary,96e4f796-8d6c-11eb-abd8-441ca8998ea1-OBSERVATION-TEMPLATE_CHILD_V2,60e848e9f1252714cff1c1a4,P1_1616678305996-1616679757967,No of toilets in the school,2,Null,Null,Null -7a8fa12b-75a7-41c5-9180-538f5ea5191a,hm,Andhra Pradesh,ANANTAPUR,AGALI,28226200815,APMS AGALI,Staging Custodian Organization,3.8.0 testing program,PGM-3542-3.8.0_testing_program,School Needs Assessment - Primary,96e4f796-8d6c-11eb-abd8-441ca8998ea1-OBSERVATION-TEMPLATE_CHILD_V2,60e848e9f1252714cff1c1a4,P1_1616678305996-1616679757967,No of boys in the school,50,Null,Null,Null -7a8fa12b-75a7-41c5-9180-538f5ea5191a,hm,Andhra Pradesh,ANANTAPUR,AGALI,28226200815,APMS AGALI,Staging Custodian Organization,3.8.0 testing program,PGM-3542-3.8.0_testing_program,School Needs Assessment - Primary,96e4f796-8d6c-11eb-abd8-441ca8998ea1-OBSERVATION-TEMPLATE_CHILD_V2,60e848e9f1252714cff1c1a4,P3_1616678305996-1616679757967,No of girls in the school,100,Null,Null,Null -7a8fa12b-75a7-41c5-9180-538f5ea5191a,hm,Andhra Pradesh,ANANTAPUR,AGALI,28226200815,APMS AGALI,Staging Custodian Organization,3.8.0 testing program,PGM-3542-3.8.0_testing_program,School Needs Assessment - Primary,96e4f796-8d6c-11eb-abd8-441ca8998ea1-OBSERVATION-TEMPLATE_CHILD_V2,60e848e9f1252714cff1c1a4,P47_1616678305996-1616679757967,Tick the following which are available:,Newspaper Stands,Null,Null,Null -7a8fa12b-75a7-41c5-9180-538f5ea5191a,hm,Andhra Pradesh,ANANTAPUR,AGALI,28226200815,APMS AGALI,Staging Custodian Organization,3.8.0 testing program,PGM-3542-3.8.0_testing_program,School Needs Assessment - Primary,96e4f796-8d6c-11eb-abd8-441ca8998ea1-OBSERVATION-TEMPLATE_CHILD_V2,60e848e9f1252714cff1c1a4,P47_1616678305996-1616679757967,Tick the following which are available:,Library books shelf/rack,Null,Null,Null diff --git a/ml_reports/ml-obs-question-detail-exhaust/999700F9A860E7A42DA968FBECDF3F22_20220726.zip b/ml_reports/ml-obs-question-detail-exhaust/999700F9A860E7A42DA968FBECDF3F22_20220726.zip deleted file mode 100644 index b40b5cd6..00000000 Binary files a/ml_reports/ml-obs-question-detail-exhaust/999700F9A860E7A42DA968FBECDF3F22_20220726.zip and /dev/null differ diff --git a/ml_reports/ml-project-status-exhaust/.852ECFC2A5C74B6071727A70F247A3D6_20220726.csv.crc b/ml_reports/ml-project-status-exhaust/.852ECFC2A5C74B6071727A70F247A3D6_20220726.csv.crc deleted file mode 100644 index b37d9c55..00000000 Binary files a/ml_reports/ml-project-status-exhaust/.852ECFC2A5C74B6071727A70F247A3D6_20220726.csv.crc and /dev/null differ diff --git a/ml_reports/ml-project-status-exhaust/.852ECFC2A5C74B6071727A70F247A3D6_20220726.zip.crc b/ml_reports/ml-project-status-exhaust/.852ECFC2A5C74B6071727A70F247A3D6_20220726.zip.crc deleted file mode 100644 index 046226b2..00000000 Binary files a/ml_reports/ml-project-status-exhaust/.852ECFC2A5C74B6071727A70F247A3D6_20220726.zip.crc and /dev/null differ diff --git a/ml_reports/ml-project-status-exhaust/852ECFC2A5C74B6071727A70F247A3D6_20220726.csv b/ml_reports/ml-project-status-exhaust/852ECFC2A5C74B6071727A70F247A3D6_20220726.csv deleted file mode 100644 index 5e7085b6..00000000 --- a/ml_reports/ml-project-status-exhaust/852ECFC2A5C74B6071727A70F247A3D6_20220726.csv +++ /dev/null @@ -1,8 +0,0 @@ -UUID,User Type,User sub type,Declared State,District,Block,School Name,School ID,Declared Board,Org Name,Program Name,Program ID,Project ID,Project Title,Project Objective,Project start date of the user,Project completion date of the user,Project Duration,Last Synced date,Project Status -0e0ebece-85c1-4855-b83d-666df314fa92,Null,"HM,DEO,SPD",Andhra Pradesh,KRISHNA,GANNAVARAM,MPPS ALLAPURAM,28162102201.0,Null,Null,Testing program 4.7,PGM-FD255-testing_program-4.7,62a98b9a7871b60008d34eb2,Project with Mandatory Tasks and Subtasks - FD260,Project with Mandatory Tasks and Subtasks - FD260,2022-06-15T07:34:50.603+05:30,Null,2 weeks,2022-06-16T10:58:19.377+05:30,inProgress -154ab19a-e91d-414d-840c-159f7378949e,Null,"HM,DEO",Andhra Pradesh,EAST GODAVARI,ALAMURU,MPPS NARSIPUDI COLONY,28144200402.0,Null,Null,Testing program 4.7,PGM-FD255-testing_program-4.7,62b487a07871b60008d3590c,Project with Mandatory Tasks and Subtasks - FD260,Project with Mandatory Tasks and Subtasks - FD260,2022-06-23T15:32:48.599+05:30,2022-06-23T15:36:05.311+05:30,2 weeks,2022-06-23T15:36:05.301+05:30,submitted -2b7c9de2-f930-4f3b-8bdb-f1a1e583f309,Null,DEO,Andhra Pradesh,KRISHNA,A.KONDURU,Null,Null,Null,Null,Testing program 4.7,PGM-FD255-testing_program-4.7,62b9afda7871b60008d35eae,Project with Mandatory Tasks and Subtasks - FD260,Project with Mandatory Tasks and Subtasks - FD260,2022-06-27T13:25:46.659+05:30,2022-06-27T13:28:37.588+05:30,2 weeks,2022-06-27T13:28:37.579+05:30,submitted -3b1b8620-c22d-47ce-9fed-35adb074d7ee,Null,"DEO,HM",Andhra Pradesh,EAST GODAVARI,ALAMURU,MPPS (GN) CHEMUDULANKA,28144200303.0,Null,Null,Testing program 4.7,PGM-FD255-testing_program-4.7,62b421267871b60008d357bb,Project with Mandatory Tasks and Subtasks - FD260,Project with Mandatory Tasks and Subtasks - FD260,2022-06-23T08:15:34.440+05:30,2022-06-23T09:45:22.967+05:30,2 weeks,2022-06-23T09:45:22.956+05:30,submitted -ecd5bbb9-5db2-4720-a51c-12fe1715d406,Null,HM,Andhra Pradesh,KRISHNA,BAPULAPADU,ZPHS REMALLI,28162600904.0,Null,Null,Testing program 4.7,PGM-FD255-testing_program-4.7,62b7057c7871b60008d35b22,Project with Mandatory Tasks and Subtasks - FD260,Project with Mandatory Tasks and Subtasks - FD260,2022-06-25T12:54:20.758+05:30,2022-06-25T14:12:00.528+05:30,2 weeks,2022-06-25T14:12:00.519+05:30,submitted -ef0325e4-db5b-4dfc-95a8-89b3e53aca0e,administrator,"HM,DEO",Andhra Pradesh,ANANTAPUR,AGALI,MPPS RAMANAHALLI,28226200404.0,State (Karnataka),Staging Custodian Organization,Testing program 4.7,PGM-FD255-testing_program-4.7,62bc3c24cf8b5d0008906e5a,Project with Mandatory Tasks and Subtasks - FD260,Project with Mandatory Tasks and Subtasks - FD260,2022-06-29T11:48:49.477+05:30,2022-06-29T11:50:59.512+05:30,2 weeks,2022-06-29T11:50:59.497+05:30,submitted -fe7ecff7-3086-489d-9ac2-02634e641d12,Null,"HM,DEO,SPD",Andhra Pradesh,NELLORE,NELLORE,MCPS SANTHAPET,28192590424.0,Null,Null,Testing program 4.7,PGM-FD255-testing_program-4.7,6299aa057871b60008d3411c,Project with Mandatory Tasks and Subtasks - FD260,Project with Mandatory Tasks and Subtasks - FD260,2022-06-03T06:28:21.954+05:30,Null,2 weeks,Null,started diff --git a/ml_reports/ml-project-status-exhaust/852ECFC2A5C74B6071727A70F247A3D6_20220726.zip b/ml_reports/ml-project-status-exhaust/852ECFC2A5C74B6071727A70F247A3D6_20220726.zip deleted file mode 100644 index 0fa77bf8..00000000 Binary files a/ml_reports/ml-project-status-exhaust/852ECFC2A5C74B6071727A70F247A3D6_20220726.zip and /dev/null differ diff --git a/ml_reports/ml-task-detail-exhaust/.888700F9A860E7A42DA968FBECDF3F22_20220726.csv.crc b/ml_reports/ml-task-detail-exhaust/.888700F9A860E7A42DA968FBECDF3F22_20220726.csv.crc deleted file mode 100644 index e050cb28..00000000 Binary files a/ml_reports/ml-task-detail-exhaust/.888700F9A860E7A42DA968FBECDF3F22_20220726.csv.crc and /dev/null differ diff --git a/ml_reports/ml-task-detail-exhaust/.888700F9A860E7A42DA968FBECDF3F22_20220726.zip.crc b/ml_reports/ml-task-detail-exhaust/.888700F9A860E7A42DA968FBECDF3F22_20220726.zip.crc deleted file mode 100644 index ec1a2944..00000000 Binary files a/ml_reports/ml-task-detail-exhaust/.888700F9A860E7A42DA968FBECDF3F22_20220726.zip.crc and /dev/null differ diff --git a/ml_reports/ml-task-detail-exhaust/888700F9A860E7A42DA968FBECDF3F22_20220726.csv b/ml_reports/ml-task-detail-exhaust/888700F9A860E7A42DA968FBECDF3F22_20220726.csv deleted file mode 100644 index bae6682c..00000000 --- a/ml_reports/ml-task-detail-exhaust/888700F9A860E7A42DA968FBECDF3F22_20220726.csv +++ /dev/null @@ -1,2 +0,0 @@ -UUID,Role,Declared State,District,Block,School Name,School ID,Organisation Name,Program Name,Program ID,Project ID,Project Title,Project Objective,Category,Project Duration,Tasks,Sub-Tasks,Evidence,Remarks,Project Status -7651c7ab-88f9-4b23-8c1d-ac8d92844f8f,hm,Andhra Pradesh,EAST GODAVARI,ALLAVARAM,MPPS (GN) SAMANTHAKURRU,Null,Pre-prod Custodian Organization,Prerak Head Teacher of the Block 19-20,PGM-Prerak-Head-Teacher-of-the-Block-19-20-Feb2021,602a19d840d02028f3af00f0,Test-कृपया उस प्रोजेक्ट का शीर्षक जोड़ें जिसे आप ब्लॉक के Prerak HT के लिए सबमिट करना चाहते हैं,test,Education Leader,1 महीना,"यहां, आप अपने विद्यालय में परियोजना को पूरा करने के लिए अपने द्वारा किए गए कार्यों ( Tasks)को जोड़ सकते हैं।",Null,Null,Null,inProgress diff --git a/ml_reports/ml-task-detail-exhaust/888700F9A860E7A42DA968FBECDF3F22_20220726.zip b/ml_reports/ml-task-detail-exhaust/888700F9A860E7A42DA968FBECDF3F22_20220726.zip deleted file mode 100644 index 2666c493..00000000 Binary files a/ml_reports/ml-task-detail-exhaust/888700F9A860E7A42DA968FBECDF3F22_20220726.zip and /dev/null differ