Browse Source

Hide cancelled notes in OB visit form

Vijayakrishnan Krishnan 4 năm trước cách đây
mục cha
commit
1e31826bb3

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

@@ -43,7 +43,7 @@
                                             onchange="toggleVisibilityAsNeeded(this, '', 'if-note-outside-system')">
                                             onchange="toggleVisibilityAsNeeded(this, '', 'if-note-outside-system')">
                                         <option value="">-- Visit Note --</option>
                                         <option value="">-- Visit Note --</option>
                                         @foreach ($notes as $note)
                                         @foreach ($notes as $note)
-                                            @if(!empty($note->title))
+                                            @if(!empty($note->title) && $note->client_id === $patient->id && !$note->is_cancelled)
                                                 <option value="{{$note->uid}}">{{$note->title}}</option>
                                                 <option value="{{$note->uid}}">{{$note->title}}</option>
                                             @endif
                                             @endif
                                         @endforeach
                                         @endforeach

+ 1 - 1
resources/views/app/patient/care-months.blade.php

@@ -37,7 +37,7 @@
                                             onchange="toggleVisibilityAsNeeded(this, '', 'if-note-outside-system')">
                                             onchange="toggleVisibilityAsNeeded(this, '', 'if-note-outside-system')">
                                         <option value="">-- Visit Note --</option>
                                         <option value="">-- Visit Note --</option>
                                         @foreach ($notes as $note)
                                         @foreach ($notes as $note)
-                                            @if(!empty($note->title))
+                                            @if(!empty($note->title) && $note->client_id === $patient->id && !$note->is_cancelled)
                                                 <option value="{{$note->uid}}">{{$note->title}}</option>
                                                 <option value="{{$note->uid}}">{{$note->title}}</option>
                                             @endif
                                             @endif
                                         @endforeach
                                         @endforeach

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

@@ -285,7 +285,7 @@
                                                             onchange="if(this.value === '-- create --') createNewNote('{{$patient->uid}}', '{{$pro->uid}}', '{{date('Y-m-d')}}');">
                                                             onchange="if(this.value === '-- create --') createNewNote('{{$patient->uid}}', '{{$pro->uid}}', '{{date('Y-m-d')}}');">
                                                         <option value="">-- Visit Note --</option>
                                                         <option value="">-- Visit Note --</option>
                                                         @foreach ($notes as $note)
                                                         @foreach ($notes as $note)
-                                                            @if(!empty($note->title) && $note->client_id === $patient->id)
+                                                            @if(!empty($note->title) && $note->client_id === $patient->id && !$note->is_cancelled)
                                                                 <option
                                                                 <option
                                                                     {{ $patient->mcp_onboarding_visit_note_id === $note->id ? 'selected' : '' }}
                                                                     {{ $patient->mcp_onboarding_visit_note_id === $note->id ? 'selected' : '' }}
                                                                     value="{{$note->uid}}">{{$note->title}} ({{friendly_date_time($note->effective_dateest, false)}})</option>
                                                                     value="{{$note->uid}}">{{$note->title}} ({{friendly_date_time($note->effective_dateest, false)}})</option>