Collaborating pros order (AMOI)

public/css/style.css

@@ -270,6 +270,9 @@ body>nav.navbar {
 .mcp-theme-1 .width-50px {
     width: 50px !important;
 }
+.mcp-theme-1 .width-70px {
+    width: 70px !important;
+}
 .mcp-theme-1 .min-width-140px {
     min-width: 140px !important;
 }

resources/views/app/patient/partials/ticket_vue_collab_card.blade.php

@@ -1,7 +1,7 @@
 <div class="card bg-light">
     <div class="card-body">
         <span class="d-flex align-items-center mb-2" v-if="item.assigned_pro_id">
-            <span class="text-secondary text-sm width-50px">Assigned:</span>
+            <span class="text-secondary text-sm width-70px">Assigned:</span>
             <b>@{{proNameFromId(item.assigned_pro_id)}}</b>
             <span class="d-inline-flex" v-if="item.manager_pro_id === {{$pro->id}}">
                 <span class="mx-2 opacity-60 text-secondary">•</span>
@@ -21,7 +21,7 @@
             </span>
         </span>
         <span class="d-flex align-items-center mb-2" v-if="item.manager_pro_id">
-            <span class="text-secondary text-sm width-50px">Manager:</span>
+            <span class="text-secondary text-sm width-70px">Manager:</span>
             <b>@{{proNameFromId(item.manager_pro_id)}}</b>
             <span class="d-inline-flex" v-if="item.manager_pro_id === {{$pro->id}}">
                 <span class="mx-2 opacity-60 text-secondary">•</span>
@@ -40,44 +40,44 @@
                    v-on:click.prevent="signAsManagerPro(item)">Sign</a>
             </span>
         </span>
-        <span class="d-flex align-items-center mb-2" v-if="item.initiating_pro_id">
-            <span class="text-secondary text-sm width-50px">Initiating:</span>
-            <b>@{{proNameFromId(item.initiating_pro_id)}}</b>
+        <span class="d-flex align-items-center mb-2" v-if="item.ordering_pro_id">
+            <span class="text-secondary text-sm width-70px">Ordering:</span>
+            <b>@{{proNameFromId(item.ordering_pro_id)}}</b>
             <span class="d-inline-flex" v-if="item.manager_pro_id === {{$pro->id}}">
                 <span class="mx-2 opacity-60 text-secondary">•</span>
-                <a class="on-hover-opaque c-pointer" v-on:click.prevent="showProUpdatePopup('other-popup', 'Initiating', item)">
+                <a class="on-hover-opaque c-pointer" v-on:click.prevent="showProUpdatePopup('other-popup', 'Ordering', item)">
                     <i class="fa fa-edit"></i>
                 </a>
             </span>
-            <span class="d-inline-flex" v-if="item.initiating_pro_id === {{$pro->id}}">
+            <span class="d-inline-flex" v-if="item.ordering_pro_id === {{$pro->id}}">
                 <span class="mx-2 opacity-60 text-secondary">•</span>
-                <span v-if="item.has_initiating_pro_signed" class="text-success">
+                <span v-if="item.has_ordering_pro_signed" class="text-success">
                     <i class="fa fa-check"></i>
                     Signed
-                    <a class="ml-2 c-pointer" v-on:click.prevent="undoSignAsInitiatingPro(item)">Undo</a>
+                    <a class="ml-2 c-pointer" v-on:click.prevent="undoSignAsOrderingPro(item)">Undo</a>
                 </span>
-                <a v-if="!item.has_initiating_pro_signed" class="c-pointer"
-                   v-on:click.prevent="signAsInitiatingPro(item)">Sign</a>
+                <a v-if="!item.has_ordering_pro_signed" class="c-pointer"
+                   v-on:click.prevent="signAsOrderingPro(item)">Sign</a>
             </span>
         </span>
-        <span class="d-flex align-items-center" v-if="item.ordering_pro_id">
-            <span class="text-secondary text-sm width-50px">Ordering:</span>
-            <b>@{{proNameFromId(item.ordering_pro_id)}}</b>
+        <span class="d-flex align-items-center" v-if="item.initiating_pro_id">
+            <span class="text-secondary text-sm width-70px">Initiating:</span>
+            <b>@{{proNameFromId(item.initiating_pro_id)}}</b>
             <span class="d-inline-flex" v-if="item.manager_pro_id === {{$pro->id}}">
                 <span class="mx-2 opacity-60 text-secondary">•</span>
-                <a class="on-hover-opaque c-pointer" v-on:click.prevent="showProUpdatePopup('other-popup', 'Ordering', item)">
+                <a class="on-hover-opaque c-pointer" v-on:click.prevent="showProUpdatePopup('other-popup', 'Initiating', item)">
                     <i class="fa fa-edit"></i>
                 </a>
             </span>
-            <span class="d-inline-flex" v-if="item.ordering_pro_id === {{$pro->id}}">
+            <span class="d-inline-flex" v-if="item.initiating_pro_id === {{$pro->id}}">
                 <span class="mx-2 opacity-60 text-secondary">•</span>
-                <span v-if="item.has_ordering_pro_signed" class="text-success">
+                <span v-if="item.has_initiating_pro_signed" class="text-success">
                     <i class="fa fa-check"></i>
                     Signed
-                    <a class="ml-2 c-pointer" v-on:click.prevent="undoSignAsOrderingPro(item)">Undo</a>
+                    <a class="ml-2 c-pointer" v-on:click.prevent="undoSignAsInitiatingPro(item)">Undo</a>
                 </span>
-                <a v-if="!item.has_ordering_pro_signed" class="c-pointer"
-                   v-on:click.prevent="signAsOrderingPro(item)">Sign</a>
+                <a v-if="!item.has_initiating_pro_signed" class="c-pointer"
+                   v-on:click.prevent="signAsInitiatingPro(item)">Sign</a>
             </span>
         </span>
     </div>

resources/views/app/patient/partials/ticket_vue_collab_column.blade.php

@@ -7,14 +7,6 @@
         </span>
     </span>
     <br>
-    <span class="d-inline-flex align-items-center" v-if="item.manager_pro_id">
-        <span class="text-nowrap">
-            <span class="text-secondary text-sm">Manager:</span>
-            <b>@{{proNameFromId(item.manager_pro_id)}}</b>
-            <span class="text-secondary text-sm" v-html="item.has_manager_pro_signed ? '(signed)' : ''"></span>
-        </span>
-    </span>
-    <br>
     <span class="d-inline-flex align-items-center" v-if="item.initiating_pro_id">
         <span class="text-nowrap">
             <span class="text-secondary text-sm">Initiating:</span>
@@ -23,6 +15,14 @@
         </span>
     </span>
     <br>
+    <span class="d-inline-flex align-items-center" v-if="item.manager_pro_id">
+        <span class="text-nowrap">
+            <span class="text-secondary text-sm">Manager:</span>
+            <b>@{{proNameFromId(item.manager_pro_id)}}</b>
+            <span class="text-secondary text-sm" v-html="item.has_manager_pro_signed ? '(signed)' : ''"></span>
+        </span>
+    </span>
+    <br>
     <span class="d-inline-flex align-items-center" v-if="item.ordering_pro_id">
         <span class="text-nowrap">
             <span class="text-secondary text-sm">Ordering:</span>