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

public/css/style.css

@@ -819,11 +819,12 @@ body .node input[type="number"] {
 
 /* call panel */
 #proCallComponent {
-    max-height: calc(100% - 151px);
+    padding-bottom: 150px;
 }
 .patient-queue {
-    height: 150px;
-    position: absolute;
+    display: flex;
+    flex-direction: column;
+    position: fixed;
     left: 0;
     width: 100%;
     bottom: 0;

resources/views/app/patient/canvas-sections/dx/default.php

@@ -1,10 +1,17 @@
 <?php
-
-$canvasData = [];
+$canvasData = [
+    "items" => []
+];
 if ($patient->canvas_data) {
     $canvasData = json_decode($patient->canvas_data, true);
     if (isset($canvasData["dx"])) {
         $canvasData = $canvasData["dx"];
+        if(!isset($canvasData["items"])) {
+            $canvasData["items"] = [];
+        }
+        for ($i = 0; $i < count($canvasData["items"]); $i++) {
+            $canvasData["items"][$i]["included"] = 1;
+        }
     }
 }
 $contentData = $canvasData;

resources/views/app/patient/canvas-sections/dx/summary.php

@@ -1,19 +1,29 @@
 <?php
 
-$contentData = [
-    "items" => []
-];
-if($patient->canvas_data) {
+if(isset($contentData) && !!$contentData) {
+    $dxContentData = $contentData;
+}
+else {
+    $dxContentData = false;
+}
+
+if(!$dxContentData && $patient->canvas_data) {
     $canvasData = json_decode($patient->canvas_data, true);
     if(isset($canvasData["dx"])) {
-        $contentData = $canvasData["dx"];
+        $dxContentData = $canvasData["dx"];
     }
 }
 
-if(count($contentData['items'])) {
-    for ($i = 0; $i < count($contentData['items']); $i++) {
-        $item = $contentData['items'][$i];
-        
+if(!$dxContentData) {
+    $dxContentData = [
+        "items" => []
+    ];
+}
+
+if(count($dxContentData['items'])) {
+    for ($i = 0; $i < count($dxContentData['items']); $i++) {
+        $item = $dxContentData['items'][$i];
+
 ?>
         <div class="mb-2 <?= @$item["included"] ? '' : 'hide-if-note' ?>">
             <div class="">

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

@@ -334,7 +334,7 @@
                 {{--@include('app/patient/partials/dx')--}}
 
                 {{-- canvas based dx --}}
-                <div class="pt-2 mt-2 border-top">
+                <div class="pt-2 border-top">
                     <div class="d-flex align-items-center pb-2">
                         <h6 class="my-0 font-weight-bold text-secondary">Current Problems / Focus Areas</h6>
                         <span class="mx-2 text-secondary">|</span>

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

@@ -54,12 +54,6 @@
                         editParent.toggleClass('edit');
                         if(editParent.is('.edit')) {
                             editParent.siblings('.edit').removeClass('edit');
-                            if(editParent.find('[contenteditable]').length) {
-                                editParent.find('[contenteditable]').first().focus();
-                            }
-                            else {
-                                editParent.find('textarea:visible').first().focus();
-                            }
                         }
                         return false;
                     });

resources/views/app/video/call.blade.php

@@ -87,7 +87,7 @@
         <div class="bg-secondary text-white font-weight-bold text-center py-1" v-if="items.length === 0">
             No patients in the queue
         </div>
-        <div class="d-flex align-items-center mt-1">
+        <div v-if="items && items.length" class="d-flex align-items-center my-1">
             <div v-for="item in items">
                 <div class="queue-item border border-primary rounded mx-1" :title="item.name">
                     <div class="patient-avatar mb-1 text-dark">@{{ item.initials }}</div>
@@ -565,7 +565,7 @@
                                 // open patient in LHS
                                 window.top.openInLHS('/patients/view/' + _uid);
                                 // open patient video in RHS
-                                openInRHS('/pro/meet/' + _uid);
+                                window.top.openInRHS('/pro/meet/' + _uid);
                             }
                             else {
                                 if (_data.message) {