Merge in dev

generatecv/tree.txt

@@ -232,6 +232,12 @@ PRO
             putRmmPro
                 rmmProUid*:record:pro:uid,name_display
             removeRmmPro
+            putRmsPro
+                rmsProUid*:record:pro:uid,name_display
+            removeRmsPro
+            putRmgPro
+                rmgProUid*:record:pro:uid,name_display
+            removeRmgPro
             putRdPro
                 rdProUid*:record:pro:uid,name_display
             removeRdPro
@@ -310,7 +316,7 @@ PRO
                 !grp:Physician:physician_pro_id:Put Physician:circle=>/clients/view/$uid/ACTION_putPhysicianPro
                 !grp:MCP Visit:has_mcp_done_onboarding_visit,mcp_onboarding_visit_date,mcp_onboarding_visit_note_id,reason_onboarding_visit_note_outside_system,is_mcp_onboarding_active,why_is_mcp_onboarding_not_active_category,why_is_mcp_onboarding_not_active_memo:Update source:circle=>/clients/view/$uid/ACTION_updateMcpOnboardingVisitInfo
                 !grp:Onboarding Strategy:mcp_onboarding_strategy,next_mcp_onboarding_attempt_date,next_mcp_onboarding_attempt_time,number_of_mcp_onboarding_phone_calls,number_of_mcp_onboarding_in_person_visits
-                !grp:Other Key Pros:cm_pro_id,rme_pro_id,rmm_pro_id,rd_pro_id
+                !grp:Other Key Pros:cm_pro_id,rme_pro_id,rmm_pro_id,rms_pro_id,rmg_pro_id,rd_pro_id
                 !grp:MNT Eligibility:eligible_for_mnt,number_of_mnt_hours_left_this_year:Update MNT Eligibility:circle=>/clients/view/$uid/ACTION_updateMntEligibility
                 !grp:CM Enrollment:is_eligible_for_cm,why_not_eligible_for_cm_category,why_not_eligible_for_cm_memo,is_enrolled_in_cm,cm_reason1,cm_reason2,cm_enrollment_consent_method,cm_enrollment_consent_method_memo,why_not_enrolled_in_cm_category,why_not_enrolled_in_cm_memo:Update CM Eligibility:circle=>/clients/view/$uid/ACTION_updateCmEligibility
                 !grp:RM Enrollment:is_eligible_for_rm,why_not_eligible_for_rm_category,why_not_eligible_for_rm_memo,is_enrolled_in_rm,rm_reason1,rm_reason2,why_not_enrolled_in_rm_category,why_not_enrolled_in_rm_memo:Update why not enrolled in RM:circle=>/clients/view/$uid/ACTION_updateRmEligibility
@@ -337,6 +343,10 @@ PRO
                 !act:rme_pro_id:removeRmePro:circle=>/clients/view/$uid/ACTION_removeRmePro
                 !act:rmm_pro_id:putRmmPro:circle=>/clients/view/$uid/ACTION_putRmmPro
                 !act:rmm_pro_id:removeRmmPro:circle=>/clients/view/$uid/ACTION_removeRmmPro
+                !act:rms_pro_id:putRmsPro:circle=>/clients/view/$uid/ACTION_putRmsPro
+                !act:rms_pro_id:removeRmsPro:circle=>/clients/view/$uid/ACTION_removeRmsPro
+                !act:rmg_pro_id:putRmgPro:circle=>/clients/view/$uid/ACTION_putRmgPro
+                !act:rmg_pro_id:removeRmgPro:circle=>/clients/view/$uid/ACTION_removeRmgPro
                 !act:rd_pro_id:putRdPro:circle=>/clients/view/$uid/ACTION_putRdPro
                 !act:rd_pro_id:removeRdPro:circle=>/clients/view/$uid/ACTION_removeRdPro
                 !act:eligible_for_mnt:updateMntEligibility:circle=>/clients/view/$uid/ACTION_updateMntEligibility
@@ -374,6 +384,8 @@ PRO
                 !col:cm_pro_id:CM Pro:~pros:name_display:id,=,$cm_pro_id:all
                 !col:rme_pro_id:RME Pro:~pros:name_display:id,=,$rme_pro_id:all
                 !col:rmm_pro_id:RMM Pro:~pros:name_display:id,=,$rmm_pro_id:all
+                !col:rms_pro_id:RMS Pro:~pros:name_display:id,=,$rms_pro_id:all
+                !col:rmg_pro_id:RMG Pro:~pros:name_display:id,=,$rmg_pro_id:all
                 !col:rd_pro_id:RD Pro:~pros:name_display:id,=,$rd_pro_id:all
                 !nal:
             measurements
@@ -661,6 +673,16 @@ PRO
             changeRmmPro
                 rmmProUid:record:pro:uid,name_display
             removeRmmPro:if:rmm_pro_id
+            assignRmsPro
+                rmsProUid:record:pro:uid,name_display
+            changeRmsPro
+                rmsProUid:record:pro:uid,name_display
+            removeRmsPro:if:rms_pro_id
+            assignRmgPro
+                rmgProUid:record:pro:uid,name_display
+            changeRmgPro
+                rmgProUid:record:pro:uid,name_display
+            removeRmgPro:if:rms_pro_id
             updateCmReasons
                 cmReason1*
                 cmReason2
@@ -1456,6 +1478,24 @@ ADMIN
                 detail=detail
         SUB
             dashboard
+    accounts|account|view|icon:tablet-alt
+    accounts/view/{uid}
+        ACTIONS
+            deactivate
+                memo
+            reactivate
+                memo
+        SUB
+            dashboard
+            clients
+                id=account_client.account_id=>/account_clients/view/UID
+    account_clients|account_client|view|icon:tablet-alt
+    account_clients/view/{uid}
+        ACTIONS
+            proAllowAccess
+            proDenyAccess
+        SUB
+            dashboard
     products|product|add|view|icon:tablet-alt
     products/add_new:create
         title*