Make effective time functional in notes list

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 "-";

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,122 +21,131 @@
                 </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 class="pl-2">
                 <a class="" href="" show start>Create Bill</a>
                 <form url="/api/bill/createForNote">
                     <input type="hidden" name="noteUid" value="{{$note->uid}}">