No "Allys" anywhere in V1

resources/views/app/patient/note/dashboard.blade.php

@@ -37,7 +37,7 @@
                     </form>
                 </div>
             </div>
-            <div class="px-2 border-left">
+            <div class="px-2 border-left border-right">
                 <div class="d-flex">
                     <span class="mr-2">{{friendly_date_time($note->effective_dateest, false)}}</span>
                     <span moe class="ml-auto">
@@ -74,7 +74,7 @@
                 </div>
             </div>
 
-            <div class="px-2 border-left">
+            <div class="px-2">
                 <div class="d-flex">
                     <span class="mr-2"><span class="text-secondary">HCP:</span> {{$note->hcpPro->name_display}}</span>
                     <div moe class="ml-auto">
@@ -85,7 +85,7 @@
                                 <select name="hcpProUid" class="form-control form-control-sm">
                                     <option value="">-- Select HCP Pro --</option>
                                     @foreach ($pros as $iPro)
-                                        <option value="{{$iPro->uid}}" {{ $iPro->id === $note->hcpPro->id ? 'selected' : '' }}>{{$iPro->name_display}}</option>
+                                        <option value="{{$iPro->uid}}" {{ $note->hcpPro && $iPro->id === $note->hcpPro->id ? 'selected' : '' }}>{{$iPro->name_display}}</option>
                                     @endforeach
                                 </select>
                             </div>
@@ -96,8 +96,8 @@
                         </form>
                     </div>
                 </div>
-                <div class="d-flex">
-                    <span class="mr-2"><span class="text-secondary">Ally:</span> {{$note->allyPro->name_display}}</span>
+                {{--<div class="d-flex">
+                    <span class="mr-2"><span class="text-secondary">Ally:</span> {{$note->allyPro ? $note->allyPro->name_display : '-'}}</span>
                     <div moe class="ml-auto">
                         <a href="" show start><i class="fa fa-edit"></i></a>
                         <form url="/api/note/putAlly">
@@ -106,7 +106,7 @@
                                 <select name="allyProUid" class="form-control form-control-sm">
                                     <option value="">-- Select Ally Pro --</option>
                                     @foreach ($pros as $iPro)
-                                        <option value="{{$iPro->uid}}" {{ $iPro->id === $note->allyPro->id ? 'selected' : '' }}>{{$iPro->name_display}}</option>
+                                        <option value="{{$iPro->uid}}" {{ $note->allyPro && $iPro->id === $note->allyPro->id ? 'selected' : '' }}>{{$iPro->name_display}}</option>
                                     @endforeach
                                 </select>
                             </div>
@@ -116,10 +116,10 @@
                             </div>
                         </form>
                     </div>
-                </div>
+                </div>--}}
             </div>
             <div class="ml-auto d-flex align-items-start">
-                <div class="pr-2 border-right">
+                <div class="pr-2">
                     <div>
                         @if($note->is_signed_by_hcp)
                             <span class="text-secondary">
@@ -142,12 +142,12 @@
                             </div>
                         @endif
                     </div>
-                    <div>
+                    {{--<div>
                         @if($note->is_signed_by_ally)
                             <span class="text-secondary">
-                        <i class="fa fa-check"></i>
-                        Ally Signed
-                    </span>
+                                <i class="fa fa-check"></i>
+                                Ally Signed
+                            </span>
                         @else
                             <div moe
                                  class="{{ $note->ally_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
@@ -163,9 +163,9 @@
                                 </form>
                             </div>
                         @endif
-                    </div>
+                    </div>--}}
                 </div>
-                <div class="pl-2">
+                <div class="pl-2 border-left">
                     <div class="d-flex justify-content-end">
                         <div moe relatve class="">
                             <a class="" href="" show start>Create Bill</a>

resources/views/app/patient/notes.blade.php

@@ -77,7 +77,7 @@
                                 @endforeach
                             </select>
                         </div>
-                        <div class="mb-2">
+                        {{--<div class="mb-2">
                             <select name="allyProUid" class="form-control form-control-sm">
                                 <option value="">-- Select Ally Pro --</option>
                                 @foreach ($pros as $iPro)
@@ -85,7 +85,7 @@
                                         value="{{$iPro->uid}}">{{$iPro->name_display}}</option>
                                 @endforeach
                             </select>
-                        </div>
+                        </div>--}}
                         <div class="mb-2">
                             <input type="text" name="title" placeholder="Title" class="form-control form-control-sm">
                         </div>
@@ -115,7 +115,7 @@
                 <th class="px-2 text-secondary border-bottom-0">Created</th>
                 <th class="px-2 text-secondary border-bottom-0">Title</th>
                 <th class="px-2 text-secondary border-bottom-0">HCP</th>
-                <th class="px-2 text-secondary border-bottom-0">Ally</th>
+                {{--<th class="px-2 text-secondary border-bottom-0">Ally</th>--}}
             </tr>
             </thead>
             <tbody>
@@ -132,9 +132,9 @@
                     <td class="px-2">
                         {{$note->hcpPro ? $note->hcpPro->name_display: '-'}}
                     </td>
-                    <td class="px-2">
+                    {{--<td class="px-2">
                         {{$note->allyPro ? $note->allyPro->name_display: '-'}}
-                    </td>
+                    </td>--}}
                 </tr>
             @endforeach
             </tbody>

resources/views/layouts/patient.blade.php

@@ -245,7 +245,7 @@
                                         <form url="/api/note/createUsingFreeTextHtml" right class="mcp-theme-1">
                                             <input type="hidden" name="clientUid" value="{{$patient->uid}}">
                                             <input type="hidden" name="hcpProUid" value="{{$pro->uid}}">
-                                            <div class="mb-2">
+                                            {{--<div class="mb-2">
                                                 <select name="allyProUid" class="form-control form-control-sm">
                                                     <option value="">-- Select Ally Pro --</option>
                                                     @foreach ($pros as $iPro)
@@ -253,7 +253,7 @@
                                                             value="{{$iPro->uid}}">{{$iPro->name_display}}</option>
                                                     @endforeach
                                                 </select>
-                                            </div>
+                                            </div>--}}
                                             <div class="mb-2">
                                                 <input type="text" name="title" placeholder="Title" class="form-control form-control-sm">
                                             </div>
@@ -525,7 +525,7 @@
                                                         @endforeach
                                                     </select>
                                                 </div>
-                                                <div class="form-group">
+                                                {{--<div class="form-group">
                                                     <label for="" class="control-label">Ally Pro</label>
                                                     <select name="allyProUid" class="form-control">
                                                         <option value="">-- select ally pro --</option>
@@ -534,7 +534,7 @@
                                                                 value="{{$iPro->uid}}">{{$iPro->name_display}}</option>
                                                         @endforeach
                                                     </select>
-                                                </div>
+                                                </div>--}}
                                                 <div class="form-group">
                                                     <label for="" class="control-label text-left">Title</label>
                                                     <input type="text" name="title" class="form-control">