Merge pull request #375 from bcgov/ofmcc-8072

ofmcc-8072 Support New Monthly Report

Author: PhillipECC

ECC.Core.DataContext/Entities/Entities.cs

@@ -60989,6 +60989,7 @@ public partial class Fields
             public const string ofm_subtitle = "ofm_subtitle";
             public const string ofm_table_name = "ofm_table_name";
             public const string ofm_table_sequence = "ofm_table_sequence";
+            public const string ofm_tool_tip = "ofm_tool_tip";
             public const string ofm_true_child_question_business_rule = "ofm_true_child_question_business_rule";
             public const string overriddencreatedon = "overriddencreatedon";
             public const string ownerid = "ownerid";
@@ -61920,6 +61921,21 @@ public string ofm_table_sequence
             }
         }
 
+        [Microsoft.Xrm.Sdk.AttributeLogicalNameAttribute("ofm_tool_tip")]
+        public string ofm_tool_tip
+        {
+            [System.Diagnostics.DebuggerNonUserCode()]
+            get
+            {
+                return this.GetAttributeValue<string>("ofm_tool_tip");
+            }
+            [System.Diagnostics.DebuggerNonUserCode()]
+            set
+            {
+                this.SetAttributeValue("ofm_tool_tip", value);
+            }
+        }
+
         /// <summary>
         /// Date and time that the record was migrated.
         /// </summary>

OFM.Infrastructure.WebAPI/Services/Processes/FundingReports/P610CreateQuestionProvider.cs

@@ -191,6 +191,7 @@ public string QuestionRequestUri
                         <attribute name='ofm_source_question_id' />
                         <attribute name='ofm_fixed_data' />
                         <attribute name='ofm_additional_info' />
+                        <attribute name='ofm_tool_tip' />
                         <filter>
                           <condition attribute='ofm_source_question_id' operator='in'>";
             for (var i = 0; i < _questionIdentifier.Length; i++)
@@ -752,7 +753,8 @@ public async Task<bool> UpdateQuestionwithManualData(IEnumerable<string?> questi
                                             {ofm_question.Fields.ofm_fixed_response, getLatestActiveVersion.ofm_fixed_response },
                                             {ofm_question.Fields.ofm_question_id, getLatestActiveVersion.ofm_question_id ?? null},
                                             {ofm_question.Fields.ofm_fixed_data, getLatestActiveVersion.ofm_fixed_data ?? null},
-                                            {ofm_question.Fields.ofm_additional_info, getLatestActiveVersion.ofm_additional_info ?? null}
+                                            {ofm_question.Fields.ofm_additional_info, getLatestActiveVersion.ofm_additional_info ?? null},
+                                            {ofm_question.Fields.ofm_tool_tip, getLatestActiveVersion.ofm_tool_tip ?? null}
                                            }));
                     }
 

OFM.Infrastructure.WebAPI/Services/Processes/FundingReports/P615CreateMonthlyReportProvider.cs

@@ -65,7 +65,7 @@ public string RequestUri
         }
     }
 
-    public string HRQuestionTemplateUri
+    public string QuestionTemplateUri
     {
         get
         {
@@ -100,7 +100,7 @@ public string HRQuestionTemplateUri
         }
     }
 
-    public string HRQuestionResponseUri
+    public string QuestionResponseUri
     {
         get
         {
@@ -125,9 +125,6 @@ public string HRQuestionResponseUri
                                         </condition>
                                       </filter>
                                       <link-entity name="ofm_section" from="ofm_sectionid" to="ofm_section">
-                                        <filter>
-                                          <condition attribute="ofm_section_title" operator="begins-with" value="Human" />
-                                        </filter>
                                       </link-entity>
                                     </link-entity>
                                     <link-entity name="ofm_question" from="ofm_questionid" to="ofm_header" link-type="outer" alias="header" visible="false">
@@ -138,10 +135,10 @@ public string HRQuestionResponseUri
                                 </fetch>
                                 """;
 
-            var previousHRQuestionResponseUri = $"""
+            var previousQuestionResponseUri = $"""
                             ofm_question_responses?fetchXml={WebUtility.UrlEncode(fetchXml)}
                             """.CleanCRLF();
-            return previousHRQuestionResponseUri;
+            return previousQuestionResponseUri;
         }
     }
 
@@ -401,8 +398,8 @@ public async Task<JsonObject> RunProcessAsync(ID365AppUserService appUserService
 
         //Get question template for current report template
 
-        var hrQuestionTemplateData = await GetReportDataAsync(HRQuestionTemplateUri);
-        var serializedHRQuestionTemplateData = System.Text.Json.JsonSerializer.Deserialize<List<Question>>(hrQuestionTemplateData.Data, Setup.s_writeOptionsForLogs);
+        var hrQuestionTemplateData = await GetReportDataAsync(QuestionTemplateUri);
+        var serializedQuestionTemplateData = System.Text.Json.JsonSerializer.Deserialize<List<Question>>(hrQuestionTemplateData.Data, Setup.s_writeOptionsForLogs);
 
         List<HttpRequestMessage> questionResponseRequests = [];
 
@@ -411,14 +408,14 @@ public async Task<JsonObject> RunProcessAsync(ID365AppUserService appUserService
             var uid = report["ofm_survey_responseid"].ToString();
             _facId = report["_ofm_facility_value"].ToString();
 
-            var previousHRQuestionResponseData = await GetReportDataAsync(HRQuestionResponseUri);
-            var serializedPreviousHRQuestionResponseData = System.Text.Json.JsonSerializer.Deserialize<List<QuestionResponse>>(previousHRQuestionResponseData.Data, Setup.s_writeOptionsForLogs);
+            var previousQuestionResponseData = await GetReportDataAsync(QuestionResponseUri);
+            var serializedPreviousQuestionResponseData = System.Text.Json.JsonSerializer.Deserialize<List<QuestionResponse>>(previousQuestionResponseData.Data, Setup.s_writeOptionsForLogs);
 
-            foreach(var questionResponse in serializedPreviousHRQuestionResponseData)
+            foreach(var questionResponse in serializedPreviousQuestionResponseData)
             {
 
-                var questionTemplateId = $"/ofm_questions({serializedHRQuestionTemplateData?.Where(q => q.ofm_question_id == questionResponse.ofm_question_qid).FirstOrDefault().ofm_questionid})";
-                var headerTemplateId = String.IsNullOrEmpty(questionResponse.ofm_header_qid) ? null:$"/ofm_questions({serializedHRQuestionTemplateData?.Where(q => q.ofm_question_id == questionResponse.ofm_header_qid).FirstOrDefault().ofm_questionid})";
+                var questionTemplateId = $"/ofm_questions({serializedQuestionTemplateData?.Where(q => q.ofm_question_id == questionResponse.ofm_question_qid).FirstOrDefault().ofm_questionid})";
+                var headerTemplateId = String.IsNullOrEmpty(questionResponse.ofm_header_qid) ? null:$"/ofm_questions({serializedQuestionTemplateData?.Where(q => q.ofm_question_id == questionResponse.ofm_header_qid).FirstOrDefault().ofm_questionid})";
 
                 var newQuestionResponse = new JsonObject
                     {
@@ -437,7 +434,7 @@ public async Task<JsonObject> RunProcessAsync(ID365AppUserService appUserService
 
         if(questionResponseRequests.Count == 0)
         {
-            _logger.LogInformation(CustomLogEvent.Process, "Cannot find HR questions responses.");
+            _logger.LogInformation(CustomLogEvent.Process, "Cannot find questions responses.");
             return ProcessResult.Completed(ProcessId).SimpleProcessResult;
         }
         try
@@ -464,14 +461,14 @@ public async Task<JsonObject> RunProcessAsync(ID365AppUserService appUserService
         {
             var result = ProcessResult.Failure(ProcessId, questionResponseBatchResult.Errors, questionResponseBatchResult.TotalProcessed, questionResponseBatchResult.TotalRecords);
 
-            _logger.LogError(CustomLogEvent.Process, "Copy HR response process finished with an error {error}", JsonValue.Create(result)!.ToJsonString());
+            _logger.LogError(CustomLogEvent.Process, "Copy Question response process finished with an error {error}", JsonValue.Create(result)!.ToJsonString());
 
             return result.SimpleProcessResult;
         }
         }
         catch (Exception ex)
         {
-            _logger.LogError(CustomLogEvent.Process, "Faile to copy HR response isthrowing an error {error}", ex.Message.ToString());
+            _logger.LogError(CustomLogEvent.Process, "Faile to copy Question response isthrowing an error {error}", ex.Message.ToString());
 
         }
         #endregion