Merge branch 'dev' into dev-vj

resources/views/app/practice-management/visit-templates/visit-template-segment-templates/create.blade.php

@@ -11,6 +11,14 @@
 						<option v-for="t in segmentTemplates" v-bind:value="t.uid">@{{ t.default_display_title }}</option>
 					</select>
 				</div>
+				<div class="mb-2">
+					<label>Left or Right</label>
+					<select name="leftOrRight" class="form-control" required>
+						<option value="">--select--</option>
+						<option value="LEFT">Left</option>
+						<option value="RIGHT">Right</option>
+					</select>
+				</div>
 				<div class="mb-2">
 					<label>Position Index<sup class="text-danger">*</sup></label>
 					<input type="number" name="positionIndex" class="form-control" required />
@@ -27,6 +35,7 @@
 					<label>Display title<sup class="text-danger">*</sup></label>
 					<input type="text" name="displayTitle" class="form-control" required />
 				</div>
+				
 			</div>
 			<div class="mb-0">
 				<button class="btn btn-success btn-sm" submit>Create</button>

resources/views/app/practice-management/visit-templates/visit-template-segment-templates/index.blade.php

@@ -75,6 +75,7 @@
                         <th class="border-0">Display title</th>
                         <th class="border-0">Heading</th>
                         <th class="border-0">Sub-heading</th>
+                        <th class="border-0">Left or Right</th>
                         <th class="border-0">Position Index</th>
                         <th class="border-0">Segment Template</th>
                         <th class="border-0">Created At</th>
@@ -88,6 +89,7 @@
                         <td>{{ $template->display_title }}</td>
                         <td>{{ $template->heading }}</td>
                         <td>{{ $template->subheading }}</td>
+                        <td>{{ $template->left_or_right }}</td>
                         <td>{{ $template->position_index }}</td>
                         <td>{{ $template->segmentTemplate ? $template->segmentTemplate->default_display_title : '---' }}</td>
                         <td>{{ friendly_date_time($template->created_at) }}</td>

resources/views/app/practice-management/visit-templates/visit-template-segment-templates/update.blade.php

@@ -3,6 +3,14 @@
 	<form url="/api/visitTemplateSegmentTemplate/updateBasic" right>
 		<div>
 			<input type="hidden" name="uid" value="{{ $template->uid }}" />
+			<div class="mb-2">
+				<label>Left or Right</label>
+				<select name="leftOrRight" class="form-control" required>
+					<option value="">--select--</option>
+					<option {{$template->left_or_right == 'LEFT' ? 'selected': ''}} value="LEFT">Left</option>
+					<option {{$template->left_or_right == 'RIGHT' ? 'selected': ''}} value="RIGHT">Right</option>
+				</select>
+			</div>
 			<div class="mb-2">
 				<label>Position Index<sup class="text-danger">*</sup></label>
 				<input type="number" name="positionIndex" class="form-control" value="{{ $template->position_index }}" required />