server changes

resources/views/app/admin/patients-table-extended.blade.php

@@ -11,6 +11,12 @@
             <th class="border-0 width-90px">#</th>
             <th class="border-0">Name</th>
             <th class="border-0">Created</th>
+            @if($pro->pro_type == 'ADMIN')
+                <th class="border-0">MCP</th>
+                <th class="border-0">NA</th>
+                <th class="border-0">Initiative</th>
+                <th class="border-0">Source</th>
+            @endif
             <th class="border-0">DOB</th>
             <th class="border-0">Age</th>
             <th class="border-0">Sex</th>
@@ -35,14 +41,8 @@
             {{-- <th class="border-0 d-none">Last Weight-In</th>--}}
             {{-- <th class="border-0 d-none">Last BP</th>--}}
             <th class="border-0">Assigned On</th>
-
-            @if($pro->pro_type == 'ADMIN')
-                <th class="border-0">MCP</th>
-                <th class="border-0">NA</th>
-                <th class="border-0">Initiative</th>
-                <th class="border-0">Source</th>
-            @endif
-            <th class="border-0">Email Address</th>
+            
+	    <th class="border-0">Email Address</th>
             <th class="border-0">Mailing Address State</th>
         </tr>
         </thead>
@@ -65,6 +65,12 @@
                         By <span>{{$patient->creator ? $patient->creator->displayName() : '-'}}</span>
                     </div>
                 </td>
+		@if($pro->pro_type == 'ADMIN')
+                    <td>{{@$patient->mcp ? $patient->mcp->displayName() : '--'}}</td>
+                    <td>{{@$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '--'}}</td>
+                    <td>{{$patient->initiative}}</td>
+                    <td>{{$patient->source}}</td>
+                @endif
                 <td>{{ friendly_date_time($patient->dob, false) }}</td>
                 <td>{{ $patient->age_in_years ?  $patient->age_in_years : '-' }}</td>
                 <td>{{ $patient->sex }}</td>
@@ -309,12 +315,6 @@
                 </td>
                 <td>{{count($patient->cellularMeasurements)}}</td>
                 <td>{{$patient->getMcpAssignedOn()}}</td>
-                @if($pro->pro_type == 'ADMIN')
-                    <td>{{@$patient->mcp ? $patient->mcp->displayName() : '--'}}</td>
-                    <td>{{@$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '--'}}</td>
-                    <td>{{$patient->initiative}}</td>
-                    <td>{{$patient->source}}</td>
-                @endif
                 <td>{{$patient->email_address}}</td>
                 <td>{{$patient->mailing_address_state}}</td>
             </tr>
@@ -367,4 +367,4 @@
 
         addMCInitializer('admin-patients-list-extended', init, '#admin-patients-list-extended');
     }).call(window);
-</script>
+</script>

resources/views/app/patient/segment-templates/covid_intake/edit.blade.php

@@ -227,10 +227,9 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
         </div>
         <div class="mb-2 ml-3">
             <ul>
-                <li>So as you might know, last week Governor Hogan declared a state of emergency.</li>
-                <li>Right now, there are more individuals hospitalized in Maryland due to COVID-19 than at any previous point in the entire pandemic.</li>
+		<li>Recent surge in cases.</li>
                 <li>
-                    So self-monitoring your vitals is more important than ever these days because even though vaccines are really effective, there’s an ongoing risk of getting COVID even after vaccination.
+                    Self-monitoring your vitals is more important than ever these days because even though vaccines are really effective, there’s an ongoing risk of getting COVID even after vaccination.
                     <ul>
                         <li>It’s likely that COVID is going to become ‘endemic’ like the flu, where the virus is here to stay and change season to season.</li>
                         <li>So you do need a long-term strategy to protect yourself in addition to vaccines.</li>