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

public/css/style.css

@@ -617,3 +617,6 @@ input.search_field, textarea.search_field {
 body #searchCount {
     display: none !important;
 }
+body .break-spaces {
+    white-space: pre-wrap;
+}

public/js/yemi.js

@@ -417,6 +417,7 @@ var initMoes = function() {
                             hideMoeFormMask();
                             initMoes();
                             initFastLoad(moeParent);
+                            initAutoRxAndICDComplete();
                         });
                     } else {
                         pageReload();

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

@@ -1288,18 +1288,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"><pre class="m-0 break-spaces">{{ $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">
@@ -1317,8 +1317,8 @@
                                                         </select>
                                                     </div>
                                                     <div class="mb-2">
-                                        <textarea class="form-control form-control-sm" name="content" rows="5"
-                                                  placeholder="Content"><?= $memo->content ?></textarea>
+                                                        <textarea class="form-control form-control-sm" name="content" rows="5"
+                                                            placeholder="Content"><?= $memo->content ?></textarea>
                                                     </div>
                                                     <div class="d-flex align-items-center">
                                                         <button class="btn btn-sm btn-primary mr-2" type="button" submit>Save</button>

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

@@ -58,7 +58,6 @@ foreach($patient->measurements as $measurement) {
                     <input type="text" class="form-control form-control-sm" name="weightPounds" value="{{$vitalValues['Wt. (lbs.)']['value']}}" placeholder="">
                 </div>
                 <div class="mb-2">
-                    <label for="" class="control-label mb-0">Temp. (F)</label>
                     Temp. (F)<br/>
                     <input type="text" class="form-control form-control-sm" name="temperatureF" value="{{$vitalValues['Temp. (F)']['value']}}" placeholder="">
                 </div>

resources/views/layouts/template.blade.php

@@ -246,8 +246,8 @@
     </script>
     <script>
         (function() {
-            function init() {
-                $('input[type="text"][name="ICD"]').each(function() {
+            window.initAutoRxAndICDComplete = function () {
+                $('input[type="text"][name="ICD"]:not([ac-initialized])').each(function() {
                     var elem = this,
                         dynID = 'icd-' + Math.ceil(Math.random() * 1000000);
                     $(elem).attr('id', dynID);
@@ -264,8 +264,9 @@
                         $(elem).closest('form').find('[name="contentText"]').val(name);
                         return false;
                     });
+                    $(elem).attr('ac-initialized', 1);
                 });
-                $('[rx-section] input[type="text"][name="contentText"]').each(function() {
+                $('[rx-section] input[type="text"][name="contentText"]:not([ac-initialized])').each(function() {
                     var elem = this,
                         dynID = 'rx-' + Math.ceil(Math.random() * 1000000);
                     $(elem).attr('id', dynID);
@@ -282,9 +283,10 @@
                         if (strengths)
                             strengthElem.autocomp.setListAndField(strengths, '');
                     });
+                    $(elem).attr('ac-initialized', 1);
                 });
             }
-            addMCInitializer('patient-single', init);
+            addMCInitializer('patient-single', window.initAutoRxAndICDComplete);
         })();
     </script>