From 4299967fcf40472f7eb4fa72bb03d4857b1d9b1d Mon Sep 17 00:00:00 2001 From: zeeshan Date: Fri, 30 Oct 2026 11:24:58 +0530 Subject: [PATCH 1/6] Team 4 (Rx Reporting) --- ...a2a4-08ff-49be-b2b5-c4087a461edd.blade.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php b/resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php index 1edd6e01..682886aa 100644 --- a/resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php +++ b/resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php @@ -42,6 +42,25 @@ $brandData = [ ]; + +$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 From 5f0c578760ad0fc9cf1f030bc60fe02a7718ea2e Mon Sep 17 00:00:00 2001 From: Ravi Gulhane Date: Fri, 30 Oct 2026 12:54:03 +0530 Subject: [PATCH 2/6] Changes --- ...2561624-4466e937-cfb5-4679-989a-c3fea892568f.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/form/rapport-lifemankind/1792561624-4466e937-cfb5-4679-989a-c3fea892568f.blade.php b/resources/views/form/rapport-lifemankind/1792561624-4466e937-cfb5-4679-989a-c3fea892568f.blade.php index ce8a00ed..4cb3b667 100644 --- a/resources/views/form/rapport-lifemankind/1792561624-4466e937-cfb5-4679-989a-c3fea892568f.blade.php +++ b/resources/views/form/rapport-lifemankind/1792561624-4466e937-cfb5-4679-989a-c3fea892568f.blade.php @@ -129,13 +129,13 @@ } $tgicsContactId = trim((string) ($sub->formdata->tgics_contact_id ?? '')); $rowUserId = trim((string) ($sub->formdata->user_id ?? ($sub->user_id ?? ($form->user_id ?? '')))); - $doctorLink = $rowUserId !== '' - ? 'https://tgics.cttr.in/' . $rowUserId - : $tgicsCommonLink; + $doctorLink = ($rowUserId !== '' && $tgicsContactId !== '') + ? 'https://tgics.cttr.in/' . $rowUserId . '/' . $tgicsContactId + : ''; $surveysDone = $tgicsContactId !== '' ? (int) ($tgicsSurveyCounts[$tgicsContactId] ?? 0) : 0; - $whatsappText = "Dear Doctor" . ($doctorName !== '' ? ' ' . $doctorName : '') . ",\n\nYou have been approved for TGICS (The Great Indian Cough Study).\nPlease open the link and enter your WhatsApp mobile number to continue:\n" . $doctorLink; + $whatsappText = "Dear Doctor" . ($doctorName !== '' ? ' ' . $doctorName : '') . ",\nThank you for participating in TGICS (The Great Indian Cough Study).\nPlease open the link and enter your WhatsApp mobile number to continue:\n" . $doctorLink; $whatsappLink = ($whatsappDigits !== '' && $doctorLink !== '') ? 'https://api.whatsapp.com/send?phone=' . $whatsappDigits . '&text=' . rawurlencode($whatsappText) : ''; From d8d6f4118f2a7f65e3418f6e1afaf714dc0cb519 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Fri, 30 Oct 2026 13:30:48 +0530 Subject: [PATCH 3/6] Team 4 (Rx Report) Maximum 10 --- .../1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php b/resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php index 682886aa..057205ba 100644 --- a/resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php +++ b/resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php @@ -432,6 +432,8 @@ if (!empty($submissions->data->submissions)) { }) + + $('#field-nicogum_freshmint_2mg_12_nicotine_gums_samples,#field-nicogum_freshmint_4mg_12_nicotine_gums_samples').attr({max:"10"}); /* $('#field-montair_lc_kid_syp_units,#field-montair_lc_kid_tab_10s_units,#field-furamist_nasal_spray_units,#field-furamist_az_nasal_sp_units,#field-furamist_oxy_70_md_nasal_spray_units,#field-levolin_syrup_100ml_units,#field-levolin_1mg_tab_units,#field-levolin_2_tab_units,#field-levolin_plus_jr_100ml_oral_liquid_units,#field-levolin_plus_jr_60ml_ip_units,#field-levolin_plus_mango_flavour_100_ml_units,#field-montair_10_15s_units,#field-montair_10_15s_units,#field-montair_4mg_15_tab_units,#field-montair_5mg_15_tab_units,#field-nicogum_freshmint_4mg_12_nicotine_gums_units,#field-nicogum_freshmint_2mg_12_nicotine_gums_units,#field-nicogum_transdermal_patch_21mg_units,#field-nicogum_transdermal_patch_14mg_units,#field-nicogum_transdermal_patch_7mg_units,#field-nicogum_4_sugarfree_units,#field-montair_lc_tablets_units,#field-erdostyne_suspension_units,#field-montair_lc_adult_units,#field-erdostyne_capsule_units,#field-nicogum_freshmint_2mg_16_nicotine_gums_rx,#field-nicogum_freshmint_2mg_48_nicotine_gums_rx,#field-nicogum_freshmint_4mg_16_nicotine_gums_rx,#field-nicogum_freshmint_4mg_48_nicotine_gums_rx').on('change',function(){ From ab56e4fbd4ffa33f8263c6781168364ab94a18c3 Mon Sep 17 00:00:00 2001 From: zeeshan Date: Fri, 30 Oct 2026 13:39:55 +0530 Subject: [PATCH 4/6] Team 4 (POB_Drive) Maximum 10 number value --- .../1742555655-4207d1db-2554-43b0-9cdd-1d7c85142433.blade.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/views/form/rapport-team4/1742555655-4207d1db-2554-43b0-9cdd-1d7c85142433.blade.php b/resources/views/form/rapport-team4/1742555655-4207d1db-2554-43b0-9cdd-1d7c85142433.blade.php index a6d46fa2..4680c8e6 100644 --- a/resources/views/form/rapport-team4/1742555655-4207d1db-2554-43b0-9cdd-1d7c85142433.blade.php +++ b/resources/views/form/rapport-team4/1742555655-4207d1db-2554-43b0-9cdd-1d7c85142433.blade.php @@ -379,6 +379,10 @@ $brandData = [ }) + + $('#field-nicogum_freshmint_2mg_12_nicotine_gums_samples,#field-nicogum_freshmint_4mg_12_nicotine_gums_samples').attr({max:"10"}); + + $('#field-montair_lc_kid_syp_units,#field-montair_lc_kid_tab_10s_units,#field-furamist_nasal_spray_units,#field-furamist_az_nasal_sp_units,#field-furamist_oxy_70_md_nasal_spray_units,#field-levolin_syrup_100ml_units,#field-levolin_1mg_tab_units,#field-levolin_2_tab_units,#field-levolin_plus_jr_100ml_oral_liquid_units,#field-levolin_plus_jr_60ml_ip_units,#field-levolin_plus_mango_flavour_100_ml_units,#field-montair_10_15s_units,#field-montair_10_15s_units,#field-montair_4mg_15_tab_units,#field-montair_5mg_15_tab_units,#field-nicogum_freshmint_4mg_12_nicotine_gums_units,#field-nicogum_freshmint_2mg_12_nicotine_gums_units,#field-nicogum_transdermal_patch_21mg_units,#field-nicogum_transdermal_patch_14mg_units,#field-nicogum_transdermal_patch_7mg_units,#field-nicogum_4_sugarfree_units,#field-montair_lc_tablets_units,#field-erdostyne_suspension_units,#field-montair_lc_adult_units,#field-erdostyne_capsule_units,#field-furamist_240mtd_units,#field-nicogum_freshmint_4mg_16_nicotine_gums_units,#field-nicogum_freshmint_2mg_16_nicotine_gums_units,#field-montair_lc_kid_5_units,#field-nicogum_freshmint_4mg_48_nicotine_gums_units,#field-nicogum_freshmint_2mg_48_nicotine_gums_units').on('change',function(){ let a=parseInt($('#field-montair_lc_kid_syp_units').val())||0; From a12e3ce18313c576d3ca961f3142cd5f005a64e8 Mon Sep 17 00:00:00 2001 From: Ravi Gulhane Date: Mon, 2 Nov 2026 12:20:29 +0530 Subject: [PATCH 5/6] Changes --- app/Http/Controllers/FormController.php | 11 ++++++----- app/Http/Controllers/FormentityController.php | 1 + resources/views/form/list.blade.php | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/FormController.php b/app/Http/Controllers/FormController.php index 4537551d..e2e679cb 100644 --- a/app/Http/Controllers/FormController.php +++ b/app/Http/Controllers/FormController.php @@ -417,16 +417,17 @@ class FormController extends Controller if (isset($question->type) && $question->type == 'hidden') { continue; } + $col = is_object($question) && isset($question->code) ? $question->code : $code; $value = null; - if (isset($submission->formdata) && is_object($submission->formdata) && property_exists($submission->formdata, $code)) { - $value = $submission->formdata->{$code}; - } elseif (isset($submission->{$code})) { - $value = $submission->{$code}; + if (isset($submission->formdata) && is_object($submission->formdata) && property_exists($submission->formdata, $col)) { + $value = $submission->formdata->{$col}; + } elseif (isset($submission->{$col})) { + $value = $submission->{$col}; } if (is_array($value)) { $value = implode(', ', $value); } - $row[$code] = $value ?? ''; + $row[$col] = $value ?? ''; } if (isset($formdata->workflow) && $formdata->workflow == 'yes') { $row['workflow_next_approver'] = $submission->workflow_next_approver ?? ''; diff --git a/app/Http/Controllers/FormentityController.php b/app/Http/Controllers/FormentityController.php index 7b7eb08e..86e0fd8b 100644 --- a/app/Http/Controllers/FormentityController.php +++ b/app/Http/Controllers/FormentityController.php @@ -61,6 +61,7 @@ class FormentityController extends Controller 'status' => ['title' => 'Status', 'type' => 'select', 'required' => true, 'values' => ['active' => 'Active', 'disabled' => 'Disabled'] ], 'metric_submission' => ['title' => 'Metric Submission', 'type' => 'yesno', 'required' => true], 'metric_authkey' => ['title' => 'Auth Key', 'type' => 'text', 'required' => true], + 'metric_ready_on_submit' => ['title' => 'Metric Ready On Submit', 'type' => 'yesno', 'required' => true, 'default' => 'no'], 'manager_de_roles' => ['title' => 'Manager Data Entry Roles', 'type' => 'multiselect', 'values' => $roles_dd ], // 'manager_data_child_role' => ['title' => 'Manager Data Child Entry Roles', 'type' => 'multiselect', 'values' => $roles_dd ], diff --git a/resources/views/form/list.blade.php b/resources/views/form/list.blade.php index be9d0a52..e5250f91 100644 --- a/resources/views/form/list.blade.php +++ b/resources/views/form/list.blade.php @@ -255,7 +255,8 @@ @if(isset($question->type) && $question->type == 'hidden') @continue @endif - { "data": "{{$code}}", "defaultContent": "" }, + @php $col = is_object($question) && isset($question->code) ? $question->code : $code; @endphp + { "data": "{{$col}}", "defaultContent": "" }, @endforeach @else { "data": "date" }, From e183aacea5c88335b359ec02ff59d21ca91ecabd Mon Sep 17 00:00:00 2001 From: zeeshan Date: Mon, 2 Nov 2026 12:27:35 +0530 Subject: [PATCH 6/6] Report Rx (Demo Domain) Doctor Condition --- .../1706001346-9b6b0b23-c3b5-4b9c-a2dd-681c5787a16c.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/form/rapport-demo/1706001346-9b6b0b23-c3b5-4b9c-a2dd-681c5787a16c.blade.php b/resources/views/form/rapport-demo/1706001346-9b6b0b23-c3b5-4b9c-a2dd-681c5787a16c.blade.php index 25ea4640..5222d0f0 100644 --- a/resources/views/form/rapport-demo/1706001346-9b6b0b23-c3b5-4b9c-a2dd-681c5787a16c.blade.php +++ b/resources/views/form/rapport-demo/1706001346-9b6b0b23-c3b5-4b9c-a2dd-681c5787a16c.blade.php @@ -84,7 +84,8 @@ @foreach ($question->options as $option) - @if($question->code == 'contact_id' && isset($option->contact->type) && $option->contact->type == 'doctor' ) + {{-- @if($question->code == 'contact_id' && isset($option->contact->type) && $option->contact->type == 'doctor' ) --}} + @if($question->code == 'contact_id' && ((isset($option->contact->type) && $option->contact->type == 'doctor') || !isset($option->contact)))