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

app/Helpers/helpers.php

@@ -28,6 +28,20 @@ if(!function_exists('friendly_date_time')) {
     }
 }
 
+if(!function_exists('friendly_time')) {
+    function friendly_time($value) {
+        if(!$value || empty($value)) return "-";
+        try {
+            $result = strtotime($value);
+            $result = date("H:i", $result);
+            return $result;
+        }
+        catch (Exception $e) {
+            return $value;
+        }
+    }
+}
+
 if(!function_exists('friendly_month')) {
     function friendly_month($value) {
         if(!$value || empty($value)) return "-";

app/Models/Pro.php

@@ -8,6 +8,19 @@ class Pro extends Model
 {
     protected $table = 'pro';
 
+    public function displayName() {
+        $name = [];
+        if(!empty($this->name_last)) $name[] = $this->name_last;
+        if(!empty($this->name_first)) $name[] = $this->name_first;
+        if(!count($name)) {
+            $name = $this->name_display;
+        }
+        else {
+            $name = implode(", ", $name);
+        }
+        return $name;
+    }
+
     public function cmBills()
     {
         return $this->hasMany(Bill::class, 'cm_pro_id');

resources/views/app/patient/care-month/dashboard.blade.php

@@ -87,19 +87,19 @@
         <div class="row m-negator bg-light py-1 text-sm-incl-children">
             <div class="col-3 pl-3-5">
                 <span class="text-secondary">MCP:</span>
-                <span class="text-nowrap">{{ $careMonth->mcp ? $careMonth->mcp->name_display : '-' }}</span>
+                <span class="text-nowrap">{{ $careMonth->mcp ? $careMonth->mcp->displayName() : '-' }}</span>
             </div>
             <div class="col-3">
                 <span class="text-secondary">CM:</span>
-                <span class="text-nowrap">{{ $careMonth->cmPro ? $careMonth->cmPro->name_display : '-' }}</span>
+                <span class="text-nowrap">{{ $careMonth->cmPro ? $careMonth->cmPro->displayName() : '-' }}</span>
             </div>
             <div class="col-3">
                 <span class="text-secondary">RMM:</span>
-                <span class="text-nowrap">{{ $careMonth->rmmPro ? $careMonth->rmmPro->name_display : '-' }}</span>
+                <span class="text-nowrap">{{ $careMonth->rmmPro ? $careMonth->rmmPro->displayName() : '-' }}</span>
             </div>
             <div class="col-3">
                 <span class="text-secondary">RME:</span>
-                <span class="text-nowrap">{{ $careMonth->rmePro ? $careMonth->rmePro->name_display : '-' }}</span>
+                <span class="text-nowrap">{{ $careMonth->rmePro ? $careMonth->rmePro->displayName() : '-' }}</span>
             </div>
         </div>
 
@@ -169,7 +169,7 @@
                                     <select class="form-control form-control-sm" name="proUid">
                                         <option value="">-- Select Pro --</option>
                                         @foreach($pros as $pro)
-                                        <option value="{{ $pro->uid }}">{{ $pro->name_display }}</option>
+                                        <option value="{{ $pro->uid }}">{{ $pro->displayName() }}</option>
                                         @endforeach
                                     </select>
                                 </div>
@@ -319,7 +319,7 @@
                                     <select class="form-control form-control-sm" name="proUid">
                                         <option value="">-- Select Pro --</option>
                                         @foreach($pros as $pro)
-                                            <option value="{{ $pro->uid }}">{{ $pro->name_display }}</option>
+                                            <option value="{{ $pro->uid }}">{{ $pro->displayName() }}</option>
                                         @endforeach
                                     </select>
                                 </div>

resources/views/app/patient/notes.blade.php

@@ -3,8 +3,8 @@
 @section('inner-content')
 @foreach ($patient->notes as $note)
 <div class="card mb-3">
-    <div class="card-header d-flex align-items-center px-3">
-        <div>
+    <div class="card-header d-flex align-items-start px-3">
+        <div class="pr-2">
             {{$note->title}}
             <div moe>
                 <a href="" show start><i class="fa fa-edit"></i></a>
@@ -21,131 +21,140 @@
                 </form>
             </div>
         </div>
-        <span class="mx-2 text-secondary">|</span>
-        <div>
-            {{$note->effective_dateest}}
-            <span moe>
-                <a href="" show start><i class="fa fa-calendar"></i></a>
-                <form url="/api/note/putEffectiveDateEST">
-                    <input type="hidden" name="uid" value="{{$note->uid}}">
-                    <div class="mb-2">
-                        <label for="" class="text-secondary text-sm">Effective date EST</label>
-                        <input type="date" name="effectiveDateEST" value="{{$note->effectiveTime}}" class="form-control form-control-sm">
-                    </div>
-                    <div class="mb-0">
-                        <button class="btn btn-primary btn-sm" submit>Submit</button>
-                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                    </div>
-                </form>
-            </span>
-            <span moe>
-                <a href="" show start><i class="fa fa-clock"></i></a>
-                <form url="/api/note/putEffectiveTime">
-                    <input type="hidden" name="uid" value="{{$note->uid}}">
-                    <div class="mb-2">
-                        <label for="" class="text-secondary text-sm">Effective time </label>
-                        <input type="time" name="effectiveTime" value="" class="form-control form-control-sm">
-                    </div>
-                    <div class="mb-0">
-                        <button class="btn btn-primary btn-sm" submit>Submit</button>
-                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                    </div>
-                </form>
-            </span>
-        </div>
-        <span class="mx-2 text-secondary">|</span>
-        <div>
-            HCP: {{$note->hcpPro->name_display}}
-            <div moe>
-                <a href="" show start><i class="fa fa-edit"></i></a>
-                <form url="/api/note/putHcp">
-                    <input type="hidden" name="uid" value="{{$note->uid}}">
-                    <div class="mb-2">
-                        <select name="hcpProUid" class="form-control form-control-sm">
-                            <option value="">-- Select HCP Pro --</option>
-                            @foreach ($pros as $pro)
-                            <option value="{{$pro->uid}}">{{$pro->name_display}}</option>
-                            @endforeach
-                        </select>
-                    </div>
-                    <div class="mb-0">
-                        <button class="btn btn-primary btn-sm" submit>Submit</button>
-                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                    </div>
-                </form>
+        <div class="px-2 border-left">
+            <div class="d-flex">
+                <span class="mr-2">{{friendly_date_time($note->effective_dateest, false)}}</span>
+                <span moe class="ml-auto">
+                    <a href="" show start><i class="fa fa-calendar"></i></a>
+                    <form url="/api/note/putEffectiveDateEST">
+                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                        <div class="mb-2">
+                            <label for="" class="text-secondary text-sm">Effective date EST</label>
+                            <input type="date" name="effectiveDateEST" value="{{$note->effective_dateest}}" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-0">
+                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                        </div>
+                    </form>
+                </span>
             </div>
-        </div>
-        <span class="mx-2 text-secondary">|</span>
-        <div>
-            Ally: {{$note->allyPro->name_display}}
-            <div moe>
-                <a href="" show start><i class="fa fa-edit"></i></a>
-                <form url="/api/note/putAlly">
-                    <input type="hidden" name="uid" value="{{$note->uid}}">
-                    <div class="mb-2">
-                        <select name="allyProUid" class="form-control form-control-sm">
-                            <option value="">-- Select Ally Pro --</option>
-                            @foreach ($pros as $pro)
-                            <option value="{{$pro->uid}}">{{$pro->name_display}}</option>
-                            @endforeach
-                        </select>
-                    </div>
-                    <div class="mb-0">
-                        <button class="btn btn-primary btn-sm" submit>Submit</button>
-                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                    </div>
-                </form>
+            <div class="d-flex">
+                <span class="mr-2">{{friendly_time($note->effective_time)}}</span>
+                <span moe class="ml-auto">
+                    <a href="" show start><i class="fa fa-clock"></i></a>
+                    <form url="/api/note/putEffectiveTime">
+                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                        <div class="mb-2">
+                            <label for="" class="text-secondary text-sm">Effective time </label>
+                            <input type="time" name="effectiveTime" value="{{ date("H:i:s", strtotime($note->effective_time)) }}" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-0">
+                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                        </div>
+                    </form>
+                </span>
             </div>
         </div>
-        <div class="ml-auto">
-            @if($note->is_signed_by_hcp)
-                <span class="text-secondary">
-                    <i class="fa fa-check"></i>
-                    HCP Signed
-                </span>
-            @else
-                <div moe>
-                    <a class="" href="" show start>Sign as HCP</a>
-                    <form url="/api/note/signAsHcp">
+
+        <div class="px-2 border-left">
+            <div class="d-flex">
+                <span class="mr-2"><span class="text-secondary">HCP:</span> {{$note->hcpPro->name_display}}</span>
+                <div moe class="ml-auto">
+                    <a href="" show start><i class="fa fa-edit"></i></a>
+                    <form url="/api/note/putHcp">
                         <input type="hidden" name="uid" value="{{$note->uid}}">
-                        <p>Sign this note as HCP?</p>
+                        <div class="mb-2">
+                            <select name="hcpProUid" class="form-control form-control-sm">
+                                <option value="">-- Select HCP Pro --</option>
+                                @foreach ($pros as $pro)
+                                <option value="{{$pro->uid}}" {{ $pro->id === $note->hcpPro->id ? 'selected' : '' }}>{{$pro->name_display}}</option>
+                                @endforeach
+                            </select>
+                        </div>
                         <div class="mb-0">
-                            <button class="btn btn-success btn-sm" submit>Sign</button>
+                            <button class="btn btn-primary btn-sm" submit>Submit</button>
                             <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                         </div>
                     </form>
                 </div>
-            @endif
-            <span class="mx-2 text-secondary">|</span>
-            @if($note->is_signed_by_ally)
-                <span class="text-secondary">
-                    <i class="fa fa-check"></i>
-                    Ally Signed
-                </span>
-            @else
-                <div moe>
-                    <a class="" href="" show start>Sign as Ally</a>
-                    <form url="/api/note/signAsAlly">
+            </div>
+            <div class="d-flex">
+                <span class="mr-2"><span class="text-secondary">Ally:</span> {{$note->allyPro->name_display}}</span>
+                <div moe class="ml-auto">
+                    <a href="" show start><i class="fa fa-edit"></i></a>
+                    <form url="/api/note/putAlly">
                         <input type="hidden" name="uid" value="{{$note->uid}}">
-                        <p>Sign this note as Ally?</p>
+                        <div class="mb-2">
+                            <select name="allyProUid" class="form-control form-control-sm">
+                                <option value="">-- Select Ally Pro --</option>
+                                @foreach ($pros as $pro)
+                                    <option value="{{$pro->uid}}" {{ $pro->id === $note->allyPro->id ? 'selected' : '' }}>{{$pro->name_display}}</option>
+                                @endforeach
+                            </select>
+                        </div>
                         <div class="mb-0">
-                            <button class="btn btn-success btn-sm" submit>Sign</button>
+                            <button class="btn btn-primary btn-sm" submit>Submit</button>
                             <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                         </div>
                     </form>
                 </div>
-            @endif
-            <span class="mx-2 text-secondary">|</span>
-            <div moe>
+            </div>
+        </div>
+        <div class="ml-auto d-flex align-items-start">
+            <div class="pr-2 border-right">
+                <div>
+                @if($note->is_signed_by_hcp)
+                    <span class="text-secondary">
+                        <i class="fa fa-check"></i>
+                        HCP Signed
+                    </span>
+                @else
+                    <div moe>
+                        <a class="" href="" show start>Sign as HCP</a>
+                        <form url="/api/note/signAsHcp">
+                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                            <p>Sign this note as HCP?</p>
+                            <div class="mb-0">
+                                <button class="btn btn-success btn-sm" submit>Sign</button>
+                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                            </div>
+                        </form>
+                    </div>
+                @endif
+                </div>
+                <div>
+                @if($note->is_signed_by_ally)
+                    <span class="text-secondary">
+                        <i class="fa fa-check"></i>
+                        Ally Signed
+                    </span>
+                @else
+                    <div moe>
+                        <a class="" href="" show start>Sign as Ally</a>
+                        <form url="/api/note/signAsAlly">
+                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                            <p>Sign this note as Ally?</p>
+                            <div class="mb-0">
+                                <button class="btn btn-success btn-sm" submit>Sign</button>
+                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                            </div>
+                        </form>
+                    </div>
+                @endif
+                </div>
+            </div>
+            <div moe relatve class="pl-2">
                 <a class="" href="" show start>Create Bill</a>
-                <form url="/api/bill/createForNote">
+                <form url="/api/bill/createForNote" right>
                     <input type="hidden" name="noteUid" value="{{$note->uid}}">
                     <div class="mb-2">
                         <label for="" class="text-secondary text-sm">Effective Date</label>
-                        <input type="date" name="effectiveDate" class="form-control form-control-sm">
+                        <input type="date" name="effectiveDate" class="form-control form-control-sm" required>
                     </div>
                     <div class="mb-2">
-                        <input type="text" name="code" placeholder="Code" class="form-control form-control-sm">
+                        <input type="text" name="code" placeholder="Code" class="form-control form-control-sm" required>
                     </div>
                     <div class="mb-2">
                         <input type="text" name="reason1" placeholder="Reason 1" class="form-control form-control-sm">

resources/views/layouts/patient.blade.php

@@ -230,6 +230,10 @@
                                 <section>
                                     <div><label>Allergies:</label> Grass, Pollen, Latex</div>
                                     <div><label>Next Appt:</label> {{$patient->next_appointment ? friendly_date_time($patient->next_appointment, false) : '-'}}</div>
+                                    <div>
+                                        <label>CM:</label> {{ $patient->is_enrolled_in_cm === 'YES' ? 'Yes' : 'No' }}
+                                        <label class="ml-2">RM:</label> {{ $patient->is_enrolled_in_rm === 'YES' ? 'Yes' : 'No' }}
+                                    </div>
                                 </section>
                                 <section class=vbox>
                                     <div moe relative>