Merge branch 'main' of https://git.stratawiz.com/Stratawiz/Rapport-Laravel
Specific Folder FTP Upload / ftp-deploy (push) Successful in 1m45s
Details
Specific Folder FTP Upload / ftp-deploy (push) Successful in 1m45s
Details
This commit is contained in:
commit
6d2524260b
|
|
@ -81,17 +81,19 @@
|
|||
<option value=""> -- Select -- </option>
|
||||
@foreach($question->options as $option)
|
||||
@if($question->code === 'contact_id')
|
||||
@php
|
||||
$doctorContact = isset($option->contact) ? $option->contact : null;
|
||||
$doctorMsl = '';
|
||||
if ($doctorContact && isset($doctorContact->msl_code)) {
|
||||
$doctorMsl = trim((string) $doctorContact->msl_code);
|
||||
}
|
||||
if ($doctorMsl === '' && isset($option->msl_code)) {
|
||||
$doctorMsl = trim((string) $option->msl_code);
|
||||
}
|
||||
@endphp
|
||||
<option value="{{$option->value}}" msl_code="{{ $doctorMsl }}" {{isset($question->value) && $question->value == $option->value ? 'selected':''}}>{{$option->display}}</option>
|
||||
@if(isset($option->contact->type) && strtolower($option->contact->type) == 'doctor')
|
||||
@php
|
||||
$doctorContact = $option->contact;
|
||||
$doctorMsl = '';
|
||||
if (isset($doctorContact->msl_code)) {
|
||||
$doctorMsl = trim((string) $doctorContact->msl_code);
|
||||
}
|
||||
if ($doctorMsl === '' && isset($option->msl_code)) {
|
||||
$doctorMsl = trim((string) $option->msl_code);
|
||||
}
|
||||
@endphp
|
||||
<option value="{{$option->value}}" msl_code="{{ $doctorMsl }}" {{isset($question->value) && $question->value == $option->value ? 'selected':''}}>{{$option->display}}</option>
|
||||
@endif
|
||||
@else
|
||||
<option value="{{$option->value}}" {{isset($question->value) && $question->value == $option->value ? 'selected':''}}>{{$option->display}}</option>
|
||||
@endif
|
||||
|
|
@ -247,6 +249,10 @@
|
|||
$('#field-contact_id').append($("<option></option>").attr("value",'').text('-- Select --'));
|
||||
if (Array.isArray(data)) {
|
||||
for(let itm of data) {
|
||||
let contactType = (itm.contact && itm.contact.type) ? String(itm.contact.type).toLowerCase() : '';
|
||||
if (contactType !== 'doctor') {
|
||||
continue;
|
||||
}
|
||||
let mslCode = (itm.contact && itm.contact.msl_code) ? String(itm.contact.msl_code).trim() : '';
|
||||
$('#field-contact_id').append($("<option></option>").attr("value",itm.value).attr("msl_code", mslCode).text(itm.display));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue