Prechádzať zdrojové kódy

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

= 3 rokov pred
rodič
commit
f98f8cac49

+ 17 - 0
resources/views/app/patient/settings.blade.php

@@ -252,6 +252,23 @@
                             </form>
                         </div>
                     </div>
+                    <div class="mb-1">
+                        Date of Birth: <b>{{ $patient->dob ?? '' }}</b>
+                        <div moe>
+                            <a start show><i class="fa fa-edit"></i></a>
+                            <form url="/api/client/editDob" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                <div class="mb-2">
+                                    <label class="mb-1 text-secondary text-sm">Date of Birth</label>
+                                    <input type="date" class="form-control form-control-sm" name="dob" value="{{ $patient->dob }}" required />
+                                </div>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
                 </div>
                 <hr class="m-negator-3 my-3">
 

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

@@ -0,0 +1,58 @@
+<style>
+	.confirm-hrs-btn {
+		background: none;
+		border: 1px solid #856404;
+		padding: 3px 10px;
+		color: #856404;
+		font-weight: bold;
+		border-radius: 4px;
+		font-size: 13px;
+		cursor: pointer;
+	}
+	.confirm-hrs-btn:hover,
+	.confirm-hrs-btn:focus {
+		text-decoration: none;
+		color: #856404;
+	}
+</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="confirmHoursOfAvailabilityMoe" moe class="ml-4">
+			<a class="confirm-hrs-btn" href="" show start>Confirm</a>
+			<form  url="/api/pro/confirmHoursOfAvailability" hook="onConfirmHoursOfAvailaility">
+				<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>
+		<a id="undoConfirmHoursOfAvailability" class="d-none ml-4 confirm-hrs-btn">Undo</a>
+
+	</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>

+ 22 - 1
resources/views/layouts/patient.blade.php

@@ -743,7 +743,28 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 											@include('app.patient.coverage-status')
 									</section>
 									@endif
-									<ul class="vbox mt-2 align-self-start patient-header-address ml-auto">
+
+									<section class="mr-4 align-self-start mt-2 ml-auto">
+										<label>Sticky Note:</label> {{$patient->sticky_note ?? '-' }}
+											<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">
+													<input type="hidden" name="uid" value="{{$patient->uid}}">
+													<div class="mb-2">
+														<label class="text-secondary text-sm">Sticky Note</label>
+														<textarea name="stickyNote" class="form-control" rows="8" cols="80"></textarea>
+													</div>
+													<div>
+														<button submit class="btn btn-sm btn-primary mr-1">Submit
+														</button>
+														<button cancel class="btn btn-sm btn-default border">
+															Cancel
+														</button>
+													</div>
+												</form>
+											</div>
+									</section>
+									<ul class="vbox mt-2 align-self-start patient-header-address ">
 										<li class="d-flex align-items-start">
 											<span class="aligned-icon">
 												<i class="fa fa-map-marker-alt" aria-hidden="true"></i>

+ 3 - 1
resources/views/layouts/template.blade.php

@@ -263,7 +263,9 @@
     </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 -->