From 06e3d133e0a21f25e958374aded9bc0af600e393 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Wed, 22 Jul 2026 13:51:35 +0530 Subject: [PATCH 01/30] Pulmocare (Rapilevo Chemist 2 Fixed) --- .../1784533027-3b12705e-bcd1-4910-b7aa-1c54b4b64135.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/form/rapport-pulmocare/1784533027-3b12705e-bcd1-4910-b7aa-1c54b4b64135.blade.php b/resources/views/form/rapport-pulmocare/1784533027-3b12705e-bcd1-4910-b7aa-1c54b4b64135.blade.php index bffa3418..54ecbd50 100644 --- a/resources/views/form/rapport-pulmocare/1784533027-3b12705e-bcd1-4910-b7aa-1c54b4b64135.blade.php +++ b/resources/views/form/rapport-pulmocare/1784533027-3b12705e-bcd1-4910-b7aa-1c54b4b64135.blade.php @@ -242,7 +242,7 @@ $('#field-pob_units').on('input', function() { var total=( (parseInt($('#field-pob_units').val())*11.4 ||0) - ); + ).toFixed(2); $('#field-pob_value').val(total) }) From 120a645058a5b2cb4e23b04d3c35538ac5ef7be2 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Wed, 22 Jul 2026 17:11:48 +0530 Subject: [PATCH 02/30] Pulmocare (Mission 100) --- ...aeb9-1a07-403e-b893-8a5c1868da6d.blade.php | 522 ++++++++++++++++++ 1 file changed, 522 insertions(+) create mode 100644 resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php diff --git a/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php b/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php new file mode 100644 index 00000000..77373720 --- /dev/null +++ b/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php @@ -0,0 +1,522 @@ + + + + @include('layouts.shared/title-meta', ['title' => "Form"]) + @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) + + + +
+ processing... +
+ +@php +$brandData = [ + +//['brand'=>'Pulmosmart G', 'slug'=>'pulmosmart_g_units','pseudoId'=>'pulmosmart_g_value'], +['brand'=>"200 PULMICAPS (30'S)", 'slug'=>'200_pulmicaps_30s_units','pseudoId'=>'200_pulmicaps_30s_value'], +['brand'=>"400 PULMICAPS (30'S)", 'slug'=>'400_pulmicaps_30s_units','pseudoId'=>'400_pulmicaps_30s_value'], +['brand'=>'DOSE COUNTER MDI 200 INHALER', 'slug'=>'dose_counter_mdi_200_inhaler_units','pseudoId'=>'dose_counter_mdi_200_inhaler_value'], +['brand'=>'DOSE COUNTER MDI 400 INHALER', 'slug'=>'dose_counter_mdi_400_inhaler_units','pseudoId'=>'dose_counter_mdi_400_inhaler_value'], +['brand'=>'PULMULES (2 ML)', 'slug'=>'pulmules_2_ml_units','pseudoId'=>'pulmules_2_ml_value'], +['brand'=>'1MG PULMULES (2 ML)', 'slug'=>'1mg_pulmules_2_ml_units','pseudoId'=>'1mg_pulmules_2_ml_value'] + + + +]; + +@endphp + +@php + $submissions = Formhelper::getMultiformData($form->partition, $form_id, $form->user_id); + + + $formdata = null; + +if (!empty($submissions->data->submissions)) { + foreach ($submissions->data->submissions as $submission) { + if ($submission->id == $id) { + $formdata = $submission->formdata ?? null; + break; + } + } +} + +@endphp + + + + + + + +@include('layouts.shared/footer-script') + + + + + + + + + + \ No newline at end of file From a5c35bf641667f6937af67c250d7f1af423af909 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Thu, 23 Jul 2026 13:01:34 +0530 Subject: [PATCH 03/30] Pulmocare (RM Form) --- ...aeb9-1a07-403e-b893-8a5c1868da6d.blade.php | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php b/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php index 77373720..9e447b7f 100644 --- a/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php +++ b/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php @@ -114,7 +114,7 @@ if (!empty($submissions->data->submissions)) { @break @case('dropdown') - required == 'yes' ? 'required' : '' }} data-selected="{{ isset($question->value) ? $question->value : '' }}"> @foreach ($question->options as $option) @if($question->code == 'contact_id' && isset($option->contact->type) && $option->contact->type == 'doctor' ) @@ -276,7 +276,17 @@ if (!empty($submissions->data->submissions)) { // 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'; }); + contacts = contacts.filter(function(itm) { return itm.value !== 'sample' && itm.contact && itm.contact.speciality; }); + contacts.sort((a, b) => + a.display.localeCompare(b.display, undefined, { sensitivity: 'base' }) + ); + + // Remove duplicate by Doctor Name + contacts = Array.from( + new Map( + contacts.map(item => [item.display.trim().toLowerCase(), item]) + ).values() + ); console.log(contacts); // Loop through contacts and append options to select elements whose id starts with 'field-contact_id' @@ -294,6 +304,8 @@ if (!empty($submissions->data->submissions)) { }); } + $("[id^='field-contact_id']").trigger('change'); + function enforceUniqueDoctorSelections() { var selectedValues = []; @@ -351,6 +363,11 @@ if (!empty($submissions->data->submissions)) { select.append(option); }); + var selectedValue = select.data('selected'); + if (selectedValue) { + select.val(selectedValue); + } + // For each select element, add a change event handler to populate `msl_code` and `speciality` // We assume dropdowns and targets follow the pattern: // - select: field-contact_id_1, field-contact_id_2, ..., field-contact_id From 9833cb037cc4a46880d97958f4f8ef2fddc6c7b3 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Thu, 23 Jul 2026 13:21:53 +0530 Subject: [PATCH 04/30] Pulmocare (Mission 100) Form --- .../1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php b/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php index 9e447b7f..083168ad 100644 --- a/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php +++ b/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php @@ -450,7 +450,7 @@ if (!empty($submissions->data->submissions)) { }); - $('#field-total_pob_units').attr('readonly',true); + $('#field-total_pob_units,#field-msl_code').attr('readonly',true); // Restrict all number fields to positive integers only $(document).on('keydown', 'input[type="number"]', function (e) { From 7024dabd6636bec298e96dd3f025ec0e9db4c19c Mon Sep 17 00:00:00 2001 From: ravigulhane Date: Thu, 23 Jul 2026 08:21:33 +0000 Subject: [PATCH 05/30] Changes --- resources/views/form/list.blade.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/resources/views/form/list.blade.php b/resources/views/form/list.blade.php index 1d4bf1ef..897d0fd2 100644 --- a/resources/views/form/list.blade.php +++ b/resources/views/form/list.blade.php @@ -23,7 +23,6 @@
-

Showing data for last 30 days, please use above button "Download" to download all submissions

@@ -72,6 +71,18 @@ @if(isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' ) Workflow Status @endif + @if(isset($form) && isset($form->show_position) && $form->show_position == 'yes' ) + Territory + Area + Region + Zone + @endif + @if(isset($form) && isset($form->show_manager_details) && $form->show_manager_details == 'yes' ) + L1 Manager + L1 Employee Code + L2 Manager + L2 Employee Code + @endif @foreach($questions as $code => $question) @if($question->type == 'hidden') @continue @@ -195,6 +206,18 @@ @if(isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' ) { "data": "workflow_status" }, @endif + @if(isset($form) && isset($form->show_position) && $form->show_position == 'yes') + { "data": "territory" }, + { "data": "area" }, + { "data": "region" }, + { "data": "zone" }, + @endif + @if(isset($form) && isset($form->show_manager_details) && $form->show_manager_details == 'yes') + { "data": "manager1_name" }, + { "data": "manager1_code" }, + { "data": "manager2_name" }, + { "data": "manager2_code" }, + @endif @foreach($questions as $code => $question) @if($question->type == 'hidden') @continue From 3a658b75c052b045cdba622f52554b67f81a59cb Mon Sep 17 00:00:00 2001 From: zeeshan Date: Thu, 23 Jul 2026 17:32:02 +0530 Subject: [PATCH 06/30] Pumocare (RFI Monday) --- ...aeb9-1a07-403e-b893-8a5c1868da6d.blade.php | 5 + ...9454-d2c1-4de6-8880-ebc68bac9231.blade.php | 399 ++++++++++++++++++ 2 files changed, 404 insertions(+) create mode 100644 resources/views/form/rapport-pulmocare/1784801601-237d9454-d2c1-4de6-8880-ebc68bac9231.blade.php diff --git a/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php b/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php index 083168ad..72c5df26 100644 --- a/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php +++ b/resources/views/form/rapport-pulmocare/1784711349-38c6aeb9-1a07-403e-b893-8a5c1868da6d.blade.php @@ -526,6 +526,11 @@ if (!empty($submissions->data->submissions)) { today = yyyy + '-' + mm + '-' + dd; var plandateField = document.getElementById('field-record_date'); + var plandateField = document.getElementById('field-record_date'); + if (plandateField) { + const currentYear = new Date().getFullYear(); + plandateField.min = `${currentYear}-06-01`; + } plandateField.setAttribute('max', today); }); diff --git a/resources/views/form/rapport-pulmocare/1784801601-237d9454-d2c1-4de6-8880-ebc68bac9231.blade.php b/resources/views/form/rapport-pulmocare/1784801601-237d9454-d2c1-4de6-8880-ebc68bac9231.blade.php new file mode 100644 index 00000000..8e8c18bc --- /dev/null +++ b/resources/views/form/rapport-pulmocare/1784801601-237d9454-d2c1-4de6-8880-ebc68bac9231.blade.php @@ -0,0 +1,399 @@ + + + + @include('layouts.shared/title-meta', ['title' => "Form"]) + @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) + + + +
+ processing... +
+ +@php +$brandData = [ + +//['brand'=>'Pulmosmart G', 'slug'=>'pulmosmart_g_units','pseudoId'=>'pulmosmart_g_value'], +['brand'=>"200 PULMICAPS (30'S)", 'slug'=>'200_pulmicaps_30s_units','pseudoId'=>'200_pulmicaps_30s_value'], +['brand'=>"400 PULMICAPS (30'S)", 'slug'=>'400_pulmicaps_30s_units','pseudoId'=>'400_pulmicaps_30s_value'], +['brand'=>'DOSE COUNTER MDI 200 INHALER', 'slug'=>'dose_counter_mdi_200_inhaler_units','pseudoId'=>'dose_counter_mdi_200_inhaler_value'], +['brand'=>'DOSE COUNTER MDI 400 INHALER', 'slug'=>'dose_counter_mdi_400_inhaler_units','pseudoId'=>'dose_counter_mdi_400_inhaler_value'], +['brand'=>'PULMULES (2 ML)', 'slug'=>'pulmules_2_ml_units','pseudoId'=>'pulmules_2_ml_value'], +['brand'=>'1MG PULMULES (2 ML)', 'slug'=>'1mg_pulmules_2_ml_units','pseudoId'=>'1mg_pulmules_2_ml_value'] + + + +]; + +@endphp + +@php + $submissions = Formhelper::getMultiformData($form->partition, $form_id, $form->user_id); + + + $formdata = null; + +if (!empty($submissions->data->submissions)) { + foreach ($submissions->data->submissions as $submission) { + if ($submission->id == $id) { + $formdata = $submission->formdata ?? null; + break; + } + } +} + +@endphp + + + + + + + +@include('layouts.shared/footer-script') + + + + + + + + + + \ No newline at end of file From bff5a50c37aa8984179005201f5279dff0481b48 Mon Sep 17 00:00:00 2001 From: ravigulhane Date: Mon, 27 Jul 2026 09:46:21 +0000 Subject: [PATCH 07/30] Form Management Control - View Form Improvement (Manager View) --- resources/views/form/list.blade.php | 211 ++++++++++++++++++++++++---- 1 file changed, 182 insertions(+), 29 deletions(-) diff --git a/resources/views/form/list.blade.php b/resources/views/form/list.blade.php index 897d0fd2..05103308 100644 --- a/resources/views/form/list.blade.php +++ b/resources/views/form/list.blade.php @@ -19,8 +19,7 @@

{{$formname}}

- Download - +
@@ -116,6 +115,33 @@ + + + +
+ processing... +
+ + + + + + @include('layouts.shared/footer-script') + + + + + + From 43d812217d6d699fba2e4eb02b76e5a6647d8907 Mon Sep 17 00:00:00 2001 From: Farhan Pathan Date: Thu, 30 Jul 2026 09:55:24 +0530 Subject: [PATCH 10/30] COPD: Changes in Voltido RCPA form --- ...d-49a3-913c-98d978cf22f1-history.blade.php | 131 ++++++++++++++++++ ...4330-0fad-49a3-913c-98d978cf22f1.blade.php | 40 +++--- 2 files changed, 154 insertions(+), 17 deletions(-) create mode 100644 resources/views/form/rapport-copd/1785317381-d72b4330-0fad-49a3-913c-98d978cf22f1-history.blade.php diff --git a/resources/views/form/rapport-copd/1785317381-d72b4330-0fad-49a3-913c-98d978cf22f1-history.blade.php b/resources/views/form/rapport-copd/1785317381-d72b4330-0fad-49a3-913c-98d978cf22f1-history.blade.php new file mode 100644 index 00000000..dcd8473f --- /dev/null +++ b/resources/views/form/rapport-copd/1785317381-d72b4330-0fad-49a3-913c-98d978cf22f1-history.blade.php @@ -0,0 +1,131 @@ + + + + @include('layouts.shared/title-meta', ['title' => "History"]) + @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) + + + + + + @include('layouts.shared/footer-script') + + \ No newline at end of file diff --git a/resources/views/form/rapport-copd/1785317381-d72b4330-0fad-49a3-913c-98d978cf22f1.blade.php b/resources/views/form/rapport-copd/1785317381-d72b4330-0fad-49a3-913c-98d978cf22f1.blade.php index 63a4e1b8..fbefe00c 100644 --- a/resources/views/form/rapport-copd/1785317381-d72b4330-0fad-49a3-913c-98d978cf22f1.blade.php +++ b/resources/views/form/rapport-copd/1785317381-d72b4330-0fad-49a3-913c-98d978cf22f1.blade.php @@ -304,8 +304,8 @@ @elseif(!$id)

- You have already submitted {{ count($submissions) }} doctor(s). - Go to View History to edit if required. + You have already submitted Voltido RCPA data for {{ count($submissions) }} Doctor(s). +

@endif @@ -704,6 +704,8 @@ preventDuplicateDoctors(filteredSubmittedDoctors); var doctor_count = 0 + let uniqueDoctorId = 0; + let numberOfSubmission=0; console.log("Number of Submission : ",numberOfSubmission); $('#adddoctor-btn').click(function() { @@ -719,13 +721,21 @@ preventDuplicateDoctors(filteredSubmittedDoctors); console.log("Doctor Name : ",doctorName); doctor_count++; - numberOfSubmission=numberOfSubmission+1; + uniqueDoctorId++; + numberOfSubmission++; console.log("Number of Submission : ",numberOfSubmission); + + + + /* ye Remove Button
ke nich tha...but abhi ke liye remove option nikal diya h */ let empty_doctor = `
- + + + +

Doctor ${doctor_count + 1}

@@ -739,7 +749,7 @@ preventDuplicateDoctors(filteredSubmittedDoctors);