EMCRI# 843 EMCRI# 843 Portal: On submitted Claim, don't display certa…

…in values until claim BPF has reached Decision Made - Added (dfa_decisioncopy) field on the currentclaim and recovery claim endpoints, Dynamicsgateway and entities - Created Enum for the claimDecision - Updated mappings for current and recovery claims - Upated logic on claim dashboard and recoverclaims page to get the claim status and show feilds based on this
bcgov · Dec 23, 2024 · 2b6a264 · 2b6a264
1 parent 20ba8ab
commit 2b6a264
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 13 deletions.
diff --git a/...public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/DynamicsGateway.cs b/...public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/DynamicsGateway.cs
@@ -1174,7 +1174,7 @@ public async Task<IEnumerable<dfa_projectclaim>> GetClaimListAsync(string projec
                         "dfa_claimbpfstages", "dfa_claimbpfsubstages", "dfa_claimtotal",
                         "createdon", "dfa_costsharing", "dfa_eligiblepayable",
                         "dfa_bpfclosedate", "dfa_onetimedeductionamount",
-                        "dfa_paidclaimamount"
+                        "dfa_paidclaimamount",  "dfa_decisioncopy"
                     },
                     Filter = $"_dfa_recoveryplanid_value eq {projectId}"
                 });
@@ -1203,6 +1203,7 @@ public async Task<IEnumerable<dfa_projectclaim>> GetClaimListAsync(string projec
                                    dfa_bpfclosedate = !string.IsNullOrEmpty(objClaim.dfa_bpfclosedate) ? DateTime.Parse(objClaim.dfa_bpfclosedate).ToLocalTime().ToString() : objClaim.dfa_bpfclosedate,
                                    dfa_onetimedeductionamount = objClaim.dfa_onetimedeductionamount,
                                    dfa_paidclaimamount = objClaim.dfa_paidclaimamount,
+                                   dfa_decisioncopy = objClaim.dfa_decisioncopy
                                }).AsEnumerable().OrderByDescending(m => m.createdon);
 
                 return lstClaims;
@@ -1253,7 +1254,7 @@ public async Task<dfa_claim_retrieve> GetClaimDetailsAsync(string claimId)
                         "dfa_finalclaim", "createdon", "dfa_claimreceivedbyemcrdate",
                         "dfa_totaleligiblegst", "dfa_totaloftotaleligible", "dfa_totalapproved", "dfa_lessfirst1000",
                         "dfa_costsharing", "dfa_eligiblepayable", "dfa_totalpaid", "dfa_claimpaiddate",
-                        "dfa_claimtotal", "dfa_paidclaimamount", "dfa_onetimedeductionamount", "dfa_claimbpfstages", "dfa_claimbpfsubstages"
+                        "dfa_claimtotal", "dfa_paidclaimamount", "dfa_onetimedeductionamount", "dfa_claimbpfstages", "dfa_claimbpfsubstages", "dfa_decisioncopy"
                     },
                     Filter = $"dfa_projectclaimid eq {claimId}"
                 });
@@ -1278,7 +1279,8 @@ public async Task<dfa_claim_retrieve> GetClaimDetailsAsync(string claimId)
                                    dfa_claimtotal = objApp.dfa_claimtotal,
                                    dfa_paidclaimamount = objApp.dfa_paidclaimamount,
                                    dfa_claimbpfstages = objApp.dfa_claimbpfstages,
-                                   dfa_claimbpfsubstages = objApp.dfa_claimbpfsubstages
+                                   dfa_claimbpfsubstages = objApp.dfa_claimbpfsubstages,
+                                   dfa_decisioncopy = objApp.dfa_decisioncopy
 
                                }).AsEnumerable().OrderByDescending(m => m.createdon);
 

diff --git a/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/Entities.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/Entities.cs
@@ -308,6 +308,8 @@ public class dfa_claim_retrieve
         public string? dfa_claimbpfstages { get; set; }
         public string? dfa_claimbpfsubstages { get; set; }
 
+        public string? dfa_decisioncopy { get; set; }
+
     }
 
     public class dfa_appapplicationmain_retrieve
@@ -867,6 +869,8 @@ public class dfa_projectclaim
         public string? dfa_bpfclosedate { get; set; }
         public string? dfa_onetimedeductionamount { get; set; }
         public string? dfa_paidclaimamount { get; set; }
+
+        public string?  dfa_decisioncopy { get; set; }
     }
 
     public class dfa_recoveryinvoice
@@ -1176,6 +1180,20 @@ public enum ClaimSubStages
         ApprovedwithExclusion = 222710008,
     }
 
+    public enum ClaimDecisions
+    {
+        [Description("Approved")]
+        Approved = 222710000,
+
+        [Description("Ineligible")]
+        Ineligible = 222710001,
+
+        [Description("Withdrawn")]
+        Withdrawn = 222710002,
+
+        [Description("Approved with exclusions")]
+        ApprovedwithExclusion = 222710003,
+    }
     public enum EMCRDecision
     {
         [Description("Approved Total")]

diff --git a/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ClaimController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ClaimController.cs
@@ -191,6 +191,8 @@ public class CurrentClaim
         public bool IsHidden { get; set; } = true;
         public string StatusColor { get; set; }
         public string DateFileClosed { get; set; }
+
+        public string ClaimDecision { get; set; }
     }
 
     public class ClaimStatusBar

diff --git a/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/SharedModels.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/SharedModels.cs
@@ -591,8 +591,9 @@ public class RecoveryClaim
         public string? paidClaimDate { get; set; }
         public string? claimReceivedByEMCRDate { get; set; }
         public Invoice[]? invoices { get; set; }
-        public string stage { get; set; }
-        public string status { get; set; }
+        public string? stage { get; set; }
+        public string? status { get; set; }
+        public string? claimDecision { get; set; }
     }
 
     public class Invoice

diff --git a/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Mappers/Mappings.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Mappers/Mappings.cs
@@ -547,7 +547,8 @@ public Mappings()
                 .ForMember(d => d.Stage, opts => opts.MapFrom(s => !string.IsNullOrEmpty(s.dfa_claimbpfsubstages) ?
                     (Convert.ToInt32(s.dfa_claimbpfstages) == Convert.ToInt32(ClaimStages.Draft) ? null : GetEnumDescription((ClaimSubStages)Convert.ToInt32(s.dfa_claimbpfsubstages)))
                     : null))
-                .ForMember(d => d.PaidClaimDate, opts => opts.MapFrom(s => string.IsNullOrEmpty(s.dfa_claimpaiddate) ? "(pending information)" : Convert.ToDateTime(s.dfa_claimpaiddate).ToString("MM/dd/yyyy", CultureInfo.InvariantCulture)));
+                .ForMember(d => d.PaidClaimDate, opts => opts.MapFrom(s => string.IsNullOrEmpty(s.dfa_claimpaiddate) ? "(pending information)" : Convert.ToDateTime(s.dfa_claimpaiddate).ToString("MM/dd/yyyy", CultureInfo.InvariantCulture)))
+                .ForMember(d => d.ClaimDecision, opts => opts.MapFrom(s => !string.IsNullOrEmpty(s.dfa_decisioncopy) ? GetEnumDescription((ClaimDecisions)Convert.ToInt32(s.dfa_decisioncopy)) : null));
 
             CreateMap<dfa_claim_retrieve, RecoveryClaim>()
                 .ForMember(d => d.claimNumber, opts => opts.MapFrom(s => s.dfa_name))
@@ -566,7 +567,8 @@ public Mappings()
                 .ForMember(d => d.status, opts => opts.MapFrom(s => !string.IsNullOrEmpty(s.dfa_claimbpfstages) ? GetEnumDescription((ClaimStages)Convert.ToInt32(s.dfa_claimbpfstages)) : null))
                 .ForMember(d => d.stage, opts => opts.MapFrom(s => !string.IsNullOrEmpty(s.dfa_claimbpfsubstages) ?
                     (Convert.ToInt32(s.dfa_claimbpfstages) == Convert.ToInt32(ClaimStages.Draft) ? null : GetEnumDescription((ClaimSubStages)Convert.ToInt32(s.dfa_claimbpfsubstages)))
-                    : null));
+                    : null))
+                .ForMember(d => d.claimDecision, opts => opts.MapFrom(s => !string.IsNullOrEmpty(s.dfa_decisioncopy) ? GetEnumDescription((ClaimDecisions)Convert.ToInt32(s.dfa_decisioncopy)) : null));
 
 
             CreateMap<dfa_appapplication, CurrentApplication>()

diff --git a/dfa-public/src/UI/embc-dfa/src/app/core/api/models/current-claim.ts b/dfa-public/src/UI/embc-dfa/src/app/core/api/models/current-claim.ts
@@ -5,6 +5,7 @@ export interface CurrentClaim {
   applicationId?: string;
   approvedClaimTotal?: string;
   approvedReimbursePercent?: string;
+  claimDecision?: string;
   claimId?: string;
   claimNumber?: string;
   claimTotal?: string;

diff --git a/dfa-public/src/UI/embc-dfa/src/app/core/api/models/recovery-claim.ts b/dfa-public/src/UI/embc-dfa/src/app/core/api/models/recovery-claim.ts
@@ -5,6 +5,7 @@ import { Invoice } from './invoice';
 export interface RecoveryClaim {
   approvedClaimTotal?: null | string;
   approvedReimbursement?: null | string;
+  claimDecision?: null | string;
   claimEligibleGST?: null | string;
   claimGrossGST?: null | string;
   claimNumber?: null | string;
@@ -19,8 +20,8 @@ export interface RecoveryClaim {
   isThisFinalClaim?: null | boolean;
   paidClaimAmount?: null | string;
   paidClaimDate?: null | string;
-  stage?: string;
-  status?: string;
+  stage?: null | string;
+  status?: null | string;
   totalActualClaim?: null | string;
   totalInvoicesBeingClaimed?: null | string;
 }
diff --git a/...c/UI/embc-dfa/src/app/sharedModules/claim-dashboard-components/claim/claim.component.html b/...c/UI/embc-dfa/src/app/sharedModules/claim-dashboard-components/claim/claim.component.html
@@ -132,7 +132,7 @@
         <div class="col-md-2">
           <span>{{applItem.firstClaim == true ? 'Yes' : (applItem.firstClaim == false ? 'No' : 'Not Set')}}</span>
         </div>
-        @if(applItem.stage == DecisionEnum.Approved || applItem.stage == DecisionEnum.ApprovedWithExclusions){
+        @if(applItem.claimDecision == DecisionEnum.Approved || applItem.claimDecision == DecisionEnum.ApprovedWithExclusions){
           <div class="col-md-2">
             <span><b>Approved Claim Total - </b></span>
           </div>
@@ -156,7 +156,7 @@
         <div class="col-md-2">
           <span id="spnCauseOfDamage">{{applItem.finalClaim == true ? 'Yes' : (applItem.finalClaim == false ? 'No' : 'Not Set')}}</span>
         </div>
-        @if(applItem.stage == DecisionEnum.Approved || applItem.stage == DecisionEnum.ApprovedWithExclusions){
+        @if(applItem.claimDecision == DecisionEnum.Approved || applItem.claimDecision == DecisionEnum.ApprovedWithExclusions){
         <div class="col-md-2">
           <span><b>Less First $1,000 -</b></span>
         </div>
@@ -180,7 +180,7 @@
         <div class="col-md-2">
           <span id="spnCauseOfDamage">{{applItem.claimTotal }}</span>
         </div>
-        @if(applItem.stage == DecisionEnum.Approved || applItem.stage == DecisionEnum.ApprovedWithExclusions){
+        @if(applItem.claimDecision == DecisionEnum.Approved || applItem.claimDecision == DecisionEnum.ApprovedWithExclusions){
         <div class="col-md-2">
           <span><b>Approved Reimbursement % -</b></span>
         </div>

diff --git a/...app/sharedModules/forms/dfa-claim-main-forms/recovery-claim/recovery-claim.component.html b/...app/sharedModules/forms/dfa-claim-main-forms/recovery-claim/recovery-claim.component.html
@@ -197,7 +197,7 @@
       </ng-container>
       <br />
 
-    @if(recoveryClaim.claim.stage == DecisionEnum.Approved || recoveryClaim.claim.stage == DecisionEnum.ApprovedWithExclusions){
+    @if(recoveryClaim.claim.claimDecision == DecisionEnum.Approved || recoveryClaim.claim.claimDecision == DecisionEnum.ApprovedWithExclusions){
       <ng-container *ngIf="isReadOnly == true">
         <div class="row decisionHeader">
           <b>Decision</b>