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

config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 67,
+    'asset_version' => 68,
 
     'temp_dir' => env('TEMP_DIR'),
 

public/css/style.css

@@ -433,6 +433,11 @@ body>nav.navbar {
     min-width: unset !important;
     max-width: unset !important;
 }
+.mcp-theme-1 .width-140px {
+    width: 140px;
+    min-width: unset !important;
+    max-width: unset !important;
+}
 .mcp-theme-1 .width-150px {
     width: 150px;
     min-width: unset !important;

resources/views/app/patient/wizard-partials/add-multiple-pre-existing.blade.php

@@ -4,7 +4,7 @@
         <input type="hidden" name="category" value="{{@$category ?: strtoupper($label)}}">
         <input type="hidden" name="dataJson">
 
-        <table class="table table-sm table-bordered stag-sheet allow-row-addition bg-white mb-2 point-table read">
+        <table class="table table-sm table-bordered stag-sheet allow-row-addition bg-white mb-2 point-table read" style="table-layout: fixed">
             <thead>
             <tr class="bg-light">
                 <th class="border-bottom-0 text-secondary text-nowrap">{{ucwords($label)}}</th>
@@ -14,11 +14,11 @@
                     <th class="border-bottom-0 text-secondary">Specialty</th>
                     <th class="border-bottom-0 text-secondary">Organization</th>
                 @endif
-                <th class="border-bottom-0 text-secondary width-100px">Start Date</th>
-                <th class="border-bottom-0 text-secondary width-100px text-nowrap">{{$adder}}</th>
                 <th class="border-bottom-0 text-secondary width-150px">Subjective</th>
                 <th class="border-bottom-0 text-secondary width-150px">Plan</th>
-                <th class="border-bottom-0 text-secondary width-40px"></th>
+                <th class="border-bottom-0 text-secondary width-140px">Start Date</th>
+                <th class="border-bottom-0 text-secondary width-100px text-nowrap">{{$adder}}</th>
+                <th class="border-bottom-0 text-secondary width-50px"></th>
             </tr>
             </thead>
             <tbody>
@@ -65,16 +65,16 @@
                     </td>
                 @endif
                 <td class="p-0">
-                    <input type="date" key="start_date" bucket="data">
+                    <textarea rows="1" key="value" bucket="childReviewData"></textarea>
                 </td>
                 <td class="p-0">
-                    <input type="text" key="prescriber" bucket="data">
+                    <textarea rows="1" key="value" bucket="childPlanData"></textarea>
                 </td>
                 <td class="p-0">
-                    <textarea rows="1" key="value" bucket="childReviewData"></textarea>
+                    <input type="date" key="start_date" bucket="data">
                 </td>
                 <td class="p-0">
-                    <textarea rows="1" key="value" bucket="childPlanData"></textarea>
+                    <input type="text" key="prescriber" bucket="data">
                 </td>
                 <td class="px-2 align-middle text-center text-nowrap">
                     <a href="#" class="delete-line mr-2"><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>