瀏覽代碼

Guest: Ability to change appt accept/reject status again

Vijayakrishnan 3 年之前
父節點
當前提交
884b836170

+ 21 - 21
resources/views/app/guest/appointment-confirmation.blade.php

@@ -25,13 +25,26 @@
                         </p>
                     </div>
 
-                    @if($appointment->status === 'CREATED')
-
-                        <div class="form-group">
-                            <p>Please confirm your appointment</p>
+                    @if(count($appointment->confirmationDecisions))
+                        <p class="mb-2 text-secondary font-weight-bold">Appointment status history</p>
+                        <div class="bg-light px-2 pt-2 border rounded mb-3">
+                            @foreach($appointment->confirmationDecisions as $decision)
+                                <div class="mb-2"><b>{{$decision->accepted_or_rejected_or_waived}}</b> on <b>{{friendlier_date_time($decision->created_at)}}</b>
+                                    @if($decision->session && $decision->session->pro)
+                                        by <b>{{$decision->session->pro->displayName()}}</b>
+                                    @elseif($decision->session && $decision->session->client)
+                                        by <b>{{$decision->session->client->displayName()}}</b>
+                                    @endif
+                                </div>
+                            @endforeach
                         </div>
+                        <p class="text-secondary font-weight-bold mb-2">Update appointment status</p>
+                    @else
+                        <p class="text-secondary font-weight-bold mb-2">Please confirm your appointment</p>
+                    @endif
 
-                        <div class="form-group">
+                    <div class="bg-light px-2 pt-2 border rounded mb-3">
+                        <div class="form-group mb-2">
                             <div class="check d-flex align-items-center mb-2">
                                 <input type="radio" required name="decision" value="ACCEPT" id="appointment_confirmation_accept" class="check-input my-0 mr-2">
                                 <label for="appointment_confirmation_accept" class="check-label my-0">Accept - <b>I confirm my availability at the above mentioned date/time</b></label>
@@ -42,27 +55,14 @@
                             </div>
                         </div>
 
-                        <div class="form-group">
+                        <div class="form-group mb-2">
                             <textarea name="memo" class="form-control form-control-sm" placeholder="Any additional information / reason in case you are rejecting the appointment"></textarea>
                         </div>
 
-                        <div class="form-group">
+                        <div class="form-group mb-2">
                             <button class="btn btn-primary">Submit</button>
                         </div>
-
-                    @else
-
-                        @foreach($appointment->confirmationDecisions as $decision)
-                            <div class="mb-2"><b>{{$decision->accepted_or_rejected}}</b> on <b>{{friendlier_date_time($decision->created_at)}}</b>
-                                @if($decision->session && $decision->session->pro)
-                                    by <b>{{$decision->session->pro->displayName()}}</b>
-                                @elseif($decision->session && $decision->session->client)
-                                    by <b>{{$decision->session->client->displayName()}}</b>
-                                @endif
-                            </div>
-                        @endforeach
-
-                    @endif
+                    </div>
 
                 </form>
                 @endif

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

@@ -17,7 +17,7 @@ $cDecisions = $appointment->confirmationDecisions;
     <p class="my-2"><b>Decisions</b></p>
     @foreach($cDecisions as $cDecision)
         <div class="bg-light p-1 my-1 border border">
-            <b class="{{$cDecision->accepted_or_rejected === 'ACCEPTED' ? 'text-success' : 'text-warning-mellow'}}">{{$cDecision->accepted_or_rejected}}</b> on {{ friendly_date_time($cDecision->created_at) }}
+            <b class="{{$cDecision->accepted_or_rejected_or_waived === 'ACCEPTED' ? 'text-success' : 'text-warning-mellow'}}">{{$cDecision->accepted_or_rejected_or_waived}}</b> on {{ friendly_date_time($cDecision->created_at) }}
             @if($cDecision->memo)
                 <div class="text-sm">
                     <i>{{$cDecision->memo}}</i>