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

public/css/style.css

@@ -182,7 +182,7 @@ body>nav.navbar {
     white-space: nowrap;
     display: block;
 }
-.mcp-theme-1 .cancelled-item {
+.cancelled-item {
     opacity: 0.5;
 }
 

resources/views/app/mc.blade.php

@@ -23,6 +23,10 @@
     </div>
     <script>
         initVSplitter('stag-mc-main', $('.app-left-panel'), $('.app-right-panel'));
+        window.openInLHS = function(_url) {
+            $('#stag_mcp_lhs')[0].contentWindow.fastLoad(_url, true, false);
+            return false;
+        };
         window.openInRHS = function(_url) {
             $('#stag_mcp_rhs').attr('src', _url);
             return false;

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

@@ -130,10 +130,10 @@
                         </a>
                     </td>
                     <td class="px-2">
-                        {{$note->hcpPro->name_display}}
+                        {{$note->hcpPro ? $note->hcpPro->name_display: '-'}}
                     </td>
                     <td class="px-2">
-                        {{$note->allyPro->name_display}}
+                        {{$note->allyPro ? $note->allyPro->name_display: '-'}}
                     </td>
                 </tr>
             @endforeach

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

@@ -19,16 +19,16 @@
     <div id="proCallComponent">
 
         <div class="d-flex align-items-center justify-content-center py-3 border-bottom">
-            <span class="mr-3">
-                {{ $pro->name_display }} | PRO
-            </span>
+{{--            <span class="mr-3">--}}
+{{--                {{ $pro->name_display }} | PRO--}}
+{{--            </span>--}}
             <button class="btn btn-sm btn-primary px-4 font-weight-bold stag-primary-bg stag-primary-border"
                     v-on:click.prevent="nextPatient()"
-                    :disabled="client || checkingForNextPatient || started">Next Patient</button>
-            <span v-if="patientInQueue && !started" class="patient-in-q-alert text-warning text-sm ml-3 small">
+                    :disabled="client || checkingForNextPatient || started || !(patientInQueue && !started)">Next Patient</button>
+            <span v-if="patientInQueue && !started" class="text-success text-sm ml-3 small">
                 <i class="fa fa-circle"></i>
             </span>
-            <span v-if="!patientInQueue && !started" class="text-success text-sm ml-3 small">
+            <span v-if="!patientInQueue && !started" class="text-secondary text-sm ml-3 small cancelled-item">
                 <i class="fa fa-circle"></i>
             </span>
         </div>
@@ -119,6 +119,9 @@
                                 self.clientUid = _data.data;
                                 self.videoActive = true;
                                 self.startOpenTokSession();
+
+                                // navigate to this patient on LHS
+                                window.top.openInLHS('/patients/view/' + self.clientUid, true, false);
                             }
                         }
                     }, 'json');

resources/views/layouts/patient.blade.php

@@ -228,7 +228,7 @@
                                     @endif
                                 </section>
                                 <section>
-                                    <div><label>Allergies:</label> Grass, Pollen, Latex</div>
+                                    {{--<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' }}