Tree updates in clients, notes & pro rates

generatecv/tree.txt

@@ -1,21 +1,14 @@
 PRO
 #    dashboard
-    my_payment_schedule|pro_rate:pro_id=OWN|icon:dollar-sign
-        !inc:code,as_hcp_or_ally,amount,earnings
-        !col:code:Code
-        !col:as_hcp_or_ally:Description (HCP/Ally)
-        !col:amount:Amount
-        !col:earnings:Earnings:select '- TODO -' as result
     clients|client|add|view|icon:user-injured
-        !inc:@name_first,name_last,gender_identity,mcp_pro_id,cm_pro_id,rme_pro_id,rmm_pro_id,rd_pro_id
-        !qry:pros:SELECT id, name_display FROM pro
+        !inc:@name_first,name_last,sex,mcp_pro_id,cm_pro_id,rme_pro_id,rmm_pro_id
+        !qry:pros:SELECT id, concat(name_last, ', ', name_first) as name_display FROM pro
         !col:name_first:First Name=>/clients/view/$uid/SUB_dashboard
         !col:name_last:Last Name
         !col:mcp_pro_id:MCP:~pros:name_display:id,=,$mcp_pro_id:all
         !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:rd_pro_id:RD Pro:~pros:name_display:id,=,$rd_pro_id:all
         !col:name_display:Name
         !col:gender_identity:Gender
     clients/add_new:create
@@ -482,19 +475,17 @@ PRO
                 id=client_ally_update.client_id
             audit_log
     notes|note|view|icon:file-alt
-        !inc:effective_dateest,client_id,hcp_pro_id,ally_pro_id,reasons,is_signed_by_ally,is_signed_by_hcp,billed
-        !qry:pros:SELECT id, name_display FROM pro
-        !qry:clients:SELECT id, concat(name_first,name_last) as name_display FROM client
-        !qry:reasons:SELECT id, concat(reason1,reason2) as result FROM note
+        !inc:effective_dateest,client_id,hcp_pro_id,reasons,is_signed_by_hcp,billed
+        !qry:pros:SELECT id, concat(name_last, ', ', name_first) as name_display FROM pro
+        !qry:clients:SELECT id, concat(name_last, ', ', name_first) as name_display FROM client
+        !qry:reasons:SELECT id, concat(reason1, reason2) as result FROM note
         !col:effective_dateest:Date
         !col:client_id:Client:~clients:name_display:id,=,$client_id:all
         !col:hcp_pro_id:HCP:~pros:name_display:id,=,$hcp_pro_id:all
-        !col:ally_pro_id:Ally:~pros:name_display:id,=,$ally_pro_id:all
         !col:reasons:Reason(s):~reasons:result:id,=,$id:all
         !col:service_location:Location
         !col:category:Category
         !col:content_text:Content
-        !col:is_signed_by_ally:Ally Signed?
         !col:is_signed_by_hcp:HCP Signed?
         !col:billed:Billed?:SELECT '-- TODO --' as result
     notes/view/{uid}
@@ -1054,6 +1045,9 @@ ADMIN
             sessions
             audit_log
     pro_rates|pro_rate|view|icon:funnel-dollar
+        !inc:@created_at,is_active,pro,responsibility,code,amount
+        !qry:pros:SELECT id, concat(name_last, ', ', name_first) as name_display FROM pro
+        !col:pro:Pro:~pros:name_display:id,=,$pro_id:all
     pro_rates/view/{uid}
         ACTIONS
             updateAmount