Merge branch 'dev-vj' of rav.triplestart.com:TigerPHP/stagfe into dev-vj

app/Http/Controllers/care_month_entries_Controller.php

@@ -13,7 +13,8 @@ class care_month_entries_Controller extends Controller
 	// GET /care_month_entries
 	public function index(Request $request) {
 		$records = DB::table('care_month_entry')->get();
-		return response()->view('pro/care_month_entries/index', compact('records'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$result_pros = DB::select("SELECT id, name_display FROM pro");
+		return response()->view('pro/care_month_entries/index', compact('records', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_month_entries/view/{uid}

app/Http/Controllers/my_clients_Controller.php

@@ -13,13 +13,15 @@ class my_clients_Controller extends Controller
 	// GET /my_clients
 	public function index(Request $request) {
 		$records = DB::table('client')->get();
-		return response()->view('pro/my_clients/index', compact('records'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$result_pros = DB::select("SELECT id, name_display FROM pro");
+		return response()->view('pro/my_clients/index', compact('records', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /my_clients/add_new
 	public function add_new(Request $request) {
 		$records = DB::table('client')->get();
-		return response()->view('pro/my_clients/add_new', compact('records'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$result_pros = DB::select("SELECT uid, name_display FROM pro");
+		return response()->view('pro/my_clients/add_new', compact('records', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /my_clients/view/{uid}

app/Http/Controllers/my_clients_SINGLE_Controller.php

@@ -301,7 +301,8 @@ class my_clients_SINGLE_Controller extends Controller
 	public function SUB_care_month_entries(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();
 		$subRecords = DB::table('care_month_entry')->where('client_id', $record->id)->get();
-		return response()->view('pro/my_clients_SINGLE/SUB_care_month_entries', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$result_pros = DB::select("SELECT id, name_display FROM pro");
+		return response()->view('pro/my_clients_SINGLE/SUB_care_month_entries', compact('record', 'subRecords', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /my_clients/view/{uid}/SUB_bills

app/Http/Controllers/notes_Controller.php

@@ -13,7 +13,10 @@ class notes_Controller extends Controller
 	// GET /notes
 	public function index(Request $request) {
 		$records = DB::table('note')->get();
-		return response()->view('pro/notes/index', compact('records'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$result_pros = DB::select("SELECT id, name_display FROM pro");
+		$result_clients = DB::select("SELECT id, name_display FROM client");
+		$result_reasons = DB::select("SELECT id, concat(reason1,reason2) as result FROM note");
+		return response()->view('pro/notes/index', compact('records', 'result_pros', 'result_clients', 'result_reasons'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /notes/view/{uid}

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
@@ -174,7 +176,7 @@ PRO
                     reasonDetail
             notes
                 id=note.client_id=>/notes/view/UID
-                !inc:category,content_text,content_detail
+                !inc:uid,title
                 add_new:note=>/notes/view/UID
                     clientUid:hidden=uid
                     hcpProUid:record:pro:uid,name_display
@@ -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
@@ -225,12 +228,15 @@ 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,content_text,is_signed_by_ally,is_signed_by_hcp,billed
+        !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, 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
@@ -375,7 +381,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
@@ -656,7 +663,7 @@ ADMIN
             putLobby
                 lobbyUid:record:lobby:uid,name
             putTargetLobbyPro
-                lobbyUid:record:lobbyPro:uid,name
+                lobbyUid:record:lobby_pro:uid,name
             putTitle
                 title
             putStrangerInfo
@@ -719,4 +726,4 @@ ADMIN
         !inc:@title,internal_name
     section_templates/add_new:create
         title
-        internalName
+        internalName

resources/views/admin/meetings_SINGLE/ACTION_putTargetLobbyPro.blade.php

@@ -30,7 +30,7 @@
 <label class='control-label'>Lobby </label>
 <select class='form-control' name='lobbyUid' value='{{ old('lobbyUid') ? old('lobbyUid') : '' }}' >
 <option value=''>-- Select --</option>
-<?php $dbOptions = \Illuminate\Support\Facades\DB::table('lobbyPro')->get(); ?>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('lobby_pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
 <option <?= $o->uid === (old('lobbyUid') ? old('lobbyUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>

resources/views/pro/care_month_entries/index.blade.php

@@ -64,8 +64,7 @@
 <td><?= $record->removed_by_session_id ?></td>
 <td><?= $record->care_month_id ?></td>
 <td><?= $record->client_id ?></td>
-<td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = " . ($record->pro_id ? $record->pro_id : -1) . "");
-echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->pro_id], ], 'all'); ?></td>
                 </tr>
             @endforeach
             </tbody>

resources/views/pro/my_clients/add_new.blade.php

@@ -29,8 +29,7 @@
 <label class='control-label'>Mcp Pro </label>
 <select class='form-control' name='mcpProUid' value='{{ old('mcpProUid') ? old('mcpProUid') : '' }}' >
 <option value=''>-- Select --</option>
-<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
-<?php foreach($dbOptions as $o): ?>
+<?php foreach($result_pros as $o): ?>
 <option <?= $o->uid === (old('mcpProUid') ? old('mcpProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
@@ -39,8 +38,7 @@
 <label class='control-label'>Cm Pro </label>
 <select class='form-control' name='cmProUid' value='{{ old('cmProUid') ? old('cmProUid') : '' }}' >
 <option value=''>-- Select --</option>
-<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
-<?php foreach($dbOptions as $o): ?>
+<?php foreach($result_pros as $o): ?>
 <option <?= $o->uid === (old('cmProUid') ? old('cmProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
@@ -49,8 +47,7 @@
 <label class='control-label'>Rme Pro </label>
 <select class='form-control' name='rmeProUid' value='{{ old('rmeProUid') ? old('rmeProUid') : '' }}' >
 <option value=''>-- Select --</option>
-<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
-<?php foreach($dbOptions as $o): ?>
+<?php foreach($result_pros as $o): ?>
 <option <?= $o->uid === (old('rmeProUid') ? old('rmeProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
@@ -59,8 +56,7 @@
 <label class='control-label'>Rmm Pro </label>
 <select class='form-control' name='rmmProUid' value='{{ old('rmmProUid') ? old('rmmProUid') : '' }}' >
 <option value=''>-- Select --</option>
-<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
-<?php foreach($dbOptions as $o): ?>
+<?php foreach($result_pros as $o): ?>
 <option <?= $o->uid === (old('rmmProUid') ? old('rmmProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>

resources/views/pro/my_clients/index.blade.php

@@ -33,14 +33,10 @@
 <td><?= $record->gender ?></td>
 <td><?= $record->is_client_enrolled_in_cm ?></td>
 <td><?= $record->is_client_enrolled_in_rm ?></td>
-<td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = " . ($record->mcp_pro_id ? $record->mcp_pro_id : -1) . "");
-echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
-<td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = " . ($record->cm_pro_id ? $record->cm_pro_id : -1) . "");
-echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
-<td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = " . ($record->rme_pro_id ? $record->rme_pro_id : -1) . "");
-echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
-<td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = " . ($record->rmm_pro_id ? $record->rmm_pro_id : -1) . "");
-echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->mcp_pro_id], ], 'all'); ?></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->cm_pro_id], ], 'all'); ?></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rme_pro_id], ], 'all'); ?></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rmm_pro_id], ], 'all'); ?></td>
                 </tr>
             @endforeach
             </tbody>

resources/views/pro/my_clients_SINGLE/SUB_care_month_entries.blade.php

@@ -66,8 +66,7 @@
 <td><?= $subRecord->removed_by_session_id ?></td>
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
-<td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = " . ($subRecord->pro_id ? $subRecord->pro_id : -1) . "");
-echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
+<td><?= $subRecord->pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

resources/views/pro/my_clients_SINGLE/SUB_notes.blade.php

@@ -15,18 +15,14 @@
                 <thead>
                 <tr>
                     <th>&nbsp;</th>
-<th>Category</th>
-<th>Content Text</th>
-<th>Content Detail</th>
+<th>Title</th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href="/notes/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
-<td><?= $subRecord->category ?></td>
-<td><?= $subRecord->content_text ?></td>
-<td><?= $subRecord->content_detail ?></td>
+<td><?= $subRecord->title ?></td>
                     </tr>
                 @endforeach
                 </tbody>

resources/views/pro/notes/index.blade.php

@@ -18,7 +18,6 @@
 <th>HCP</th>
 <th>Ally</th>
 <th>Reason(s)</th>
-<th>Content</th>
 <th>Ally Signed?</th>
 <th>HCP Signed?</th>
 <th>Billed?</th>
@@ -29,15 +28,10 @@
                 <tr>
 <td><a href="/notes/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
 <td><?= $record->effective_dateest ?></td>
-<td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result FROM client WHERE id = " . ($record->client_id ? $record->client_id : -1) . "");
-echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
-<td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result FROM pro WHERE id = " . ($record->hcp_pro_id ? $record->hcp_pro_id : -1) . "");
-echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
-<td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result FROM pro WHERE id = " . ($record->ally_pro_id ? $record->ally_pro_id : -1) . "");
-echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
-<td><?php $_r = \Illuminate\Support\Facades\DB::select("select concat(reason1,reason2) as result FROM note WHERE id = " . ($record->id ? $record->id : -1) . "");
-echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
-<td><?= $record->content_text ?></td>
+<td><?= value_from_rs($result_clients, 'name_display', [['id', '=', $record->client_id], ], 'all'); ?></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->hcp_pro_id], ], 'all'); ?></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->ally_pro_id], ], 'all'); ?></td>
+<td><?= value_from_rs($result_reasons, 'result', [['id', '=', $record->id], ], 'all'); ?></td>
 <td><?= $record->is_signed_by_ally ?></td>
 <td><?= $record->is_signed_by_hcp ?></td>
 <td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT '-- TODO --' as result");