added interaction boolean when creating entry

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

@@ -309,36 +309,8 @@
                                         @endif
                                         <span class="ml-1 text-secondary text-sm font-weight-normal">(20 needed)</span>
                                     </b>
-                                    @if($careMonth->number_of_days_with_remote_measurements >= 16)
-                                    <div moe relative class="ml-2">
-                                        <a href="#" start show class="text-sm">+ Entry</a>
-                                        <form url="/api/careMonthEntry/createForRm" right>
-                                            <input type="hidden" name="careMonthUid" value="{{$careMonth->uid}}">
-                                            <input type="hidden" name="proUid" value="{{$pro->uid}}">
-                                            <div class="mb-2">
-                                                <label class="mb-1 text-secondary">Effective Date *</label>
-                                                <input type="date" value="{{date('Y-m-d')}}"
-                                                       class="form-control form-control-sm" name="effectiveDate"
-                                                       required>
-                                            </div>
-                                            <div class="mb-2">
-                                                <label class="mb-1 text-secondary">Time (secs) *</label>
-                                                <input autofocus type="number"
-                                                       class="form-control form-control-sm" name="timeInSeconds"
-                                                       required>
-                                            </div>
-                                            <div class="mb-2">
-                                                <label class="mb-1 text-secondary">Memo</label>
-                                                <textarea class="form-control form-control-sm" name="contentText"
-                                                          placeholder="" rows="2"></textarea>
-                                            </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>
-                                    @endif
+                                  
+                                    @include('app.practice-management.care_month_add_entry_form')
                                 </div>
                                 @endif
 
@@ -885,7 +857,20 @@
                                             </div>
                                         </div>
                                     </div>--}}
-                                    {{--@include('app/entry-templates/rm/default')--}}
+                                    <div class="mb-2 border border-info p-2 mt-2 bg-light">
+                                        <span>I have had interactive communication with <b>{{$careMonth->client->displayName()}}</b>.</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>
+                                                <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>
+                                                <span>No</span>
+                                            </label>
+                                        </div>
+                                    </div>
+                                                                        {{--@include('app/entry-templates/rm/default')--}}
                                     <div class="mb-2">
                                         <div class="row">
                                             <div class="col-12">

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

@@ -0,0 +1,54 @@
+<div moe large class="ml-2">
+    <a start show class="py-0 mb-3 text-sm">Add Entry</a>
+    <form url="/api/careMonthEntry/createForRm" right>
+        <input type="hidden" name="careMonthUid" value="{{$careMonth->uid }}">
+        <input type="hidden" name="proUid" value="{{ $performer->pro->uid }}">
+        <div class="mb-2">
+            <div class="row">
+                <div class="col-6 pr-0">
+                    <?php
+                    $sD = strtotime($careMonth->start_date);
+                    $y = date('Y', $sD);
+                    $m0 = date('m', $sD);
+                    $d = date('t', $sD);
+                    $defaultED = $sD >= strtotime(date('Y-m-d')) ? date('Y-m-d') : $careMonth->start_date;
+                    ?>
+                    <label class="text-sm text-secondary mb-1">Effective Date</label>
+                    <input autofocus type="date" min="{{ date($y . '-' . $m0 . '-01') }}" max="{{ date($y . '-' . $m0 . '-' . $d) }}"
+                            value="{{$defaultED}}"
+                            class="form-control form-control-sm w-100" name="effectiveDate"
+                            placeholder="Effective Date" required>
+                </div>
+                <div class="col-6">
+                    <label class="text-sm text-secondary mb-1">Seconds</label>
+                    <input type="number" class="form-control form-control-sm w-100 cm-time-value" name="timeInSeconds"
+                            value="1200" placeholder="Time (secs.)" required>
+                </div>
+            </div>
+        </div>
+
+        <div class="mb-2 border border-info p-2 mt-2 bg-light">
+            <span>I have had interactive communication with <b>{{$careMonth->client->displayName()}}</b>.</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>
+                    <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>
+                    <span>No</span>
+                </label>
+            </div>
+        </div>
+       
+        <div class="mb-2">
+            <label class="text-sm text-secondary mb-1">Memo</label>
+            <textarea class="form-control form-control-sm w-100" name="contentText"
+                        required>Interacted with the patient</textarea>
+        </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>