Josh Kamau 5 år sedan
förälder
incheckning
2b94596a3f
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. 1 1
      app/Http/Controllers/notes_Controller.php
  2. 1 1
      generatecv/tree.txt

+ 1 - 1
app/Http/Controllers/notes_Controller.php

@@ -14,7 +14,7 @@ class notes_Controller extends Controller
 	public function index(Request $request) {
 		$records = DB::table('note')->get();
 		$result_pros = DB::select("SELECT id, name_display FROM pro");
-		$result_clients = DB::select("SELECT id, name_display FROM client");
+		$result_clients = DB::select("SELECT id, concat(name_first,name_last) as 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');
 	}

+ 1 - 1
generatecv/tree.txt

@@ -469,7 +469,7 @@ PRO
     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, name_display FROM client
+        !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
         !col:effective_dateest:Date
         !col:client_id:Client:~clients:name_display:id,=,$client_id:all