Care Plan flag soccer

app/Models/Client.php

@@ -1013,5 +1013,11 @@ ORDER BY m.ts DESC
         return $this->getDeviceDeliveryStatus(2);
     }
 
+    public function carePlanFlaggedBy(){
+        return $this->hasOne(Pro::class, 'id', 'flagged_by_pro_id');
+    }
+    public function carePlanFlagAcknowledgedBy(){
+        return $this->hasOne(Pro::class, 'id', 'flag_acknowledged_by_pro_id');
+    }
 
 }

app/Models/ClientCarePlanFlagUpdate.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+# use Illuminate\Database\Eloquent\Model;
+
+class ClientCarePlanFlagUpdate extends Model
+{
+    protected $table = 'client_care_plan_flag_update';
+
+    public function client() {
+        return $this->hasOne(Client::class, 'id', 'client_id');
+    }
+
+    public function carePlanFlagAcknowledgedBy() {
+        return $this->hasOne(Pro::class, 'id', 'flag_acknowledged_by_pro_id');
+    }
+
+    public function carePlanFlaggedBy() {
+        return $this->hasOne(Pro::class, 'id', 'flagged_by_pro_id');
+    }
+}

resources/views/app/patient/note/flag-care-plan.blade.php

@@ -1,38 +1,38 @@
 
-	{{--
-	<div <?= $patient->has_care_plan_flag && !$patient->is_care_plan_flag_cleared ? 'class="alert alert-danger p-1 rounded-0" style="min-width: 380px;"' : '' ?>>
+
+	<div <?= $patient->has_care_plan_flag && !$patient->is_flag_cleared ? 'class="alert alert-danger p-1 rounded-0" style="min-width: 380px;"' : '' ?>>
 	<?php #dump($patient); ?>
 	@if($pro->pro_type === 'ADMIN')
-		@if($patient->has_care_plan_flag && !$patient->is_care_plan_flag_cleared)
+		@if($patient->has_care_plan_flag && !$patient->is_flag_cleared)
 			<div class="d-flex flex-column">
 				<div class="d-flex align-items-center flex-wrap">
-					<span class="mr-2"><b>Flagged At:</b> {{ friendly_date_time($patient->flagged_administrator_at) }}</span>
-					<small class="text-sm">By: <i class="fas fa-user"></i> {{ $patient->billFlagAcknowledgedByProAdmin->displayName() }}</small>
+					<span class="mr-2"><b>Flagged At:</b> {{ friendly_date_time($patient->flagged_at) }}</span>
+					<small class="text-sm">By: <i class="fas fa-user"></i> {{ $patient->carePlanFlaggedBy->displayName() }}</small>
 				</div>
 				
-				<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque text-primary"></i></b> {{ $patient->administrator_flag_memo }}</small>
+				<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque text-primary"></i></b> {{ $patient->memo }}</small>
 			</div>
 
-			@if($patient->is_administrator_flag_acknowledged && $patient->administrator_flag_acknowledged_at > $patient->flagged_administrator_at)
+			@if($patient->is_flag_acknowledged && $patient->flag_acknowledged_at > $patient->flagged_at)
 				<!-- This is resolved -->
 				<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
 					<div class="d-flex flex-column">
 						<div class="d-flex align-items-center flex-wrap">
-							<span class="mr-2"><b>Ack. At:</b> {{ friendly_date_time($patient->administrator_flag_acknowledged_at) }}</span>
-							<small class="text-sm">By: <i class="fas fa-user"></i> {{ $patient->billFlagAcknowledgedByPro->displayName() }}</small>
+							<span class="mr-2"><b>Ack. At:</b> {{ friendly_date_time($patient->flag_acknowledged_at) }}</span>
+							<small class="text-sm">By: <i class="fas fa-user"></i> {{ $patient->carePlanFlagAcknowledgedBy->displayName() }}</small>
 						</div>
 						
-						<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque"></i></b> {{ $patient->administrator_flag_acknowledgement_memo }}</small>
+						<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque"></i></b> {{ $patient->flag_acknowledgement_memo }}</small>
 					</div>
 				</div>
 			@endif
 				<!-- Flagged by admin, pending ack. by pro -->
 				<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
 					<div class="d-flex">
-						@if($patient->is_administrator_flag_acknowledged)
+						@if($patient->is_flag_acknowledged)
 							<div moe>
 								<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">
+								<form url="/api/client/clearFlag" class="mcp-theme-1">
 									<input type="hidden" name="uid" value="{{$patient->uid}}">
 									<div class="form-group">
 										<label>Memo:</label>
@@ -46,32 +46,32 @@
 							</div>
 						@else
 							<div moe>
-								<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">
+								<a start show class="text-success"><i class="fas fa-flag  on-hover-opaque"></i> Unflag Care Plan</a>
+								<form url="/api/client/undoCarePlanFlag" class="mcp-theme-1">
 									<input type="hidden" name="uid" value="{{$patient->uid}}">
 									<div class="form-group">
 										<label>Memo:</label>
 										<textarea name="memo" rows="2" class="form-control"></textarea>
 									</div>
 									<div>
-										<button submit class="btn btn-sm btn-success mr-1">Unflag Bill</button>
+										<button submit class="btn btn-sm btn-success mr-1">Unflag Care Plan</button>
 										<button cancel class="btn btn-sm btn-default border">Cancel</button>
 									</div>
 								</form>
 							</div>
 						@endif
 						<span class="mx-1 text-muted">|</span>
-						@if($patient->is_administrator_flag_acknowledged)
+						@if($patient->is_flag_acknowledged)
 							<div moe>
-								<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">
+								<a start show class="text-danger"><i class="fas fa-flag  on-hover-opaque"></i> Flag Care Plan Again</a>
+								<form url="/api/client/flagCarePlan" class="mcp-theme-1">
 									<input type="hidden" name="uid" value="{{$patient->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 submit class="btn btn-sm btn-danger mr-1">Flag Care Plan</button>
 										<button cancel class="btn btn-sm btn-default border">Cancel</button>
 									</div>
 								</form>
@@ -79,11 +79,11 @@
 						@else
 							<div moe>
 								<a start show class="text-primary">Update Memo</a>
-								<form url="/api/bill/updateFlagMemo" class="mcp-theme-1">
+								<form url="/api/client/updateFlagMemo" class="mcp-theme-1">
 									<input type="hidden" name="uid" value="{{$patient->uid}}">
 									<div class="form-group">
 										<label>Memo:</label>
-										<textarea name="memo" rows="2" class="form-control"><?= $patient->administrator_flag_memo ?></textarea>
+										<textarea name="memo" rows="2" class="form-control"><?= $patient->memo ?></textarea>
 									</div>
 									<div>
 										<button submit class="btn btn-sm btn-primary mr-1">Update</button>
@@ -93,59 +93,58 @@
 							</div>
 						@endif
 						<span class="ml-1 text-muted">|</span>
-						@include('app.patient.note.partials.bill-flags-history')
+						@include('app.patient.note.partials.care-plan-flags-history')
 					</div>
 				</div>
 			
 		@else
 			<!-- Not flagged, show flag popup -->
-			<!-- //api/bill//flagAsAdministrator -->
 			<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">
+					<a start show class="text-danger"><i class="fas fa-flag  on-hover-opaque"></i> Flag Care Plan</a>
+					<form url="/api/client/flagCarePlan" class="mcp-theme-1">
 						<input type="hidden" name="uid" value="{{$patient->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 submit class="btn btn-sm btn-danger mr-1">Flag Care Plan</button>
 							<button cancel class="btn btn-sm btn-default border">Cancel</button>
 						</div>
 					</form>
 				</div>
-				@include('app.patient.note.partials.bill-flags-history')
+				@include('app.patient.note.partials.care-plan-flags-history')
 			</div>
 			
 		@endif
 
 	@else
 	<!-- HCP -->
-		@if($patient->has_care_plan_flag && !$patient->is_care_plan_flag_cleared)
+		@if($patient->has_care_plan_flag && !$patient->is_flag_cleared)
 			<div class="d-flex flex-column">
 				<div class="d-flex align-items-center flex-wrap">
-					<span class="mr-2"><b>Flagged At:</b> {{ friendly_date_time($patient->flagged_administrator_at) }}</span>
-					<small class="text-sm">By: <i class="fas fa-user"></i> {{ $patient->billFlagAcknowledgedByProAdmin->displayName() }}</small>
+					<span class="mr-2"><b>Flagged At:</b> {{ friendly_date_time($patient->flagged_at) }}</span>
+					<small class="text-sm">By: <i class="fas fa-user"></i> {{ $patient->carePlanFlaggedBy->displayName() }}</small>
 				</div>			
-				<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque text-primary"></i></b> {{ $patient->administrator_flag_memo }}</small>
+				<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque text-primary"></i></b> {{ $patient->memo }}</small>
 			</div>
 
-			@if($patient->is_administrator_flag_acknowledged && $patient->administrator_flag_acknowledged_at > $patient->flagged_administrator_at)
+			@if($patient->is_flag_acknowledged && $patient->flag_acknowledged_at > $patient->flagged_at)
 				<!-- hcp has ack. -->
 				<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
 					<div class="d-flex flex-column">
 						<div class="d-flex align-items-center flex-wrap">
-							<span class="mr-2"><b>Ack. At:</b> {{ friendly_date_time($patient->administrator_flag_acknowledged_at) }}</span>
-							<small class="text-sm">By: <i class="fas fa-user"></i> {{ $patient->billFlagAcknowledgedByPro->displayName() }}</small>
+							<span class="mr-2"><b>Ack. At:</b> {{ friendly_date_time($patient->flag_acknowledged_at) }}</span>
+							<small class="text-sm">By: <i class="fas fa-user"></i> {{ $patient->carePlanFlagAcknowledgedBy->displayName() }}</small>
 						</div>
 						
-						<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque"></i></b> {{ $patient->administrator_flag_acknowledgement_memo }}</small>
+						<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque"></i></b> {{ $patient->flag_acknowledgement_memo }}</small>
 						
 						<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
 							<div moe>
 								<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">
+								<form url="/api/client/undoAcknowledgeCarePlanFlag" class="mcp-theme-1">
 									<input type="hidden" name="uid" value="{{$patient->uid}}">
 									<div class="form-group">
 										<label>Memo:</label>
@@ -160,11 +159,11 @@
 							<span class="mx-1 text-muted">|</span>
 							<div moe>
 								<a start show class="text-primary">Update Memo</a>
-								<form url="/api/bill/updateAcknowledgementMemo" class="mcp-theme-1">
+								<form url="/api/client/updateAcknowledgementMemo" class="mcp-theme-1">
 									<input type="hidden" name="uid" value="{{$patient->uid}}">
 									<div class="form-group">
 										<label>Memo:</label>
-										<textarea name="memo" rows="2" class="form-control"><?= $patient->administrator_flag_acknowledgement_memo ?></textarea>
+										<textarea name="memo" rows="2" class="form-control"><?= $patient->flag_acknowledgement_memo ?></textarea>
 									</div>
 									<div>
 										<button submit class="btn btn-sm btn-primary mr-1">Update</button>
@@ -181,7 +180,7 @@
 				<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
 				<div moe>
 					<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">
+					<form url="/api/client/acknowledgeCarePlanFlag" class="mcp-theme-1">
 						<input type="hidden" name="uid" value="{{$patient->uid}}">
 						<div class="form-group">
 							<label>Memo:</label>
@@ -199,5 +198,3 @@
 		@endif
 	@endif
 	</div>
-
-	--}}

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

@@ -0,0 +1,63 @@
+<?php
+use App\Models\ClientCarePlanFlagUpdate;
+
+$recentClientCarePlanFlags = ClientCarePlanFlagUpdate::where('client_id', $patient->id)->orderBy('created_at', 'DESC')->limit(5)->get();
+?>
+@if(count($recentClientCarePlanFlags))
+<div moe relative wide center class="ml-2 mr-2">
+	<a start show title="View Care Plan 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">
+				<h5 class="mb-0 font-weight-bold">Recent Care Plan Flags</h5>
+				<button cancel class="btn btn-sm btn-default border">
+					<i class="fas fa-times"></i>
+				</button>
+			</div>
+			<table class="table table-sm table-striped table-bordered">
+				<thead class="bg-light">
+					<tr>
+						<th class="border-bottom-0">Date</th>
+						<th class="border-bottom-0">Flag Memo</th>
+						<th class="border-bottom-0">Ack. Memo</th>
+					</tr>
+				</thead>
+				<tbody>
+					@foreach($recentClientCarePlanFlags as $bf)
+					<tr>
+						<td>{{ friendly_date_time($bf->created_at) }}</td>
+						<td>
+							<div class="d-flex flex-column">
+								<small class="text-sm text-muted"><?= $bf->memo ?></small>
+								@if($bf->carePlanFlaggedBy)
+								<div class="d-flex align-items-center">
+									<span class="text-sm">By: {{ $bf->carePlanFlaggedBy->displayName() }}</span>
+									<span class="text-sm ml-2">At: {{ friendly_date_time($bf->flagged_at) }}</span>
+								</div>
+								@endif
+							</div>
+						</td>
+						<td>
+							<div class="d-flex flex-column">
+								<small class="text-sm text-muted"><?= $bf->flag_acknowledgement_memo ?></small>
+								@if($bf->carePlanFlagAcknowledgedBy)
+								<div class="d-flex align-items-center">
+									<span class="text-sm">By: {{ $bf->carePlanFlagAcknowledgedBy->displayName() }}</span>
+									<span class="text-sm ml-2">At: {{ friendly_date_time($bf->flag_acknowledged_at) }}</span>
+								</div>
+								@endif
+							</div>
+						</td>
+					</tr>
+					@endforeach
+					@if(!count($recentClientCarePlanFlags))
+						<tr>
+							<td colspan="3">No records found</td>
+						</tr>
+					@endif
+				</tbody>
+			</table>
+		</div>
+	</form>
+</div>
+@endif