From 3df1e8bf74bcfba51bbb41a743346da486a05330 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Mon, 25 May 2026 13:41:14 +0530 Subject: [PATCH 01/32] team4 changes --- ...600f-1613-4a82-af1d-f460a8f79ffa.blade.php | 152 ++- ...c3e9-b341-4429-81fa-f4ac41711912.blade.php | 166 +++- ...5a6c-519f-49fb-b8aa-54f4116f28d5.blade.php | 865 +++++++++++++----- ...1986-1393-408b-87ec-f0dd77dae110.blade.php | 211 ++++- ...ad7d-9c7b-4b7c-bef5-5fed13a0fc04.blade.php | 110 ++- ...b301-bb23-48fd-9f94-ad4f1959d0a6.blade.php | 798 ++++++++++++++++ 6 files changed, 2009 insertions(+), 293 deletions(-) create mode 100644 resources/views/form/rapport-team4/1779442011-6310b301-bb23-48fd-9f94-ad4f1959d0a6.blade.php diff --git a/resources/views/form/rapport-team4/1741155802-25a7600f-1613-4a82-af1d-f460a8f79ffa.blade.php b/resources/views/form/rapport-team4/1741155802-25a7600f-1613-4a82-af1d-f460a8f79ffa.blade.php index dbeee750..a9084445 100644 --- a/resources/views/form/rapport-team4/1741155802-25a7600f-1613-4a82-af1d-f460a8f79ffa.blade.php +++ b/resources/views/form/rapport-team4/1741155802-25a7600f-1613-4a82-af1d-f460a8f79ffa.blade.php @@ -60,7 +60,7 @@ Camp Plan Date Execution Done Doctor Name - Other Doctor Name + {{-- Other Doctor Name --}} Camp Execution Date Reporting Date @@ -110,19 +110,19 @@ $today=date('d',strtotime("-1 months")); ?> - @if($sub->workflow_status == 'approved') + @if ( $planDate && $planDate->between($startOfCurrentMonth, $fifthOfNextMonth) && $now->greaterThanOrEqualTo($planDate)) - @endif - @elseif ($sub->workflow_status == 'rejected' || + + {{-- @elseif ($sub->workflow_status == 'rejected' || (isset($sub->formdata->execution_done) && $sub->formdata->execution_done == 'no')) + --}} @endif @@ -142,17 +142,18 @@ {{ '' }} @endif - + + {{-- @if (isset($sub->formdata->contact_id_2) && $sub->formdata->contact_id_2 !== '') {{ $sub->formdata->contact_id_2 }} @elseif (isset($sub->formdata->doctor_name)) {{ $sub->formdata->doctor_name }} @else - {{-- Default value or empty string, adjust as needed --}} + {{ '' }} @endif - + --}} {{$sub->formdata->execution_date}} {{isset($sub->formdata->record_date ) ? $sub->formdata->record_date : ''}} @@ -247,16 +248,20 @@ @if ($question->code == 'contact_id') @foreach ($question->options as $option) - @if( isset($option->contact->ardc_camp_doctor_octnov) && $option->contact->ardc_camp_doctor_octnov == 'Yes' ) - - @endif + @endforeach - + --}} @elseif($question->code=='contact_id_2') @foreach ($question->options as $option) @@ -534,7 +539,7 @@ }); $('#execution-total_rxns').prop({"readonly":true}); - $('#execution-executed_as_per_plan').prop("disabled",true); + //$('#execution-executed_as_per_plan').prop("disabled",true); // $('#execution-patients_diagnosed').on('change',function(){ // let a=document.getElementById('execution-patients_diagnosed'); @@ -572,10 +577,10 @@ e.preventDefault(); }) - let contact2 = document.getElementById('execution-contact_id_2'); + /* let contact2 = document.getElementById('execution-contact_id_2'); contact2.addEventListener('mousedown', function(e) { e.preventDefault(); - }) + }) */ let camp_planned_start = document.getElementById('execution-camp_planned_start_time'); @@ -666,6 +671,8 @@ $('#execution-form').append(''); }) + + /* $('.edit-plan-btn').click(function() { $('#execution-form-wrapper').show(100, () => { $('#add-camp-btn').hide(0); @@ -772,6 +779,10 @@ } }) + */ + + + $('#report-form').on('submit', function(event) { event.preventDefault(); @@ -819,12 +830,30 @@ - $('#field-contact_id').change(function() { + /*$('#field-contact_id').change(function() { $('#field-speciality').val($('option:selected', this).attr('speciality')) }) $('#field-contact_id').change(function() { $('#field-msl_code').val($('option:selected', this).attr('legacy_code')) + })*/ + + + $('#field-contact_id').change(function() { + $('#field-speciality').val($('option:selected', this).attr('speciality')) + $('#field-msl_code').val($('option:selected', this).attr('legacy_code')) + let restricted=$(this).find(":selected").attr('ardc_css_restricted_drs'); + console.log("restricted:",restricted); + if (restricted === 'Yes') { + + alert('Planning with these Doctors not allowed'); + + // Deselect current option + $(this).val('').trigger('change'); + + // Clear msl code as well + $('#field-msl_code').val(''); + } }) @@ -974,6 +1003,95 @@ }); + + + + \ No newline at end of file diff --git a/resources/views/form/rapport-team4/1741169144-1a2dc3e9-b341-4429-81fa-f4ac41711912.blade.php b/resources/views/form/rapport-team4/1741169144-1a2dc3e9-b341-4429-81fa-f4ac41711912.blade.php index 9483a668..197200b7 100644 --- a/resources/views/form/rapport-team4/1741169144-1a2dc3e9-b341-4429-81fa-f4ac41711912.blade.php +++ b/resources/views/form/rapport-team4/1741169144-1a2dc3e9-b341-4429-81fa-f4ac41711912.blade.php @@ -71,6 +71,14 @@ if (!empty($history->data->submissions)) { } } } +/* +echo "
"; +echo "
";
+print_r($history->data->submissions);
+echo "
"; + +echo "
"; +*/ @endphp @@ -128,7 +136,7 @@ if (!empty($history->data->submissions)) { Camp Plan Date Execution Done Doctor Name - Other Doctor Name + {{-- Other Doctor Name --}} Camp Execution Date Legacy Code Speciality @@ -172,19 +180,19 @@ if (!empty($history->data->submissions)) { - @if($sub->workflow_status == 'approved') + @if ( $planDate && $planDate->between($startOfCurrentMonth, $fifthOfNextMonth) && $now->greaterThanOrEqualTo($planDate)) - @endif - @elseif ($sub->workflow_status == 'rejected' || + + {{-- @elseif ($sub->workflow_status == 'rejected' || (isset($sub->formdata->execution_done) && $sub->formdata->execution_done == 'no')) + --}} @endif {{ $sub->formdata->plan_date }} @@ -202,17 +210,17 @@ if (!empty($history->data->submissions)) { {{ '' }} @endif - + {{-- @if (isset($sub->formdata->contact_id_2) && $sub->formdata->contact_id_2 !== '') {{ $sub->formdata->contact_id_2 }} @elseif (isset($sub->formdata->doctor_name)) {{ $sub->formdata->doctor_name }} @else - {{-- Default value or empty string, adjust as needed --}} + {{ '' }} @endif - + --}} {{$sub->formdata->execution_date}} {{isset($sub->formdata->msl_code) ? $sub->formdata->msl_code : '' }} @@ -304,16 +312,21 @@ if (!empty($history->data->submissions)) { @if ($question->code == 'contact_id') @foreach ($question->options as $option) - @if( isset($option->contact->css_camp_doctor_octnov) && $option->contact->css_camp_doctor_octnov == 'Yes' ) - @endif @endforeach - + --}} @elseif($question->code=='contact_id_2') @foreach ($question->options as $option) @@ -424,9 +437,9 @@ if (!empty($history->data->submissions)) { @endif @endforeach - + --}} @@ -599,10 +612,10 @@ if (!empty($history->data->submissions)) { e.preventDefault(); }) - let contact2 = document.getElementById('execution-contact_id_2'); + /* let contact2 = document.getElementById('execution-contact_id_2'); contact2.addEventListener('mousedown', function(e) { e.preventDefault(); - }) + }) */ // let typeOfDr = document.getElementById('execution-type_of_dr'); // typeOfDr.addEventListener('mousedown', function(e) { @@ -696,6 +709,7 @@ if (!empty($history->data->submissions)) { }) + /* $('.edit-plan-btn').click(function() { $('#execution-form-wrapper').show(100, () => { $('#add-camp-btn').hide(0); @@ -801,6 +815,9 @@ if (!empty($history->data->submissions)) { $typeDr.on('change', toggleFlutter); }) + */ + + $('#report-form').on('submit', function(event) { event.preventDefault(); @@ -832,28 +849,28 @@ if (!empty($history->data->submissions)) { }); }); - // $('#execution-sitazit_d_rx').attr({ - // "min":0, - // "max":50 - // }); - // $('#execution-sitazit_dm_rx').attr({ - // "min":0, - // "max":50 - // }); - // $('#execution-ziten_m_rx').attr({ - // "min":0, - // "max":50 - // }); - + $('#field-contact_id').change(function() { - $('#field-speciality').val($('option:selected', this).attr( - 'speciality')) + }) $('#field-contact_id').change(function() { - $('#field-msl_code').val($('option:selected', this).attr('msl_code')) + $('#field-speciality').val($('option:selected', this).attr('speciality')) + $('#field-msl_code').val($('option:selected', this).attr('msl_code')) + let restricted=$(this).find(":selected").attr('ardc_css_restricted_drs'); + console.log("restricted:",restricted); + if (restricted === 'Yes') { + + alert('Planning with these Doctors not allowed'); + + // Deselect current option + $(this).val('').trigger('change'); + + // Clear msl code as well + $('#field-msl_code').val(''); + } }) @@ -883,6 +900,7 @@ if (!empty($history->data->submissions)) { $('#field-contact_id_2').change(function() { $('#field-msl_code').val($('option:selected', this).attr('msl_code')) + }) $('#execution-form').on('submit', function(event) { @@ -1246,8 +1264,92 @@ $(document).ready(function () { }); + diff --git a/resources/views/form/rapport-team4/1769684976-dc875a6c-519f-49fb-b8aa-54f4116f28d5.blade.php b/resources/views/form/rapport-team4/1769684976-dc875a6c-519f-49fb-b8aa-54f4116f28d5.blade.php index ede83ba8..e2f6f13f 100644 --- a/resources/views/form/rapport-team4/1769684976-dc875a6c-519f-49fb-b8aa-54f4116f28d5.blade.php +++ b/resources/views/form/rapport-team4/1769684976-dc875a6c-519f-49fb-b8aa-54f4116f28d5.blade.php @@ -1,13 +1,57 @@ + @include('layouts.shared/title-meta', ['title' => "Form"]) @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) + +
- processing... + processing...
+
@@ -24,7 +68,8 @@

{{$form->title}}

- @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) + @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' + ) )
@if($form->link_type == 'form') View History @@ -38,11 +83,19 @@
Submitted By: {{$form->user_info->name}}
@endif + + @php + $submissions = Formhelper::getMultiformData( $form->partition, $form_id, $form->user_id); + $submissions = $submissions->data->submissions; + + + @endphp + @if(count($submissions)===0 || $id)
@csrf @if($id) - + @endif @if(isset($form->manager_can_submit) && $form->manager_can_submit == true)
@@ -56,83 +109,181 @@
@endif - - @foreach($questions as $question) -
- + @if( !in_array($question->code, + ["record_date","select_rxber_type"] ) ) + @continue; + @endif +
+ @switch($question->type) + @case('hidden') + + @break + @case('text') + @case('email') + @case('tel') + @case('date') + required == 'yes'?'required':'' }} + value="{{isset($question->value)?$question->value:''}}"> + @break + @case('number') + required == 'yes'?'required':'' }} + value="{{isset($question->value)?$question->value:0}}"> + @break + @case('textarea') + + @break + @case('dropdown') + + @break + @endswitch +
+ @endforeach +
+ + @foreach($questions as $question) + @if( in_array($question->code, + ["record_date","select_rxber_type"] ) ) + @continue; + @endif +
+ + @switch($question->type) @case('hidden') - - @break + + @break @case('text') @case('email') @case('tel') @case('date') - required == 'yes'?'required':'' }} value="{{isset($question->value)?$question->value:''}}"> - @break + required == 'yes'?'required':'' }} + value="{{isset($question->value)?$question->value:''}}"> + @break @case('number') - required == 'yes'?'required':'' }} value="{{isset($question->value)?$question->value:0}}"> - @break + required == 'yes'?'required':'' }} + value="{{isset($question->value)?$question->value:0}}"> + @break @case('textarea') - - @break + + @break @case('dropdown') - required == 'yes' ? 'required' : '' }}> + + @foreach ($question->options as $option) + + + + + @endforeach + + @else + @endif - - @break + @break @case('checkbox') + @foreach($question->options as $option) +
+ value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked':''}}> + +
+ @endforeach + @break + @case('file') + @if(!isset($form->is_approval) || (isset($form->is_approval) && + $form->is_approval != 'yes' ) ) + required == 'yes'?'required':'' }}> + @elseif(isset($question->value)) + + @endif + + @break + @case('multitextbox') +
@foreach($question->options as $option) -
- value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked':''}}> - +
{{$option->display}}
+
+
@endforeach - @break - @case('file') - @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) - required == 'yes'?'required':'' }}> - @elseif(isset($question->value)) - - @endif - - @break - @case('multitextbox') -
- @foreach($question->options as $option) -
{{$option->display}}
-
- -
- @endforeach -
- @break - @endswitch +
+ @break + @endswitch
- @endforeach - @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) -
+ @endforeach +
+
+ +
+ @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != + 'yes' ) ) +
+ @if(!$id) + + @endif
@endif - + @elseif(!$id) +

You have submitted 10 doctors

+ @endif
@@ -146,37 +297,415 @@
- + @include('layouts.shared/footer-script') + + + - + - \ No newline at end of file + diff --git a/resources/views/form/rapport-team4/1777991655-af4c1986-1393-408b-87ec-f0dd77dae110.blade.php b/resources/views/form/rapport-team4/1777991655-af4c1986-1393-408b-87ec-f0dd77dae110.blade.php index 3e7551f7..bd8cede1 100644 --- a/resources/views/form/rapport-team4/1777991655-af4c1986-1393-408b-87ec-f0dd77dae110.blade.php +++ b/resources/views/form/rapport-team4/1777991655-af4c1986-1393-408b-87ec-f0dd77dae110.blade.php @@ -81,16 +81,16 @@
@endif - + {{--
+ +
--}}
-
-
Doctor
- +
+ {{--
Doctor
--}} +
@foreach($doctorQuestions as $question) @@ -107,7 +107,7 @@ required == 'yes'?'required':'' }} value="{{isset($question->value)?$question->value:''}}"> @break @case('number') - required == 'yes'?'required':'' }} value="{{isset($question->value)?$question->value:0}}"> + required == 'yes'?'required':'' }} value="{{isset($question->value)?$question->value:0}}"> @break @case('textarea') @@ -166,16 +166,12 @@
@if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) - -
-
- -
-
- -
+
+ +
+
+
- @endif @@ -362,6 +358,189 @@ }); }); + + $(document).ready(function () { + + // Define doctor dropdown + let $doctorSelect = $('.js-contact-id'); + + // Store original options + let originalOptions = $doctorSelect.find('option').clone(); + + $(document).on('change', '.js-campaign-type', function () { + + /* let selectedCampaign = $(this).html(); */ + let selectedCampaign = ($(this).val() || '').trim(); + + selectedCampaign = selectedCampaign.replace(/@/g, '').replace(/\s+/g, ' ').trim(); + + + /* if (selectedCampaign === '7 PM Conversion Campaign') { + console.log("Selected 7 PM"); + $('[data-code="rxs_given_for_montair_lc_adult"]') + .attr('min', 15); + + } else if (selectedCampaign === 'MLC A Pedia Campaign') { + console.log("Selected MLC A"); + $('[data-code="rxs_given_for_montair_lc_adult"]') + .attr('min', 8); + + } */ + + + let $wrapper2 = $(this).closest('.doctor-card'); + + let $rxField = $wrapper2.find('[data-code="rxs_given_for_montair_lc_adult"]'); + + if (selectedCampaign === '7 PM Conversion Campaign') { + console.log("Selected 7 PM"); + + $rxField.attr('min', 15); + + } else if (selectedCampaign === 'MLC A Pedia Campaign') { + console.log("Selected MLC A"); + + $rxField.attr('min', 8); + } + + + + console.log("Selected Campaign:", selectedCampaign); + + let $wrapper = $(this).closest('.doctor-card'); + + // Doctor dropdown ONLY inside current wrapper + $doctorSelect = $wrapper.find('.js-contact-id'); + + // Destroy select2 temporarily + $doctorSelect.select2('destroy'); + + // Empty dropdown + $doctorSelect.empty(); + + // Array to collect pediatrician doctors + let pediatricianDoctors = []; + + // Loop through original options + originalOptions.each(function () { + + let $option = $(this).clone(); + /* console.log($option); */ + + let speciality = ($option.attr('speciality') || '').trim(); + + + /* console.log("Speciality:", speciality); */ + + // Keep default option + if ($option.val() === '') { + console.log("Doctor:",$option.val()); + $doctorSelect.append($option); + return; + } + + // Show all doctors + if (selectedCampaign === '7 PM Conversion Campaign') { + console.log("7PM"); + $doctorSelect.append($option); + }else if (selectedCampaign === 'MLC A Pedia Campaign') { + console.log("*",selectedCampaign); + + + if (speciality === 'PAEDIATRICIAN' || speciality === 'Paediatrician' ||speciality === 'paediatrician' ) { + + pediatricianDoctors.push($option) + + + } + + } + + + + }); + + // Append pediatrician doctors + if (selectedCampaign === 'MLC A Pedia Campaign') { + + pediatricianDoctors.forEach(function ($doctor) { + + $doctorSelect.append($doctor); + }); + } + + // Reinitialize select2 + $doctorSelect.select2(); + + // Reset selection + $doctorSelect.val('').trigger('change'); + }); + + + + + }); + + + $('#field-record_date').closest('.col-md-12').before(` +
+
+ +
+ Campaign Guidelines +
+ +
+
+ 7PM Conversion Campaign +
+ +

+ Target Drs : + 25 Drs Mont+Fexo & Mont+Bila Drs +

+ +

+ Conversion : + 5 Conversions for Montair LC Adult +

+ +

+ Goal : + Each conversion with 15 Rxs Montair LC Adult +

+
+ +
+ +
+
+ MLC Adult @Pedia +
+ +

+ Target Drs : + 10 Drs Mont+Fexo & Mont+Bila Drs +

+ +

+ Conversion : + 5 Conversions for Montair LC Adult +

+ +

+ Goal : + Each conversion with 8 Rxs Montair LC Adult +

+
+ +
+
+`); + + + $('#report-form').on('submit', function(event){ event.preventDefault(); $("#pageloader").fadeIn(); diff --git a/resources/views/form/rapport-team4/1778148311-e733ad7d-9c7b-4b7c-bef5-5fed13a0fc04.blade.php b/resources/views/form/rapport-team4/1778148311-e733ad7d-9c7b-4b7c-bef5-5fed13a0fc04.blade.php index a3a0af07..aef91851 100644 --- a/resources/views/form/rapport-team4/1778148311-e733ad7d-9c7b-4b7c-bef5-5fed13a0fc04.blade.php +++ b/resources/views/form/rapport-team4/1778148311-e733ad7d-9c7b-4b7c-bef5-5fed13a0fc04.blade.php @@ -328,7 +328,115 @@ }); @endif - + + + /* for (let i = 1; i <= 10; i++) { + + $(`#field-email_id_${i}`).on('input', function () { + + // Remove spaces + this.value = this.value.replace(/\s/g, ''); + }); + + $(`#field-email_id_${i}`).on('blur', function () { + + let email = $(this).val().trim(); + + let emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; + + if (email !== '' && !emailPattern.test(email)) { + alert('Please enter a valid email address'); + $(this).focus(); + } + }); + + } */ + + for (let i = 1; i <= 10; i++) { + + $(`#field-email_id_${i}`).on('input', function () { + + // Remove spaces + this.value = this.value.replace(/\s/g, ''); + + }); + + $(`#field-email_id_${i}`).on('blur', function () { + + let email = $(this).val().trim(); + + let emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; + + // Remove old error + $(this).next('.email-error').remove(); + + if (email !== '' && !emailPattern.test(email)) { + + $(this).addClass('is-invalid'); + + $(this).after(` + + `); + + } else { + + $(this).removeClass('is-invalid'); + + } + + }); + + } + + + for(let i=1;i<=10;i++){ + $(`#field-msl_code_${i}`).prop('readonly',true); + $(`#field-speciality_${i}`).prop('readonly',true); + + } + + for (let i = 1; i <= 10; i++) { + + $(`#field-mobile_number_${i}`).on('input', function () { + + // Allow only numbers + this.value = this.value.replace(/\D/g, ''); + + // Limit to 10 digits + if (this.value.length > 10) { + this.value = this.value.slice(0, 10); + } + + }); + + // Validation on form submit / field blur + $(`#field-mobile_number_${i}`).on('blur', function () { + + if (this.value.length !== 10) { + $(this).addClass('is-invalid'); + + // Optional message + if (!$(this).next('.error-msg').length) { + $(this).after( + ` + Mobile number must be exactly 10 digits + ` + ); + } + + } else { + $(this).removeClass('is-invalid'); + $(this).next('.error-msg').remove(); + } + + }); + } + + + + // Loop through hierarcies and fetch contacts for each hierarchy, store in contacts variable // $('#field-user_id').change(function(){ diff --git a/resources/views/form/rapport-team4/1779442011-6310b301-bb23-48fd-9f94-ad4f1959d0a6.blade.php b/resources/views/form/rapport-team4/1779442011-6310b301-bb23-48fd-9f94-ad4f1959d0a6.blade.php new file mode 100644 index 00000000..503d9c04 --- /dev/null +++ b/resources/views/form/rapport-team4/1779442011-6310b301-bb23-48fd-9f94-ad4f1959d0a6.blade.php @@ -0,0 +1,798 @@ + + + + + @include('layouts.shared/title-meta', ['title' => "Form"]) + @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) + + + + +
+ processing... +
+ + + + + + @include('layouts.shared/footer-script') + + + + + + From aef085f3cb5a6868afa5cd77d24b31f7a2e6a804 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Mon, 25 May 2026 14:08:08 +0530 Subject: [PATCH 02/32] vitalis 5 --- .vscode/settings.json | 0 ...8ceeb99-b393-47b7-9e3b-850a1d42c204.blade.php | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..e69de29b diff --git a/resources/views/form/rapport-vitalis5/1741672502-78ceeb99-b393-47b7-9e3b-850a1d42c204.blade.php b/resources/views/form/rapport-vitalis5/1741672502-78ceeb99-b393-47b7-9e3b-850a1d42c204.blade.php index 409de008..8ee23d8f 100644 --- a/resources/views/form/rapport-vitalis5/1741672502-78ceeb99-b393-47b7-9e3b-850a1d42c204.blade.php +++ b/resources/views/form/rapport-vitalis5/1741672502-78ceeb99-b393-47b7-9e3b-850a1d42c204.blade.php @@ -81,8 +81,20 @@ required == 'yes' ? 'required' : '' }}> @foreach ($question->options as $option) - --}} + + @endforeach @@ -188,6 +203,7 @@ $('label[for="field-cresar_am_pob_strips"]').append('w-100').html("

Report POB

Cresar-AM POB Strips *
") $('label[for="field-new_conversion"]').append('w-100').html("

Report Conversion

New Conversion *
") + $('#field-speciality,#field-msl_code,#field-pcode').attr('readonly',true); $('#field-contact_id').change(function() { $('#field-speciality').val($('option:selected', this).attr( From bf42dbf73436efcd3529ade61b987c98a52c32e3 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Mon, 25 May 2026 15:17:10 +0530 Subject: [PATCH 04/32] GennovaDC Changes --- ...3d1a-8d00-4800-9b88-e78815ece1d4.blade.php | 81 +++++++++++++++++-- 1 file changed, 76 insertions(+), 5 deletions(-) diff --git a/resources/views/form/rapport-gennovadc/1777713876-e5a33d1a-8d00-4800-9b88-e78815ece1d4.blade.php b/resources/views/form/rapport-gennovadc/1777713876-e5a33d1a-8d00-4800-9b88-e78815ece1d4.blade.php index f18fee2c..de79c334 100644 --- a/resources/views/form/rapport-gennovadc/1777713876-e5a33d1a-8d00-4800-9b88-e78815ece1d4.blade.php +++ b/resources/views/form/rapport-gennovadc/1777713876-e5a33d1a-8d00-4800-9b88-e78815ece1d4.blade.php @@ -584,7 +584,7 @@ $brandData2 = [ + class="form-control form-control-large" value="{{ isset($formdata->{$brand['slug']}) ? $formdata->{$brand['slug']} : 0 }}" > @@ -941,7 +941,9 @@ $brandData2 = [ } }) */ - $('[id*="_transplant_"][id*="week"]').prop('readonly', true); + $('[id*="_transplant_"][id*="week"]').prop('readonly', true); + + $('#execution-execution_week').on('change', function () { @@ -964,12 +966,17 @@ $brandData2 = [ }); }); } + + $('#execution-total_transplant').prop('readonly', true); + + $('[id^="execution-total_transplant_"]').prop('readonly', true); + }); - $(document).on('input', '[id*="_transplant_"][id*="week"]', function () { + /* $(document).on('input', '[id*="_transplant_"][id*="week"]', function () { const organs = ['kidney', 'liver', 'heart', 'cardio']; const organsWeek = ['kidney', 'liver', 'heart']; // exclude cardio @@ -1021,8 +1028,68 @@ $brandData2 = [ // ------------------------- $('#execution-total_transplant').val(totalTransplant); + }); */ + + + $(document).on('input','[id*="_transplant_"]',function () { + + const organs = ['kidney', 'liver', 'heart']; + const organsWeek = ['kidney', 'liver', 'heart']; + const types = ['gennova', 'switch', 'graftsol']; + + // ------------------------- + // 1. WEEK-WISE TOTALS + // ------------------------- + for (let week = 1; week <= 4; week++) { + + types.forEach(type => { + + let total = 0; + + organsWeek.forEach(organ => { + + let id = `#execution-${organ}_transplant_${type}_week${week}`; + + total += parseInt($(id).val()) || 0; + + }); + + $(`#execution-total_transplant_${type}_week${week}`).val(total); + + }); + + } + + // ------------------------- + // 2. FIRST COLUMN GRAND TOTAL + // ------------------------- + let firstColumnTotal = 0; + + organs.forEach(organ => { + + firstColumnTotal += parseInt( + $(`#execution-${organ}_transplant`).val() + ) || 0; + + }); + + $('#execution-total_transplant').val(firstColumnTotal); + }); - + + $(document).on('input','#execution-kidney_transplant, #execution-liver_transplant, #execution-heart_transplant',function () { + + let total = + (parseInt($('#execution-kidney_transplant').val()) || 0) + + (parseInt($('#execution-liver_transplant').val()) || 0) + + (parseInt($('#execution-heart_transplant').val()) || 0); + + $('#execution-total_transplant').val(total); + + } + ); + + }) @@ -1217,8 +1284,12 @@ $brandData2 = [ // }); $('.edit-btn').click(function() { + let today = new Date().toISOString().split('T')[0]; var executionexeField = document.getElementById('execution-execution_date'); - executionexeField.setAttribute('min', executionDateField.value); + console.log("Edit execution date"); + //executionexeField.setAttribute('min', executionDateField.value); + executionexeField.setAttribute('max',today); + }); From 20cd8795ab51f92ad2e08fb7ae68ced9deee829e Mon Sep 17 00:00:00 2001 From: zeeshan Date: Mon, 25 May 2026 15:40:47 +0530 Subject: [PATCH 05/32] Team 3 Changes --- ...e7c9-c60e-410e-ada7-8e0fef8e6ac4.blade.php | 50 ++----------------- 1 file changed, 3 insertions(+), 47 deletions(-) diff --git a/resources/views/form/rapport-team3/1655458544-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac4.blade.php b/resources/views/form/rapport-team3/1655458544-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac4.blade.php index 67afb54f..c1b1446b 100644 --- a/resources/views/form/rapport-team3/1655458544-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac4.blade.php +++ b/resources/views/form/rapport-team3/1655458544-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac4.blade.php @@ -601,47 +601,7 @@ $(document).ready(function () { } - /* - function setDateRange() { - let today = new Date(); - - let currentDay = today.getDate(); - let currentMonth = today.getMonth(); - let currentYear = today.getFullYear(); - - let lastDayOfMonth = new Date(currentYear, currentMonth + 1, 0).getDate(); - - if (currentDay >= 25 || currentDay === lastDayOfMonth) { - - let nextMonthStart = new Date(currentYear, currentMonth + 1, 1); - let nextMonthEnd = new Date(currentYear, currentMonth + 2, 0); - - $('#field-plan_date') - .attr('min', formatYMD(nextMonthStart)) - .attr('max', formatYMD(nextMonthEnd)) - .val(formatYMD(nextMonthStart)) - .prop('disabled', false); - - // $('#execution-plan_date') - // .attr('min', formatYMD(nextMonthStart)) - // .attr('max', formatYMD(nextMonthEnd)) - // .val(formatYMD(nextMonthStart)) - // .prop('disabled', false); - - } else { - $('#field-plan_date') - .val('') - .prop('disabled', true); - - // $('#execution-plan_date') - // .val('') - // .prop('disabled', true); - } - } - - setDateRange(); - */ - +/* function setPlanDateRange() { let today = new Date(); @@ -677,13 +637,9 @@ function setPlanDateRange() { // Call on page load setPlanDateRange(); - + */ -// $(function () { -// $('#field-plan_date') -// .attr('min', '2026-02-01') -// .attr('max', '2026-02-28'); // use 29 if leap year -// }); + From c386278d13ca9da7cb0cab2db7461e27891cb453 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Mon, 25 May 2026 16:05:59 +0530 Subject: [PATCH 06/32] Team3 Changes --- ...a43b-8be4-418a-ab42-cbb1dcae232e.blade.php | 848 +++++++----------- ...81c6-b4d0-4c27-8790-b197973e8c03.blade.php | 56 ++ 2 files changed, 396 insertions(+), 508 deletions(-) diff --git a/resources/views/form/rapport-team3/1774866189-e645a43b-8be4-418a-ab42-cbb1dcae232e.blade.php b/resources/views/form/rapport-team3/1774866189-e645a43b-8be4-418a-ab42-cbb1dcae232e.blade.php index 387d67b0..2c771f21 100644 --- a/resources/views/form/rapport-team3/1774866189-e645a43b-8be4-418a-ab42-cbb1dcae232e.blade.php +++ b/resources/views/form/rapport-team3/1774866189-e645a43b-8be4-418a-ab42-cbb1dcae232e.blade.php @@ -1,55 +1,13 @@ - - @include('layouts.shared/title-meta', ['title' => 'Form']) - @include('layouts.shared/head-css', ['mode' => $mode ?? '', 'demo' => $demo ?? '']) - + @include('layouts.shared/title-meta', ['title' => "Form"]) + @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) +
- processing... + processing...
- -@php - // echo "
";
-    // print_r($form);
-    // exit;
-
-    $data = DB::table('team3_tripleimpact')->where('hierarchy_id', $form->hierarchy_id)->get();
-    // echo "
";
-    // print_r($data);
-    // exit;
-
-    $history = Formhelper::getMultiformData($form->partition, $form->form_id, $form->user_id);
-    // echo '
';
-    // print_r($history);
-    // echo '
';
-    // exit
-
-    $existingCounts = [
-        'chest' => 0,
-        'pedia' => 0,
-        'gp' => 0,
-    ];
-
-    if (!empty($history->data->submissions)) {
-        foreach ($history->data->submissions as $sub) {
-            $spec = strtolower($sub->formdata->speciality ?? '');
-
-            if ($spec === 'chest') {
-                $existingCounts['chest']++;
-            }
-            if ($spec === 'pedia') {
-                $existingCounts['pedia']++;
-            }
-            if ($spec === 'gp') {
-                $existingCounts['gp']++;
-            }
-        }
-    }
-
-@endphp
-
 
     
+        
+
+ + +@include('layouts.shared/footer-script') + + + + + \ No newline at end of file From 2b24f95efb013ab035e235c10cecf5cf65ec6e92 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Tue, 26 May 2026 16:20:18 +0530 Subject: [PATCH 22/32] Glenmark (Form 2) --- ...54e2-5551-46fe-9603-9591728bc15c.blade.php | 333 ++++++++++++++++++ 1 file changed, 333 insertions(+) create mode 100644 resources/views/form/rapport-glenmarkcv/1779082388-17bb54e2-5551-46fe-9603-9591728bc15c.blade.php diff --git a/resources/views/form/rapport-glenmarkcv/1779082388-17bb54e2-5551-46fe-9603-9591728bc15c.blade.php b/resources/views/form/rapport-glenmarkcv/1779082388-17bb54e2-5551-46fe-9603-9591728bc15c.blade.php new file mode 100644 index 00000000..f3c0ad10 --- /dev/null +++ b/resources/views/form/rapport-glenmarkcv/1779082388-17bb54e2-5551-46fe-9603-9591728bc15c.blade.php @@ -0,0 +1,333 @@ + + + + @include('layouts.shared/title-meta', ['title' => "Form"]) + @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) + + +
+ processing... +
+ + + + +@include('layouts.shared/footer-script') + + + + + \ No newline at end of file From b80be9ff7f08e1016d043279567504428143d51f Mon Sep 17 00:00:00 2001 From: zeeshan Date: Tue, 26 May 2026 16:22:40 +0530 Subject: [PATCH 23/32] Glenmark (Form 3) --- ...260b-40d2-4f1f-950c-3b327701ec2d.blade.php | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/resources/views/form/rapport-glenmarkcv/1779081191-58b7260b-40d2-4f1f-950c-3b327701ec2d.blade.php b/resources/views/form/rapport-glenmarkcv/1779081191-58b7260b-40d2-4f1f-950c-3b327701ec2d.blade.php index 9fc149ae..b500d3f4 100644 --- a/resources/views/form/rapport-glenmarkcv/1779081191-58b7260b-40d2-4f1f-950c-3b327701ec2d.blade.php +++ b/resources/views/form/rapport-glenmarkcv/1779081191-58b7260b-40d2-4f1f-950c-3b327701ec2d.blade.php @@ -285,7 +285,30 @@ } ); + + $('#field-upload_supporting_document').on('change', function () { + let file = this.files[0]; + + if (file) { + let allowedTypes = ['image/png', 'image/jpg', 'image/jpeg']; + let maxSize = 10 * 1024 * 1024; // 10 MB + + // Type validation + if (!allowedTypes.includes(file.type)) { + alert('Only PNG, JPG, and JPEG files are allowed.'); + $(this).val(''); + return; + } + + // Size validation + if (file.size > maxSize) { + alert('File size should not exceed 10 MB.'); + $(this).val(''); + return; + } + } + }); From 5fd1b86619f451298588f4307609e79e740d465a Mon Sep 17 00:00:00 2001 From: zeeshan Date: Tue, 26 May 2026 16:26:15 +0530 Subject: [PATCH 24/32] Glenmark (Form 4) --- ...8e84-aeba-4ab8-b468-eb470ee6cc35.blade.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/resources/views/form/rapport-glenmarkcv/1779081113-c6488e84-aeba-4ab8-b468-eb470ee6cc35.blade.php b/resources/views/form/rapport-glenmarkcv/1779081113-c6488e84-aeba-4ab8-b468-eb470ee6cc35.blade.php index 9830183d..fbb34309 100644 --- a/resources/views/form/rapport-glenmarkcv/1779081113-c6488e84-aeba-4ab8-b468-eb470ee6cc35.blade.php +++ b/resources/views/form/rapport-glenmarkcv/1779081113-c6488e84-aeba-4ab8-b468-eb470ee6cc35.blade.php @@ -353,7 +353,28 @@ syncLOBGTotal(); + $('#field-upload_supporting_document').on('change', function () { + let file = this.files[0]; + if (file) { + let allowedTypes = ['image/png', 'image/jpg', 'image/jpeg']; + let maxSize = 10 * 1024 * 1024; // 10 MB + + // Type validation + if (!allowedTypes.includes(file.type)) { + alert('Only PNG, JPG, and JPEG files are allowed.'); + $(this).val(''); + return; + } + + // Size validation + if (file.size > maxSize) { + alert('File size should not exceed 10 MB.'); + $(this).val(''); + return; + } + } + }); }); From 929f2515a3ae4cf3e689d9b8060bbfae1d055e18 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Tue, 26 May 2026 17:26:38 +0530 Subject: [PATCH 25/32] Team4 (DRopdown Changes) --- ...442011-6310b301-bb23-48fd-9f94-ad4f1959d0a6.blade.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/views/form/rapport-team4/1779442011-6310b301-bb23-48fd-9f94-ad4f1959d0a6.blade.php b/resources/views/form/rapport-team4/1779442011-6310b301-bb23-48fd-9f94-ad4f1959d0a6.blade.php index 503d9c04..c8467a9c 100644 --- a/resources/views/form/rapport-team4/1779442011-6310b301-bb23-48fd-9f94-ad4f1959d0a6.blade.php +++ b/resources/views/form/rapport-team4/1779442011-6310b301-bb23-48fd-9f94-ad4f1959d0a6.blade.php @@ -578,9 +578,12 @@ echo ""; let slug = createSlug2($(this).val()); $('#report-form').append( - '' + '' ); }); + + + @@ -707,8 +710,10 @@ echo ""; let slug = createSlug($(this).val()); + let index = fieldId.split('-').pop(); + $('#report-form').append( - '' + '' ); }); From 9eb935aac8e57b30e2ed12cc5d8281c967a02334 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Tue, 26 May 2026 18:17:44 +0530 Subject: [PATCH 26/32] Horizon (Zion 2 Changes) --- .../1776162763-2593f6ae-5950-4a39-9c3a-bf1e1ebbe700.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/form/rapport-horizon/1776162763-2593f6ae-5950-4a39-9c3a-bf1e1ebbe700.blade.php b/resources/views/form/rapport-horizon/1776162763-2593f6ae-5950-4a39-9c3a-bf1e1ebbe700.blade.php index af0a5dd4..92bc0b3a 100644 --- a/resources/views/form/rapport-horizon/1776162763-2593f6ae-5950-4a39-9c3a-bf1e1ebbe700.blade.php +++ b/resources/views/form/rapport-horizon/1776162763-2593f6ae-5950-4a39-9c3a-bf1e1ebbe700.blade.php @@ -95,7 +95,7 @@ $brandData = [ /* ['brand'=>"NEKSIUM 20mg TAB (IP)", 'slug'=>'neksium_20mg_tab_ip_units','pseudoId'=>'neksium_20mg_tab_ip_value'], */ /* ['brand'=>"NEKSIUM 40mg TAB", 'slug'=>'neksium_40mg_tab_units','pseudoId'=>'neksium_40mg_tab_value'], */ /* ['brand'=>"NEKSIUM-D 20/30mg CAPS 15s (IP)", 'slug'=>'neksium_d_2030mg_caps_15s_ip_units','pseudoId'=>'neksium_d_2030mg_caps_15s_ip_value'], */ -['brand'=>"NEKSIUM-D 40/30mg CAPS 15s (IP)", 'slug'=>'neksium_d_4030mg_caps_15s_ip_units','pseudoId'=>'neksium_d_4030mg_caps_15s_ip_value'], +/*['brand'=>"NEKSIUM-D 40/30mg CAPS 15s (IP)", 'slug'=>'neksium_d_4030mg_caps_15s_ip_units','pseudoId'=>'neksium_d_4030mg_caps_15s_ip_value'],*/ ['brand'=>"TASIRON 15 CHEW TABS 3X10'S (B12)", 'slug'=>'tasiron_15_chew_tabs_3x10s_b12_units','pseudoId'=>'tasiron_15_chew_tabs_3x10s_b12_value'], ['brand'=>"TASIRON 30 CHEW TABS", 'slug'=>'tasiron_30_chew_tabs_units','pseudoId'=>'tasiron_30_chew_tabs_value'], ['brand'=>"TASIRON DROPS 30ML WITH EXTERNAL DROPPER", 'slug'=>'tasiron_drops_30ml_with_external_dropper_units','pseudoId'=>'tasiron_drops_30ml_with_external_dropper_value'], From a380dc78a82eb6805b522d2e11248deff44e7792 Mon Sep 17 00:00:00 2001 From: Farhan Pathan Date: Wed, 27 May 2026 12:52:35 +0530 Subject: [PATCH 27/32] Updated 4 form minor changes(added Search Bar for Doctor name) and New Form CV POB Tracker --- ...068f-ad9a-4279-afed-71c5f9e89eeb.blade.php | 2 +- ...8e84-aeba-4ab8-b468-eb470ee6cc35.blade.php | 9 +- ...260b-40d2-4f1f-950c-3b327701ec2d.blade.php | 10 +- ...54e2-5551-46fe-9603-9591728bc15c.blade.php | 9 +- ...7b57-287e-419c-9413-fbee9a2ac88a.blade.php | 9 +- ...9925-b986-4dc6-b867-0e18922c1f88.blade.php | 546 ++++++++++++++++++ 6 files changed, 580 insertions(+), 5 deletions(-) create mode 100644 resources/views/form/rapport-glenmarkcv/1779787418-c5969925-b986-4dc6-b867-0e18922c1f88.blade.php diff --git a/resources/views/form/rapport-copd/1725611704-e406068f-ad9a-4279-afed-71c5f9e89eeb.blade.php b/resources/views/form/rapport-copd/1725611704-e406068f-ad9a-4279-afed-71c5f9e89eeb.blade.php index 4fa8d17e..ca243d55 100644 --- a/resources/views/form/rapport-copd/1725611704-e406068f-ad9a-4279-afed-71c5f9e89eeb.blade.php +++ b/resources/views/form/rapport-copd/1725611704-e406068f-ad9a-4279-afed-71c5f9e89eeb.blade.php @@ -117,7 +117,7 @@ $brandData = [ {{$question->required == 'yes'?'required':'' }}>{{isset($question->value)?$question->value:''}} @break @case('dropdown') - required == 'yes' ? 'required' : '' }}> @foreach ($question->options as $option)