Merge branch 'main' into feature/dashboard-and-home

Sundae-Shop-Consulting · Aug 13, 2024 · e713278 · e713278
2 parents 674bbe6 + df2c3f7
commit e713278
Show file tree

Hide file tree

Showing 37 changed files with 84 additions and 98 deletions.
diff --git a/cumulusci.yml b/cumulusci.yml
@@ -14,24 +14,35 @@ project:
 
 
 flows:
-    dev_org:
+    config_with_data:
         steps:
-            10:
+            1:
                 task: deploy_dlrs 
-            11:
+            2:
                 task: assign_permission_sets
                 options:
                     api_names:
                         - VolunteerManager 
-            12:
+            3:
                 task: load_dataset
                 options:
                     mapping: datasets/mapping.yml
                     sql_path: datasets/sample-animalshelter.sql
                     drop_missing_schema: True
-            13:
+            4:
                 task: reorder_app_menu
 
+    dev_org:
+        steps:
+            10: 
+                flow: config_with_data
+
+    install_beta:
+        steps:
+            10:
+                flow: config_with_data
+
+
     make_community:
         steps:
             1:

diff --git a/docs/images/volunteers_erd.png b/docs/images/volunteers_erd.png
diff --git a/force-app/volunteers/objects/VolunteerPosition__c/fields/Location__c.field-meta.xml b/force-app/volunteers/objects/VolunteerPosition__c/fields/Location__c.field-meta.xml
diff --git a/force-app/volunteers/reports/VolunteerReports/ActivitiesWithVolunteersNeeded.report-meta.xml b/force-app/volunteers/reports/VolunteerReports/ActivitiesWithVolunteersNeeded.report-meta.xml
@@ -29,7 +29,6 @@
             <operator>greaterThan</operator>
             <value>0</value>
         </criteriaItems>
-        <language>en_US</language>
     </filter>
     <format>Tabular</format>
     <name>Activities with Volunteers Needed</name>

diff --git a/force-app/volunteers/reports/VolunteerReports/AllVolunteersLastMonth.report-meta.xml b/force-app/volunteers/reports/VolunteerReports/AllVolunteersLastMonth.report-meta.xml
@@ -19,7 +19,6 @@
             <operator>equals</operator>
             <value>LAST_MONTH</value>
         </criteriaItems>
-        <language>en_US</language>
     </filter>
     <format>Summary</format>
     <groupingsDown>

diff --git a/force-app/volunteers/reports/VolunteerReports/AllVolunteersThisYear.report-meta.xml b/force-app/volunteers/reports/VolunteerReports/AllVolunteersThisYear.report-meta.xml
@@ -19,7 +19,6 @@
             <operator>equals</operator>
             <value>THIS_YEAR</value>
         </criteriaItems>
-        <language>en_US</language>
     </filter>
     <format>Summary</format>
     <groupingsDown>

diff --git a/force-app/volunteers/reports/VolunteerReports/AvailableVolunteerActivities.report-meta.xml b/force-app/volunteers/reports/VolunteerReports/AvailableVolunteerActivities.report-meta.xml
@@ -39,7 +39,6 @@
             <operator>equals</operator>
             <value>1</value>
         </criteriaItems>
-        <language>en_US</language>
     </filter>
     <format>Tabular</format>
     <name>Available Volunteer Activities</name>

diff --git a/force-app/volunteers/reports/VolunteerReports/AvailableVolunteerShifts.report-meta.xml b/force-app/volunteers/reports/VolunteerReports/AvailableVolunteerShifts.report-meta.xml
@@ -46,7 +46,6 @@
             <operator>greaterOrEqual</operator>
             <value>TODAY</value>
         </criteriaItems>
-        <language>en_US</language>
     </filter>
     <format>Summary</format>
     <groupingsDown>

diff --git a/force-app/volunteers/reports/VolunteerReports/RecentVolunteers.report-meta.xml b/force-app/volunteers/reports/VolunteerReports/RecentVolunteers.report-meta.xml
@@ -28,7 +28,6 @@
             <operator>greaterOrEqual</operator>
             <value>N_DAYS_AGO:120</value>
         </criteriaItems>
-        <language>en_US</language>
     </filter>
     <format>Tabular</format>
     <name>Recent Volunteers</name>

diff --git a/force-app/volunteers/reports/VolunteerReports/TopVolunteersByLifetimeHours.report-meta.xml b/force-app/volunteers/reports/VolunteerReports/TopVolunteersByLifetimeHours.report-meta.xml
@@ -19,7 +19,6 @@
             <operator>greaterThan</operator>
             <value>0</value>
         </criteriaItems>
-        <language>en_US</language>
     </filter>
     <format>Tabular</format>
     <name>Top Volunteers by Lifetime Hours</name>

diff --git a/force-app/volunteers/reports/VolunteerReports/TopVolunteersByRecentHours.report-meta.xml b/force-app/volunteers/reports/VolunteerReports/TopVolunteersByRecentHours.report-meta.xml
@@ -47,7 +47,6 @@
             <operator>equals</operator>
             <value>LAST_N_DAYS:120</value>
         </criteriaItems>
-        <language>en_US</language>
     </filter>
     <format>Summary</format>
     <groupingsDown>

diff --git a/force-app/volunteers/reports/VolunteerReports/TotalVolunteerHoursByMonth.report-meta.xml b/force-app/volunteers/reports/VolunteerReports/TotalVolunteerHoursByMonth.report-meta.xml
@@ -16,7 +16,6 @@
             <operator>equals</operator>
             <value>THIS_YEAR</value>
         </criteriaItems>
-        <language>en_US</language>
     </filter>
     <format>Summary</format>
     <groupingsDown>

diff --git a/...e-app/volunteers/reports/VolunteerReports/UpcomingShiftsNeedingVolunteers.report-meta.xml b/...e-app/volunteers/reports/VolunteerReports/UpcomingShiftsNeedingVolunteers.report-meta.xml
@@ -38,7 +38,6 @@
             <operator>greaterOrEqual</operator>
             <value>TODAY</value>
         </criteriaItems>
-        <language>en_US</language>
     </filter>
     <format>Summary</format>
     <groupingsDown>

diff --git a/force-app/volunteers/reports/VolunteerReports/UpcomingShiftsWithVolunteers.report-meta.xml b/force-app/volunteers/reports/VolunteerReports/UpcomingShiftsWithVolunteers.report-meta.xml
@@ -21,7 +21,6 @@
             <operator>greaterOrEqual</operator>
             <value>TODAY</value>
         </criteriaItems>
-        <language>en_US</language>
     </filter>
     <format>Summary</format>
     <groupingsDown>

diff --git a/sfdx-project.json b/sfdx-project.json
@@ -5,6 +5,6 @@
             "default": true
         }
     ],
-    "namespace": "v4us",
+    "namespace": "v4ustest",
     "sourceApiVersion": "58.0"
 }
diff --git a/unpackaged/config/dlrs/classes/dlrs_VolunteerActivityAssignmentTest.cls b/unpackaged/config/dlrs/classes/dlrs_VolunteerActivityAssignmentTest.cls
@@ -8,6 +8,6 @@ private class dlrs_VolunteerActivityAssignmentTest
     private static void testTrigger()
     {
         // Force the dlrs_VolunteerActivityAssignmentTrigger to be invoked, fails the test if org config or other Apex code prevents this.
-        dlrs.RollupService.testHandler(new VolunteerActivityAssignment__c());
+        dlrs.RollupService.testHandler(new %%%NAMESPACE%%%VolunteerActivityAssignment__c());
     }
 }
diff --git a/unpackaged/config/dlrs/classes/dlrs_VolunteerActivityTest.cls b/unpackaged/config/dlrs/classes/dlrs_VolunteerActivityTest.cls
@@ -8,6 +8,6 @@ private class dlrs_VolunteerActivityTest
     private static void testTrigger()
     {
         // Force the dlrs_VolunteerActivityTrigger to be invoked, fails the test if org config or other Apex code prevents this.
-        dlrs.RollupService.testHandler(new VolunteerActivity__c());
+        dlrs.RollupService.testHandler(new %%%NAMESPACE%%%VolunteerActivity__c());
     }
 }
diff --git a/unpackaged/config/dlrs/classes/dlrs_VolunteerHoursLogTest.cls b/unpackaged/config/dlrs/classes/dlrs_VolunteerHoursLogTest.cls
@@ -8,6 +8,6 @@ private class dlrs_VolunteerHoursLogTest
     private static void testTrigger()
     {
         // Force the dlrs_VolunteerHoursLogTrigger to be invoked, fails the test if org config or other Apex code prevents this.
-        dlrs.RollupService.testHandler(new VolunteerHoursLog__c());
+        dlrs.RollupService.testHandler(new %%%NAMESPACE%%%VolunteerHoursLog__c());
     }
 }
diff --git a/unpackaged/config/dlrs/classes/dlrs_VolunteerPositionAssignmentTest.cls b/unpackaged/config/dlrs/classes/dlrs_VolunteerPositionAssignmentTest.cls
@@ -8,6 +8,6 @@ private class dlrs_VolunteerPositionAssignmentTest
     private static void testTrigger()
     {
         // Force the dlrs_VolunteerPositionAssignmentTrigger to be invoked, fails the test if org config or other Apex code prevents this.
-        dlrs.RollupService.testHandler(new VolunteerPositionAssignment__c());
+        dlrs.RollupService.testHandler(new %%%NAMESPACE%%%VolunteerPositionAssignment__c());
     }
 }
diff --git a/unpackaged/config/dlrs/classes/dlrs_VolunteerShiftAssignmentTest.cls b/unpackaged/config/dlrs/classes/dlrs_VolunteerShiftAssignmentTest.cls
@@ -8,6 +8,6 @@ private class dlrs_VolunteerShiftAssignmentTest
     private static void testTrigger()
     {
         // Force the dlrs_VolunteerShiftAssignmentTrigger to be invoked, fails the test if org config or other Apex code prevents this.
-        dlrs.RollupService.testHandler(new VolunteerShiftAssignment__c());
+        dlrs.RollupService.testHandler(new %%%NAMESPACE%%%VolunteerShiftAssignment__c());
     }
 }
diff --git a/unpackaged/config/dlrs/classes/dlrs_VolunteerShiftTest.cls b/unpackaged/config/dlrs/classes/dlrs_VolunteerShiftTest.cls
@@ -8,6 +8,6 @@ private class dlrs_VolunteerShiftTest
     private static void testTrigger()
     {
         // Force the dlrs_VolunteerShiftTrigger to be invoked, fails the test if org config or other Apex code prevents this.
-        dlrs.RollupService.testHandler(new VolunteerShift__c());
+        dlrs.RollupService.testHandler(new %%%NAMESPACE%%%VolunteerShift__c());
     }
 }
diff --git a/...fig/dlrs/customMetadata/dlrs__LookupRollupSummary2.ContactFirstVolunteerDate.md b/...fig/dlrs/customMetadata/dlrs__LookupRollupSummary2.ContactFirstVolunteerDate.md
@@ -16,7 +16,7 @@
     </values>
     <values>
         <field>dlrs__AggregateResultField__c</field>
-        <value xsi:type="xsd:string">FirstVolunteerDate__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%FirstVolunteerDate__c</value>
     </values>
     <values>
         <field>dlrs__CalculationMode__c</field>
@@ -28,7 +28,7 @@
     </values>
     <values>
         <field>dlrs__ChildObject__c</field>
-        <value xsi:type="xsd:string">VolunteerHoursLog__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerHoursLog__c</value>
     </values>
     <values>
         <field>dlrs__ConcatenateDelimiter__c</field>
@@ -40,11 +40,11 @@
     </values>
     <values>
         <field>dlrs__FieldToAggregate__c</field>
-        <value xsi:type="xsd:string">StartDate__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%StartDate__c</value>
     </values>
     <values>
         <field>dlrs__FieldToOrderBy__c</field>
-        <value xsi:type="xsd:string">StartDate__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%StartDate__c</value>
     </values>
     <values>
         <field>dlrs__ParentObject__c</field>
@@ -60,7 +60,7 @@
     </values>
     <values>
         <field>dlrs__RelationshipField__c</field>
-        <value xsi:type="xsd:string">VolunteerContact__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerContact__c</value>
     </values>
     <values>
         <field>dlrs__RowLimit__c</field>

diff --git a/...nfig/dlrs/customMetadata/dlrs__LookupRollupSummary2.ContactLastVolunteerDate.md b/...nfig/dlrs/customMetadata/dlrs__LookupRollupSummary2.ContactLastVolunteerDate.md
@@ -16,7 +16,7 @@
     </values>
     <values>
         <field>dlrs__AggregateResultField__c</field>
-        <value xsi:type="xsd:string">FirstVolunteerDate__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%FirstVolunteerDate__c</value>
     </values>
     <values>
         <field>dlrs__CalculationMode__c</field>
@@ -28,7 +28,7 @@
     </values>
     <values>
         <field>dlrs__ChildObject__c</field>
-        <value xsi:type="xsd:string">VolunteerHoursLog__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerHoursLog__c</value>
     </values>
     <values>
         <field>dlrs__ConcatenateDelimiter__c</field>
@@ -40,11 +40,11 @@
     </values>
     <values>
         <field>dlrs__FieldToAggregate__c</field>
-        <value xsi:type="xsd:string">StartDate__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%StartDate__c</value>
     </values>
     <values>
         <field>dlrs__FieldToOrderBy__c</field>
-        <value xsi:type="xsd:string">StartDate__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%StartDate__c</value>
     </values>
     <values>
         <field>dlrs__ParentObject__c</field>
@@ -60,7 +60,7 @@
     </values>
     <values>
         <field>dlrs__RelationshipField__c</field>
-        <value xsi:type="xsd:string">VolunteerContact__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerContact__c</value>
     </values>
     <values>
         <field>dlrs__RowLimit__c</field>

diff --git a/.../config/dlrs/customMetadata/dlrs__LookupRollupSummary2.ContactVolunteerHours.md b/.../config/dlrs/customMetadata/dlrs__LookupRollupSummary2.ContactVolunteerHours.md
@@ -16,7 +16,7 @@
     </values>
     <values>
         <field>dlrs__AggregateResultField__c</field>
-        <value xsi:type="xsd:string">VolunteerHours__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerHours__c</value>
     </values>
     <values>
         <field>dlrs__CalculationMode__c</field>
@@ -28,7 +28,7 @@
     </values>
     <values>
         <field>dlrs__ChildObject__c</field>
-        <value xsi:type="xsd:string">VolunteerHoursLog__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerHoursLog__c</value>
     </values>
     <values>
         <field>dlrs__ConcatenateDelimiter__c</field>
@@ -40,11 +40,11 @@
     </values>
     <values>
         <field>dlrs__FieldToAggregate__c</field>
-        <value xsi:type="xsd:string">Hours__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%Hours__c</value>
     </values>
     <values>
         <field>dlrs__FieldToOrderBy__c</field>
-        <value xsi:type="xsd:string">StartDate__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%StartDate__c</value>
     </values>
     <values>
         <field>dlrs__ParentObject__c</field>
@@ -60,7 +60,7 @@
     </values>
     <values>
         <field>dlrs__RelationshipField__c</field>
-        <value xsi:type="xsd:string">VolunteerContact__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerContact__c</value>
     </values>
     <values>
         <field>dlrs__RowLimit__c</field>

diff --git a/...ustomMetadata/dlrs__LookupRollupSummary2.VolunteerActivityFirstShiftDateTime.md b/...ustomMetadata/dlrs__LookupRollupSummary2.VolunteerActivityFirstShiftDateTime.md
@@ -16,7 +16,7 @@
     </values>
     <values>
         <field>dlrs__AggregateResultField__c</field>
-        <value xsi:type="xsd:string">FirstShiftDateTime__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%FirstShiftDateTime__c</value>
     </values>
     <values>
         <field>dlrs__CalculationMode__c</field>
@@ -28,7 +28,7 @@
     </values>
     <values>
         <field>dlrs__ChildObject__c</field>
-        <value xsi:type="xsd:string">VolunteerShift__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerShift__c</value>
     </values>
     <values>
         <field>dlrs__ConcatenateDelimiter__c</field>
@@ -40,15 +40,15 @@
     </values>
     <values>
         <field>dlrs__FieldToAggregate__c</field>
-        <value xsi:type="xsd:string">StartDateTime__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%StartDateTime__c</value>
     </values>
     <values>
         <field>dlrs__FieldToOrderBy__c</field>
-        <value xsi:type="xsd:string">StartDateTime__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%StartDateTime__c</value>
     </values>
     <values>
         <field>dlrs__ParentObject__c</field>
-        <value xsi:type="xsd:string">VolunteerActivity__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerActivity__c</value>
     </values>
     <values>
         <field>dlrs__RelationshipCriteriaFields__c</field>
@@ -60,7 +60,7 @@
     </values>
     <values>
         <field>dlrs__RelationshipField__c</field>
-        <value xsi:type="xsd:string">VolunteerActivity__c</value>
+        <value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerActivity__c</value>
     </values>
     <values>
         <field>dlrs__RowLimit__c</field>