瀏覽代碼

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

= 3 年之前
父節點
當前提交
8f48ec0cc1

+ 4 - 0
app/Models/Client.php

@@ -948,6 +948,10 @@ ORDER BY m.ts DESC
         return $this->hasOne(Status::class, 'id', 'client_engagement_status_id');
     }
 
+    public function clientBpWeightPhoneNumberStatus(){
+        return $this->hasOne(ClientBpWeightPhoneNumberStatus::class, 'id', 'client_bp_weight_phone_number_status_id'); 
+    }
+
     public function getDeviceDeliveryStatus($productId){
         $result =  DB::select("SELECT sh.status FROM shipment sh LEFT JOIN supply_order so ON so.shipment_id = sh.id WHERE so.product_id  = ".$productId." AND so.client_id = ".$this->id." ORDER BY sh.created_at DESC LIMIT 1");
         if (count($result)){

+ 11 - 0
app/Models/ClientBpWeightPhoneNumberStatus.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+# use Illuminate\Database\Eloquent\Model;
+
+class ClientBpWeightPhoneNumberStatus extends Model
+{
+    protected $table = 'client_bp_weight_phone_number_status';
+
+}

+ 3 - 0
config/app.php

@@ -73,6 +73,9 @@ return [
 
     'point_impl_date' => env('POINT_IMPL_DATE', '2021-10-29'),
 
+    'weightSmsNumber' => env('WEIGHT_SMS_NUMBER', ''),
+    'bpSmsNumber' => env('BP_SMS_NUMBER', ''),
+
     /*
     |--------------------------------------------------------------------------
     | Application Timezone

+ 44 - 0
resources/views/app/patient/partials/client_bp_weight_phone_number_status.blade.php

@@ -0,0 +1,44 @@
+<div class="mb-1">
+    <div class="border-bottom mb-2">
+        <div>
+            Please ask the client to save the following numbers for receiving measurement sms messages.
+        </div>
+        <div>
+            Cardio1st BP sms number: {{config('app.bpSmsNumber')}}   
+        </div>
+        <div>
+            Cardio1st Weight sms number: {{config('app.weightSmsNumber')}}   
+        </div>
+    </div>
+    
+    <div>Has client saved BP phone number: <b>{{ $patient->clientBpWeightPhoneNumberStatus && $patient->clientBpWeightPhoneNumberStatus->has_client_saved_bp_phone_number ? 'Yes': 'No' }}</b></div>
+    <div>Saved BP Phone number: <b>{{ $patient->clientBpWeightPhoneNumberStatus && $patient->clientBpWeightPhoneNumberStatus->saved_bp_phone_number }}</b></div>
+    <div>Has client saved Weight phone number: <b>{{ $patient->clientBpWeightPhoneNumberStatus && $patient->clientBpWeightPhoneNumberStatus->has_client_saved_weight_phone_number ? 'Yes': 'No' }}</b></div>
+    <div>Saved Weight Phone number: <b>{{ $patient->clientBpWeightPhoneNumberStatus && $patient->clientBpWeightPhoneNumberStatus->saved_weight_phone_number }}</b></div>
+    <div moe>
+        <a start show><i class="fa fa-edit"></i></a>
+        <form url="/api/client/updateClientBpWeightPhoneNumberStatus" class="mcp-theme-1">
+            <input type="hidden" name="uid" value="{{$patient->uid}}">
+            <div class="mb-2 checkbox">
+                <input type="checkbox" name="hasClientSavedBpPhoneNumber">
+                <label class="mb-1 text-secondary text-sm">Has client saved bp phone number?</label>
+            </div>
+            <div class="mb-2">
+                <label class="mb-1 text-secondary text-sm">Saved BP phone number</label>
+                <input type="text" name="savedBpPhoneNumber" class="form-control form-control-sm" value="{{config('app.bpSmsNumber')}}">
+            </div>
+            <div class="mb-2 checkbox">
+                <input type="checkbox" name="hasClientSavedWeightPhoneNumber">
+                <label class="mb-1 text-secondary text-sm">Has client saved weight phone number?</label>
+            </div>
+            <div class="mb-2">
+                <label class="mb-1 text-secondary text-sm">Saved weight phone number</label>
+                <input type="text" name="savedWeightPhoneNumber" class="form-control form-control-sm" value="{{config('app.weightSmsNumber')}}">
+            </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>
+    </div>
+</div>

+ 1 - 0
resources/views/app/patient/rm-setup.blade.php

@@ -6,4 +6,5 @@
 
     @include('app.patient.partials.rm-setup')
 
+    @include('app.patient.partials.client_bp_weight_phone_number_status')
 @endsection

+ 1 - 0
resources/views/app/practice-management/visit-templates/visit-template-segment-templates/index.blade.php

@@ -177,6 +177,7 @@ var draggableVisitTemplateSegmentTemplates = null;
         },
         updateDraggedDeactivatedRecord: function(position){
             var self = this;
+            if(!self.draggedDeactivatedRecordUid) return;
             self.forceShowMask();
             var positionUrl = position == 'LEFT' ? 'moveToLeft':'moveToRight';
             $.post('/api/visitTemplateSegmentTemplate/reactivate', {uid: self.draggedDeactivatedRecordUid, memo:''}, function(response){