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

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

@@ -29,18 +29,18 @@
             @if($patient->memos && count($patient->memos))
                 <thead>
                 <tr>
-                    <th class="px-2 text-secondary">Created</th>
                     <th class="px-2 text-secondary w-25">Category</th>
                     <th class="px-2 text-secondary w-50">Summary</th>
+                    <th class="px-2 text-secondary">Created</th>
                     <th class="px-2 text-secondary delete-column">&nbsp;</th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($patient->memos as $memo)
                     <tr>
-                        <td class="px-2">{{ friendly_date_time($memo->created_at) }}</td>
                         <td class="px-2">{{ $memo->category }}</td>
                         <td class="px-2"><pre class="m-0">{{ $memo->content }}</pre></td>
+                        <td class="px-2">{{ friendly_date_time($memo->created_at) }}</td>
                         <td class="px-2 text-center delete-column">
                             <div moe wide relative class="mr-2">
                                 <a class="on-hover-opaque" start show title="Edit">

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

@@ -640,7 +640,7 @@
                         let latestSection = $('.note-section[data-ts="' + latestSectionTS.text() + '"]');
                         if(latestSection.length) {
                             latestSection[0].scrollIntoView({behavior: "smooth", block: "center"});
-                            latestSection.find('.edit-trigger').first().click();
+                            // latestSection.find('.edit-trigger').first().click();
                             console.log('DONE!');
                         }
                     }

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

@@ -15,23 +15,7 @@ $vitalMap = [
 
 $vitalLabels = ['Ht. (in.)','Wt. (lbs.)','Temp. (F)','Pulse','Resp.','Pulse Ox.','SBP','DBP','Smoking Status', 'BMI'];
 
-$vitalValues = [];
-
-foreach($vitalLabels as $l){
-    $vitalValues[$l] = [
-        'value' => null,
-        'effectiveDate' => null
-    ];
-}
-
-foreach($patient->measurements as $measurement) {
-    if(!empty($measurement->label) && in_array($measurement->label, $vitalLabels)){
-        $vitalValues[$measurement->label] = [
-            'value'=>$measurement->value,
-            'effectiveDate' => $measurement->effective_date
-        ];
-    }
-}
+$vitalValues = json_decode($patient->latest_measurements, true);
 
 ?>