Merge branch 'dev' into dev-vj

resources/views/app/patient/create-patient/create-patient-script-templates.blade.php

@@ -8,7 +8,7 @@
 				<div class="form-group">
 					<select class="form-control" name="script_type">
 						<option value="">-- Select Script --</option>
-						<option value="dialmd-covid-kit">DialMD COVID Kit</option>
+						<option selected value="dialmd-covid-kit">DialMD COVID Kit</option>
 					</select>
 				</div>
 			</div>
@@ -24,25 +24,31 @@
 		function init() {
 			(function($) {
 				var createPatientTemplateScript = {
+					defaultTemplate: "dialmd-covid-kit",
 					initScriptTemplateChange: function(){
-						var templateContainer = $('#scriptTemplateContent');
+						var self = this;
 						$('select[name=script_type]').change(function(evt){
 							var input = evt.target;
 							var value = input.value;
-							templateContainer.html('<i class="fas fa-circle-notch fa-spin text-primary"></i> Loading template...');
-							$.get('{{ route("admin.getCreateNewPatientScriptTemplate") }}', {template:value}, function(response){
-								if(response.success){
-									var templateHtml = response.data;
-									templateContainer.html(templateHtml);
-								}else{
-									toastr.error(response.message);
-									templateContainer.html('');
-								}
-							}, 'json');
+							self.onTemplateChange(value);
 						});
 					},
+					onTemplateChange: function(value) {
+						var templateContainer = $('#scriptTemplateContent');
+						templateContainer.html('<i class="fas fa-circle-notch fa-spin text-primary"></i> Loading template...');
+						$.get('{{ route("admin.getCreateNewPatientScriptTemplate") }}', {template:value}, function(response){
+							if(response.success){
+								var templateHtml = response.data;
+								templateContainer.html(templateHtml);
+							}else{
+								toastr.error(response.message);
+								templateContainer.html('');
+							}
+						}, 'json');
+					},
 					init: function() {
 						this.initScriptTemplateChange();
+						this.onTemplateChange(this.defaultTemplate);
 					}
 				};
 				createPatientTemplateScript.init();

resources/views/app/practice-management/pro-availability.blade.php

@@ -585,6 +585,9 @@
             </div>
         </div>
         <div class="col-md-6">
+            @if($pro->is_enrolled_as_mcp && $pro->is_considered_for_mcp_assignment)
+                @include('layouts.confirm-hours-of-availability-notification')
+            @endif
             <div class="card">
                 <div class="card-header px-3 py-1 d-flex align-items-center">
                     <strong class="">

resources/views/layouts/confirm-hours-of-availability-notification.blade.php

@@ -3,25 +3,31 @@
 		background: none;
 		border: 1px solid #856404;
 		padding: 3px 10px;
-		color: #856404;
+		color: #856404 !important;
 		font-weight: bold;
 		border-radius: 4px;
 		font-size: 13px;
 		cursor: pointer;
 	}
+
 	.confirm-hrs-btn:hover,
 	.confirm-hrs-btn:focus {
 		text-decoration: none;
-		color: #856404;
+		color: #856404 !important;
+	}
+	.confirm-hrs-btn.red {
+		color: #d14e4e !important;
+    	border-color: #d14e4e;
 	}
 </style>
-<div id="confirmHoursOfAvailability" class="alert alert-warning mb-0 py-1 px-3 rounded-0">
-	<div class="d-flex align-items-center justify-content-center" style="font-size: 14px;">
-		<span><i class="fas fa-exclamation-triangle"></i> Please confirm your <a href="{{ route('practice-management.proAvailability') }}" style="color: #856404;"><u>hours of availability</u></a>.</span>
+<div id="confirmHoursOfAvailability" class="alert alert-warning mb-0 py-2 px-3 mb-2">
+	<div class="d-flex align-items-center justify-content-between" style="font-size: 14px;">
+		@if(!$pro->are_hours_of_availability_confirmed)
+		<span><i class="fas fa-exclamation-triangle"></i> Please confirm your hours of availability.</span>
 
 		<div id="confirmHoursOfAvailabilityMoe" moe class="ml-4">
 			<a class="confirm-hrs-btn" href="" show start>Confirm</a>
-			<form  url="/api/pro/confirmHoursOfAvailability" hook="onConfirmHoursOfAvailaility">
+			<form right url="/api/pro/confirmHoursOfAvailability">
 				<input type="hidden" name="uid" value="{{ $pro->uid }}">
 				<label>Are you sure?</label>
 				<div class="">
@@ -30,29 +36,37 @@
 				</div>
 			</form>
 		</div>
-		<a id="undoConfirmHoursOfAvailability" class="d-none ml-4 confirm-hrs-btn">Undo</a>
+		@else
+		<div>
+			<span>Hours of Avaliability last confirmed on <b><i class="fas fa-history"></i> {{ friendly_date($pro->hours_of_availability_confirmed_at) }}</b></span>
+		</div>
 
-	</div>
-</div>
+		<div>
+			<div id="confirmHoursOfAvailabilityMoe" moe class="ml-4">
+				<a class="confirm-hrs-btn" href="" show start>Reconfirm</a>
+				<form right url="/api/pro/confirmHoursOfAvailability">
+					<input type="hidden" name="uid" value="{{ $pro->uid }}">
+					<label>Are you sure?</label>
+					<div class="">
+						<button class="btn btn-primary btn-sm" submit>Yes</button>
+						<button class="btn btn-default border btn-sm" cancel>Cancel</button>
+					</div>
+				</form>
+			</div>
+			<div id="confirmHoursOfAvailabilityMoe" moe class="ml-1">
+				<a class="confirm-hrs-btn red" href="" show start>Undo</a>
+				<form right url="/api/pro/undoConfirmHoursOfAvailability">
+					<input type="hidden" name="uid" value="{{ $pro->uid }}">
+					<label>Are you sure?</label>
+					<div class="">
+						<button class="btn btn-primary btn-sm" submit>Yes</button>
+						<button class="btn btn-default border btn-sm" cancel>Cancel</button>
+					</div>
+				</form>
+			</div>
+		</div>
 
-<script>
-	(function() {
-		var hasUndoneConfirmation = false;
-		addMCHook('onConfirmHoursOfAvailaility', function(){
-			$('#confirmHoursOfAvailabilityMoe').remove();
-			var confirmSection = $('#confirmHoursOfAvailability');
-			var undoConfirmBtn = $('#undoConfirmHoursOfAvailability');
 
-			undoConfirmBtn.removeClass('d-none').click(function(){
-				hasUndoneConfirmation = true;
-				$.post('/api/pro/undoConfirmHoursOfAvailability', {uid:"{{ $pro->uid }}"}, function(response){
-					fastReload();
-				}, 'json');
-			});
-			setTimeout(function(){
-				if(hasUndoneConfirmation) return;
-				$('#confirmHoursOfAvailability').remove();
-			}, 5000);			
-		});
-	}).call(window);
-</script>
+		@endif
+	</div>
+</div>

resources/views/layouts/patient.blade.php

@@ -745,7 +745,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 									@endif
 
 									<section class="mr-4 align-self-start mt-2 ml-auto">
-										<label>Sticky Note:</label> {{$patient->sticky_note ?? '-' }}
+										<label>Sticky Note:</label> <span class="text-secondary">{{$patient->sticky_note ?? '-' }}</span>
 											<div moe right class="ml-2 hide-inside-popup">
 												<a start show><i class="fa fa-edit"></i></a>
 												<form url="/api/client/updateStickyNote" class="mcp-theme-1">

resources/views/layouts/template.blade.php

@@ -263,9 +263,6 @@
     </nav>
 
     <main role="main" class="stag-content px-0">
-        @if($pro->is_enrolled_as_mcp && $pro->is_considered_for_mcp_assignment && !$pro->are_hours_of_availability_confirmed)
-            @include('layouts.confirm-hours-of-availability-notification')
-        @endif
         @yield('content')
 
     </main><!-- /.container -->