Merge branch 'master' into dev-vj

app/Http/Controllers/HomeController.php

@@ -949,7 +949,7 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
             });
         }
         $patients = $query->orderBy('name_last', 'asc')->orderBy('name_first', 'asc')->get();
-        $unmappedSMS = ClientSMS::where('client_id', null)->where('incoming_or_outgoing', 'INCOMING')->get();
+        $unmappedSMS = ClientSMS::where('client_id', null)->where('incoming_or_outgoing', 'INCOMING')->paginate(20);
         return view('app/unmapped-sms', compact('unmappedSMS', 'patients'));
     }
 

resources/views/app/patient/note/dashboard.blade.php

@@ -332,8 +332,8 @@
             <div class="ml-auto d-flex align-items-start">
                 <div class="">
                     <div>
-                        @if($note->is_signed_by_hcp)
-                            <div class="text-secondary">
+                        
+                            <!-- <div class="text-secondary">
                                 <i class="fa fa-check"></i>
                                 Note Signed
                                 @if($pro->pro_type == 'ADMIN')
@@ -349,8 +349,8 @@
                                     </form>
                                 </span>
                                 @endif
-                            </div>
-                        @else
+                            </div> -->
+                        @if(!$note->is_signed_by_hcp )
                             <div moe
                                  class="{{ $note->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
                                  title="{{ $note->hcp_pro_id !== $pro->id ? 'Only the note\'s HCP can sign' : '' }}">

resources/views/app/patient/partials/appointment-request-confirmation.blade.php

@@ -1,11 +1,15 @@
 <div moe relative class="">
     <a href="#" start show class="text-sm font-weight-normal">{{ $label }}</a>
-    <form url="/api/appointment/sendConfirmationRequestViaSms" right>
+    <form url="/api/appointment/sendConfirmationRequestViaEmailAndSms" right>
         <input type="hidden" name="uid" value="{{ $appointment->uid }}">
         <div class="mb-2">
             <label for="" class="text-sm text-secondary mb-1">Cell Number</label>
             <input type="text" class="form-control form-control-sm" name="toSmsNumber" value="{{$patient->cell_number}}" required>
         </div>
+        <div class="mb-2">
+            <label for="" class="text-sm text-secondary mb-1">Email Address</label>
+            <input type="text" class="form-control form-control-sm" name="emailAddress" value="{{$patient->email_address}}" required>
+        </div>
         <div>
             <button submit class="btn btn-sm btn-primary mr-1">Send</button>
             <button cancel class="btn btn-sm btn-default border">Cancel</button>

resources/views/app/unmapped-sms.blade.php

@@ -55,6 +55,9 @@
                 @endforeach
                 </tbody>
             </table>
+            <div>
+                {{$unmappedSMS->links()}}
+            </div>
         </div>
     </div>
     </div>