Caremonth single - reuse updated form for entry edit as well

resources/views/app/patient/care-month/_matrix-v2.blade.php

@@ -73,81 +73,9 @@ foreach ($days as $k => $day) {
                             <div class="text-secondary in-table-markup">{!! $entry->content_text !!}</div>
                             <!--                                        <div class="text-secondary text-sm">{{$entry->content_detail}}</div>-->
                         </td>
-                        <td class="px-2 text-right">
+                        <td class="px-2">
                             @if(!$activeRMBill)
-                                <div moe large class="mr-2">
-                                    <a start show class="py-0 mb-3">Edit</a>
-                                    <form url="/api/careMonthEntry/updateSimpleForRm" right>
-                                        <input type="hidden" name="uid" value="{{ $entry->uid }}">
-                                        <div class="mb-2">
-                                            <div class="row">
-                                                <div class="col-4 pr-0">
-                                                    <select class="form-control form-control-sm w-100" name="proUid" provider-search data-pro-uid="{{ @$entry->pro->uid }}"
-                                                            required>
-                                                        <option value="">-- Select Pro --</option>
-                                                        @foreach($pros as $iPro)
-                                                            <option {{ $iPro->uid === $pro->uid ? 'selected' : '' }}
-                                                                    value="{{ $iPro->uid }}">{{ $iPro->displayName() }}</option>
-                                                        @endforeach
-                                                    </select>
-                                                </div>
-                                                <div class="col-4 pr-0">
-                                                    <?php
-                                                    $sD = strtotime($careMonth->start_date);
-                                                    $y = date('Y', $sD);
-                                                    $m = date('m', $sD);
-                                                    $d = date('t', $sD);
-                                                    $yCurrent = date('Y');
-                                                    $mCurrent = date('m');
-                                                    $isToday = false;
-                                                    if($y === $yCurrent && $m === $mCurrent) {
-                                                        $d = date('d');
-                                                        $isToday = true;
-                                                    }
-                                                    ?>
-                                                    <input autofocus type="date" min="{{ date($y . '-' . $m . '-01') }}" max="{{ date($y . '-' . $m . '-' . $d) }}"
-                                                           value="{{$entry->effective_date}}"
-                                                           class="form-control form-control-sm w-100" name="effectiveDate"
-                                                           placeholder="Effective Date" required>
-                                                </div>
-                                                <div class="col-4">
-                                                    <select name="timeInSeconds" class="form-control form-control-sm w-100 cm-time-value" required>
-                                                        <option value="">-- Minutes --</option>
-                                                        <option value="60" {{$entry->time_in_seconds === 60 ? 'selected' : ''}}>1:00</option>
-                                                        <option value="75" {{$entry->time_in_seconds === 75 ? 'selected' : ''}}>1:15</option>
-                                                        <option value="300" {{$entry->time_in_seconds === 300 ? 'selected' : ''}}>5:00</option>
-                                                        <option value="600" {{$entry->time_in_seconds === 600 ? 'selected' : ''}}>10:00</option>
-                                                        <option value="1200" {{$entry->time_in_seconds === 1200 ? 'selected' : ''}}>20:00</option>
-                                                    </select>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="mb-2 border border-info p-2 mt-2 bg-light text-left">
-                                            <span><i class="fa fa-phone rotateh text-dark mr-1"></i>This time entry involved interactive communication (audio, video, or in-person) with the patient and/or caretaker.</span>
-                                            <div class="d-flex border-top mt-2">
-                                                <label class="mt-2 mb-0 d-inline-flex align-items-center mr-3">
-                                                    <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="true" {{$entry->did_pro_interact_with_client_about_rm ? 'checked' : ''}} required>
-                                                    <span>Yes</span>
-                                                </label>
-                                                <label class="mt-2 mb-0 d-inline-flex align-items-center">
-                                                    <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="false" {{$entry->did_pro_interact_with_client_about_rm ? '' : 'checked' }} required>
-                                                    <span>No</span>
-                                                </label>
-                                            </div>
-                                        </div>
-                                        <div class="mb-2">
-                                            <div class="row">
-                                                <div class="col-12">
-                                                    <div cm-rte data-name="contentText">{!! $entry->content_text !!}</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="d-flex align-items-center">
-                                            <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                        </div>
-                                    </form>
-                                </div>
+                                @include('app.practice-management.care_month_add_entry_form', ['right' => true, 'entry' => $entry])
                                 <div moe relative>
                                     <a start show class="text-danger">Delete</a>
                                     <form url="/api/careMonthEntry/remove" right class="text-left">

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

@@ -318,7 +318,7 @@
                                         @endif
                                         <span class="ml-1 text-secondary text-sm font-weight-normal">(20 needed)</span>
                                     </b>
-                                  
+                                    <span class="mx-2 text-secondary">|</span>
                                     @include('app.practice-management.care_month_add_entry_form', ['right' => true])
                                 </div>
 

resources/views/app/practice-management/care_month_add_entry_form.blade.php

@@ -1,19 +1,19 @@
-@if(!$activeRMBill)
-    <span class="mx-2 text-secondary">|</span>
-    <div moe large id="cm-entry-form">
-        <a start show class="py-0 mb-3">Add</a>
-        <form url="/api/careMonthEntry/createForRm" {{@$right ? 'right' : ''}}>
-            <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
+@if(!$activeRMBill || @$entry)
+    <div moe large class="mr-2" id="cm-entry-form{{@$entry ? '-' . $entry->uid : ''}}">
+        <a start show class="py-0 mb-3">{{@$entry ? 'Edit' : 'Add'}}</a>
+        <form url="/api/careMonthEntry/{{@$entry ? 'updateSimpleForRm' : 'createForRm'}}" {{@$right ? 'right' : ''}}>
+            @if(@$entry)
+                <input type="hidden" name="uid" value="{{ $entry->uid }}">
+            @else
+                <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
+            @endif
             <div class="mb-2">
                 <div class="row">
                     <div class="col-4 pr-0">
-                        <select class="form-control form-control-sm w-100" name="proUid" provider-search data-pro-uid="{{ @$pro->uid }}"
+                        <label class="mb-1 text-sm text-secondary text-left">Pro</label>
+                        <select class="form-control form-control-sm w-100" name="proUid" provider-search data-pro-uid="{{ @$entry ? $entry->pro->uid : '' }}"
                                 required>
                             <option value="">-- Select Pro --</option>
-                            @foreach($pros as $iPro)
-                                <option {{ $iPro->uid === $pro->uid ? 'selected' : '' }}
-                                        value="{{ $iPro->uid }}">{{ $iPro->displayName() }}</option>
-                            @endforeach
                         </select>
                     </div>
                     <div class="col-4 pr-0">
@@ -30,27 +30,30 @@
                             $isToday = true;
                         }
                         ?>
+                        <label class="mb-1 text-sm text-secondary text-left">Date</label>
                         <input autofocus type="date" min="{{ date($y . '-' . $m . '-01') }}" max="{{ date($y . '-' . $m . '-' . $d) }}"
-                               value="{{date('Y-m-d')}}"
+                               value="{{@$entry ? $entry->effective_date : $careMonth->end_date}}"
                                class="form-control form-control-sm w-100" name="effectiveDate"
                                placeholder="Effective Date" required>
                     </div>
                     <div class="col-4">
-                        <input type="hidden" name="timeInSeconds">
+                        <label class="mb-1 text-sm text-secondary text-left">Minutes</label>
+                        <input type="hidden" name="timeInSeconds" value="{{@$entry ? $entry->time_in_seconds : ''}}">
                         <input type="number" min="1" max="20" name="timeInMinutes" class="form-control form-control-sm w-100 cm-time-value"
+                               value="{{@$entry ? round($entry->time_in_seconds / 60, 0) : ''}}"
                                required>
                     </div>
                 </div>
             </div>
-            <div class="mb-2 border border-info p-2 mt-2 bg-light">
+            <div class="mb-2 border border-info p-2 mt-2 bg-light text-left">
                 <span><i class="fa fa-phone rotateh text-dark mr-1"></i>This time entry involved interactive communication (audio, video, or in-person) with the patient and/or caretaker.</span>
                 <div class="d-flex border-top mt-2">
                     <label class="mt-2 mb-0 d-inline-flex align-items-center mr-3">
-                        <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="true" required>
+                        <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="true" {{@$entry && $entry->did_pro_interact_with_client_about_rm ? 'checked' : ''}} required>
                         <span>Yes</span>
                     </label>
                     <label class="mt-2 mb-0 d-inline-flex align-items-center">
-                        <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="false" required>
+                        <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="false" {{@$entry && $entry->did_pro_interact_with_client_about_rm ? '' : 'checked' }} required>
                         <span>No</span>
                     </label>
                 </div>
@@ -58,7 +61,7 @@
             <div class="mb-2">
                 <div class="row">
                     <div class="col-12">
-                        <div cm-rte data-content="Reviewed/managed patient measurements" data-name="contentText"></div>
+                        <div cm-rte data-name="contentText">{!! @$entry ? $entry->content_text : 'Reviewed/managed patient measurements' !!}</div>
                     </div>
                 </div>
             </div>
@@ -84,6 +87,6 @@
                     }
                 });
         }
-        addMCInitializer('cm-entry-form', init, '#cm-entry-form');
+        addMCInitializer('cm-entry-form{{@$entry ? '-' . $entry->uid : ''}}', init, '#cm-entry-form{{@$entry ? '-' . $entry->uid : ''}}');
     }).call(window);
 </script>