Changes Related to EDRD-1175

bcgov · Dec 12, 2024 · e8dcab1 · e8dcab1
1 parent 6d060fa
commit e8dcab1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/...main/default/lwc/eDRD_lwc_SFPatientSearchComponent/eDRD_lwc_SFPatientSearchComponent.html b/...main/default/lwc/eDRD_lwc_SFPatientSearchComponent/eDRD_lwc_SFPatientSearchComponent.html
@@ -8,6 +8,7 @@
                     label="Patient Identifier" 
                     value={patientIdentifierSearch} 
                     type="text" 
+                    field-level-help="Personal Health Number"
                     onchange={handlePatientIdentifierChange}>
                 </lightning-input>
             </div>
@@ -105,8 +106,7 @@
                         value={manualGender} 
                         options={genderOptions.data.values} 
                         onchange={handleManualInputChange} 
-                        data-id="manualGender"
-                        required>
+                        data-id="manualGender">
                     </lightning-combobox>
                 </div>
                 <div class="slds-col slds-var-p-horizontal_x-small slds-size_1-of-3">
@@ -126,6 +126,7 @@
                         value={manualPatientIdentifier} 
                         onchange={handleManualInputChange} 
                         data-id="manualPatientIdentifier"
+                        field-level-help="Personal Health Number"
                         minlength="10"
                         maxlength="10">
                     </lightning-input>

diff --git a/...p/main/default/lwc/eDRD_lwc_SFPatientSearchComponent/eDRD_lwc_SFPatientSearchComponent.js b/...p/main/default/lwc/eDRD_lwc_SFPatientSearchComponent/eDRD_lwc_SFPatientSearchComponent.js
@@ -244,7 +244,6 @@ export default class eDRD_lwc_SFPatientSearchComponent extends LightningElement
         this.isNextDisable = !(
             this.patientFirstName &&
             this.patientLastName &&
-            this.patientGender &&
             this.patientBirthdate &&
             (!this.patient_IdentifierManual || !this.isPHNAvaiable)
         );

diff --git a/force-app/main/default/lwc/lookupSearchComp/lookupSearchComp.html b/force-app/main/default/lwc/lookupSearchComp/lookupSearchComp.html
@@ -9,6 +9,7 @@
                     type="search" 
                     onchange={handlekeychange} 
                     value={patientPHN} 
+                    field-level-help="Personal Health Number"
                     placeholder="Enter Identifier Number">
                 </lightning-input>
             </div>

diff --git a/...main/default/objects/Case/validationRules/EDRD_Validate_CaseClose.validationRule-meta.xml b/...main/default/objects/Case/validationRules/EDRD_Validate_CaseClose.validationRule-meta.xml
@@ -8,7 +8,9 @@ RecordType.DeveloperName = &apos;EDRD&apos;,
 ISCHANGED(Status),
 ISBLANK(TEXT(EDRD_MOHFunding_Decision__c)),
 OR(ISPICKVAL(Status,&apos;Funding Approved&apos;),
-ISPICKVAL(Status,&apos;Funding Denied&apos;))
+AND(ISPICKVAL(Status,&apos;Funding Denied&apos;),
+NOT(ISPICKVAL(EDRD_Case_closure_reasons__c, &quot;SC Not Recommended&quot;)),
+NOT(ISPICKVAL(EDRD_Case_closure_reasons__c, &quot;AC Not Recommended&quot;))) )
 )</errorConditionFormula>
     <errorMessage>The case cannot be closed without a funding decision.</errorMessage>
 </ValidationRule>