Team 4 (Montair LC Kid ABM)
Specific Folder FTP Upload / ftp-deploy (push) Successful in 28s Details

This commit is contained in:
zeeshan 2026-11-04 16:54:28 +05:30
parent ab0ac794ac
commit 855a07e6cf
1 changed files with 33 additions and 18 deletions

View File

@ -41,22 +41,37 @@
@endif @endif
@php @php
$currentRecordId = $id ?? null; @php
$alreadySubmittedDoctors = []; $submissions = Formhelper::getMultiformData($form->partition, $form_id, $form->user_id);
if(isset($submissions) && is_array($submissions)) { // 1. null safe check
foreach($submissions as $sub) { $submissions = $submissions->data->submissions ?? [];
// Edit करताना सध्याचा रेकॉर्ड वगळा
if($currentRecordId && isset($sub->id) && $sub->id == $currentRecordId) { $currentRecordId = $id ?? null;
continue; $alreadySubmittedDoctors = [];
}
if(isset($sub->formdata->contact_id) && !empty($sub->formdata->contact_id)) { if (!empty($submissions)) {
$alreadySubmittedDoctors[] = (string)$sub->formdata->contact_id; foreach ($submissions as $sub) {
} $subObj = (object)$sub; // safe object cast
if(isset($sub->formdata->cont_id) && !empty($sub->formdata->cont_id)) {
$alreadySubmittedDoctors[] = (string)$sub->formdata->cont_id;
} if ($currentRecordId && isset($subObj->id) && (string)$subObj->id === (string)$currentRecordId) {
} continue;
} }
if (isset($subObj->formdata)) {
$fData = (object)$subObj->formdata;
if (!empty($fData->contact_id)) {
$alreadySubmittedDoctors[] = (string)$fData->contact_id;
}
if (!empty($fData->cont_id)) {
$alreadySubmittedDoctors[] = (string)$fData->cont_id;
}
}
}
}
$alreadySubmittedDoctors = array_values(array_unique($alreadySubmittedDoctors));
@endphp
@endphp @endphp
@ -203,7 +218,7 @@
$('[data-toggle="select2"]').select2(); $('[data-toggle="select2"]').select2();
var hierarcies = []; var hierarcies = [];
var contacts = []; var contacts = [];
var submittedDoctors = {!! json_encode(array_values(array_unique($alreadySubmittedDoctors))) !!}; var submittedDoctors = @json($alreadySubmittedDoctors ?? []);
@if(isset($form->manager_can_submit) && $form->manager_can_submit == true) @if(isset($form->manager_can_submit) && $form->manager_can_submit == true)
@foreach($form->users as $option) @foreach($form->users as $option)
hierarcies.push('{{$option->hierarchy_id}}'); hierarcies.push('{{$option->hierarchy_id}}');
@ -279,7 +294,7 @@
$("[id^='field-contact_id']").each(function() { $("[id^='field-contact_id']").each(function() {
var select = $(this); var select = $(this);
// Clear previous options
//var existingVal = select.val() || select.attr('data-preselected') || ''; //var existingVal = select.val() || select.attr('data-preselected') || '';