Merge remote-tracking branch 'origin/master'

app/Helpers/helpers.php

@@ -1138,3 +1138,9 @@ if(!function_exists('mask_string')) {
         return $maskedFirstCharacters . $lastCharacters;
     }
 }
+
+if(!function_exists('limit_string_length')) {
+    function limit_string_length($string, $length = 30) {
+        return substr($string,0, $length);
+    }
+}

app/Models/Client.php

@@ -1139,4 +1139,9 @@ ORDER BY m.ts DESC
         return ClientMemo::where('client_id', $this->id)->orderBy('created_at', 'DESC')->first();
     }
 
+    public function dentalCompany()
+    {
+        return $this->hasOne(Company::class, 'id', 'dental_company_id');
+    }
+
 }

public/css/style.css

@@ -3803,4 +3803,4 @@ table.v-top th {
 .ss-leftnav>a {
     padding: 0.5rem 1.25rem;
     width: 250px;
-}
+}

resources/views/app/patient/partials/sticky-notes-view.blade.php

@@ -0,0 +1,19 @@
+
+@if(strlen($patient->sticky_note) > 60)
+<div moe relative wide center>
+	<a start show class="font-weight-bold">...</a>
+	<form url="" class="mcp-theme-1">
+		<div>
+			<div class="d-flex align-items-center justify-content-between pb-2 mb-1">
+				<h5 class="mb-0 font-weight-bold">Sticky Note</h5>
+				<button cancel class="btn btn-sm btn-default border">
+					<i class="fas fa-times"></i>
+				</button>
+			</div>
+			<div>
+				{{ $patient->sticky_note }}
+			</div>
+		</div>
+	</form>
+</div>
+@endif

resources/views/layouts/patient-header.blade.php

@@ -171,6 +171,45 @@ $addressParts .= implode(", ", $addressPart2);
                         </div>
                     </form>
                 </div>
+                <span class="mx-2 text-muted">|</span>
+                <div class="">
+                    <label class="text-secondary">Dental Company:</label>
+                    {{$patient->dentalCompany ? $patient->dentalCompany->name : '(not set)'}}
+                    @if(!$patient->dentalCompany)
+                        <div moe class="ml-1">
+                            <a start show><i class="fa fa-edit"></i></a>
+                            <form url="/api/client/putDentalCompany" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                <div class="mb-2">
+                                    <label class="text-secondary text-sm">Dental Company</label>
+                                    <select name="dentalCompanyUid" class="form-control form-control-sm">
+                                        <option value=""> --select--</option>
+                                        <?php $allDentalCompanies = \App\Models\Company::where('is_dental_clinic', true)->orderBy('name')->get(); ?>
+                                        @foreach($allDentalCompanies as $dentalCompany)
+                                            <option value="{{$dentalCompany->uid}}">{{$dentalCompany->name}}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @else
+                        <div moe class="ml-1">
+                            <a start show><i class="text-danger fa fa-ban"></i></a>
+                            <form url="/api/client/wipeDentalCompany" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                <p>Wipe Dental Company?</p>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+                </div>
             </div>
         </div>
         <div class="d-flex align-items-start">
@@ -554,7 +593,9 @@ $addressParts .= implode(", ", $addressPart2);
                     $patientRecentStickyNote = App\Models\ClientStickyNote::where('client_id', $patient->id)->orderBy('created_at', 'DESC')->limit(1)->first();
                     ?>
                     <div class="">
-                        <span class="d-block text-secondary">{{$patient->sticky_note ?? '-' }}</span>
+                        <span class="d-block text-secondary">{{ limit_string_length($patient->sticky_note ?? '-', 60) }}
+                            @include('app.patient.partials.sticky-notes-view')
+                        </span>
                         <div>
                             <small class="text-muted">By: {{ $patient->stickyNoteUpdatedBySession? $patient->stickyNoteUpdatedBySession->pro->displayName() : '-'  }} • At: {{ friendlier_date($patient->sticky_note_updated_at) }}</small>
                         </div>