Updates

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

@@ -500,14 +500,14 @@
         </div> */ ?>
 
         <div class="row my-3">
-            <div class="col-12">
+            <div class="col-md-6">
                 {{-- memos --}}
                 <div  class="mb-2 pt-3 pb-2 border-top">
                     <div class="">
                         <div class="d-flex align-items-start pb-2">
                             <h6 class="my-0 font-weight-bold text-secondary">Client Memos</h6>
                         </div>
-                        <div moe class="w-50 p-2 border mb-3">
+                        <div moe class="w-100 p-2 border mb-3">
                             <form url="/api/clientMemo/create" show>
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <label class="text-secondary font-weight-bold">+ New Memo</label>
@@ -659,6 +659,11 @@
                     </div>
                 </div>
             </div>
+            <div class="col-md-6">
+            <div  class="mb-2 pt-3 pb-2 border-top">
+                    @include('app.patient.intake-data.intake-data')
+            </div>    
+            </div>
         </div>
 
     </div>

resources/views/app/patient/intake-data/intake-data.blade.php

@@ -0,0 +1,24 @@
+<?php
+	$intakeDataFields = [
+		'height' => 'Height',
+		'weight' => 'Weight',
+		'last_vitamin_d' => 'Last Vitamin D',
+		'ethnicity' => 'Ethnicity',
+		'hypertension' => 'Hypertension',
+		'diabetes' => 'Diabetes',
+		'copd' => 'COPD',
+		'arthritis' => 'Arthritis',
+	];
+	$patientCanvasData = json_decode($patient->canvas_data ?? null);
+	$patientIntakeData = null;
+	if($patientCanvasData && @$patientCanvasData->INTAKE_DATA){
+		$patientIntakeData = @$patientCanvasData->INTAKE_DATA;
+	}
+?>
+<div class="d-flex align-items-center pb-2">
+	<h6 class="my-0 font-weight-bold text-secondary mr-2">Client Memos</h6>
+	@include('app.patient.intake-data.patient-intake-data-form',['tableGrid' => true])
+</div>
+<div>
+	@include('app.patient.intake-data.patient-intake-data-display')
+</div>

resources/views/app/patient/intake-data/patient-intake-data-form.blade.php

@@ -4,7 +4,6 @@
 		'weight' => 'Weight',
 		'last_vitamin_d' => 'Last Vitamin D',
 		'ethnicity' => 'Ethnicity',
-		'previous_dx' => 'Previous Dx',
 		'hypertension' => 'Hypertension',
 		'diabetes' => 'Diabetes',
 		'copd' => 'COPD',
@@ -16,34 +15,39 @@
 		$patientIntakeData = @$patientCanvasData->INTAKE_DATA;
 	}
 ?>
+
 <div id="patient-intake-data-form" visit-moe moe relative wide class="ml-2 hide-inside-popup">
 	<a start show>
-		@if($patientIntakeData)
+		@if($patientIntakeData && !@$tableGrid)
 			<i class="fas fa-eye"></i>
 		@else
 			<i class="fa fa-edit"></i>
 		@endif
 		</a>
 	<form id="patientIntakeDataForm" url="/api/client/updateCanvasData" class="mcp-theme-1" right>
-		@if($patientIntakeData)
-			@include('app.patient.intake-data.patient-intake-data-display')
-			<div class="text-center">
-				<button type="button" class="btn btn-sm btn-primary mb-2 hide-form" id="patientIntakeToggleForm">Update Data</button>
-			</div>
+		@if(!@$tableGrid)
+			@if($patientIntakeData)
+				@include('app.patient.intake-data.patient-intake-data-display')
+				<div class="text-center">
+					<button type="button" class="btn btn-sm btn-primary mb-2 hide-form" id="patientIntakeToggleForm">Update Data</button>
+				</div>
+			@endif
 		@endif
-		<div id="patientIntakeFormSection" class="{{ $patientIntakeData ? 'd-none':'' }}">
+		<div id="patientIntakeFormSection" class="{{ $patientIntakeData && !@$tableGrid ? 'd-none':'' }}">
 			<div class="bg-light p-2 font-weight-bold mb-2">Update Patient Intake Data</div>
 			<input type="hidden" name="uid" value="{{$patient->uid}}">
 			<input type="hidden" name="key" value="INTAKE_DATA">
 			<input type="hidden" name="data">
-			@foreach($intakeDataFields as $key=>$label)
-			<div class="mb-2">
-				<label class="text-secondary text-sm font-weight-bold">{{ $label }}</label>
-				<input name="{{$key}}" class="form-control" value="{{ $patientIntakeData ? @$patientIntakeData->{$key}:'' }}" />
+			<div class="row">
+				@foreach($intakeDataFields as $key=>$label)
+				<div class="col-md-6 mb-2">
+					<label class="text-secondary text-sm font-weight-bold">{{ $label }}</label>
+					<input name="{{$key}}" class="form-control" value="{{ $patientIntakeData ? @$patientIntakeData->{$key}:'' }}" />
+				</div>
+				@endforeach
 			</div>
-			@endforeach
 
-			<div>
+			<div class="mb-2">
 				<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
 				<button cancel class="btn btn-sm btn-default border">
 					Cancel
@@ -53,7 +57,6 @@
 	</form>
 </div>
 
-
 <script>
 	(function() {
 		function init() {