Merge pull request #1398 from bcgov/feature-Edrd-1045

Edrd-1045
bcgov · Nov 26, 2024 · e225dab · e225dab
2 parents 1fdde46 + 06caa79
commit e225dab
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 46 deletions.
diff --git a/.../objects/Case/validationRules/EDRD_Prevent_Case_Edit_After_Closed.validationRule-meta.xml b/.../objects/Case/validationRules/EDRD_Prevent_Case_Edit_After_Closed.validationRule-meta.xml
@@ -4,7 +4,7 @@
     <active>true</active>
     <errorConditionFormula>AND(
  $Profile.Name &lt;&gt; &apos;System Administrator&apos;,
-$Permission.EDRD_MOH_STAFF  = TRUE,
+ $Permission.EDRD_PHSA_PSP_Staff  = TRUE,
 RecordType.DeveloperName = &apos;EDRD&apos;,
 
 OR(
@@ -14,47 +14,18 @@ OR(
 ),
 
 
-        OR(	
-ISCHANGED(Type),
-ISCHANGED(Origin),
-ISCHANGED(Priority),
-ISCHANGED(Subject),
-ISCHANGED(Description),
-ISCHANGED(EDRD_Case_Fits_Criteria__c),
-ISCHANGED(EDRD_Case_Reason_Does_Not_Meet_Criteria__c),
-ISCHANGED(EDRD_Ref_No__c),
-ISCHANGED(EDRD_Eligibility_Form_Signed_Date__c),
-ISCHANGED(EDRD_Coverage_Status__c),
-ISCHANGED(EDRD_Insurance_Provider__c),
-ISCHANGED(EDRD_Additional_information__c),
-ISCHANGED(EDRD_of_Coverage__c),
-ISCHANGED(EDRD_Annual_Max_Coverage__c),
-ISCHANGED(EDRD_Lifetime_Max_Coverage__c),
-ISCHANGED(Provider__c),
-ISCHANGED(EDRD_RPH_Simplified_Review__c),
-ISCHANGED(EDRD_Case_Eligible_For_Rph_Review__c),
-ISCHANGED(EDRD_RPH_Review_Notes__c),
-ISCHANGED(EDRD_RPH_Review_Pathway__c),
-ISCHANGED(EDRD_RPH_Review_Funding_Duration_Unit__c),
-ISCHANGED(EDRD_RPH_Review_Funding_Duration__c),
-ISCHANGED(EDRD_Patient_Meets_Criteria_for_Rph__c),
-ISCHANGED(EDRD_SubCommittee_Name__c),
-ISCHANGED(EDRD_SC_Review_Requested_Date__c),
-ISCHANGED(EDRD_SC_Recommendation_Review__c),
-ISCHANGED(EDRD_SC_Reason_Patient_Not_Meet_Criteria__c),
-ISCHANGED(EDRD_SC_Review_Funding_Duration__c),
-ISCHANGED(EDRD_SC_Review_Funding_Duration_Unit__c),
-ISCHANGED(EDRD_SC_Review_Notes__c),
-ISCHANGED(EDRD_SC_Review_Pathway__c),
-ISCHANGED(EDRD_AC_Review_Requested_Date__c),
-ISCHANGED(EDRD_AC_Reason_Patient_Not_Meet_Criteria__c),
-ISCHANGED(EDRD_AC_Recommendation_Review__c),
-ISCHANGED(EDRD_AC_Review_Funding_Duration__c),
-ISCHANGED(EDRD_AC_Review_Funding_Duration_Unit__c),
-ISCHANGED(EDRD_AC_Review_Notes__c),
-ISCHANGED(EDRD_AC_Review_Pathway__c),
-ISCHANGED(EDRD_AC_Review_Requested__c),
-ISCHANGED(EDRD_Patient_Meets_Criteria_for_AC__c)
+OR(	
+ISCHANGED(EDRD_MOHFunding_Decision__c),
+ISCHANGED(EDRD_MOHIndefinite_Funding__c),
+ISCHANGED(EDRD_MOHFunding_Start_Date__c),
+ISCHANGED(EDRD_MOHComments__c),
+ISCHANGED(EDRD_MOHDrug_Cost_Forecast__c),
+ISCHANGED(EDRD_MOHApproved_Dosage__c),
+ISCHANGED(EDRD_MOHApproved_Dosage_Unit__c),
+ISCHANGED(EDRD_MOHApproved_Frequency__c),
+ISCHANGED(EDRD_MOHApproved_Frequency_Unit__c),
+ISCHANGED(EDRD_MOHApproved_Funding_Duration__c),
+ISCHANGED(EDRD_MOHApproved_Funding_Duration_Unit__c)
 )
 )</errorConditionFormula>
     <errorMessage>You do not have access to make these changes, please contact Ministry of Health staff</errorMessage>

diff --git a/...ault/objects/Case/validationRules/EDRD_Prevent_Case_Status_Change.validationRule-meta.xml b/...ault/objects/Case/validationRules/EDRD_Prevent_Case_Status_Change.validationRule-meta.xml
@@ -2,9 +2,14 @@
 <ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>EDRD_Prevent_Case_Status_Change</fullName>
     <active>true</active>
-    <description>Case Status cannot be changed to the</description>
+    <description>Case Status cannot be changed from closed</description>
     <errorConditionFormula>AND(
 RecordType.DeveloperName = &apos;EDRD&apos;,
+$Profile.Name &lt;&gt; &apos;System Administrator&apos;,
+OR( 
+$Permission.EDRD_MOH_STAFF = TRUE,
+$Permission.EDRD_PHSA_PSP_Staff = TRUE
+),
 
 OR(
 ISPICKVAL( PRIORVALUE( Status ), &quot;Cancelled&quot;),
@@ -15,7 +20,8 @@ ISPICKVAL( PRIORVALUE( Status ), &quot;Funding Denied&quot;)
 OR(
 ISPICKVAL( Status, &quot;Received - Awaiting Verification&quot;),
 ISPICKVAL( Status, &quot;SC Review&quot;),
-ISPICKVAL( Status, &quot;AC Review&quot;)
+ISPICKVAL( Status, &quot;AC Review&quot;),
+ISPICKVAL( Status, &quot;MOH Review&quot;)
 )
 )</errorConditionFormula>
     <errorMessage>You do not have access to make these changes, please contact Ministry of Health staff</errorMessage>

diff --git a/force-app/main/default/permissionsets/EDRD_PS_PHSA_PSP_Staff.permissionset-meta.xml b/force-app/main/default/permissionsets/EDRD_PS_PHSA_PSP_Staff.permissionset-meta.xml
@@ -280,7 +280,7 @@
         <readable>true</readable>
     </fieldPermissions>
     <fieldPermissions>
-        <editable>false</editable>
+        <editable>true</editable>
         <field>Case.EDRD_MOHFunding_Expiry_Date__c</field>
         <readable>true</readable>
     </fieldPermissions>
@@ -575,7 +575,7 @@
         <readable>true</readable>
     </fieldPermissions>
     <fieldPermissions>
-        <editable>true</editable>
+        <editable>false</editable>
         <field>Contact.Patient_is_Deceased__c</field>
         <readable>true</readable>
     </fieldPermissions>