Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2

app/Models/ClientPrimaryCoverage.php

@@ -40,6 +40,15 @@ class ClientPrimaryCoverage extends Model
         return $status;
     }
 
+    public function insuranceDisplayName(){
+        $coverageName = $this->toString();
+        if(stripos($coverageName, 'medicare') !== false) return 'Medicare';
+        if(stripos($coverageName, 'medicaid') !== false) return 'Medicaid';
+        if(stripos($coverageName, 'commercial') !== false) return 'Commercial';
+        return null;
+
+    }
+
     public function toString() {
         $parts = [];
         $parts[] = $this->plan_type;

resources/views/app/dashboard-admin.blade.php

@@ -63,7 +63,7 @@
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_cancelled_supply_orders_awaiting_review_count_as_mcp()}}</th>
-                                    <th class="pl-2">Cancelled Supply Orders Pending Review</th>
+                                    <th class="pl-2">Cancelled Supply Orders</th>
                                 </tr>
 
                                 <tr>

resources/views/app/dashboard-dna.blade.php

@@ -63,7 +63,7 @@
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_cancelled_supply_orders_awaiting_review_count_as_mcp()}}</th>
-                                    <th class="pl-2">Cancelled Supply Orders Pending Review</th>
+                                    <th class="pl-2">Cancelled Supply Orders</th>
                                 </tr>
 
                                 <tr>

resources/views/app/dashboard-mcp.blade.php

@@ -143,8 +143,8 @@
                                            native target="_blank"
                                            open-in-stag-popup
                                            popup-style="tall"
-                                           title="Cancelled Supply Orders Pending Review">
-                                            Cancelled Supply Orders Pending Review
+                                           title="Cancelled Supply Orders">
+                                            Cancelled Supply Orders
                                         </a>
                                     </th>
                                 </tr>

resources/views/app/dna/patients-table.blade.php

@@ -43,7 +43,7 @@
 				@endif
 				<?php $coverage = $patient->getPrimaryCoverage(); ?>
 				@if($coverage)
-				{{$coverage->toString()}}
+				{{$coverage->insuranceDisplayName()}}
 				@endif
 			</td>
 			<td>{{$patient->lastMcpAppointment() ? $patient->lastMcpAppointment()->start_date : '-'}}</td>

resources/views/app/generic-bills/inline.blade.php

@@ -171,7 +171,7 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
                             @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
                                 <div class="mt-2 text-secondary">
                                     <i class="fa fa-exclamation-triangle"></i>
-                                    Not Acknowledged
+                                    Not Ack.
                                 </div>
                                 <div class="d-block mt-1" moe>
                                     <a class="" href="" show start>Ack. Cancellation</a>
@@ -190,7 +190,7 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
                             @if($bill->is_cancellation_acknowledged)
                                 <div class="mt-2 text-secondary">
                                     <i class="fa fa-check"></i>
-                                    Acknowledged
+                                    Ack.
                                 </div>
                                 <div class="d-block mt-1" moe>
                                     <a class="" href="" show start>Undo Cancellation Ack.</a>

resources/views/app/mcp/appointments_filters.blade.php

@@ -6,22 +6,16 @@
 	#mcp-appointments-filters .mw-100px {
 		min-width: 100px;
 	}
-	.filter-container, .filter-child-container {
+	.filter-container{
 		display: flex;
 		align-items: flex-start;
 		flex-wrap: wrap;
 	}
 	.filter-container >div {
-		width: 180px;
+		width: 165px;
 	}
 	.filter-container >div:not(:last-child) {
-		margin-right: 20px;
-	}
-	.filter-child-container >div {
-		width: 85px;
-	}
-	.filter-child-container >div:not(:last-child) {
-		margin-right: 10px;
+		margin-right: 15px;
 	}
 </style>
 <form id="mcp-appointments-filters" method="GET" action="{{ route('mcp.appointments') }}" class="filter-container" v-cloak>
@@ -37,12 +31,12 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-			<div v-show="filters.date_category" class="filter-child-container mt-2">
+			<div v-show="filters.date_category" class="mt-2">
 				<div>
-					<input  name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+					<input  name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm"/>
 				</div>
-				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
-					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="mt-2">
+					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm"/>
 				</div>
 			</div>
 		</div>
@@ -65,8 +59,8 @@
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">
-				<button type="submit" v-on:click.prevent="doSubmit()" class="w-50 btn btn-primary btn-sm mr-2">Apply</button>
-				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.appointments')}}')" class="w-50 btn btn-danger btn-sm text-white">Clear</a>
+				<button type="submit" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.appointments')}}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
 			</div>
 		</div>
 	</div>

resources/views/app/mcp/bills_filters.blade.php

@@ -6,22 +6,16 @@
 	#mcp-bills-filters .mw-100px {
 		min-width: 100px;
 	}
-	.filter-container, .filter-child-container {
+	.filter-container {
 		display: flex;
 		align-items: flex-start;
 		flex-wrap: wrap;
 	}
 	.filter-container >div {
-		width: 180px;
+		width: 165px;
 	}
 	.filter-container >div:not(:last-child) {
-		margin-right: 20px;
-	}
-	.filter-child-container >div {
-		width: 85px;
-	}
-	.filter-child-container >div:not(:last-child) {
-		margin-right: 10px;
+		margin-right: 15px;
 	}
 </style>
 <form id="mcp-bills-filters" method="GET" action="{{ route('mcp.bills') }}" class="filter-container" v-cloak>
@@ -37,12 +31,12 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-			<div v-show="filters.date_category" class="filter-child-container mt-2">
+			<div v-show="filters.date_category" class="mt-2">
 				<div>
-					<input name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+					<input name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm"/>
 				</div>
-				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
-					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="mt-2">
+					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm"/>
 				</div>
 			</div>
 		</div>
@@ -63,8 +57,8 @@
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">
-				<button type="submit" v-on:click.prevent="doSubmit()" class="w-50 btn btn-primary btn-sm mr-2">Apply</button>
-				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.bills')}}')" class="w-50 btn btn-danger btn-sm text-white">Clear</a>
+				<button type="submit" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.bills')}}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
 			</div>
 		</div>
 	</div>

resources/views/app/mcp/cancelled_supply_orders_pending_review.blade.php

@@ -4,7 +4,7 @@
         <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
                 <i class="fas fa-box"></i>
-                Cancelled Supply Orders Pending Review
+                Cancelled Supply Orders
             </strong>
         </div>
 

resources/views/app/mcp/client_messages_filters.blade.php

@@ -6,22 +6,16 @@
 	#mcp-client-messages-filters .mw-100px {
 		min-width: 100px;
 	}
-	.filter-container, .filter-child-container {
+	.filter-container {
 		display: flex;
 		align-items: flex-start;
 		flex-wrap: wrap;
 	}
 	.filter-container >div {
-		width: 180px;
+		width: 165px;
 	}
 	.filter-container >div:not(:last-child) {
-		margin-right: 20px;
-	}
-	.filter-child-container >div {
-		width: 85px;
-	}
-	.filter-child-container >div:not(:last-child) {
-		margin-right: 10px;
+		margin-right: 15px;
 	}
 </style>
 <form id="mcp-client-messages-filters" method="GET" action="{{ route('mcp.client_messages') }}" class="filter-container" v-cloak>
@@ -37,12 +31,12 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-			<div v-show="filters.date_category" class="filter-child-container mt-2">
+			<div v-show="filters.date_category" class="mt-2">
 				<div>
-					<input  name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+					<input  name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm"/>
 				</div>
-				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
-					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="mt-2">
+					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm"/>
 				</div>
 			</div>
 		</div>
@@ -73,8 +67,8 @@
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">
-				<button type="submit" v-on:click.prevent="doSubmit()" class="w-50 btn btn-primary btn-sm mr-2">Apply</button>
-				<a v-on:click.prevent="fastLoad('{{route('mcp.client_messages')}}')" href="#" class="w-50 btn btn-danger btn-sm text-white">Clear</a>
+				<button type="submit" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+				<a v-on:click.prevent="fastLoad('{{route('mcp.client_messages')}}')" href="#" class="btn btn-link btn-sm text-danger">Clear Filters</a>
 			</div>
 		</div>
 	</div>

resources/views/app/mcp/erx_and_orders_filters.blade.php

@@ -6,22 +6,16 @@
 	#mcp-erx-and-orders-filters .mw-100px {
 		min-width: 100px;
 	}
-	.filter-container, .filter-child-container {
+	.filter-container {
 		display: flex;
 		align-items: flex-start;
 		flex-wrap: wrap;
 	}
 	.filter-container >div {
-		width: 180px;
+		width: 165px;
 	}
 	.filter-container >div:not(:last-child) {
-		margin-right: 20px;
-	}
-	.filter-child-container >div {
-		width: 85px;
-	}
-	.filter-child-container >div:not(:last-child) {
-		margin-right: 10px;
+		margin-right: 15px;
 	}
 </style>
 <form id="mcp-erx-and-orders-filters" method="GET" action="{{ route('mcp.notes') }}" class="filter-container" v-cloak>
@@ -37,12 +31,12 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-			<div v-show="filters.date_category" class="filter-child-container mt-2">
+			<div v-show="filters.date_category" class="mt-2">
 				<div>
-					<input  name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+					<input  name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm"/>
 				</div>
-				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
-					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="mt-2">
+					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm"/>
 				</div>
 			</div>
 		</div>
@@ -66,8 +60,8 @@
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">
-				<button type="submit" v-on:click.prevent="doSubmit()" class="w-50 btn btn-primary btn-sm mr-2">Apply</button>
-				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.erx_and_orders')}}')" class="w-50 btn btn-danger btn-sm text-white">Clear</a>
+				<button type="submit" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.erx_and_orders')}}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
 			</div>
 		</div>
 	</div>

resources/views/app/mcp/new_patients_awaiting_visit.blade.php

@@ -55,7 +55,7 @@
                                 @endif
                                 <?php $coverage = $row->getPrimaryCoverage(); ?>
                                 @if($coverage)
-                                    {{ucwords(strtolower($coverage->toString()))}}
+                                    {{$coverage->insuranceDisplayName()}}
                                 @endif
                               </div>
                             </td>

resources/views/app/mcp/notes_filters.blade.php

@@ -6,22 +6,16 @@
 	#mcp-notes-filters .mw-100px {
 		min-width: 100px;
 	}
-	.filter-container, .filter-child-container {
+	.filter-container{
 		display: flex;
 		align-items: flex-start;
 		flex-wrap: wrap;
 	}
 	.filter-container >div {
-		width: 180px;
+		width: 165px;
 	}
 	.filter-container >div:not(:last-child) {
-		margin-right: 20px;
-	}
-	.filter-child-container >div {
-		width: 85px;
-	}
-	.filter-child-container >div:not(:last-child) {
-		margin-right: 10px;
+		margin-right: 15px;
 	}
 </style>
 <form id="mcp-notes-filters" method="GET" action="{{ route('mcp.notes') }}" class="filter-container" v-cloak>
@@ -39,10 +33,10 @@
 			</select>
 			<div v-show="filters.date_category" class="filter-child-container mt-2">
 				<div>
-					<input  name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+					<input  name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm"/>
 				</div>
-				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
-					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="mt-2">
+					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm"/>
 				</div>
 			</div>
 		</div>
@@ -63,8 +57,8 @@
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">
-				<button type="submit"  v-on:click.prevent="doSubmit()" class="w-50 btn btn-primary btn-sm mr-2">Apply</button>
-				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.notes')}}')" class="w-50 btn btn-danger btn-sm text-white">Clear</a>
+				<button type="submit"  v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.notes')}}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
 			</div>
 		</div>
 	</div>

resources/views/app/mcp/patients-table.blade.php

@@ -43,7 +43,7 @@
 					@endif
 					<?php $coverage = $patient->getPrimaryCoverage(); ?>
 					@if($coverage)
-					{{ucwords(strtolower($coverage->toString()))}}
+					{{$coverage->insuranceDisplayName()}}
 					@endif
 				</div>
 			</td>

resources/views/app/mcp/patients_filters.blade.php

@@ -6,33 +6,30 @@
 	#mcp-patients-filters .mw-100px {
 		min-width: 100px;
 	}
-	.filter-container, .filter-child-container {
+	.filter-container{
 		display: flex;
 		align-items: flex-start;
 		flex-wrap: wrap;
 	}
 	.filter-container >div {
-		width: 180px;
+		width: 165px;
 	}
 	.filter-container >div:not(:last-child) {
-		margin-right: 20px;
+		margin-right: 15px;
 	}
-	.filter-child-container >div {
-		width: 85px;
-	}
-	.filter-child-container >div:not(:last-child) {
-		margin-right: 10px;
+	.sm-section {
+		width: 125px !important;
 	}
 </style>
 <form id="mcp-patients-filters" method="GET" action="{{ route('mcp.patients') }}" class="filter-container" v-cloak>
-	<div>
+	<div class="sm-section">
 		<div class="form-group">
 			<label>Name:</label>
 			<input name="name" class="form-control input-sm" v-model="filters.name">
 		</div>
 	</div>
 	<!-- AGE	 -->
-	<div>
+	<div class="sm-section">
 		<div class="form-group">
 			<label>Age:</label>
 			<select name="age_category" class="form-control input-sm" v-model="filters.age_category">
@@ -43,18 +40,18 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-			<div v-show="filters.age_category" class="filter-child-container mt-2">
+			<div v-show="filters.age_category" class="mt-2">
 				<div>
 					<input  name="age_value_1" v-model="filters.age_value_1" type="number" class="form-control input-sm" :placeholder="(filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
 				</div>
-				<div v-show="filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN'">
+				<div v-show="filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN'" class="mt-2">
 					<input name="age_value_2" v-model="filters.age_value_2" type="number" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
 		</div>
 	</div>
 	<!-- SEX -->
-	<div>
+	<div class="sm-section">
 		<div class="form-group">
 			<label>Sex:</label>
 			<select name="sex" class="form-control input-sm" v-model="filters.sex">
@@ -65,7 +62,7 @@
 		</div>
 	</div>
 	<!-- BMI -->
-	<div>
+	<div class="sm-section">
 		<div class="form-group">
 			<label>BMI:</label>
 			<select name="bmi_category" class="form-control input-sm" v-model="filters.bmi_category">
@@ -76,11 +73,11 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-			<div v-show="filters.bmi_category" class="filter-child-container mt-2">
+			<div v-show="filters.bmi_category" class="mt-2">
 				<div>
 					<input  name="bmi_value_1" v-model="filters.bmi_value_1" type="number" class="form-control input-sm" :placeholder="(filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
 				</div>
-				<div v-show="filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN'">
+				<div v-show="filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN'" class="mt-2">
 					<input name="bmi_value_2" v-model="filters.bmi_value_2" type="number" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
@@ -88,9 +85,9 @@
 	</div>
 
 	<!-- LAST VISIT -->
-	<div>
+	<div class="sm-section">
 		<div class="form-group">
-			<label>Last Visit **:</label>
+			<label>Last Visit:</label>
 			<select name="last_visit_category" class="form-control input-sm" v-model="filters.last_visit_category">
 				<option value="">All</option>
 				<option value="EXACTLY">Exactly</option>
@@ -99,11 +96,11 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-			<div v-show="filters.last_visit_category" class="filter-child-container mt-2">
+			<div v-show="filters.last_visit_category" class="mt-2">
 				<div>
-					<input  name="last_visit_value_1" v-model="filters.last_visit_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+					<input  name="last_visit_value_1" v-model="filters.last_visit_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN') ? 'From' : 'Last Visit'" />
 				</div>
-				<div v-show="filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN'">
+				<div v-show="filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN'" class="mt-2">
 					<input name="last_visit_value_2" v-model="filters.last_visit_value_2" type="number" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
@@ -113,7 +110,7 @@
 	<!-- NEXT APPOINTMENT -->
 	<div>
 		<div class="form-group">
-			<label>Next Appointment **:</label>
+			<label>Next Appointment:</label>
 			<select name="next_appointment_category" class="form-control input-sm" v-model="filters.next_appointment_category">
 				<option value="">All</option>
 				<option value="EXACTLY">Exactly</option>
@@ -122,11 +119,11 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-			<div v-show="filters.next_appointment_category" class="filter-child-container mt-2">
+			<div v-show="filters.next_appointment_category" class="mt-2">
 				<div>
-					<input  name="next_appointment_value_1" v-model="filters.next_appointment_value_1" type="number" class="form-control input-sm" :placeholder="(filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+					<input  name="next_appointment_value_1" v-model="filters.next_appointment_value_1" type="number" class="form-control input-sm" :placeholder="(filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN') ? 'From' : 'Next Appt.'" />
 				</div>
-				<div v-show="filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN'">
+				<div v-show="filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN'" class="mt-2">
 					<input name="next_appointment_value_2" v-model="filters.next_appointment_value_2" type="number" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
@@ -134,7 +131,7 @@
 	</div>
 
 	<!-- STATUS -->
-	<div>
+	<div class="sm-section">
 		<div class="form-group">
 			<label>Status:</label>
 			<select name="status" class="form-control input-sm" v-model="filters.status">
@@ -147,7 +144,7 @@
 	</div>
 
 	<!-- LAST WEIGHED-IN -->
-	<div class="col-md-2 d-none">
+	<!-- <div class="col-md-2 d-none">
 		<div class="form-group">
 			<label>Last Weighed-In:</label>
 			<select name="last_weighed_in_category" class="form-control input-sm" v-model="filters.last_weighed_in_category">
@@ -158,19 +155,19 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-			<div v-show="filters.last_weighed_in_category" class="filter-child-container mt-2">
+			<div v-show="filters.last_weighed_in_category" class="mt-2">
 				<div>
-					<input  name="last_weighed_in_value_1" v-model="filters.last_weighed_in_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+					<input  name="last_weighed_in_value_1" v-model="filters.last_weighed_in_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN') ? 'From' : 'Last Weighed'" />
 				</div>
-				<div v-show="filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN'">
+				<div v-show="filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN'" class="mt-2">
 					<input name="last_weighed_in_value_2" v-model="filters.last_weighed_in_value_2" type="number" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
 		</div>
-	</div>
+	</div> -->
 
 	<!-- LAST BP -->
-	<div class="col-md-2 d-none">
+	<!-- <div class="col-md-2 d-none">
 		<div class="form-group">
 			<label>Last BP:</label>
 			<select name="last_bp_category" class="form-control input-sm" v-model="filters.last_bp_category">
@@ -181,23 +178,23 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-			<div v-show="filters.last_bp_category" class="filter-child-container mt-2">
+			<div v-show="filters.last_bp_category" class="mt-2">
 				<div>
-					<input  name="last_bp_value_1" v-model="filters.last_bp_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+					<input  name="last_bp_value_1" v-model="filters.last_bp_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN') ? 'From' : 'Last BP'" />
 				</div>
-				<div v-show="filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN'">
+				<div v-show="filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN'" class="mt-2">
 					<input name="last_bp_value_2" v-model="filters.last_bp_value_2" type="number" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
 		</div>
-	</div>
+	</div> -->
 
 	<div>
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class=" d-flex">
-				<button type="button" v-on:click.prevent="doSubmit()" class="w-50 btn btn-primary btn-sm mr-2">Apply</button>
-				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.patients')}}')" class="w-50 btn btn-danger btn-sm text-white">Clear</a>
+				<button type="button" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.patients')}}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
 			</div>
 		</div>
 	</div>

resources/views/app/mcp/reports_filters.blade.php

@@ -6,22 +6,16 @@
 	#mcp-reports-filters .mw-100px {
 		min-width: 100px;
 	}
-	.filter-container, .filter-child-container {
+	.filter-container{
 		display: flex;
 		align-items: flex-start;
 		flex-wrap: wrap;
 	}
 	.filter-container >div {
-		width: 180px;
+		width: 165px;
 	}
 	.filter-container >div:not(:last-child) {
-		margin-right: 20px;
-	}
-	.filter-child-container >div {
-		width: 85px;
-	}
-	.filter-child-container >div:not(:last-child) {
-		margin-right: 10px;
+		margin-right: 15px;
 	}
 </style>
 <form id="mcp-reports-filters" method="GET" action="{{ route('mcp.reports') }}" class="filter-container" v-cloak>
@@ -37,12 +31,12 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-			<div v-show="filters.date_category" class="filter-child-container mt-2">
+			<div v-show="filters.date_category" class="mt-2">
 				<div>
-					<input name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+					<input name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm"/>
 				</div>
-				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
-					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="mt-2">
+					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm"/>
 				</div>
 			</div>
 		</div>
@@ -63,8 +57,8 @@
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">
-				<button type="submit" v-on:click.prevent="doSubmit()" class="w-50 btn btn-primary btn-sm mr-2">Apply</button>
-				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.reports')}}')" class="w-50 btn btn-danger btn-sm text-white">Clear</a>
+				<button type="submit" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.reports')}}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
 			</div>
 		</div>
 	</div>

resources/views/app/mcp/supply_orders_filters.blade.php

@@ -6,22 +6,15 @@
 	#mcp-supply-orders-filters .mw-100px {
 		min-width: 100px;
 	}
-	.filter-container, .filter-child-container {
+	.filter-container {
 		display: flex;
 		align-items: flex-start;
-		flex-wrap: wrap;
 	}
 	.filter-container >div {
-		width: 180px;
+		width: 165px;
 	}
 	.filter-container >div:not(:last-child) {
-		margin-right: 20px;
-	}
-	.filter-child-container >div {
-		width: 85px;
-	}
-	.filter-child-container >div:not(:last-child) {
-		margin-right: 10px;
+		margin-right: 15px;
 	}
 </style>
 <form id="mcp-supply-orders-filters" method="GET" action="{{ route('mcp.supply_orders') }}" class="filter-container" v-cloak>
@@ -39,10 +32,10 @@
 			</select>
 			<div v-show="filters.date_category" class="filter-child-container mt-2">
 				<div>
-					<input  name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+					<input  name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm"/>
 				</div>
-				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
-					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="mt-2">
+					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm"/>
 				</div>
 			</div>
 		</div>
@@ -76,8 +69,8 @@
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">
-				<button type="submit" v-on:click.prevent="doSubmit()" class="w-50 btn btn-primary btn-sm mr-2">Apply</button>
-				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.supply_orders')}}')" class="w-50 btn btn-danger btn-sm text-white">Clear</a>
+				<button type="submit" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.supply_orders')}}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
 			</div>
 		</div>
 	</div>

resources/views/app/new-patient.blade.php

@@ -217,9 +217,9 @@
                 					</div>
                 				</div>
                         <div class="mb-1" v-if="planType == 'COMMERCIAL'">
-                					<p>Does the patient also have either a Medicare or Medicaid #? (optional)</p>
+                					<h6 class="font-weight-bold">Does the patient also have either a Medicare or Medicaid #? (optional)</h6>
                 				</div>
-                        <div class="row" v-if="planType == 'MEDICAID' || planType == 'COMMERCIAL'">
+                        <div class="row" v-if="planType == 'MEDICAID' || planType == 'COMMERCIAL'" :class="planType == 'COMMERCIAL' ? 'mx-0' : ''">
                 					<div class="col-md-12 bg-light p-3 mb-2">
                 						<h5 class="m-0 font-weight-bold">Medicaid Information:</h5>
                 					</div>
@@ -293,7 +293,7 @@
                 					</div>
                 				</div>
 
-                				<div class="row" v-if="planType == 'MEDICARE' || planType == 'COMMERCIAL'">
+                				<div class="row" v-if="planType == 'MEDICARE' || planType == 'COMMERCIAL'" :class="planType == 'COMMERCIAL' ? 'mx-0' : ''">
                 					<div class="col-md-12 bg-light p-3 mb-2">
                 						<h5 class="m-0 font-weight-bold">Medicare Information:</h5>
                 					</div>

resources/views/app/patient/care-month/dashboard.blade.php

@@ -1657,7 +1657,7 @@
                                             @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
                                                 <div class="mt-2 text-secondary">
                                                     <i class="fa fa-exclamation-triangle"></i>
-                                                    Not Acknowledged
+                                                    Not Ack.
                                                 </div>
                                                 <div class="d-block mt-1" moe>
                                                     <a class="" href="" show start>Ack. Cancellation</a>
@@ -1676,7 +1676,7 @@
                                             @if($bill->is_cancellation_acknowledged && !$careMonth->is_billing_marked_done)
                                                 <div class="mt-2 text-secondary">
                                                     <i class="fa fa-check"></i>
-                                                    Acknowledged
+                                                    Ack.
                                                 </div>
                                                 <div class="d-block mt-1" moe>
                                                     <a class="" href="" show start>Undo Cancellation Ack.</a>

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

@@ -1359,7 +1359,7 @@
                                                         @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
                                                             <div class="mt-2 text-secondary">
                                                                 <i class="fa fa-exclamation-triangle"></i>
-                                                                Not Acknowledged
+                                                                Not Ack.
                                                             </div>
                                                             <div class="d-block mt-1" moe>
                                                                 <a class="" href="" show start>Ack. Cancellation</a>
@@ -1378,7 +1378,7 @@
                                                         @if($bill->is_cancellation_acknowledged && !$note->is_billing_marked_done)
                                                             <div class="mt-2 text-secondary">
                                                                 <i class="fa fa-check"></i>
-                                                                Acknowledged
+                                                                Ack.
                                                             </div>
                                                             <div class="d-block mt-1" moe>
                                                                 <a class="" href="" show start>Undo Cancellation Ack.</a>

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

@@ -1466,7 +1466,7 @@
                                     @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
                                         <div class="mt-2 text-secondary">
                                             <i class="fa fa-exclamation-triangle"></i>
-                                            Not Acknowledged
+                                            Not Ack.
                                         </div>
                                         <div class="d-block mt-1" moe>
                                             <a class="" href="" show start>Ack. Cancellation</a>
@@ -1486,7 +1486,7 @@
                                     @if($bill->is_cancellation_acknowledged && !$note->is_billing_marked_done)
                                         <div class="mt-2 text-secondary">
                                             <i class="fa fa-check"></i>
-                                            Acknowledged
+                                            Ack.
                                         </div>
                                         <div class="d-block mt-1" moe>
                                             <a class="" href="" show start>Undo Cancellation Ack.</a>
@@ -1757,7 +1757,7 @@
                                             @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
                                                 <div class="ml-2 text-secondary">
                                                     <i class="fa fa-exclamation-triangle"></i>
-                                                    Not Acknowledged
+                                                    Not Ack.
                                                 </div>
                                                 <div class="d-block ml-2" moe>
                                                     <a class="" href="" show start>Ack. Cancellation</a>
@@ -1777,7 +1777,7 @@
                                             @if($bill->is_cancellation_acknowledged && !$note->is_billing_marked_done)
                                                 <div class="ml-2 text-secondary">
                                                     <i class="fa fa-check"></i>
-                                                    Acknowledged
+                                                    Ack.
                                                 </div>
                                                 <div class="d-block ml-2" moe>
                                                     <a class="" href="" show start>Undo</a>

resources/views/app/patient/partials/appointment-confirmation.blade.php

@@ -46,9 +46,11 @@
                     Request Pending
                 </div>
             @endif
+            @if($appointment->status !== 'COMPLETED' && $appointment->status !== 'CONFIRMED' && $appointment->status !== 'CANCELLED')
             <div>
-                @include('app.patient.partials.appointment-request-confirmation', ['label' => 'Re-request Confirmation'])
+              @include('app.patient.partials.appointment-request-confirmation', ['label' => 'Re-request Confirmation'])
             </div>
+            @endif
         @endif
     </div>
     @if($appointment->latest_confirmation_request_at || $appointment->latest_confirmation_decision_at)

resources/views/app/patient/supply-orders.blade.php

@@ -481,7 +481,7 @@
                         @else
                             <div class="text-secondary font-weight-bold mt-1">
                                 <i class="fa fa-check"></i>
-                                Cancellation Acknowledged
+                                Cancellation Ack.
                             </div>
                             @if($supplyOrder->cancellation_acknowledgement_memo)
                                 <div class="text-sm text-secondary font-italic mt-1">{{$supplyOrder->cancellation_acknowledgement_memo}}</div>

resources/views/app/patient/vitals-settings/bmi-management-summary.blade.php

@@ -37,6 +37,9 @@
     <span class="text-secondary">Remarks:</span>
     <span>___</span>
 </div>-->
+{{--usual_bmi_min_category;--}}
+{{--usual_bmi_max_category;--}}
+{{--ideal_bmi_category;--}}
 
 <div class="mb-3">
     <span class="text-secondary">CHF?:</span>

resources/views/app/patients.blade.php

@@ -179,7 +179,7 @@
                             @endif
                             <?php $coverage = $patient->getPrimaryCoverage(); ?>
                             @if($coverage)
-                                {{$coverage->toString()}}
+                                {{$coverage->insuranceDisplayName()}}
                             @endif
                             @include('app.patient.coverage-status')
                         </td>

resources/views/app/practice-management/bill-matrix.blade.php

@@ -311,7 +311,7 @@
                             @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
                                 <div class="mt-2 text-secondary">
                                     <i class="fa fa-exclamation-triangle"></i>
-                                    Not Acknowledged
+                                    Not Ack.
                                 </div>
                                 <div class="d-block mt-1" moe>
                                     <a class="" href="" show start>Ack. Cancellation</a>
@@ -330,7 +330,7 @@
                             @if($bill->is_cancellation_acknowledged)
                                 <div class="mt-2 text-secondary">
                                     <i class="fa fa-check"></i>
-                                    Acknowledged
+                                    Ack.
                                 </div>
                                 <div class="d-block mt-1" moe>
                                     <a class="" href="" show start>Undo Cancellation Ack.</a>

resources/views/app/practice-management/cellular-device-manager.blade.php

@@ -74,7 +74,7 @@
                                 @endif
                                 <?php $coverage = $client->getPrimaryCoverage(); ?>
                                 @if($coverage)
-                                    {{$coverage->toString()}}
+                                    {{$coverage->insuranceDisplayName()}}
                                 @endif
                             </td>
 

resources/views/app/practice-management/patient-claim-summary.blade.php

@@ -170,7 +170,7 @@
                                 @endif
                                 <?php $coverage = $patient->getPrimaryCoverage(); ?>
                                 @if($coverage)
-                                    {{$coverage->toString()}}
+                                    {{$coverage->insuranceDisplayName()}}
                                 @endif
                             </td>
                             <td>{{$patient->notes_without_billing_closed}}</td>

resources/views/layouts/patient.blade.php

@@ -320,7 +320,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 					</div>
 				@endif
 				<div class="card {{$isVisitNote ? 'card m-0 border-0 rounded-0' : 'my-3'}}" id="patient-header">
-					<div class="card-header py-1 hide-inside-ticket-popup">
+					<div class="card-header @if($patient->client_engagement_status_category == 'DUMMY') alert-warning @endif py-1 hide-inside-ticket-popup">
 						<?php
 						$thumbnail = $patient->profile_picture_base64;
 						$initials = !$thumbnail ? substr($patient->name_first, 0, 1) . substr($patient->name_last, 0, 1) : '';
@@ -376,7 +376,12 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 											<div>{{friendly_date_time($patient->dob, false,null, true)}}({{$patient->age_in_years}}
 												y.o {{$patient->sex}})
 											</div>
-
+											@if($patient->getPrimaryCoverage() &&  $patient->getPrimaryCoverageStatus() === 'YES')
+												<div class="text-nowrap">
+													<i class="fa fa-check-circle text-success" data-toggle="tooltip" data-placement="bottom" title="Covered"></i>
+													{{$patient->getPrimaryCoverage()->insuranceDisplayName()}}
+												</div>
+											@endif
 										</div>
 										<div class="screen-only">
 										<div class=separators>
@@ -546,7 +551,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
                       </div>
 											<div>
 												<label>Engagement Status:</label>
-												<b>{{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category))) : '-'}}</b>
+												<b>{{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category == 'DUMMY' ? 'Test Chart' : $patient->client_engagement_status_category))) : '-'}}</b>
 												<div moe class="ml-2 hide-inside-popup">
 													<a start show><i class="fa fa-edit"></i></a>
 													<form url="/api/client/updateClientEngagementAssessmentStatus" class="mcp-theme-1">
@@ -558,7 +563,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 																<option {{ $patient->client_engagement_status_category === 'ACTIVE' ? 'selected' : '' }} value="ACTIVE">Active</option>
 																<option {{ $patient->client_engagement_status_category === 'INACTIVE' ? 'selected' : '' }} value="INACTIVE">Inactive</option>
 																<option {{ $patient->client_engagement_status_category === 'ENTRY_ERROR' ? 'selected' : '' }} value="ENTRY_ERROR">Entry Error</option>
-																<option {{ $patient->client_engagement_status_category === 'DUMMY' ? 'selected' : '' }} value="DUMMY">Dummy</option>
+																<option {{ $patient->client_engagement_status_category === 'DUMMY' ? 'selected' : '' }} value="DUMMY">Test Chart</option>
 																<option {{ $patient->client_engagement_status_category === 'DECEASED' ? 'selected' : '' }} value="DECEASED">Deceased</option>
 																<option {{ $patient->client_engagement_status_category === 'DUPLICATE' ? 'selected' : '' }} value="DUPLICATE">Duplicate</option>
 																<option {{ $patient->client_engagement_status_category === 'NO_LONGER_INTERESTED' ? 'selected' : '' }} value="NO_LONGER_INTERESTED">No Longer Interested</option>
@@ -752,11 +757,12 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 																									class="on-hover-opaque fa fa-video text-secondary"></i>&nbsp;Join</button>
 																				</div>
                                     </section>
-
+									
+									@if(!$patient->getPrimaryCoverage() || $patient->getPrimaryCoverageStatus() !== 'YES')
 									<section class="hide-inside-popup screen-only vbox align-self-start mt-2 mx-2">
-										@include('app.patient.coverage-status')
+											@include('app.patient.coverage-status')										
 									</section>
-
+									@endif
 									<ul class="vbox mt-2 align-self-start patient-header-address">
 										<li class="d-flex align-items-start">
 											<span class="aligned-icon">