Samson Mutunga 3 年 前
コミット
a9807324d0

+ 2 - 1
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

+ 2 - 2
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>

+ 2 - 2
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>

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

@@ -62,7 +62,7 @@
             <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 name="nextFollowUpReason" class="form-control input-sm" data-uid="{{ $patient->clientRepFollowUp->uid }}"  submit-status>
+                    <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>