浏览代码

initiative related changes

Josh 4 年之前
父节点
当前提交
b2e5f41c65

+ 3 - 0
app/Http/Controllers/Controller.php

@@ -50,6 +50,9 @@ class Controller extends BaseController
         
         $noteTemplates = NoteTemplate::all();
         view()->share('noteTemplates', $noteTemplates);
+
+        $initiatives = ['LI', 'BI'];
+        view()->share('intiatives', $initiatives);
     }
 
     public function performer(){

+ 7 - 6
app/Http/Controllers/PracticeManagementController.php

@@ -295,13 +295,14 @@ class PracticeManagementController extends Controller
         if($requests && count($requests)) {
             foreach ($requests as $mcpRequest) {
                 $client = $mcpRequest->client;
-                $results[] = [
-                    "clientUid" => $client->uid,
-                    "name" => $client->displayName(),
-                    "initials" => substr($client->name_first, 0, 1) . substr($client->name_last, 0, 1)
-                ];
+                if($client->initiative && strpos($this->performer->pro->initiative,$client->initiative) !== false){
+                    $results[] = [
+                        "clientUid" => $client->uid,
+                        "name" => $client->displayName(),
+                        "initials" => substr($client->name_first, 0, 1) . substr($client->name_last, 0, 1)
+                    ];
+                }
             }
-//            $results = $requests;
         }
         return json_encode($results);
     }

+ 9 - 0
resources/views/app/new-patient.blade.php

@@ -59,6 +59,15 @@
                             <label class='control-label'>Medicare Number *</label>
                             <input class='form-control' type='text' name='medicareNumber' required>
                         </div>
+                        <div class='form-group mb-3'>
+                            <label class='control-label'>Initiative</label>
+                            <select name="initiative" class="form-control">
+                                <option value="">-- select --</option>
+                                @foreach($intiatives as $initiative)
+                                <option value="{{$initiative}}">{{$initiative}}</option>
+                                @endforeach
+                            </select>
+                        </div>
                     </form>
                 </div>
                 <div class="card-footer">

+ 26 - 0
resources/views/layouts/patient.blade.php

@@ -357,6 +357,32 @@
                                         </div>
                                         @endif
                                     </div>
+                                    <div>
+                                        <span class="text-dark d-inline-flex align-items-center">
+                                            <span class="mr-2">
+                                                Intiative: {{$patient->initiative}}
+                                            </span>
+                                        </span>
+                                        <span moe>
+                                            <a start show><i class="fa fa-edit"></i></a>
+                                            <form url="/api/client/updateInitiative" class="mcp-theme-1">
+                                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                <div class="mb-2">
+                                                    <select name="initiative" class="form-control">
+                                                        <option value="">-- select --</option>
+                                                        @foreach($intiatives as $initiative)
+                                                        <option value="{{$initiative}}">{{$initiative}}</option>
+                                                        @endforeach
+                                                    </select>
+                                                </div>
+                                                <div>
+                                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                                </div>
+                                            </form>
+                                        </span>
+                                        
+                                    </div>
                                 </section>
                                 {{--<section>
                                     <div>

+ 2 - 0
resources/views/layouts/template.blade.php

@@ -291,10 +291,12 @@
 
             window.socketClient.subscribe("/user/topic/newMcpRequest", function(message) {
                 console.log("Received new mcp request: ", message);
+                //TODO: Update the mcp queue on the DOM 
             }); // once in 15 seconds
 
             window.socketClient.subscribe("/user/topic/removeMcpRequest", function(message) {
                 console.log("An mcp request has been removed: ", message);
+                //TODO: Update the mcp queue on the DOM 
             }); 
 
             window.socketClient.subscribe("/user/topic/myCurrentProClientWork", function(message) {