Use !qry: directives for efficiency

generatecv/tree.txt

@@ -8,20 +8,22 @@ PRO
         !col:earnings:Earnings:select '- TODO -' as result
     my_clients|client|add|view|icon:user-injured
         !inc:@name_display,date_of_birth,gender,is_client_enrolled_in_cm,is_client_enrolled_in_rm,mcp_pro_id,cm_pro_id,rme_pro_id,rmm_pro_id
+        !qry:pros:SELECT id, name_display FROM pro
         !col:name_display:Name
         !col:date_of_birth:DOB
         !col:gender:Sex
         !col:is_client_enrolled_in_cm:CM
         !col:is_client_enrolled_in_rm:RM
-        !col:mcp_pro_id:MCP:SELECT name_display AS result FROM pro WHERE id = $mcp_pro_id
-        !col:cm_pro_id:CM:SELECT name_display AS result FROM pro WHERE id = $cm_pro_id
-        !col:rme_pro_id:RME:SELECT name_display AS result FROM pro WHERE id = $rme_pro_id
-        !col:rmm_pro_id:RMM:SELECT name_display AS result FROM pro WHERE id = $rmm_pro_id
+        !col:mcp_pro_id:MCP:~pros:name_display:id,=,$mcp_pro_id:all
+        !col:cm_pro_id:CM:~pros:name_display:id,=,$cm_pro_id:all
+        !col:rme_pro_id:RME:~pros:name_display:id,=,$rme_pro_id:all
+        !col:rmm_pro_id:RMM:~pros:name_display:id,=,$rmm_pro_id:all
     my_clients/add_new:create
-        mcpProUid:record:pro:uid,name_display
-        cmProUid:record:pro:uid,name_display
-        rmeProUid:record:pro:uid,name_display
-        rmmProUid:record:pro:uid,name_display
+        !qry:pros:SELECT uid, name_display FROM pro
+        mcpProUid:record:~pros:uid,name_display
+        cmProUid:record:~pros:uid,name_display
+        rmeProUid:record:~pros:uid,name_display
+        rmmProUid:record:~pros:uid,name_display
         nameDisplay
         namePrefix
         nameFirst
@@ -198,7 +200,8 @@ PRO
                     startYear:number
             care_month_entries
                 id=care_month_entry.client_id=>/care_month_entries/view/UID
-                !col:pro_id:Pro:select name_display as result from pro where id = $pro_id
+                !qry:pros:SELECT id, name_display FROM pro
+                !col:pro_id:Pro:~pros:name_display:id,=,$pro_id:all
             bills
                 id=bill.client_id=>/bills/view/UID
             related_transactions
@@ -226,11 +229,14 @@ PRO
             audit_log
     notes|note|view|icon:file-alt
         !inc:effective_dateest,client_id,hcp_pro_id,ally_pro_id,reasons,content_text,is_signed_by_ally,is_signed_by_hcp,billed
+        !qry:pros:SELECT id, name_display FROM pro
+        !qry:clients:SELECT id, name_display FROM client
+        !qry:reasons:SELECT id, concat(reason1,reason2) as result FROM note
         !col:effective_dateest:Date
-        !col:client_id:Client:select name_display as result FROM client WHERE id = $client_id
-        !col:hcp_pro_id:HCP:select name_display as result FROM pro WHERE id = $hcp_pro_id
-        !col:ally_pro_id:Ally:select name_display as result FROM pro WHERE id = $ally_pro_id
-        !col:reasons:Reason(s):select concat(reason1,reason2) as result FROM note WHERE id = $id
+        !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
@@ -374,7 +380,8 @@ PRO
                     contentDetail
             audit_log
     care_month_entries|care_month_entry|view|icon:calendar-alt
-        !col:pro_id:Pro:select name_display as result from pro where id = $pro_id
+        !qry:pros:SELECT id, name_display FROM pro
+        !col:pro_id:Pro:~pros:name_display:id,=,$pro_id:all
     care_month_entries/view/{uid}
         ACTIONS
             updateContent
@@ -655,7 +662,7 @@ ADMIN
             putLobby
                 lobbyUid:record:lobby:uid,name
             putTargetLobbyPro
-                lobbyUid:record:lobbyPro:uid,name
+                lobbyUid:record:lobby_pro:uid,name
             putTitle
                 title
             putStrangerInfo
@@ -718,4 +725,4 @@ ADMIN
         !inc:@title,internal_name
     section_templates/add_new:create
         title
-        internalName
+        internalName