Changes-2

bcgov · Aug 18, 2024 · 3bca745 · 3bca745
1 parent a8cd3e3
commit 3bca745
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 20 deletions.
diff --git a/...ult/objects/Account/validationRules/EDRD_Validate_ACCommitteeName.validationRule-meta.xml b/...ult/objects/Account/validationRules/EDRD_Validate_ACCommitteeName.validationRule-meta.xml
@@ -4,11 +4,13 @@
     <active>true</active>
     <description>This validation rule ensures that when the Account record type is &quot;Committee_Reviewer/ Provider,&quot; and the Committee picklist is set to &quot;EDRD Advisory Committee&quot; then Committee Name field should left blank.</description>
     <errorConditionFormula>AND(
-CONTAINS($UserRole.Name, &quot;EDRD&quot;),
-ISPICKVAL(Committee__pc, &quot;EDRD Advisory Committee&quot;),
-NOT(ISPICKVAL(Committee_Name__pc, &quot;&quot;)),
-OR(Record_Type_Name__c = &apos;Committee_Reviewer&apos;,
-Record_Type_Name__c = &apos;Provider&apos;)
+    CONTAINS($UserRole.Name, &quot;EDRD&quot;),
+    ISPICKVAL(Committee__pc, &quot;EDRD Advisory Committee&quot;),
+    NOT(ISBLANK(Committee_Name__pc)),
+    OR(
+        Record_Type_Name__c = &apos;Committee_Reviewer&apos;,
+        Record_Type_Name__c = &apos;Provider&apos;
+    )
 )</errorConditionFormula>
     <errorMessage>When Committee is EDRD Advisory Committee then Committee Name cannot be selected.</errorMessage>
 </ValidationRule>
diff --git a/...lt/objects/Account/validationRules/EDRD_Validate_SubCommitteeName.validationRule-meta.xml b/...lt/objects/Account/validationRules/EDRD_Validate_SubCommitteeName.validationRule-meta.xml
@@ -4,12 +4,16 @@
     <active>true</active>
     <description>This validation rule ensures that when the Account record type is &quot;Committee_Reviewer,&quot; and the Committee picklist is set to &quot;EDRD Sub Committee&quot; then Committee Name field is not left blank.</description>
     <errorConditionFormula>AND(
-CONTAINS($UserRole.Name, &quot;EDRD&quot;),
-OR(ISPICKVAL(Committee__pc, &quot;EDRD Sub Committee&quot;),
-(ISPICKVAL(Committee__pc, &quot;EDRD Advisory/ Sub Committee&quot;))),
-ISPICKVAL(Committee_Name__pc, &quot;&quot;),
-OR(Record_Type_Name__c = &apos;Committee_Reviewer&apos;,
-Record_Type_Name__c = &apos;Provider&apos;)
+    CONTAINS($UserRole.Name, &quot;EDRD&quot;),
+    OR(
+        ISPICKVAL(Committee__pc, &quot;EDRD Sub Committee&quot;),
+        ISPICKVAL(Committee__pc, &quot;EDRD Advisory/ Sub Committee&quot;)
+    ),
+    ISBLANK(Committee_Name__pc),
+    OR(
+        Record_Type_Name__c = &apos;Committee_Reviewer&apos;,
+        Record_Type_Name__c = &apos;Provider&apos;
+    )
 )</errorConditionFormula>
     <errorMessage>When Committee is EDRD Sub Committee OR EDRD Advisory/ Sub Committee then Committee Name cannot be blank.</errorMessage>
 </ValidationRule>
diff --git a/force-app/main/default/objects/Case/fields/EDRD_Is_Provider_Login__c.field-meta.xml b/force-app/main/default/objects/Case/fields/EDRD_Is_Provider_Login__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>EDRD_Is_Provider_Login__c</fullName>
+    <description>When these IDs match, the formula returns True, otherwise, it returns False.</description>
+    <externalId>false</externalId>
+    <formula>$User.Id = Provider__r.Id</formula>
+    <label>Is Provider Login</label>
+    <trackHistory>false</trackHistory>
+    <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Case/listViews/EDRD_AC_Cases_Historic.listView-meta.xml b/force-app/main/default/objects/Case/listViews/EDRD_AC_Cases_Historic.listView-meta.xml
@@ -6,7 +6,7 @@
     <columns>CASES.STATUS</columns>
     <columns>Provider__c</columns>
     <columns>Medication_Name__c</columns>
-    <filterScope>Mine</filterScope>
+    <filterScope>Everything</filterScope>
     <filters>
         <field>EDRD_AC_Review_Requested_Date__c</field>
         <operation>notEqual</operation>

diff --git a/force-app/main/default/objects/Case/listViews/EDRD_AC_Cases_Upcoming.listView-meta.xml b/force-app/main/default/objects/Case/listViews/EDRD_AC_Cases_Upcoming.listView-meta.xml
@@ -7,7 +7,7 @@
     <columns>CASES.STATUS</columns>
     <columns>Provider__c</columns>
     <columns>Medication_Name__c</columns>
-    <filterScope>Mine</filterScope>
+    <filterScope>Everything</filterScope>
     <filters>
         <field>EDRD_AC_Review_Requested_Date__c</field>
         <operation>notEqual</operation>

diff --git a/force-app/main/default/objects/Case/listViews/EDRD_Ministry_Queue_Case.listView-meta.xml b/force-app/main/default/objects/Case/listViews/EDRD_Ministry_Queue_Case.listView-meta.xml
@@ -14,7 +14,7 @@
         <operation>equals</operation>
         <value>Case.EDRD</value>
     </filters>
-    <label>EDRD Ministry Queue</label>
+    <label>EDRD MOH Queue</label>
     <queue>EDRD_Ministry_Queue</queue>
     <sharedTo>
         <role>Developer</role>

diff --git a/force-app/main/default/objects/Case/listViews/EDRD_SC_Cases_Historic.listView-meta.xml b/force-app/main/default/objects/Case/listViews/EDRD_SC_Cases_Historic.listView-meta.xml
@@ -6,7 +6,7 @@
     <columns>CASES.STATUS</columns>
     <columns>Provider__c</columns>
     <columns>Medication_Name__c</columns>
-    <filterScope>Mine</filterScope>
+    <filterScope>Everything</filterScope>
     <filters>
         <field>EDRD_SubCommittee_Name__c</field>
         <operation>notEqual</operation>

diff --git a/force-app/main/default/objects/Case/listViews/My_EDRD_Closed_Cases_Portal.listView-meta.xml b/force-app/main/default/objects/Case/listViews/My_EDRD_Closed_Cases_Portal.listView-meta.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ListView xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>My_EDRD_Closed_Cases_Portal</fullName>
-    <booleanFilter>1 AND 2</booleanFilter>
     <columns>CASES.CASE_NUMBER</columns>
+    <columns>CASES.TYPE</columns>
     <columns>EDRD_Ref_No__c</columns>
     <columns>CASES.STATUS</columns>
     <columns>NAME</columns>
@@ -22,6 +22,11 @@
         <operation>equals</operation>
         <value>1</value>
     </filters>
+    <filters>
+        <field>EDRD_Is_Provider_Login__c</field>
+        <operation>equals</operation>
+        <value>1</value>
+    </filters>
     <label>My EDRD Closed Cases-Provider</label>
     <sharedTo>
         <group>EDRD_Physicians</group>

diff --git a/force-app/main/default/objects/Case/listViews/My_EDRD_Open_Cases_Portal.listView-meta.xml b/force-app/main/default/objects/Case/listViews/My_EDRD_Open_Cases_Portal.listView-meta.xml
@@ -2,6 +2,7 @@
 <ListView xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>My_EDRD_Open_Cases_Portal</fullName>
     <columns>CASES.CASE_NUMBER</columns>
+    <columns>CASES.TYPE</columns>
     <columns>EDRD_Ref_No__c</columns>
     <columns>CASES.STATUS</columns>
     <columns>Provider__c</columns>
@@ -20,6 +21,11 @@
         <operation>equals</operation>
         <value>Case.EDRD</value>
     </filters>
+    <filters>
+        <field>EDRD_Is_Provider_Login__c</field>
+        <operation>equals</operation>
+        <value>1</value>
+    </filters>
     <label>My EDRD Open Cases-Provider</label>
     <sharedTo>
         <group>EDRD_Physicians</group>

diff --git a/force-app/main/default/objects/Contact/fields/Committee_Name__c.field-meta.xml b/force-app/main/default/objects/Contact/fields/Committee_Name__c.field-meta.xml
@@ -6,15 +6,15 @@
     <required>false</required>
     <trackFeedHistory>false</trackFeedHistory>
     <trackHistory>false</trackHistory>
-    <type>Picklist</type>
+    <type>MultiselectPicklist</type>
     <valueSet>
         <restricted>true</restricted>
         <valueSetDefinition>
             <sorted>false</sorted>
             <value>
-                <fullName>Cystic Fibrosis Mutation (CFM) Subcommittee</fullName>
+                <fullName>Cystic Fibrosis Mutation Subcommittee</fullName>
                 <default>false</default>
-                <label>Cystic Fibrosis Mutation (CFM) Subcommittee</label>
+                <label>Cystic Fibrosis Mutation Subcommittee</label>
             </value>
             <value>
                 <fullName>Cardiac Clinical Subcommittee</fullName>
@@ -53,4 +53,5 @@
             </value>
         </valueSetDefinition>
     </valueSet>
+    <visibleLines>8</visibleLines>
 </CustomField>
diff --git a/force-app/main/default/queues/EDRD_Ministry_Queue.queue-meta.xml b/force-app/main/default/queues/EDRD_Ministry_Queue.queue-meta.xml
@@ -2,7 +2,7 @@
 <Queue xmlns="http://soap.sforce.com/2006/04/metadata">
     <doesSendEmailToMembers>true</doesSendEmailToMembers>
     <email>nour.sahib@gov.bc.ca</email>
-    <name>EDRD Ministry Queue</name>
+    <name>EDRD MOH Queue</name>
     <queueMembers>
         <roles>
             <role>EDRD_Admin</role>