Team 4 (Mother Forum)
Specific Folder FTP Upload / ftp-deploy (push) Successful in 37s Details

This commit is contained in:
zeeshan 2026-10-09 16:43:40 +05:30
parent 8866282b97
commit 3b675acae3
1 changed files with 147 additions and 70 deletions

View File

@ -89,27 +89,72 @@
@case('textarea') @case('textarea')
<textarea id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" {{$question->required == 'yes'?'required':'' }}>{{isset($question->value)?$question->value:''}}</textarea> <textarea id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" {{$question->required == 'yes'?'required':'' }}>{{isset($question->value)?$question->value:''}}</textarea>
@break @break
{{-- @case('dropdown')
@php
$isContact = str_starts_with($question->code, 'contact_id');
$options = collect($question->options)->sortBy('display', SORT_NATURAL | SORT_FLAG_CASE);
@endphp
<select class="form-control" {!!($isContact)?'data-toggle="select2"':'' !!} id="field-{{ $question->code }}" name="{{ $question->code }}" {{ $question->required == 'yes' ? 'required' : '' }}>
<option value=""> -- Select -- </option>
@foreach ($question->options as $option)
@if($isContact && isset($option->contact->type) && $option->contact->type == 'doctor' )
<option value="{{ $option->value }}"
@if(isset($question->value) && $question->value == $option->value) selected @endif
@if($isContact)
msl_code="{{ (isset($option->contact->msl_code) ? $option->contact->msl_code : '') }}"
speciality="{{ (isset($option->contact->speciality) ? $option->contact->speciality : '') }}"
@endif
>
{{ $option->display }}
</option>
@elseif(!$isContact)
<option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'pcode= ' . (isset($option->contact->pcode)?$option->contact->pcode:'') . ' ' : '' }} {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality :'') . ' ' : '' }} >
{{ $option->display }}
</option>
@endif
@endforeach
</select>
@break --}}
@case('dropdown') @case('dropdown')
@php @php
$isContact = str_starts_with($question->code, 'contact_id'); $isContact = str_starts_with($question->code, 'contact_id');
// जर options collection किंवा array असेल तर display field नुसार alphabetize करा
$options = collect($question->options)->sortBy('display', SORT_NATURAL | SORT_FLAG_CASE); $options = collect($question->options)->sortBy('display', SORT_NATURAL | SORT_FLAG_CASE);
@endphp @endphp
{{-- $isContact असल्यास data-toggle="select2" देऊ नका, जेणेकरून AJAX लोड होण्यापूर्वी Select2 चुकीच्या options सह bind होणार नाही --}} <select class="form-control" {!!($isContact)?'data-toggle="select2"':'' !!} id="field-{{ $question->code }}" name="{{ $question->code }}" data-selected="{{ isset($question->value) ? $question->value : '' }}" {{ $question->required == 'yes' ? 'required' : '' }}>
<select class="form-control" {!! (!$isContact) ? 'data-toggle="select2"' : '' !!} id="field-{{ $question->code }}" name="{{ $question->code }}" data-selected="{{ isset($question->value) ? $question->value : '' }}" {{ $question->required == 'yes' ? 'required' : '' }}>
<option value=""> -- Select -- </option> <option value=""> -- Select -- </option>
@if(!$isContact) {{-- $question->options ऐवजी $options वापरा --}}
@foreach ($options as $option) @foreach ($options as $option)
<option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}> @if($isContact && isset($option->contact->type) && $option->contact->type == 'doctor' )
<option value="{{ $option->value }}"
@if(isset($question->value) && $question->value == $option->value) selected @endif
@if($isContact)
msl_code="{{ (isset($option->contact->msl_code) ? $option->contact->msl_code : '') }}"
speciality="{{ (isset($option->contact->speciality) ? $option->contact->speciality : '') }}"
@endif
>
{{ $option->display }} {{ $option->display }}
</option> </option>
@endforeach @elseif(!$isContact)
@endif <option value="{{ $option->value }}"
{{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}
{{ $question->code == 'contact_id' ? 'pcode= ' . (isset($option->contact->pcode)?$option->contact->pcode:'') . ' ' : '' }}
{{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality :'') . ' ' : '' }}>
{{ $option->display }}
</option>
@endif
@endforeach
</select> </select>
@break @break
@case('checkbox') @case('checkbox')
@foreach($question->options as $option) @foreach($question->options as $option)
<div class="form-check mb-2 form-check-primary"> <div class="form-check mb-2 form-check-primary">
@ -220,7 +265,9 @@
}); });
}) })
).then(function() { ).then(function() {
// All contacts loaded for each hierarchy
// Example usage: console.log(contacts);
// Filter out contacts where value == 'sample'
contacts = contacts.filter(function(itm) { return itm.value !== 'sample' && itm.contact && itm.contact.type === 'doctor' }); contacts = contacts.filter(function(itm) { return itm.value !== 'sample' && itm.contact && itm.contact.type === 'doctor' });
contacts.sort(function(a, b) { contacts.sort(function(a, b) {
@ -231,7 +278,18 @@
// Loop through contacts and append options to select elements whose id starts with 'field-contact_id' // Loop through contacts and append options to select elements whose id starts with 'field-contact_id'
// We assume contact_id fields may be suffixed, e.g. field-contact_id_1, field-contact_id, etc. // We assume contact_id fields may be suffixed, e.g. field-contact_id_1, field-contact_id, etc.
function applySelect2ToDoctorDropdowns() {
$("select[id^='field-contact_id']").each(function () {
var select = $(this);
// Avoid re-initializing select2
if (select.data("select2")) return;
select.select2({
width: "100%",
placeholder: "-- Select --",
allowClear: true
});
});
}
$('input[id^="field-msl_code"], input[id^="field-speciality"]').prop('readonly', true); $('input[id^="field-msl_code"], input[id^="field-speciality"]').prop('readonly', true);
@ -251,10 +309,8 @@
var currentSelect = $(this); var currentSelect = $(this);
var currentVal = currentSelect.val() ? String(currentSelect.val()) : ""; var currentVal = currentSelect.val() ? String(currentSelect.val()) : "";
currentSelect.find("option").prop("disabled", false); currentSelect.find("option").prop("disabled", false);
selectedValues.forEach(function (v) { selectedValues.forEach(function (v) {
if (v && v !== currentVal) { if (v && v !== currentVal) {
currentSelect currentSelect
@ -265,79 +321,95 @@
if (currentSelect.hasClass("select2-hidden-accessible")) { if (currentSelect.hasClass("select2-hidden-accessible")) {
currentSelect.trigger('change.select2');
currentSelect.select2({
width: "100%",
placeholder: "-- Select --",
allowClear: true
});
} }
}); });
} }
$("select[id^='field-contact_id']").each(function() { $("select[id^='field-contact_id']").each(function() {
var select = $(this); var select = $(this);
var savedValue = select.attr('data-selected') || select.data('selected') || select.val() || ''; // Clear previous options
// जुने select2 नष्ट करा (जर आधी लागले असेल तर) var savedValue = select.attr('data-selected') || select.data('selected') || select.val() || '';
if (select.hasClass("select2-hidden-accessible")) { select.empty();
select.select2('destroy');
}
// Options रीसेट करा // Add a default 'Select' option
select.empty(); select.append(
select.append($("<option></option>").attr("value", '').text('-- Select --')); $("<option></option>")
.attr("value", '')
.text('-- Select --')
);
// Append options from contacts
contacts.forEach(function(itm) {
var option = $("<option></option>")
.attr("value", itm.value)
.text(itm.display);
// नवीन contacts append करा
contacts.forEach(function(itm) {
var option = $("<option></option>").attr("value", itm.value).text(itm.display);
if (itm.contact && itm.contact.msl_code) { // If doctor options have extra attributes
option.attr("msl_code", itm.contact.msl_code); if (itm.contact && itm.contact.msl_code) {
} option.attr("msl_code", itm.contact.msl_code);
if (itm.contact && itm.contact.speciality) { }
option.attr("speciality", itm.contact.speciality); if (itm.contact && itm.contact.speciality) {
} option.attr("speciality", itm.contact.speciality);
}
if (savedValue && String(savedValue) === String(itm.value)) { if (savedValue && String(savedValue) === String(itm.value)) {
option.prop('selected', true); option.prop('selected', true);
} }
select.append(option); select.append(option);
}); });
// Event listener bind करा // For each select element, add a change event handler to populate `msl_code` and `speciality`
select.off('change').on('change', function () { // We assume dropdowns and targets follow the pattern:
var selected = $(this).find(':selected'); // - select: field-contact_id_1, field-contact_id_2, ..., field-contact_id
var selectId = $(this).attr('id'); // - result: field-msl_code_1, field-speciality_1, etc.
var match = selectId.match(/^field-contact_id(_\d+)?$/);
var suffix = match && match[1] ? match[1] : '';
var mslCodeField = $('#field-msl_code' + suffix); // Remove any old event handlers first to prevent duplicate bindings
var specialityField = $('#field-speciality' + suffix); select.off('change').on('change', function () {
var selected = $(this).find(':selected');
var selectId = $(this).attr('id'); // e.g., field-contact_id_1
// Extract the suffix (e.g., _1 or empty)
var match = selectId.match(/^field-contact_id(_\d+)?$/);
var suffix = match && match[1] ? match[1] : '';
if (mslCodeField.length) { // Build the target msl_code and speciality field ids
mslCodeField.val(selected.attr('msl_code') || ''); var mslCodeField = $('#field-msl_code' + suffix);
} var specialityField = $('#field-speciality' + suffix);
if (specialityField.length) {
specialityField.val(selected.attr('speciality') || '');
}
enforceUniqueDoctorSelections(); if (mslCodeField.length) {
}); mslCodeField.val(selected.attr('msl_code') || '');
}
if (specialityField.length) {
specialityField.val(selected.attr('speciality') || '');
}
if (savedValue) { // Prevent selecting the same doctor across multiple dropdowns
select.val(savedValue); enforceUniqueDoctorSelections();
} });
// Select2 पुन्हा इनिशिअलाइझ करा if (savedValue) {
select.select2({ select.val(savedValue).trigger('change');
width: "100%", }
placeholder: "-- Select --",
allowClear: true
});
});
// 3. Unique selection लागू करा आणि लोडर बंद करा
enforceUniqueDoctorSelections(); });
$("#pageloader").fadeOut();
}); // Ensure unique selection is enforced after initial render
enforceUniqueDoctorSelections();
// Enable search on doctor dropdowns
applySelect2ToDoctorDropdowns();
$("#pageloader").fadeOut();
});
@ -390,7 +462,12 @@
var plandateField = document.getElementById('field-record_date'); var plandateField = document.getElementById('field-record_date');
plandateField.setAttribute('min', "2026-10-09");
plandateField.setAttribute('max', "2026-10-09");
plandateField.value="2026-10-09";
$('#field-record_date').prop('readonly', true);
}); });
</script> </script>