Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2

app/Models/Pro.php

@@ -1376,7 +1376,8 @@ SELECT crfu.id AS crfu_id,
        crfu.next_follow_up_reason,
        crfu.next_follow_up_memo,
        c.uid as client_uid,
-       (c.name_first || ' ' || c.name_last) as client_name
+       (c.name_first || ' ' || c.name_last) as client_name,
+       crfu.status AS status
 FROM client_rep_follow_up crfu join client c on crfu.id = c.client_rep_follow_up_id
 WHERE crfu.client_rep_pro_id = :pro_id
   AND crfu.next_follow_up_date = :date

resources/views/app/dashboard-admin.blade.php

@@ -440,7 +440,7 @@
                                         <tr>
                                             <th>Client</th>
                                             <th>Reason</th>
-                                            <th>Memo</th>
+                                            <th>Status</th>
                                         </tr>
                                         </thead>
                                         <tbody>
@@ -448,7 +448,7 @@
                                             <tr>
                                                 <td><a href="/patients/view/{{$fu->client_uid}}">{{$fu->client_name}}</a></td>
                                                 <td>{{$fu->next_follow_up_reason}}</td>
-                                                <td>{{$fu->next_follow_up_memo}}</td>
+                                                <td>{{$fu->status}}</td>
                                             </tr>
                                         @endforeach
                                         </tbody>

resources/views/app/dashboard-mcp.blade.php

@@ -395,7 +395,7 @@
                                             <tr>
                                                 <th>Client</th>
                                                 <th>Reason</th>
-                                                <th>Memo</th>
+                                                <th>Status</th>
                                             </tr>
                                             </thead>
                                             <tbody>
@@ -403,7 +403,7 @@
                                                 <tr>
                                                     <td><a href="/patients/view/{{$fu->client_uid}}">{{$fu->client_name}}</a></td>
                                                     <td>{{$fu->next_follow_up_reason}}</td>
-                                                    <td>{{$fu->next_follow_up_memo}}</td>
+                                                    <td>{{$fu->status}}</td>
                                                 </tr>
                                             @endforeach
                                             </tbody>

resources/views/app/patient/partials/fu-form.blade.php

@@ -22,22 +22,30 @@
         "Goals Follow Up",
         "Other-- (check recent memo)",
     ];
+    $nextFUStatus = [
+        "SCHEDULED",
+        "CANCELLED",
+        "COMPLETED",
+    ];
 ?>
 <div moe wide>
     <a href="#" start show class="d-flex align-items-baseline" title="Next FU"><img src="{{ asset('img/p-phone.png') }}" alt="" style="width:24px"></a>
     <form url="/api/client/putClientRepFollowUp" class="mcp-theme-1">
-        <div id="viewNextFuData" class="{{ $patient->clientRepFollowUp ? '':'d-none' }}">
+        <div id="viewNextFuData" class="{{ $patient->clientRepFollowUp ? '':'d-none' }}" fu-screen>
             @if($patient->clientRepFollowUp)
-            <a id="updateNextFu" class="c-pointer">Update</a>
+            <div class="d-flex align-items-center">
+            <a id="updateNextFu" class="c-pointer" data-show="#updateNextFuData" next-fu-screen>Update</a>
+            <a id="updateFuStatus" class="c-pointer ml-3" data-show="#updateStatus" next-fu-screen >Update Status</a>
+            </div>
             <table class="table table-sm table-striped table-bordered">
-                <tr>
-                    <td><b>Updated At</b></td>
-                    <td>{{ friendly_date_time($patient->clientRepFollowUp->updated_at) }}</td>
-                </tr>
                 <tr>
                     <td><b>Client Rep</b></td>
                     <td>{{ $patient->clientRepFollowUp->pro->displayName() }}</td>
                 </tr>
+                <tr>
+                    <td><b>Status</b></td>
+                    <td>{{ $patient->clientRepFollowUp->status }}</td>
+                </tr>
                 <tr>
                     <td><b>Next Followup Date</b></td>
                     <td>{{ friendly_date_time($patient->clientRepFollowUp->next_follow_up_date) }}</td>
@@ -46,15 +54,25 @@
                     <td><b>Next Followup Reason</b></td>
                     <td>{{ $patient->clientRepFollowUp->next_follow_up_reason }}</td>
                 </tr>
-                <tr>
-                    <td><b>Next Followup Memo</b></td>
-                    <td>{{ $patient->clientRepFollowUp->next_follow_up_memo }}</td>
-                </tr>
             </table>
             @endif
         </div>
-        <div id="updateNextFuData" class="{{ $patient->clientRepFollowUp ? 'd-none':'' }}">
-            <a id="showNextFu" class="c-pointer">Show FU</a>
+        @if($patient->clientRepFollowUp)
+            <div id="updateStatus" class="{{ $patient->clientRepFollowUp ? 'd-none':'' }}" fu-screen>
+            <a class="c-pointer mb-2" data-show="#updateNextFuData" next-fu-screen>View FU</a>
+                <div class="mb-2">
+                    <label for="" class="text-secondary mb-1">Update Status</label>
+                    <select class="form-control input-sm" data-uid="{{ $patient->clientRepFollowUp->uid }}"  submit-status>
+                        <option value=""></option>
+                        @foreach($nextFUStatus as $fuStatus)
+                            <option {{ $patient->clientRepFollowUp->status == $fuStatus ? 'selected':'' }}>{{ $fuStatus }}</option>
+                        @endforeach
+                    </select>
+                </div>
+            </div>
+        @endif
+        <div id="updateNextFuData" class="{{ $patient->clientRepFollowUp ? 'd-none':'' }}" fu-screen>
+            <a id="showNextFu" class="c-pointer" data-show="#viewNextFuData" next-fu-screen>Show FU</a>
             <input type="hidden" name="uid" value="{{ $patient->uid }}">
             <div class="mb-2">
                 <label for="" class="text-sm text-secondary mb-1">Next Calling Date</label>
@@ -80,10 +98,6 @@
                     @endforeach
                 </select>
             </div>
-            <div class="mb-2">
-                <label for="" class="text-sm text-secondary mb-1">Memo</label>
-                <textarea class="form-control input-sm" name="nextFollowUpMemo">{{ $patient->clientRepFollowUp ? $patient->clientRepFollowUp->next_follow_up_memo :'' }}</textarea>
-            </div>
             <div class="d-flex align-items-center">
                 <button class="btn btn-sm btn-primary mr-2" submit>Submit</button>
                 <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
@@ -94,13 +108,20 @@
 
 <script>
     $(document).ready(function() {
-        $('#updateNextFu').click(function(){
-            $('#viewNextFuData').addClass('d-none');
-            $('#updateNextFuData').removeClass('d-none');
+        $('[next-fu-screen]').click(function(){
+            var showRef = $(this).data('show');
+            $('[fu-screen]').addClass('d-none');
+            $(showRef).removeClass('d-none');
         });
-        $('#showNextFu').click(function(){
-            $('#viewNextFuData').removeClass('d-none');
-            $('#updateNextFuData').addClass('d-none');
+
+        $('[submit-status]').change(function(){
+            var value = $(this).val();
+            var uid = $(this).data('uid');
+            $.post('/api/clientRepFollowUp/update-status', {uid: uid, status: value}, function(response){
+                if(response.success){
+                    fastReload();
+                }
+            }, 'json')
         });
     });
 </script>