Changes

resources/views/app/patient/care-month/care-month-update-mcp-onboarding-visit-info.blade.php

@@ -52,7 +52,7 @@
 				var fields = $('[name=mcpOnboardingVisitNoteUid], [name=reasonOnboardingVisitNoteOutsideSystem]');
 				if(self.form.hasMcpDoneOnboardingVisit == 'YES'){					
 					fields.prop('required', true);
-					fields.on('change, keyup', function(){
+					fields.on('change keyup', function(){
 						fields.prop('required', false);
 						$(this).prop('required', true);
 					});

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

@@ -1524,10 +1524,7 @@ use App\Models\Handout;
                                             </form>
                                         </div>
                                     @endif
-                                    <div class="d-flex align-items-center">
-                                        @if($pro->pro_type === 'ADMIN')
-                                            @include('app.patient.note.partials.bill-flags-history')
-                                        @endif
+                                    <div>
                                         @include('app.patient.note.flag-bill')
                                     </div>
                                     

resources/views/app/patient/note/flag-bill.blade.php

@@ -1,32 +1,37 @@
-<div class="{{ $bill->is_flagged_by_administrator && !$bill->is_administrator_flag_cleared ? 'alert alert-danger p-1 rounded-0' : '' }}">
+<div <?= $bill->is_flagged_by_administrator && !$bill->is_administrator_flag_cleared ? 'class="alert alert-danger p-1 rounded-0" style="min-width: 380px;"' : '' ?>>
 <?php #dump($bill); ?>
 @if($pro->pro_type === 'ADMIN')
 	@if($bill->is_flagged_by_administrator && !$bill->is_administrator_flag_cleared)
 		<div class="d-flex flex-column">
-			<span><b>Flagged At:</b> {{ friendly_date_time($bill->flagged_administrator_at) }}</span>
-			<small class="text-muted"><b><i class="fas fa-comment text-primary"></i></b> {{ $bill->administrator_flag_memo }}</small>
-			<small class="text-muted text-sm">Flagged By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByProAdmin->displayName() }}</small>
+			<div class="d-flex align-items-center flex-wrap">
+				<span class="mr-2"><b>Flagged At:</b> {{ friendly_date_time($bill->flagged_administrator_at) }}</span>
+				<small class="text-sm">By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByProAdmin->displayName() }}</small>
+			</div>
+			
+			<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque text-primary"></i></b> {{ $bill->administrator_flag_memo }}</small>
 		</div>
 
 		@if($bill->is_administrator_flag_acknowledged && $bill->administrator_flag_acknowledged_at > $bill->flagged_administrator_at)
 			<!-- This is resolved -->
-			<div class="border-top border-light mt-2 pt-2">
+			<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
 				<div class="d-flex flex-column">
-					<span><b>Ack. At:</b> {{ friendly_date_time($bill->administrator_flag_acknowledged_at) }}</span>
-					<small class="text-muted"><b><i class="fas fa-comment"></i></b> {{ $bill->administrator_flag_acknowledgement_memo }}</small>
-					<small class="text-muted text-sm">Ack. By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByPro->displayName() }}</small>
+					<div class="d-flex align-items-center flex-wrap">
+						<span class="mr-2"><b>Ack. At:</b> {{ friendly_date_time($bill->administrator_flag_acknowledged_at) }}</span>
+						<small class="text-sm">By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByPro->displayName() }}</small>
+					</div>
+					
+					<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque"></i></b> {{ $bill->administrator_flag_acknowledgement_memo }}</small>
 				</div>
 			</div>
 		@endif
 			<!-- Flagged by admin, pending ack. by pro -->
-			<div class="border-top border-light mt-2 pt-2">
+			<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
 				<div class="d-flex">
 					@if($bill->is_administrator_flag_acknowledged)
 						<div moe>
-							<a start class="text-success"><i class="fas fa-flag  on-hover-opaque"></i> Clear Flag</a>
+							<a start show class="text-success"><i class="fas fa-flag  on-hover-opaque"></i> Clear Flag</a>
 							<form url="/api/bill/clearFlag" class="mcp-theme-1">
 								<input type="hidden" name="uid" value="{{$bill->uid}}">
-								<p class="mb-1">Are you sure?</p>
 								<div class="form-group">
 									<label>Memo:</label>
 									<textarea name="memo" rows="2" class="form-control"></textarea>
@@ -39,10 +44,9 @@
 						</div>
 					@else
 						<div moe>
-							<a start class="text-success"><i class="fas fa-flag  on-hover-opaque"></i> Unflag Bill</a>
+							<a start show class="text-success"><i class="fas fa-flag  on-hover-opaque"></i> Unflag Bill</a>
 							<form url="/api/bill/undoFlagAsAdministrator" class="mcp-theme-1">
 								<input type="hidden" name="uid" value="{{$bill->uid}}">
-								<p class="mb-1">Are you sure?</p>
 								<div class="form-group">
 									<label>Memo:</label>
 									<textarea name="memo" rows="2" class="form-control"></textarea>
@@ -54,13 +58,12 @@
 							</form>
 						</div>
 					@endif
-					<span class="mx-2 text-muted">|</span>
+					<span class="mx-1 text-muted">|</span>
 					@if($bill->is_administrator_flag_acknowledged)
 						<div moe>
-							<a start class="text-danger"><i class="fas fa-flag  on-hover-opaque"></i> Flag Bill Again</a>
+							<a start show class="text-danger"><i class="fas fa-flag  on-hover-opaque"></i> Flag Bill Again</a>
 							<form url="/api/bill/flagAsAdministrator" class="mcp-theme-1">
 								<input type="hidden" name="uid" value="{{$bill->uid}}">
-								<p class="mb-1">Are you sure?</p>
 								<div class="form-group">
 									<label>Memo:</label>
 									<textarea name="memo" rows="2" class="form-control" required></textarea>
@@ -73,7 +76,7 @@
 						</div>
 					@else
 						<div moe>
-							<a start class="text-primary">Update Memo</a>
+							<a start show class="text-primary">Update Memo</a>
 							<form url="/api/bill/updateFlagMemo" class="mcp-theme-1">
 								<input type="hidden" name="uid" value="{{$bill->uid}}">
 								<div class="form-group">
@@ -87,51 +90,61 @@
 							</form>
 						</div>
 					@endif
+					<span class="ml-1 text-muted">|</span>
+					@include('app.patient.note.partials.bill-flags-history')
 				</div>
 			</div>
 		
 	@else
 		<!-- Not flagged, show flag popup -->
 		<!-- //api/bill//flagAsAdministrator -->
-		<div moe>
-			<a start class="text-danger"><i class="fas fa-flag  on-hover-opaque"></i> Flag Bill</a>
-			<form url="/api/bill/flagAsAdministrator" class="mcp-theme-1">
-				<input type="hidden" name="uid" value="{{$bill->uid}}">
-				<p class="mb-1">Are you sure?</p>
-				<div class="form-group">
-					<label>Memo:</label>
-					<textarea name="memo" rows="2" class="form-control" required></textarea>
-				</div>
-				<div>
-					<button submit class="btn btn-sm btn-danger mr-1">Flag Bill</button>
-					<button cancel class="btn btn-sm btn-default border">Cancel</button>
-				</div>
-			</form>
+		<div class="d-flex align-items-center">
+			<div moe>
+				<a start show class="text-danger"><i class="fas fa-flag  on-hover-opaque"></i> Flag Bill</a>
+				<form url="/api/bill/flagAsAdministrator" class="mcp-theme-1">
+					<input type="hidden" name="uid" value="{{$bill->uid}}">
+					<div class="form-group">
+						<label>Memo:</label>
+						<textarea name="memo" rows="2" class="form-control" required></textarea>
+					</div>
+					<div>
+						<button submit class="btn btn-sm btn-danger mr-1">Flag Bill</button>
+						<button cancel class="btn btn-sm btn-default border">Cancel</button>
+					</div>
+				</form>
+			</div>
+			@include('app.patient.note.partials.bill-flags-history')
 		</div>
+		
 	@endif
 
 @else
 <!-- HCP -->
 	@if($bill->is_flagged_by_administrator && !$bill->is_administrator_flag_cleared)
 		<div class="d-flex flex-column">
-			<span><b>Flagged At:</b> {{ friendly_date_time($bill->flagged_administrator_at) }}</span>
-			<small class="text-muted"><b><i class="fas fa-comment text-primary"></i></b> {{ $bill->administrator_flag_memo }}</small>
-			<small class="text-muted text-sm">Flagged By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByProAdmin->displayName() }}</small>
+			<div class="d-flex align-items-center flex-wrap">
+				<span class="mr-2"><b>Flagged At:</b> {{ friendly_date_time($bill->flagged_administrator_at) }}</span>
+				<small class="text-sm">By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByProAdmin->displayName() }}</small>
+			</div>			
+			<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque text-primary"></i></b> {{ $bill->administrator_flag_memo }}</small>
 		</div>
 
 		@if($bill->is_administrator_flag_acknowledged && $bill->administrator_flag_acknowledged_at > $bill->flagged_administrator_at)
 			<!-- hcp has ack. -->
-			<div class="border-top border-light mt-2 pt-2">
+			<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
 				<div class="d-flex flex-column">
-					<span><b>Ack. At:</b> {{ friendly_date_time($bill->administrator_flag_acknowledged_at) }}</span>
-					<small class="text-muted"><b><i class="fas fa-comment"></i></b> {{ $bill->administrator_flag_acknowledgement_memo }}</small>
-					<small class="text-muted text-sm">Ack. By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByPro->displayName() }}</small>
-					<div class="d-flex">
+					<div class="d-flex align-items-center flex-wrap">
+						<span class="mr-2"><b>Ack. At:</b> {{ friendly_date_time($bill->administrator_flag_acknowledged_at) }}</span>
+						<small class="text-sm">By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByPro->displayName() }}</small>
+					</div>
+					
+					<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque"></i></b> {{ $bill->administrator_flag_acknowledgement_memo }}</small>
+					
+					<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
 						<div moe>
-							<a start class="text-danger"><i class="fas fa-undo fa-fw  on-hover-opaque"></i> Undo Ack.</a>
+							<a start show class="text-danger"><i class="fas fa-undo fa-fw  on-hover-opaque"></i> Undo Ack.</a>
 							<form url="/api/bill/undoAcknowledgeAdministratorFlag" class="mcp-theme-1">
 								<input type="hidden" name="uid" value="{{$bill->uid}}">
-								<p class="mb-1">Are you sure?</p>
 								<div class="form-group">
 									<label>Memo:</label>
 									<textarea name="memo" rows="2" class="form-control"></textarea>
@@ -142,9 +155,9 @@
 								</div>
 							</form>
 						</div>
-						<span class="mx-2 text-muted">|</span>
+						<span class="mx-1 text-muted">|</span>
 						<div moe>
-							<a start class="text-primary">Update Memo</a>
+							<a start show class="text-primary">Update Memo</a>
 							<form url="/api/bill/updateAcknowledgementMemo" class="mcp-theme-1">
 								<input type="hidden" name="uid" value="{{$bill->uid}}">
 								<div class="form-group">
@@ -163,12 +176,11 @@
 		
 		@else
 			<!-- Needs hcp ack. -->
-			<div class="border-top border-light mt-2 pt-2">
+			<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
 			<div moe>
-				<a start class="text-primary"><i class="fas fa-thumbs-up fa-fw  on-hover-opaque"></i> Ack. Flag</a>
+				<a start show class="text-primary"><i class="fa fa-check text-sm on-hover-opaque"></i> Ack.</a>
 				<form url="/api/bill/acknowledgeAdministratorFlag" class="mcp-theme-1">
 					<input type="hidden" name="uid" value="{{$bill->uid}}">
-					<p class="mb-1">Are you sure?</p>
 					<div class="form-group">
 						<label>Memo:</label>
 						<textarea name="memo" rows="2" class="form-control" required></textarea>

resources/views/app/patient/note/partials/bill-flags-history.blade.php

@@ -6,7 +6,7 @@ $recentBillFlags = AdministratorBillFlagUpdate::where('bill_id', $bill->id)->ord
 ?>
 @if(count($recentBillFlags))
 <div moe relative wide center class="ml-2 mr-2">
-	<a start show><i class="fas fa-history fa-fw on-hover-opaque"></i> Bill Flag History</a>
+	<a start show title="View Bill Flag History"><i class="fas fa-history fa-fw on-hover-opaque"></i></a>
 	<form url="" class="mcp-theme-1">
 		<div>
 			<div class="d-flex align-items-center justify-content-between pb-2 mb-1">

resources/views/app/patient/partials/update-mcp-onboarding-visit-info.blade.php

@@ -55,7 +55,8 @@
 				var fields = $('[name=mcpOnboardingVisitNoteUid], [name=reasonOnboardingVisitNoteOutsideSystem]');
 				if(self.form.hasMcpDoneOnboardingVisit == 'YES'){					
 					fields.prop('required', true);
-					fields.on('change, keyup', function(){
+					fields.on('change keyup', function(){
+						alert('gg');
 						fields.prop('required', false);
 						$(this).prop('required', true);
 					});