Jelajahi Sumber

stag-title UI update

Vijayakrishnan 3 tahun lalu
induk
melakukan
5858ae0eb5

+ 5 - 3
public/css/style.css

@@ -3074,9 +3074,11 @@ body.forced-masking #mask {
     bottom: 100%;
     left: 0;
     width: 100%;
-    background: #eee;
-    border: 1px solid #ccc;
-    color: #777;
+    background: #f7f7f7;
+    border-top: 1px solid #d7d7d7;
+    border-bottom: 1px solid #d7d7d7;
+    color: #888;
+    text-align: center;
     font-size: 80%;
     font-weight: normal;
     padding: 1px 3px;

+ 31 - 25
resources/views/app/practice-management/remote-monitoring.blade.php

@@ -77,20 +77,20 @@
                     <div class="flex-grow-1 px-0 pt-2">
                         <table class="table table-sm table-striped table-hover p-0 m-0 border-top" id="table-rm-matrix">
                             <thead class="bg-light">
-                            <tr>
-                                <th class="border-0 pl-2" stag-title="Click to sort. Shift+Click to multi-sort.">Name</th>
-                                <th class="border-0" stag-title="Click to sort. Shift+Click to multi-sort.">DOB</th>
-                                <th class="border-0" stag-title="Click to sort. Shift+Click to multi-sort.">RPM?</th>
-                                <th class="border-0" stag-title="Click to sort. Shift+Click to multi-sort.">Cell. BP?</th>
-                                <th class="border-0" stag-title="Click to sort. Shift+Click to multi-sort.">Cell. Scale?</th>
-                                <th class="border-0" stag-title="Click to sort. Shift+Click to multi-sort.">Last BP</th>
-                                <th class="border-0" stag-title="Click to sort. Shift+Click to multi-sort.">Last Wt</th>
-                                <th class="border-0" stag-title="Click to sort. Shift+Click to multi-sort.">Last Visit</th>
-                                <th class="border-0" stag-title="Click to sort. Shift+Click to multi-sort.">Interacted?</th>
-                                <th class="border-0" stag-title="Click to sort. Shift+Click to multi-sort.">#Meas. Days</th>
-                                <th class="border-0" stag-title="Click to sort. Shift+Click to multi-sort.">#Unstamped</th>
-                                <th class="border-0" stag-title="Click to sort. Shift+Click to multi-sort.">#RPM Mins.</th>
-                                <th class="border-0" stag-title="Click to sort. Shift+Click to multi-sort.">Billable</th>
+                            <tr stag-title="Click to sort. Shift+Click to multi-sort.">
+                                <th class="border-0 pl-2">Name</th>
+                                <th class="border-0">DOB</th>
+                                <th class="border-0">RPM?</th>
+                                <th class="border-0">Cell. BP?</th>
+                                <th class="border-0">Cell. Scale?</th>
+                                <th class="border-0">Last BP</th>
+                                <th class="border-0">Last Wt</th>
+                                <th class="border-0">Last Visit</th>
+                                <th class="border-0">Interacted?</th>
+                                <th class="border-0">#Meas. Days</th>
+                                <th class="border-0">#Unstamped</th>
+                                <th class="border-0">#RPM Mins.</th>
+                                <th class="border-0">Billable</th>
                             </tr>
                             </thead>
                             <tbody>
@@ -132,18 +132,22 @@
                                     <td>{!! $iPatient->is_assigned_cellular_bp_device ? '<i class="fa fa-check text-success"></i>' : 'No' !!}</td>
                                     <td>{!! $iPatient->is_assigned_cellular_weight_scale_device ? '<i class="fa fa-check text-success"></i>' : 'No' !!}</td>
                                     <td>
-                                        {{$iPatient->most_recent_cellular_bp_sbp_mm_hg ?: '-'}}/{{$iPatient->most_recent_cellular_bp_dbp_mm_hg ?: '-'}}
-                                        @if($iPatient->most_recent_cellular_bp_measurement_at)
-                                            <span class="text-sm text-secondary text-nowrap ml-1"
-                                                  title="{{friendly_date_time($iPatient->most_recent_cellular_bp_measurement_at)}}">({{friendly_date($iPatient->most_recent_cellular_bp_measurement_at)}})</span>
-                                        @endif
+                                        <div class="text-nowrap">
+                                            <span class="sort-data">{{$iPatient->most_recent_cellular_bp_sbp_mm_hg ?: '-'}}</span>/{{$iPatient->most_recent_cellular_bp_dbp_mm_hg ?: '-'}}
+                                            @if($iPatient->most_recent_cellular_bp_measurement_at)
+                                                <span class="text-sm text-secondary text-nowrap ml-1"
+                                                      title="{{friendly_date_time($iPatient->most_recent_cellular_bp_measurement_at)}}">({{friendly_date($iPatient->most_recent_cellular_bp_measurement_at)}})</span>
+                                            @endif
+                                        </div>
                                     </td>
                                     <td>
-                                        {{$iPatient->most_recent_cellular_weight_value ? round($iPatient->most_recent_cellular_weight_value, 1) : '-'}}
-                                        @if($iPatient->most_recent_cellular_weight_measurement_at)
-                                            <span class="text-sm text-secondary text-nowrap ml-1"
-                                                  title="{{friendly_date_time($iPatient->most_recent_cellular_weight_measurement_at)}}">({{friendly_date($iPatient->most_recent_cellular_weight_measurement_at)}})</span>
-                                        @endif
+                                        <div class="text-nowrap">
+                                            <span class="sort-data">{{$iPatient->most_recent_cellular_weight_value ? round($iPatient->most_recent_cellular_weight_value, 1) : '-'}}</span>
+                                            @if($iPatient->most_recent_cellular_weight_measurement_at)
+                                                <span class="text-sm text-secondary text-nowrap ml-1"
+                                                      title="{{friendly_date_time($iPatient->most_recent_cellular_weight_measurement_at)}}">({{friendly_date($iPatient->most_recent_cellular_weight_measurement_at)}})</span>
+                                            @endif
+                                        </div>
                                     </td>
                                     <td>
                                         <div class="d-flex align-items-baseline">
@@ -358,7 +362,7 @@
                             },
                         },
                         {
-                            targets: [9, 10, 11],
+                            targets: [5, 6, 9, 10, 11],
                             type: 'num',
                             render: function (data, type, row, meta) {
                                 if(type === 'sort') {
@@ -370,6 +374,8 @@
                     ]
                 });
                 $('#practice-remote-monitoring').removeAttr('v-cloak');
+                $('#practice-remote-monitoring [moe][initialized]').removeAttr('initialized');
+                initMoes();
             }
             addMCInitializer('practice-remote-monitoring', init, '#practice-remote-monitoring');
         }).call(window);