From 1f68ed2ae2829f367a521d6f0ddc40774ca66c83 Mon Sep 17 00:00:00 2001 From: Ravi Gulhane <> Date: Fri, 29 May 2026 17:00:37 +0530 Subject: [PATCH 1/7] Team2 - BF Educator Tagging Region Issue --- ...6-f1edf255-27cb-4fdb-8768-cde142573f97.blade.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/resources/views/form/rapport-team2/1776415976-f1edf255-27cb-4fdb-8768-cde142573f97.blade.php b/resources/views/form/rapport-team2/1776415976-f1edf255-27cb-4fdb-8768-cde142573f97.blade.php index 60c64dc9..0778d0ac 100644 --- a/resources/views/form/rapport-team2/1776415976-f1edf255-27cb-4fdb-8768-cde142573f97.blade.php +++ b/resources/views/form/rapport-team2/1776415976-f1edf255-27cb-4fdb-8768-cde142573f97.blade.php @@ -369,7 +369,7 @@ if (!region) return; $.ajax({ - url: "/form/team2bfedu", + url: "/form/team2bfeducators", type: "GET", data: { region: region @@ -382,6 +382,12 @@ $('#educator-wrapper').empty(); + toggleSubmit(); + }, + error: function() { + educatorData = []; + $('#educator-wrapper').empty(); + alert('Unable to load educators for the selected region.'); toggleSubmit(); } }); @@ -393,6 +399,11 @@ const maxFields = 48; + const urlRegion = new URLSearchParams(window.location.search).get('region'); + if (urlRegion) { + $('#field-region').val(urlRegion).trigger('change'); + } + /* ================= ADD EDUCATOR ================= */ $('#add-educator').on('click', function() { From 89d21055def66b07b4a77b896fda8d7e2a41f34f Mon Sep 17 00:00:00 2001 From: Ravi Gulhane <> Date: Mon, 8 Jun 2026 11:26:13 +0530 Subject: [PATCH 2/7] Arise Changes --- ...b702-e048-4499-9b87-95f9ae2d94d5.blade.php | 713 ++++++++++++++++ ...0da9-b147-435f-a0be-e2b9087d3c49.blade.php | 309 +++++++ ...8b95-d240-452c-bd5f-00dab08a14dd.blade.php | 315 +++++++ ...a724-fffb-4ab9-8fcb-a635b6c71091.blade.php | 315 +++++++ ...eb8b-4c93-4b76-958c-be343fd201c9.blade.php | 636 ++++++++++++++ ...2-4521-9d85-85ec424fa8d5-history.blade.php | 188 +++++ ...d8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php | 786 ++++++++++++++---- ...eb14-e144-4667-84a8-32d939cf281a.blade.php | 704 ++++++++++++++++ ...-8be4-418a-ab42-cbb1dcae232e.blade_new.php | 594 +++++++++++++ ...-8be4-418a-ab42-cbb1dcae232e.blade_old.php | 426 ++++++++++ 10 files changed, 4841 insertions(+), 145 deletions(-) create mode 100644 resources/views/form/rapport-arise/1777029250-544db702-e048-4499-9b87-95f9ae2d94d5.blade.php create mode 100644 resources/views/form/rapport-arise/1777097685-b3bf0da9-b147-435f-a0be-e2b9087d3c49.blade.php create mode 100644 resources/views/form/rapport-arise/1777271277-05698b95-d240-452c-bd5f-00dab08a14dd.blade.php create mode 100644 resources/views/form/rapport-arise/1777276825-8b57a724-fffb-4ab9-8fcb-a635b6c71091.blade.php create mode 100644 resources/views/form/rapport-arise/1777355327-446feb8b-4c93-4b76-958c-be343fd201c9.blade.php create mode 100644 resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5-history.blade.php create mode 100644 resources/views/form/rapport-arise/1780568628-677ceb14-e144-4667-84a8-32d939cf281a.blade.php create mode 100644 resources/views/form/rapport-team3/1774866189-e645a43b-8be4-418a-ab42-cbb1dcae232e.blade_new.php create mode 100644 resources/views/form/rapport-team3/1774866189-e645a43b-8be4-418a-ab42-cbb1dcae232e.blade_old.php diff --git a/resources/views/form/rapport-arise/1777029250-544db702-e048-4499-9b87-95f9ae2d94d5.blade.php b/resources/views/form/rapport-arise/1777029250-544db702-e048-4499-9b87-95f9ae2d94d5.blade.php new file mode 100644 index 00000000..da74abc6 --- /dev/null +++ b/resources/views/form/rapport-arise/1777029250-544db702-e048-4499-9b87-95f9ae2d94d5.blade.php @@ -0,0 +1,713 @@ + + + + + @include('layouts.shared/title-meta', ['title' => 'Form']) + @include('layouts.shared/head-css', ['mode' => $mode ?? '', 'demo' => $demo ?? '']) + + +
+ processing... +
+ + +
+
+
+
+
+
+ + @if (Session::has('error')) +
{{ Session::get('error') }}
+
+ @endif + @if (session('success')) +
{{ session('success') }} +
+
+ @endif +
+

(RA-2) Catch Up Camp

+
+ @if (!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes')) +
+ @if ($form->link_type == 'form') + + + @else + Back + @endif +
+ @endif + + @php + $history = Formhelper::getMultiformData( + $form->partition, + $form->form_id, + $form->user_id, + ); + @endphp + + + +
+ + +
+ + + + + + + + + + + + + + + + + + {{-- --}} + + {{-- --}} + + {{-- --}} + + {{-- --}} + + + + + + @foreach (collect($history->data->submissions)->sortByDesc('formdata.record_date') as $sub) + @php + $sub->formdata->id = $sub->id; + + @endphp + + + + + + + + + + + + + + + + {{-- --}} + + {{-- --}} + + {{-- --}} + + {{-- --}} + + + + + + @endforeach + +
Action.Camp Plan DateExecution CompletedDoctor NameMSL CodeSpecialityType of campExecution DoneReason For Not-ExecutingPatient ScreenedPatient DiagnosedForacort RxSeroflo RxDuolin RxAerocort RxGlycohale FB RxE-Voltido RxE- Foracort G RxE-Synchrobreathe range Rx
+ + {{ $sub->formdata->plan_date }}{{ isset($sub->formdata->execution_done) && $sub->formdata->execution_done == 'yes' ? 'Yes' : 'No' }} + + @if (isset($sub->formdata->contact_id) && $sub->formdata->contact_id !== '') + {{ $sub->formdata->contact_id }} + @elseif (isset($sub->formdata->doctor_name)) + {{ $sub->formdata->doctor_name }} + @else + {{-- Default value or empty string, adjust as needed --}} + {{ '' }} + @endif + {{ isset($sub->formdata->msl_code) ? $sub->formdata->msl_code : '' }} + {{ isset($sub->formdata->speciality) ? $sub->formdata->speciality : '' }} + {{ isset($sub->formdata->type_of_camp) ? $sub->formdata->type_of_camp : '' }} + {{ isset($sub->formdata->execution) ? $sub->formdata->execution : '' }} + {{ isset($sub->formdata->reason) ? $sub->formdata->reason : '' }}{{ isset($sub->formdata->patient_screened) ? $sub->formdata->patient_screened : '' }}{{ isset($sub->formdata->patients_diagnosed) ? $sub->formdata->patients_diagnosed : '' }}{{ isset($sub->formdata->foracort_rx) ? $sub->formdata->foracort_rx : '' }}{{ isset($sub->formdata->seroflo_rx) ? $sub->formdata->seroflo_rx : '' }}{{ isset($sub->formdata->duolin_rx) ? $sub->formdata->duolin_rx : '' }}{{ isset($sub->formdata->aerocort_rx) ? $sub->formdata->aerocort_rx : '' }}{{ isset($sub->formdata->glycohale_fb_rx) ? $sub->formdata->glycohale_fb_rx : '' }}{{ isset($sub->formdata->e_voltido_rx) ? $sub->formdata->e_voltido_rx : '' }}{{ isset($sub->formdata->e_foracort_g_rx) ? $sub->formdata->e_foracort_g_rx : '' }}{{ isset($sub->formdata->e_synchrobreathe_range_rx) ? $sub->formdata->e_synchrobreathe_range_rx : '' }}
+
+ +
+ +
+
+ + @csrf + @if ($id) + + @endif + @foreach ($questions as $question) + @if (in_array($question->code, [ + 'execution_date', + 'execution', + 'reason', + 'patient_screened', + 'patients_diagnosed', + 'foracort_rx', + 'seroflo_rx', + 'duolin_rx', + 'aerocort_rx', + 'glycohale_fb_rx', + 'e_voltido_rx', + 'e_foracort_g_rx', + 'e_synchrobreathe_range_rx' + ])) + @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 + + @case('checkbox') + @foreach ($question->options as $option) +
+ value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked' : '' }}> + +
+ @endforeach + @break + + @case('file') + + @break + @endswitch +
+ @endforeach + @if (!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes')) +
+ +
+ @endif +
+
+ +
+
+ + @csrf + + + @foreach ($questions as $question) +
+ + @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 + + @case('checkbox') + @foreach ($question->options as $option) +
+ value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked' : '' }}> + +
+ @endforeach + @break + + @case('file') + + @break + @endswitch +
+ @endforeach + @if (!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes')) +
+ +
+ @endif +
+
+ +
+
+ + + + +
+
+ +
+ +
+ + + @include('layouts.shared/footer-script') + + + + + + diff --git a/resources/views/form/rapport-arise/1777097685-b3bf0da9-b147-435f-a0be-e2b9087d3c49.blade.php b/resources/views/form/rapport-arise/1777097685-b3bf0da9-b147-435f-a0be-e2b9087d3c49.blade.php new file mode 100644 index 00000000..4bf6a1e3 --- /dev/null +++ b/resources/views/form/rapport-arise/1777097685-b3bf0da9-b147-435f-a0be-e2b9087d3c49.blade.php @@ -0,0 +1,309 @@ + + + + @include('layouts.shared/title-meta', ['title' => "Form"]) + @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) + + +
+ processing... +
+ +
+
+
+
+
+
+ + @if(Session::has('error'))
{{Session::get('error')}}
+
@endif + @if(session('success'))
{{ session('success') }} +
+
@endif +
+

{{$form->title}}

+
+ @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) +
+ @if($form->link_type == 'form') + View History + @else + Back + @endif +
+ @endif + @if(isset($form->user_info)) +
+
Submitted By: {{$form->user_info->name}}
+
+ @endif +
+ + + + @csrf + @if($id) + + @endif + @if(isset($form->manager_can_submit) && $form->manager_can_submit == true) +
+ + + +
+ @endif + + + @foreach($questions as $question) +
+ + @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 + @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) +
{{$option->display}}
+
+ +
+ @endforeach +
+ @break + + @case('time') + required == 'yes' ? 'required' : ''}} + value="{{isset($question->value) ? $question->value : ''}}"> + @break + + @endswitch +
+ @endforeach + @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) +
+ +
+ @endif +
+ +
+
+ + + + +
+
+ +
+ +
+ + +@include('layouts.shared/footer-script') + + + + + \ No newline at end of file diff --git a/resources/views/form/rapport-arise/1777271277-05698b95-d240-452c-bd5f-00dab08a14dd.blade.php b/resources/views/form/rapport-arise/1777271277-05698b95-d240-452c-bd5f-00dab08a14dd.blade.php new file mode 100644 index 00000000..40061d13 --- /dev/null +++ b/resources/views/form/rapport-arise/1777271277-05698b95-d240-452c-bd5f-00dab08a14dd.blade.php @@ -0,0 +1,315 @@ + + + + @include('layouts.shared/title-meta', ['title' => "Form"]) + @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) + + +
+ processing... +
+ +
+
+
+
+
+
+ + @if(Session::has('error'))
{{Session::get('error')}}
+
@endif + @if(session('success'))
{{ session('success') }} +
+
@endif +
+

{{$form->title}}

+
+ @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) +
+ @if($form->link_type == 'form') + View History + @else + Back + @endif +
+ @endif + @if(isset($form->user_info)) +
+
Submitted By: {{$form->user_info->name}}
+
+ @endif +
+ + + + @csrf + @if($id) + + @endif + @if(isset($form->manager_can_submit) && $form->manager_can_submit == true) +
+ + + +
+ @endif + + + @foreach($questions as $question) +
+ + @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 + @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) +
{{$option->display}}
+
+ +
+ @endforeach +
+ @break + + @case('time') + required == 'yes' ? 'required' : ''}} + value="{{isset($question->value) ? $question->value : ''}}"> + @break + + @endswitch +
+ @endforeach + @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) +
+ +
+ @endif +
+ +
+
+ + + + +
+
+ +
+ +
+ + +@include('layouts.shared/footer-script') + + + + + \ No newline at end of file diff --git a/resources/views/form/rapport-arise/1777276825-8b57a724-fffb-4ab9-8fcb-a635b6c71091.blade.php b/resources/views/form/rapport-arise/1777276825-8b57a724-fffb-4ab9-8fcb-a635b6c71091.blade.php new file mode 100644 index 00000000..40061d13 --- /dev/null +++ b/resources/views/form/rapport-arise/1777276825-8b57a724-fffb-4ab9-8fcb-a635b6c71091.blade.php @@ -0,0 +1,315 @@ + + + + @include('layouts.shared/title-meta', ['title' => "Form"]) + @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) + + +
+ processing... +
+ +
+
+
+
+
+
+ + @if(Session::has('error'))
{{Session::get('error')}}
+
@endif + @if(session('success'))
{{ session('success') }} +
+
@endif +
+

{{$form->title}}

+
+ @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) +
+ @if($form->link_type == 'form') + View History + @else + Back + @endif +
+ @endif + @if(isset($form->user_info)) +
+
Submitted By: {{$form->user_info->name}}
+
+ @endif +
+ + + + @csrf + @if($id) + + @endif + @if(isset($form->manager_can_submit) && $form->manager_can_submit == true) +
+ + + +
+ @endif + + + @foreach($questions as $question) +
+ + @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 + @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) +
{{$option->display}}
+
+ +
+ @endforeach +
+ @break + + @case('time') + required == 'yes' ? 'required' : ''}} + value="{{isset($question->value) ? $question->value : ''}}"> + @break + + @endswitch +
+ @endforeach + @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) +
+ +
+ @endif +
+ +
+
+ + + + +
+
+ +
+ +
+ + +@include('layouts.shared/footer-script') + + + + + \ No newline at end of file diff --git a/resources/views/form/rapport-arise/1777355327-446feb8b-4c93-4b76-958c-be343fd201c9.blade.php b/resources/views/form/rapport-arise/1777355327-446feb8b-4c93-4b76-958c-be343fd201c9.blade.php new file mode 100644 index 00000000..d8f2c995 --- /dev/null +++ b/resources/views/form/rapport-arise/1777355327-446feb8b-4c93-4b76-958c-be343fd201c9.blade.php @@ -0,0 +1,636 @@ + + + + + @include('layouts.shared/title-meta', ['title' => 'Form']) + @include('layouts.shared/head-css', ['mode' => $mode ?? '', 'demo' => $demo ?? '']) + + +
+ processing... +
+ + +
+
+
+
+
+
+ + @if (Session::has('error')) +
{{ Session::get('error') }}
+
+ @endif + @if (session('success')) +
{{ session('success') }} +
+
+ @endif +
+

Dr Engagement Meet

+
+ @if (!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes')) +
+ @if ($form->link_type == 'form') + + + @else + Back + @endif +
+ @endif + + @php + $history = Formhelper::getMultiformData( + $form->partition, + $form->form_id, + $form->user_id, + ); + @endphp + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + @foreach (collect($history->data->submissions)->sortByDesc('formdata.record_date') as $sub) + @php + $sub->formdata->id = $sub->id; + + @endphp + + + + + + + + + + + + + + + + + + + + + @endforeach + +
Action.Plan DateExecution DoneCamp Execution DateType of meetLocationModule TypeMeeting DoneDr list submitted to HONo of Drs attended
+ + {{ $sub->formdata->plan_date }}{{ isset($sub->formdata->execution_done) && $sub->formdata->execution_done == 'yes' ? 'Yes' : 'No' }} + {{ $sub->formdata->execution_date }}{{ isset($sub->formdata->type_of_meet) ? $sub->formdata->type_of_meet : '' }}{{ isset($sub->formdata->location) ? $sub->formdata->location : '' }}{{ isset($sub->formdata->module_type) ? $sub->formdata->module_type : '' }}{{ isset($sub->formdata->meeting_done) ? $sub->formdata->meeting_done : '' }}{{ isset($sub->formdata->dr_list_submitted_to_ho) ? $sub->formdata->dr_list_submitted_to_ho : '' }}{{ isset($sub->formdata->no_of_drs_attended) ? $sub->formdata->no_of_drs_attended : '' }}
+
+ +
+ +
+
+ + @csrf + @if ($id) + + @endif + @foreach ($questions as $question) + @if (in_array($question->code, [ + 'execution_date', + 'meeting_done', + 'dr_list_submitted_to_ho', + 'no_of_drs_attended' + ])) + @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 + + @case('checkbox') + @foreach ($question->options as $option) +
+ value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked' : '' }}> + +
+ @endforeach + @break + + @case('file') + + @break + @endswitch +
+ @endforeach + @if (!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes')) +
+ +
+ @endif +
+
+ +
+
+ + @csrf + + + @foreach ($questions as $question) +
+ + @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 + + @case('checkbox') + @foreach ($question->options as $option) +
+ value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked' : '' }}> + +
+ @endforeach + @break + + @case('file') + + @break + @endswitch +
+ @endforeach + @if (!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes')) +
+ +
+ @endif +
+
+ +
+
+ + + + +
+
+ +
+ +
+ + + @include('layouts.shared/footer-script') + + + + + + diff --git a/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5-history.blade.php b/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5-history.blade.php new file mode 100644 index 00000000..f065fd29 --- /dev/null +++ b/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5-history.blade.php @@ -0,0 +1,188 @@ + + + + @include('layouts.shared/title-meta', ['title' => "History"]) + @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) + + + +
+
+ + +
+
+

{{$formname}}

+
+
+ New Submission +
+
+ + @if(session()->has('message')) +
+ {{ session()->get('message') }} +
+ @endif + @if(session()->has('error')) +
+ {{ session()->get('error') }} +
+ @endif +
+
+
+
+
+
+
+ + + + + @foreach($questions as $code => $question) + @if($question->type == 'hidden') + @continue; + @endif + + @endforeach + + + + + @foreach($submissions as $submission) + + + @foreach($questions as $code => $question) + @if($question->type == 'hidden') + @continue; + @endif + @if($question->type == 'file') + + + @elseif($question->type == 'radiometrix' && isset($submission->formdata->{$code}) && is_object($submission->formdata->{$code})) + + + @elseif(count((array)$question->options) > 0 && 1==2 ) + + @else + + @endif + @endforeach + + + @endforeach + +
Submission Date{{$question->label}}Action
{{date("d M Y", strtotime($submission->updatedAt))}} Download + {{ collect((array)$submission->formdata->{$code})->map(function($val, $key){ return "$key: $val"; })->implode(', ') }} + {{ $question->options->{ $submission->formdata->{$code} } }}{{ isset($submission->formdata->{$code}) ? is_array($submission->formdata->{$code})? implode(', ', $submission->formdata->{$code}) :$submission->formdata->{$code} : $code }} + + @if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 ) + + @if($submission->workflow == 'yes' && $submission->workflow_status == 'approved') + +

Approved

+ + @else + + {{-- EDIT BUTTON COMMENTED --}} + {{-- + + Edit + + --}} + + @if(true) + + + + + + @endif + + @endif + + @endif + +
+
+ +
+
+ +
+
+
+
+ +
+ +
+ + @include('layouts.shared/footer-script') + + + + + \ No newline at end of file diff --git a/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php b/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php index a39d65ad..391ab421 100644 --- a/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php +++ b/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php @@ -27,7 +27,7 @@ @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
@if($form->link_type == 'form') - View History + @else Back @endif @@ -58,6 +58,22 @@ @endif @foreach($questions as $question) + @php + + $hideFields = [ + 'date', + 'contact_id', + 'month_1_rx', + 'month_2_rx', + 'month_3_rx', + 'converted' + ]; + + @endphp + + @if(in_array($question->code, $hideFields)) + @continue + @endif
@switch($question->type) @@ -97,8 +113,12 @@ // Decode the first option's value to use as heading labels $headings = count($question->options) > 0 - ? json_decode($question->options[0]->value) + ? json_decode($question->options[0]->value, true) : []; + + if(!is_array($headings)){ + $headings = []; + } @endphp {{-- Matrix Wrapper with Horizontal Scroll on Small Screens --}} @@ -116,7 +136,14 @@ {{-- Table Rows --}} @foreach ($question->options as $option) - @php $nn = json_decode($option->value); @endphp + @php + $nn = json_decode($option->value, true); + + // fallback if invalid json + if(!is_array($nn)){ + $nn = []; + } + @endphp
@@ -180,18 +207,45 @@
@endforeach @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) -
+
+
+
+
+
Tagged Doctors
+
+
+
+ + + + + + + + + + + + + + + +
Doctor NameSpecialityMonth1 RxMonth2 RxMonth3 Rx
+ No Doctors Found +
+
+
+
+
-
+
@endif - +
- -
@@ -224,20 +278,231 @@ .upload-doc-fields { display: none; } + +.rx_count{ + width: 70px; +} + + + @include('layouts.shared/footer-script') + + + + + diff --git a/resources/views/form/rapport-team3/1774866189-e645a43b-8be4-418a-ab42-cbb1dcae232e.blade_new.php b/resources/views/form/rapport-team3/1774866189-e645a43b-8be4-418a-ab42-cbb1dcae232e.blade_new.php new file mode 100644 index 00000000..387d67b0 --- /dev/null +++ b/resources/views/form/rapport-team3/1774866189-e645a43b-8be4-418a-ab42-cbb1dcae232e.blade_new.php @@ -0,0 +1,594 @@ + + + + + @include('layouts.shared/title-meta', ['title' => 'Form']) + @include('layouts.shared/head-css', ['mode' => $mode ?? '', 'demo' => $demo ?? '']) + + +
+ 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')
+    
+
+    
+
+
+
+
+
diff --git a/resources/views/form/rapport-team3/1774866189-e645a43b-8be4-418a-ab42-cbb1dcae232e.blade_old.php b/resources/views/form/rapport-team3/1774866189-e645a43b-8be4-418a-ab42-cbb1dcae232e.blade_old.php
new file mode 100644
index 00000000..2c771f21
--- /dev/null
+++ b/resources/views/form/rapport-team3/1774866189-e645a43b-8be4-418a-ab42-cbb1dcae232e.blade_old.php
@@ -0,0 +1,426 @@
+
+
+
+    @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 ac8f7de6af35a5db145727c1246ae451664f2bda Mon Sep 17 00:00:00 2001
From: Farhan Pathan 
Date: Tue, 9 Jun 2026 10:55:35 +0530
Subject: [PATCH 3/7] Removed Upload Rx Image option in GALVUS NPIs form, Shown
 Doctor list dropdown instead of text box in GALVUS NPI form, Added Upload POB
 Image option in Bisofig POB Drive form

---
 ...0da9-b147-435f-a0be-e2b9087d3c49.blade.php | 370 ++++++++++++++++++
 ...33e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php |  53 ++-
 ...d43c-0466-4e4d-9a15-0adaa01f5b94.blade.php | 112 +++++-
 ...c4bf-8d55-48e3-b670-0236a84179ab.blade.php |  42 ++
 4 files changed, 557 insertions(+), 20 deletions(-)

diff --git a/resources/views/form/rapport-arise/1777097685-b3bf0da9-b147-435f-a0be-e2b9087d3c49.blade.php b/resources/views/form/rapport-arise/1777097685-b3bf0da9-b147-435f-a0be-e2b9087d3c49.blade.php
index 4bf6a1e3..06eb0bf1 100644
--- a/resources/views/form/rapport-arise/1777097685-b3bf0da9-b147-435f-a0be-e2b9087d3c49.blade.php
+++ b/resources/views/form/rapport-arise/1777097685-b3bf0da9-b147-435f-a0be-e2b9087d3c49.blade.php
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:resources/views/form/rapport-arise/1777097685-b3bf0da9-b147-435f-a0be-e2b9087d3c49.blade.php
 
 
 
@@ -306,4 +307,373 @@
 
 
 
+=======
+
+
+
+    @include('layouts.shared/title-meta', ['title' => "Form"])
+    @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? ''])
+    
+
+

+   processing...
+

+
+    
+    
+
+@include('layouts.shared/footer-script')
+
+
+
+
+>>>>>>> 5906af6e (1.Removed Upload Rx Image option in GALVUS NPIs form 2.Shown Doctor list dropdown instead of text box in GALVUS NPI form 3.Added new field Upload POB Image option in Bisofig POB Drive form):resources/views/form/rapport-vitalis/1778220759-74ee7fca-186f-46a0-8f37-97c7fb2bbc54.blade.php
 
\ No newline at end of file
diff --git a/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php b/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php
index 7e219305..708feb36 100644
--- a/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php
+++ b/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php
@@ -899,11 +899,62 @@ $brandData2 = [
                 $('#field-dynulta_week4').val(Math.round(month_plan_units_Dynulta*1));
                 
                 
+<<<<<<< HEAD
         })
 
             
 
         $('.edit-btn').click(function() {
+=======
+        // })
+        
+        
+
+        $('.edit-btn').click(function() {
+            // First make all readonly
+            // $('#execution-form input').prop('readonly', true);
+
+             // Keep only PLAN fields editable (plan with value that user filled while making plan and week selection fields)
+            $('#execution-vintor_4k_units').prop('readonly', false);
+            $('#execution-vintor_10k_units').prop('readonly', false);
+            $('#execution-encicarb_500_units').prop('readonly', false);
+            $('#execution-encicarb_100_units').prop('readonly', false);
+            $('#execution-dynulta_units').prop('readonly', false);
+
+            $('#execution-vintor_4k_week1').prop('readonly', false);
+            $('#execution-vintor_4k_week2').prop('readonly', false);
+            $('#execution-vintor_4k_week3').prop('readonly', false);
+            $('#execution-vintor_4k_week4').prop('readonly', false);
+
+            $('#execution-vintor_10k_week1').prop('readonly', false);
+            $('#execution-vintor_10k_week2').prop('readonly', false);
+            $('#execution-vintor_10k_week3').prop('readonly', false);
+            $('#execution-vintor_10k_week4').prop('readonly', false);
+
+            $('#execution-encicarb_500_week1').prop('readonly', false);
+            $('#execution-encicarb_500_week2').prop('readonly', false);
+            $('#execution-encicarb_500_week3').prop('readonly', false);
+            $('#execution-encicarb_500_week4').prop('readonly', false);
+
+            $('#execution-encicarb_100_week1').prop('readonly', false);
+            $('#execution-encicarb_100_week2').prop('readonly', false);
+            $('#execution-encicarb_100_week3').prop('readonly', false);
+            $('#execution-encicarb_100_week4').prop('readonly', false);
+
+            $('#execution-dynulta_week1').prop('readonly', false);
+            $('#execution-dynulta_week2').prop('readonly', false);
+            $('#execution-dynulta_week3').prop('readonly', false);
+            $('#execution-dynulta_week4').prop('readonly', false);
+
+            // execution fields still editable
+            // $('[id*="_exe"]').prop('readonly', false);
+
+            // percentage + total execution readonly
+            $('[id*="_percent"]').prop('readonly', true);
+            $('[id*="_units_execution"]').prop('readonly', true);
+
+
+>>>>>>> 5906af6e (1.Removed Upload Rx Image option in GALVUS NPIs form 2.Shown Doctor list dropdown instead of text box in GALVUS NPI form 3.Added new field Upload POB Image option in Bisofig POB Drive form)
             $('#execution-form-wrapper').show(100, () => {
                 $('#add-camp-btn').hide(0);
             })
@@ -925,7 +976,7 @@ $brandData2 = [
                 e.preventDefault();
             })
 
-            
+       
             $('#execution-speciality').prop('readonly', true)
             $('#execution-plan_date').prop('readonly', true)
             $('#execution-uid_number').prop('readonly',true);
diff --git a/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php b/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
index 6d13c60a..e2376e25 100644
--- a/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
+++ b/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
@@ -84,7 +84,7 @@
                                             
                                             @foreach ($question->options as $option)
                                             @if($question->code == 'contact_id'  && isset($option->contact->type) && $option->contact->type != 'chemist' )
-                                            
                                             @elseif($question->code != 'contact_id')
@@ -178,6 +178,71 @@
 
 
 
 
-=======
-
-
-
-    @include('layouts.shared/title-meta', ['title' => "Form"])
-    @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? ''])
-    
-
-

-   processing...
-

-
-    
-    
-
-@include('layouts.shared/footer-script')
-
-
-
-
->>>>>>> 5906af6e (1.Removed Upload Rx Image option in GALVUS NPIs form 2.Shown Doctor list dropdown instead of text box in GALVUS NPI form 3.Added new field Upload POB Image option in Bisofig POB Drive form):resources/views/form/rapport-vitalis/1778220759-74ee7fca-186f-46a0-8f37-97c7fb2bbc54.blade.php
 
\ No newline at end of file
diff --git a/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php b/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php
index 708feb36..7e219305 100644
--- a/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php
+++ b/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php
@@ -899,62 +899,11 @@ $brandData2 = [
                 $('#field-dynulta_week4').val(Math.round(month_plan_units_Dynulta*1));
                 
                 
-<<<<<<< HEAD
         })
 
             
 
         $('.edit-btn').click(function() {
-=======
-        // })
-        
-        
-
-        $('.edit-btn').click(function() {
-            // First make all readonly
-            // $('#execution-form input').prop('readonly', true);
-
-             // Keep only PLAN fields editable (plan with value that user filled while making plan and week selection fields)
-            $('#execution-vintor_4k_units').prop('readonly', false);
-            $('#execution-vintor_10k_units').prop('readonly', false);
-            $('#execution-encicarb_500_units').prop('readonly', false);
-            $('#execution-encicarb_100_units').prop('readonly', false);
-            $('#execution-dynulta_units').prop('readonly', false);
-
-            $('#execution-vintor_4k_week1').prop('readonly', false);
-            $('#execution-vintor_4k_week2').prop('readonly', false);
-            $('#execution-vintor_4k_week3').prop('readonly', false);
-            $('#execution-vintor_4k_week4').prop('readonly', false);
-
-            $('#execution-vintor_10k_week1').prop('readonly', false);
-            $('#execution-vintor_10k_week2').prop('readonly', false);
-            $('#execution-vintor_10k_week3').prop('readonly', false);
-            $('#execution-vintor_10k_week4').prop('readonly', false);
-
-            $('#execution-encicarb_500_week1').prop('readonly', false);
-            $('#execution-encicarb_500_week2').prop('readonly', false);
-            $('#execution-encicarb_500_week3').prop('readonly', false);
-            $('#execution-encicarb_500_week4').prop('readonly', false);
-
-            $('#execution-encicarb_100_week1').prop('readonly', false);
-            $('#execution-encicarb_100_week2').prop('readonly', false);
-            $('#execution-encicarb_100_week3').prop('readonly', false);
-            $('#execution-encicarb_100_week4').prop('readonly', false);
-
-            $('#execution-dynulta_week1').prop('readonly', false);
-            $('#execution-dynulta_week2').prop('readonly', false);
-            $('#execution-dynulta_week3').prop('readonly', false);
-            $('#execution-dynulta_week4').prop('readonly', false);
-
-            // execution fields still editable
-            // $('[id*="_exe"]').prop('readonly', false);
-
-            // percentage + total execution readonly
-            $('[id*="_percent"]').prop('readonly', true);
-            $('[id*="_units_execution"]').prop('readonly', true);
-
-
->>>>>>> 5906af6e (1.Removed Upload Rx Image option in GALVUS NPIs form 2.Shown Doctor list dropdown instead of text box in GALVUS NPI form 3.Added new field Upload POB Image option in Bisofig POB Drive form)
             $('#execution-form-wrapper').show(100, () => {
                 $('#add-camp-btn').hide(0);
             })
@@ -976,7 +925,7 @@ $brandData2 = [
                 e.preventDefault();
             })
 
-       
+            
             $('#execution-speciality').prop('readonly', true)
             $('#execution-plan_date').prop('readonly', true)
             $('#execution-uid_number').prop('readonly',true);
diff --git a/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php b/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
index e2376e25..6d13c60a 100644
--- a/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
+++ b/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
@@ -84,7 +84,7 @@
                                             
                                             @foreach ($question->options as $option)
                                             @if($question->code == 'contact_id'  && isset($option->contact->type) && $option->contact->type != 'chemist' )
-                                            
                                             @elseif($question->code != 'contact_id')
@@ -178,71 +178,6 @@
 
 
     
 
diff --git a/resources/views/form/rapport-team3/1780482240-add652c4-0e79-4524-8ec1-fc3c8bb2b9e0.blade.php b/resources/views/form/rapport-team3/1780482240-add652c4-0e79-4524-8ec1-fc3c8bb2b9e0.blade.php
new file mode 100644
index 00000000..56b9e2e1
--- /dev/null
+++ b/resources/views/form/rapport-team3/1780482240-add652c4-0e79-4524-8ec1-fc3c8bb2b9e0.blade.php
@@ -0,0 +1,479 @@
+
+
+
+    @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
diff --git a/resources/views/form/rapport-team3/1780486861-23784b46-4c61-41e1-87a8-fc54f8bbdd4e.blade.php b/resources/views/form/rapport-team3/1780486861-23784b46-4c61-41e1-87a8-fc54f8bbdd4e.blade.php
new file mode 100644
index 00000000..7afeb4f6
--- /dev/null
+++ b/resources/views/form/rapport-team3/1780486861-23784b46-4c61-41e1-87a8-fc54f8bbdd4e.blade.php
@@ -0,0 +1,477 @@
+
+
+
+    @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
diff --git a/resources/views/form/rapport-team3/1780548606-6544d930-7144-4b75-b769-560752809662.blade.php b/resources/views/form/rapport-team3/1780548606-6544d930-7144-4b75-b769-560752809662.blade.php
new file mode 100644
index 00000000..8e44de3f
--- /dev/null
+++ b/resources/views/form/rapport-team3/1780548606-6544d930-7144-4b75-b769-560752809662.blade.php
@@ -0,0 +1,443 @@
+
+
+
+    @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
diff --git a/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php b/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
index 6d13c60a..0de3b14c 100644
--- a/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
+++ b/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
@@ -84,7 +84,7 @@
                                             
                                             @foreach ($question->options as $option)
                                             @if($question->code == 'contact_id'  && isset($option->contact->type) && $option->contact->type != 'chemist' )
-                                            
                                             @elseif($question->code != 'contact_id')
@@ -178,6 +178,22 @@