From 6e5b10222190324b4af77d9078972086f85a8eff Mon Sep 17 00:00:00 2001 From: Ravi Gulhane <> Date: Thu, 16 Jul 2026 09:45:44 +0530 Subject: [PATCH 1/3] Changes --- resources/views/form/fullworkflow.blade.php | 8 +- resources/views/form/list.blade.php | 4 +- ...1cd8-cb64-4efd-8928-25ddc4849f80.blade.php | 4 +- .../form/rapport-inventia/list.blade.php | 4 +- ...81a1-5d69-4b96-95da-dc49f1d75987.blade.php | 740 +++++----- ...c1b8-d34d-4ada-9ab8-661291282b1c.blade.php | 4 +- ...-312b-4a60-nebmitra-15afa4ce6163.blade.php | 2 + ...683c-b91a-4a62-95c1-3edc589f6d30.blade.php | 4 +- ...43b9-94d0-4dcb-b3f3-4fa11588a0a9.blade.php | 4 +- ...9477-fa29-4040-b5da-b15df9e06b78.blade.php | 440 +++--- ...1858-8520-45e9-aa5c-239b6bacdf98.blade.php | 1236 ++++++++-------- ...f68d-0dcb-4c04-b10b-3e6cd2152e56.blade.php | 1246 ++++++++--------- .../views/form/rapport-xennex/list.blade.php | 4 +- .../views/form/rapport-xennex/list_.blade.php | 4 +- 14 files changed, 1853 insertions(+), 1851 deletions(-) diff --git a/resources/views/form/fullworkflow.blade.php b/resources/views/form/fullworkflow.blade.php index ee5dec8b..92d05abe 100644 --- a/resources/views/form/fullworkflow.blade.php +++ b/resources/views/form/fullworkflow.blade.php @@ -188,7 +188,7 @@ $.ajax({ url: '/form/approverejectmultiple', type: 'GET', - data: {action:'approve', ids:[that.attr('submission')], form_id:'1719380553-df77ae1b-7861-4e3d-a8ef-6ae1b94bf456'}, + data: {action:'approve', ids:[that.attr('submission')], form_id:'1719380553-df77ae1b-7861-4e3d-a8ef-6ae1b94bf456', user_id:'{{ $formdata->user_id ?? '' }}', partition:'{{ $formdata->partition ?? '' }}'}, success: function( data ) { $("#pageloader").fadeOut(); $('#scrollable-modal').modal('hide'); @@ -207,7 +207,7 @@ $.ajax({ url: '/form/approverejectmultiple', type: 'GET', - data: {action:'reject', ids:[that.attr('submission')], form_id:'1719380553-df77ae1b-7861-4e3d-a8ef-6ae1b94bf456'}, + data: {action:'reject', ids:[that.attr('submission')], form_id:'1719380553-df77ae1b-7861-4e3d-a8ef-6ae1b94bf456', user_id:'{{ $formdata->user_id ?? '' }}', partition:'{{ $formdata->partition ?? '' }}'}, success: function( data ) { $("#pageloader").fadeOut(); $('#scrollable-modal').modal('hide'); @@ -235,7 +235,7 @@ $.ajax({ url: '/form/approverejectmultiple', type: 'GET', - data: {action:'approve', ids:selected, form_id:'1719380553-df77ae1b-7861-4e3d-a8ef-6ae1b94bf456'}, + data: {action:'approve', ids:selected, form_id:'1719380553-df77ae1b-7861-4e3d-a8ef-6ae1b94bf456', user_id:'{{ $formdata->user_id ?? '' }}', partition:'{{ $formdata->partition ?? '' }}'}, dataType: "json", success: function(resultData) { $("#pageloader").fadeOut(); @@ -269,7 +269,7 @@ $.ajax({ url: '/form/approverejectmultiple', type: 'GET', - data: {action:'reject', ids:selected, form_id:'1719380553-df77ae1b-7861-4e3d-a8ef-6ae1b94bf456'}, + data: {action:'reject', ids:selected, form_id:'1719380553-df77ae1b-7861-4e3d-a8ef-6ae1b94bf456', user_id:'{{ $formdata->user_id ?? '' }}', partition:'{{ $formdata->partition ?? '' }}'}, dataType: "json", success: function(resultData) { $("#pageloader").fadeOut(); diff --git a/resources/views/form/list.blade.php b/resources/views/form/list.blade.php index 49e4cb8d..1d4bf1ef 100644 --- a/resources/views/form/list.blade.php +++ b/resources/views/form/list.blade.php @@ -304,7 +304,7 @@ let that = $(this); $.ajax({ type: "GET", - url: '/form/approvereject?action=approve&id=' + that.attr('submission') + '&form_id=' + formId, + url: '/form/approvereject?action=approve&id=' + that.attr('submission') + '&form_id=' + formId + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}', processData: false, contentType: false, success: function() { @@ -323,7 +323,7 @@ let that = $(this); $.ajax({ type: "GET", - url: '/form/approvereject?action=reject&id=' + that.attr('submission') + '&form_id=' + formId, + url: '/form/approvereject?action=reject&id=' + that.attr('submission') + '&form_id=' + formId + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}', processData: false, contentType: false, success: function() { diff --git a/resources/views/form/rapport-acute/list-1699019684-4d6a1cd8-cb64-4efd-8928-25ddc4849f80.blade.php b/resources/views/form/rapport-acute/list-1699019684-4d6a1cd8-cb64-4efd-8928-25ddc4849f80.blade.php index b80470b8..75203c85 100644 --- a/resources/views/form/rapport-acute/list-1699019684-4d6a1cd8-cb64-4efd-8928-25ddc4849f80.blade.php +++ b/resources/views/form/rapport-acute/list-1699019684-4d6a1cd8-cb64-4efd-8928-25ddc4849f80.blade.php @@ -177,7 +177,7 @@ $('.btn-approve').click(function(){ $.ajax({ type: "GET", - url: '/form/approvereject?action=approve&id=' + $(this).attr('submission'), + url: '/form/approvereject?action=approve&id=' + $(this).attr('submission') + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}', //data: new FormData($('#report-form')[0]), processData: false, contentType: false, @@ -190,7 +190,7 @@ $('.btn-reject').click(function(){ $.ajax({ type: "GET", - url: '/form/approvereject?action=reject&id=' + $(this).attr('submission'), + url: '/form/approvereject?action=reject&id=' + $(this).attr('submission') + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}', //data: new FormData($('#report-form')[0]), processData: false, contentType: false, diff --git a/resources/views/form/rapport-inventia/list.blade.php b/resources/views/form/rapport-inventia/list.blade.php index 55e37d27..4186cbc9 100644 --- a/resources/views/form/rapport-inventia/list.blade.php +++ b/resources/views/form/rapport-inventia/list.blade.php @@ -179,7 +179,7 @@ let that = $(this) $.ajax({ type: "GET", - url: '/form/approvereject?action=approve&id=' + $(this).attr('submission'), + url: '/form/approvereject?action=approve&id=' + $(this).attr('submission') + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}', //data: new FormData($('#report-form')[0]), processData: false, contentType: false, @@ -195,7 +195,7 @@ let that = $(this) $.ajax({ type: "GET", - url: '/form/approvereject?action=reject&id=' + $(this).attr('submission'), + url: '/form/approvereject?action=reject&id=' + $(this).attr('submission') + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}', //data: new FormData($('#report-form')[0]), processData: false, contentType: false, diff --git a/resources/views/form/rapport-team3/list-1694761350-3cfa81a1-5d69-4b96-95da-dc49f1d75987.blade.php b/resources/views/form/rapport-team3/list-1694761350-3cfa81a1-5d69-4b96-95da-dc49f1d75987.blade.php index c4612679..2657cada 100644 --- a/resources/views/form/rapport-team3/list-1694761350-3cfa81a1-5d69-4b96-95da-dc49f1d75987.blade.php +++ b/resources/views/form/rapport-team3/list-1694761350-3cfa81a1-5d69-4b96-95da-dc49f1d75987.blade.php @@ -1,370 +1,370 @@ - - - - - @include('layouts.shared/title-meta', ['title' => 'History']) - @include('layouts.shared/head-css', ['mode' => $mode ?? '', 'demo' => $demo ?? '']) - -
- processing... -
- - -
-
- - -
-
-

{{ $formname }}

-
-
- Download. - -
-
-

Showing data for last 30 days, please use above button "Download" to download all submissions - - {{-- @php echo "

"; print_r($submissions) @endphp --}}
-                    

-
-
- - @if (session()->has('message')) -
- {{ session()->get('message') }} -
- @endif - @if (session()->has('error')) -
- {{ session()->get('error') }} -
- @endif -
- -
-
-
-
-
-
-
- - - - - - @if (isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes') - - @endif - @foreach ($questions as $code => $question) - @if ($question->type == 'multitextbox') - @foreach ($question->options as $k => $v) - - @endforeach - @else - - @endif - @endforeach - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @foreach ($submissions as $submission) - @if (isset($submission->user_info->name)) - - - - - @if (isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes') - - @endif - - @foreach ($questions as $code => $question) - @if ($question->type == 'multitextbox') - @foreach ($question->options as $k => $v) - - @endforeach - @elseif($question->type == 'file') - - @else - - - - @for ($suffix = 1; $suffix <= 25; $suffix++) - - - - - @endfor - - - {{-- --}} - @endif - @endforeach - {{-- --}} - - @endif - @endforeach - -
Submission DateSubmitted ByWorkflow Status{{ $v }} - ({{ $question->label }}) - {{ $question->label }}Doctor Name 1MSL Code 1Speciality 1Role 1Doctor Name 2MSL Code 2Speciality 2Role 2Doctor Name 3MSL Code 3Speciality 3Role 3Doctor Name 4MSL Code 4Speciality 4Role 4Doctor Name 5MSL Code 5Speciality 5Role 5Doctor Name 6MSL Code 6Speciality 6Role 6Doctor Name 7MSL Code 7Speciality 7Role 7Doctor Name 8MSL Code 8Speciality 8Role 8Doctor Name 9MSL Code 9Speciality 9Role 9Doctor Name 10MSL Code 10Speciality 10Role 10Doctor Name 11MSL Code 11Speciality 11Role 11Doctor Name 12MSL Code 12Speciality 12Role 12Doctor Name 13MSL Code 13Speciality 13Role 13Doctor Name 14MSL Code 14Speciality 14Role 14Doctor Name 15MSL Code 15Speciality 15Role 15Doctor Name 16MSL Code 16Speciality 16Role 16Doctor Name 17MSL Code 17Speciality 17Role 17Doctor Name 18MSL Code 18Speciality 18Role 18Doctor Name 19MSL Code 19Speciality 19Role 19Doctor Name 20MSL Code 20Speciality 20Role 20Doctor Name 21MSL Code 21Speciality 21Role 21Doctor Name 22MSL Code 22Speciality 22Role 22Doctor Name 23MSL Code 23Speciality 23Role 23Doctor Name 24MSL Code 24Speciality 24Role 24Doctor Name 25MSL Code 25Speciality 25Role 25Action
{{ date('d M Y', strtotime(isset($submission->record_date) ? $submission->record_date : $submission->updatedAt)) }} - - - -
- {{ $submission->user_info->name }}
-

- {{ $submission->user_info->designation }} -

- 		{{ ucwords($submission->workflow_status) }}{{ isset($submission->formdata->{$k}) ? (is_array($submission->formdata->{$k}) ? implode(', ', $submission->formdata->{$k}) : $submission->formdata->{$k}) : '' }} - - Download{{ isset($submission->formdata->record_date) ? $submission->formdata->record_date : '' }} - {{ isset($submission->formdata->{"doctor_name_$suffix"}) ? $submission->formdata->{"doctor_name_$suffix"} : '' }}{{ isset($submission->formdata->{"msl_code_$suffix"}) ? $submission->formdata->{"msl_code_$suffix"} : '' }}{{ isset($submission->formdata->{"speciality_$suffix"}) ? $submission->formdata->{"speciality_$suffix"} : '' }}{{ isset($submission->formdata->{"role_$suffix"}) ? $submission->formdata->{"role_$suffix"} : '' }}{{ isset($submission->formdata->{$code}) ? (is_array($submission->formdata->{$code}) ? implode(', ', $submission->formdata->{$code}) : $submission->formdata->{$code}) : '' }} - @if (in_array('edit', $submission->actions)) - Edit - @endif - @if (isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' && $submission->workflow_status == 'unapproved') - - - @endif --}} - {{--
-
- -
-
- @if ($lastkey) -
- -
- @endif -
-
-
-
- -
- -
- - - - @include('layouts.shared/footer-script') - - - - + + + + + @include('layouts.shared/title-meta', ['title' => 'History']) + @include('layouts.shared/head-css', ['mode' => $mode ?? '', 'demo' => $demo ?? '']) + +
+ processing... +
+ + +
+
+ + +
+
+

{{ $formname }}

+
+
+ Download. + +
+
+

Showing data for last 30 days, please use above button "Download" to download all submissions + + {{-- @php echo "

"; print_r($submissions) @endphp --}}
+                    

+
+
+ + @if (session()->has('message')) +
+ {{ session()->get('message') }} +
+ @endif + @if (session()->has('error')) +
+ {{ session()->get('error') }} +
+ @endif +
+ +
+
+
+
+
+
+
+ + + + + + @if (isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes') + + @endif + @foreach ($questions as $code => $question) + @if ($question->type == 'multitextbox') + @foreach ($question->options as $k => $v) + + @endforeach + @else + + @endif + @endforeach + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @foreach ($submissions as $submission) + @if (isset($submission->user_info->name)) + + + + + @if (isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes') + + @endif + + @foreach ($questions as $code => $question) + @if ($question->type == 'multitextbox') + @foreach ($question->options as $k => $v) + + @endforeach + @elseif($question->type == 'file') + + @else + + + + @for ($suffix = 1; $suffix <= 25; $suffix++) + + + + + @endfor + + + {{-- --}} + @endif + @endforeach + {{-- --}} + + @endif + @endforeach + +
Submission DateSubmitted ByWorkflow Status{{ $v }} + ({{ $question->label }}) + {{ $question->label }}Doctor Name 1MSL Code 1Speciality 1Role 1Doctor Name 2MSL Code 2Speciality 2Role 2Doctor Name 3MSL Code 3Speciality 3Role 3Doctor Name 4MSL Code 4Speciality 4Role 4Doctor Name 5MSL Code 5Speciality 5Role 5Doctor Name 6MSL Code 6Speciality 6Role 6Doctor Name 7MSL Code 7Speciality 7Role 7Doctor Name 8MSL Code 8Speciality 8Role 8Doctor Name 9MSL Code 9Speciality 9Role 9Doctor Name 10MSL Code 10Speciality 10Role 10Doctor Name 11MSL Code 11Speciality 11Role 11Doctor Name 12MSL Code 12Speciality 12Role 12Doctor Name 13MSL Code 13Speciality 13Role 13Doctor Name 14MSL Code 14Speciality 14Role 14Doctor Name 15MSL Code 15Speciality 15Role 15Doctor Name 16MSL Code 16Speciality 16Role 16Doctor Name 17MSL Code 17Speciality 17Role 17Doctor Name 18MSL Code 18Speciality 18Role 18Doctor Name 19MSL Code 19Speciality 19Role 19Doctor Name 20MSL Code 20Speciality 20Role 20Doctor Name 21MSL Code 21Speciality 21Role 21Doctor Name 22MSL Code 22Speciality 22Role 22Doctor Name 23MSL Code 23Speciality 23Role 23Doctor Name 24MSL Code 24Speciality 24Role 24Doctor Name 25MSL Code 25Speciality 25Role 25Action
{{ date('d M Y', strtotime(isset($submission->record_date) ? $submission->record_date : $submission->updatedAt)) }} + + + +
+ {{ $submission->user_info->name }}
+

+ {{ $submission->user_info->designation }} +

+ 		{{ ucwords($submission->workflow_status) }}{{ isset($submission->formdata->{$k}) ? (is_array($submission->formdata->{$k}) ? implode(', ', $submission->formdata->{$k}) : $submission->formdata->{$k}) : '' }} + + Download{{ isset($submission->formdata->record_date) ? $submission->formdata->record_date : '' }} + {{ isset($submission->formdata->{"doctor_name_$suffix"}) ? $submission->formdata->{"doctor_name_$suffix"} : '' }}{{ isset($submission->formdata->{"msl_code_$suffix"}) ? $submission->formdata->{"msl_code_$suffix"} : '' }}{{ isset($submission->formdata->{"speciality_$suffix"}) ? $submission->formdata->{"speciality_$suffix"} : '' }}{{ isset($submission->formdata->{"role_$suffix"}) ? $submission->formdata->{"role_$suffix"} : '' }}{{ isset($submission->formdata->{$code}) ? (is_array($submission->formdata->{$code}) ? implode(', ', $submission->formdata->{$code}) : $submission->formdata->{$code}) : '' }} + @if (in_array('edit', $submission->actions)) + Edit + @endif + @if (isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' && $submission->workflow_status == 'unapproved') + + + @endif --}} + {{--
+
+ +
+
+ @if ($lastkey) +
+ +
+ @endif +
+
+
+
+ +
+ +
+ + + + @include('layouts.shared/footer-script') + + + + diff --git a/resources/views/form/rapport-team3/list-1714578520-efa6c1b8-d34d-4ada-9ab8-661291282b1c.blade.php b/resources/views/form/rapport-team3/list-1714578520-efa6c1b8-d34d-4ada-9ab8-661291282b1c.blade.php index c90515ab..4f9fed87 100644 --- a/resources/views/form/rapport-team3/list-1714578520-efa6c1b8-d34d-4ada-9ab8-661291282b1c.blade.php +++ b/resources/views/form/rapport-team3/list-1714578520-efa6c1b8-d34d-4ada-9ab8-661291282b1c.blade.php @@ -209,7 +209,7 @@ let that = $(this) $.ajax({ type: "GET", - url: '/form/approvereject?action=approve&id=' + $(this).attr('submission'), + url: '/form/approvereject?action=approve&id=' + $(this).attr('submission') + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}', //data: new FormData($('#report-form')[0]), processData: false, contentType: false, @@ -225,7 +225,7 @@ let that = $(this) $.ajax({ type: "GET", - url: '/form/approvereject?action=reject&id=' + $(this).attr('submission'), + url: '/form/approvereject?action=reject&id=' + $(this).attr('submission') + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}', //data: new FormData($('#report-form')[0]), processData: false, contentType: false, diff --git a/resources/views/form/rapport-team3/list-1718178830-d871301e-312b-4a60-nebmitra-15afa4ce6163.blade.php b/resources/views/form/rapport-team3/list-1718178830-d871301e-312b-4a60-nebmitra-15afa4ce6163.blade.php index 02b8a31c..68c243bf 100644 --- a/resources/views/form/rapport-team3/list-1718178830-d871301e-312b-4a60-nebmitra-15afa4ce6163.blade.php +++ b/resources/views/form/rapport-team3/list-1718178830-d871301e-312b-4a60-nebmitra-15afa4ce6163.blade.php @@ -706,6 +706,8 @@ url: '/form/approvereject?action=' + currentAction + '&id=' + currentSubmission + '&form_id={{ $form_id }}' + + '&user_id={{ $formdata->user_id ?? '' }}' + + '&partition={{ $formdata->partition ?? '' }}' + '&reason=' + encodeURIComponent(reason), success: function(res) { $("#pageloader").fadeOut(); diff --git a/resources/views/form/rapport-team3/list-1724855317-a89d683c-b91a-4a62-95c1-3edc589f6d30.blade.php b/resources/views/form/rapport-team3/list-1724855317-a89d683c-b91a-4a62-95c1-3edc589f6d30.blade.php index b99144f3..afa6af05 100644 --- a/resources/views/form/rapport-team3/list-1724855317-a89d683c-b91a-4a62-95c1-3edc589f6d30.blade.php +++ b/resources/views/form/rapport-team3/list-1724855317-a89d683c-b91a-4a62-95c1-3edc589f6d30.blade.php @@ -188,7 +188,7 @@ let that = $(this) $.ajax({ type: "GET", - url: '/form/approvereject?action=approve&id=' + $(this).attr('submission'), + url: '/form/approvereject?action=approve&id=' + $(this).attr('submission') + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}', //data: new FormData($('#report-form')[0]), processData: false, contentType: false, @@ -204,7 +204,7 @@ let that = $(this) $.ajax({ type: "GET", - url: '/form/approvereject?action=reject&id=' + $(this).attr('submission'), + url: '/form/approvereject?action=reject&id=' + $(this).attr('submission') + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}', //data: new FormData($('#report-form')[0]), processData: false, contentType: false, diff --git a/resources/views/form/rapport-team3/list-1750914801-153443b9-94d0-4dcb-b3f3-4fa11588a0a9.blade.php b/resources/views/form/rapport-team3/list-1750914801-153443b9-94d0-4dcb-b3f3-4fa11588a0a9.blade.php index 233eeb0f..4b305641 100644 --- a/resources/views/form/rapport-team3/list-1750914801-153443b9-94d0-4dcb-b3f3-4fa11588a0a9.blade.php +++ b/resources/views/form/rapport-team3/list-1750914801-153443b9-94d0-4dcb-b3f3-4fa11588a0a9.blade.php @@ -458,7 +458,7 @@ $is_authorised = in_array('1655449174-a39a5017-8232-4d58-a253-90d06bc733d0', $ro let that = $(this) $.ajax({ type: "GET", - url: '/form/approvereject?action=approve&id=' + $(this).attr('submission') + '&form_id=' + '{{$form_id}}&user_id=' + user_id + '&next_approver=' + $(this).attr('next_approver') + '&countofneb=' + $(this).attr('no_of_nebulizer'), + url: '/form/approvereject?action=approve&id=' + $(this).attr('submission') + '&form_id=' + '{{$form_id}}&user_id=' + user_id + '&partition={{ $formdata->partition ?? '' }}&next_approver=' + $(this).attr('next_approver') + '&countofneb=' + $(this).attr('no_of_nebulizer'), //data: new FormData($('#report-form')[0]), processData: false, contentType: false, @@ -476,7 +476,7 @@ $is_authorised = in_array('1655449174-a39a5017-8232-4d58-a253-90d06bc733d0', $ro let that = $(this) $.ajax({ type: "GET", - url: '/form/approvereject?action=reject&id=' + $(this).attr('submission') + '&form_id=' + '{{$form_id}}&user_id=' + user_id + '&next_approver=' + $(this).attr('next_approver') + '&countofneb=' + $(this).attr('no_of_nebulizer'), + url: '/form/approvereject?action=reject&id=' + $(this).attr('submission') + '&form_id=' + '{{$form_id}}&user_id=' + user_id + '&partition={{ $formdata->partition ?? '' }}&next_approver=' + $(this).attr('next_approver') + '&countofneb=' + $(this).attr('no_of_nebulizer'), //data: new FormData($('#report-form')[0]), processData: false, contentType: false, diff --git a/resources/views/form/rapport-team3/list-1764312102-2f7e9477-fa29-4040-b5da-b15df9e06b78.blade.php b/resources/views/form/rapport-team3/list-1764312102-2f7e9477-fa29-4040-b5da-b15df9e06b78.blade.php index b12c78f3..afa6af05 100644 --- a/resources/views/form/rapport-team3/list-1764312102-2f7e9477-fa29-4040-b5da-b15df9e06b78.blade.php +++ b/resources/views/form/rapport-team3/list-1764312102-2f7e9477-fa29-4040-b5da-b15df9e06b78.blade.php @@ -1,221 +1,221 @@ - - - - @include('layouts.shared/title-meta', ['title' => "History"]) - @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) - -
- processing... -
- -
-
- - -
-
-

{{$formname}}

-
-
- Download - -
-
-

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

-
-
- - @if(session()->has('message')) -
- {{ session()->get('message') }} -
- @endif - @if(session()->has('error')) -
- {{ session()->get('error') }} -
- @endif -
- -
-
-
-
-
-
-
- - - - - - @if(isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' ) - - @endif - @foreach($questions as $code => $question) - @if($question->type == 'hidden' || $code == 'company_name') - @continue; - @endif - @if($question->type == 'multitextbox') - @foreach( $question->options as $k => $v ) - @if($question->type == 'hidden') - @continue; - @endif - - @endforeach - @else - - @endif - @endforeach - - - - - @foreach($submissions as $submission) - @if(isset($submission->user_info->name)) - - - - - @if(isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' ) - - @endif - @foreach($questions as $code => $question) - @if($question->type == 'hidden' || $code == 'company_name') - @continue; - @endif - @if($question->type == 'multitextbox') - @foreach( $question->options as $k => $v ) - - @endforeach - @elseif($question->type == 'file') - - @else - - @endif - @endforeach - - - @endif - @endforeach - -
Submission DateSubmitted ByWorkflow Status{{$v}} ({{$question->label}}){{$question->label}}Action
{{date("d M Y", strtotime(isset($submission->record_date) ? $submission->record_date : $submission->updatedAt))}} - - -
{{$submission->user_info->name}}
-

{{$submission->user_info->designation}}

- 		{{ucwords($submission->workflow_status)}}{{ isset($submission->formdata->{$k}) ? (is_array($submission->formdata->{$k}) ? implode(', ', $submission->formdata->{$k}) : $submission->formdata->{$k}) : '' }} Download{{ isset($submission->formdata->{$code}) ? (is_array($submission->formdata->{$code}) ? implode(', ', $submission->formdata->{$code}) : $submission->formdata->{$code}) : '' }} - @if( in_array('edit', $submission->actions) ) - Edit - @endif - @if(isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' && $submission->workflow_status == 'unapproved' ) - - - @endif -
-
- -
-
- @if($lastkey) -
- -
- @endif -
-
-
-
- -
- -
- - - - @include('layouts.shared/footer-script') - - + + + + @include('layouts.shared/title-meta', ['title' => "History"]) + @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) + +
+ processing... +
+ +
+
+ + +
+
+

{{$formname}}

+
+
+ Download + +
+
+

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

+
+
+ + @if(session()->has('message')) +
+ {{ session()->get('message') }} +
+ @endif + @if(session()->has('error')) +
+ {{ session()->get('error') }} +
+ @endif +
+ +
+
+
+
+
+
+
+ + + + + + @if(isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' ) + + @endif + @foreach($questions as $code => $question) + @if($question->type == 'hidden' || $code == 'company_name') + @continue; + @endif + @if($question->type == 'multitextbox') + @foreach( $question->options as $k => $v ) + @if($question->type == 'hidden') + @continue; + @endif + + @endforeach + @else + + @endif + @endforeach + + + + + @foreach($submissions as $submission) + @if(isset($submission->user_info->name)) + + + + + @if(isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' ) + + @endif + @foreach($questions as $code => $question) + @if($question->type == 'hidden' || $code == 'company_name') + @continue; + @endif + @if($question->type == 'multitextbox') + @foreach( $question->options as $k => $v ) + + @endforeach + @elseif($question->type == 'file') + + @else + + @endif + @endforeach + + + @endif + @endforeach + +
Submission DateSubmitted ByWorkflow Status{{$v}} ({{$question->label}}){{$question->label}}Action
{{date("d M Y", strtotime(isset($submission->record_date) ? $submission->record_date : $submission->updatedAt))}} + + +
{{$submission->user_info->name}}
+

{{$submission->user_info->designation}}

+ 		{{ucwords($submission->workflow_status)}}{{ isset($submission->formdata->{$k}) ? (is_array($submission->formdata->{$k}) ? implode(', ', $submission->formdata->{$k}) : $submission->formdata->{$k}) : '' }} Download{{ isset($submission->formdata->{$code}) ? (is_array($submission->formdata->{$code}) ? implode(', ', $submission->formdata->{$code}) : $submission->formdata->{$code}) : '' }} + @if( in_array('edit', $submission->actions) ) + Edit + @endif + @if(isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' && $submission->workflow_status == 'unapproved' ) + + + @endif +
+
+ +
+
+ @if($lastkey) +
+ +
+ @endif +
+
+
+
+ +
+ +
+ + + + @include('layouts.shared/footer-script') + + \ No newline at end of file diff --git a/resources/views/form/rapport-team3/list-1771861147-eb801858-8520-45e9-aa5c-239b6bacdf98.blade.php b/resources/views/form/rapport-team3/list-1771861147-eb801858-8520-45e9-aa5c-239b6bacdf98.blade.php index d39c1df0..bec088d6 100644 --- a/resources/views/form/rapport-team3/list-1771861147-eb801858-8520-45e9-aa5c-239b6bacdf98.blade.php +++ b/resources/views/form/rapport-team3/list-1771861147-eb801858-8520-45e9-aa5c-239b6bacdf98.blade.php @@ -1,619 +1,619 @@ - - - - @include('layouts.shared/title-meta', ['title' => "History"]) - @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) - - - -
- processing... -
- -@php -// echo "
"; print_r($formdata); exit;
-$logged_in_user = $formdata->user_id ?? '';
-$roles = [];
-foreach($formdata->roles as $role){
-    $roles[] = $role;
-};
-$is_authorised = in_array('1655449174-a39a5017-8232-4d58-a253-90d06bc733d0', $roles);
-@endphp
-
-
-    

-        

-    
-    

-        

-            
{{$formname}}

-        

-        

-            Download
-            
-        

-        

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

-        

-    

-    
-    @if(session()->has('message'))
-        

-            {{ session()->get('message') }}
-        

-    @endif
-    @if(session()->has('error'))
-        

-            {{ session()->get('error') }}
-        

-    @endif
-
-    
-    

-
-        

-            

-                

-                    

-                        

-                            

-                                
-                                
-                            

-                            

-                                
-                                
-                            

-                            

-                                
-                            

-                            
-                        

-                        

-                            

-                                

-                                    
-                                        
-                                            
-                                                
-                                                
-                                                
-                                                
-                                                
-                                                
-                                                @if(isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' )
-                                                
-                                                @endif
-                                                @foreach($questions as $code => $question)
-                                                    @if($question->type == 'multitextbox')
-                                                        @foreach( $question->options as $k => $v )
-                                                        @if($question->type == 'hidden')
-                                                            @continue;
-                                                        @endif
-                                                        
-                                                        @endforeach
-                                                    @else
-                                                    
-                                                    @endif
-                                                @endforeach
-                                                
-                                            
-                                        
-                                        
-                                            
-                                        
-                                    
ActionRecord IdStatusSubmission DateSubmitted ByEmployee CodeWorkflow Status{{$v}} ({{$question->label}}){{$question->label}}

-                                
 
-                            
 
-                        
 
-
-                        
-                        @if($lastkey)
-                        

-                            
-                        

-                        @endif
-                    
 
-                
 
-            

-        

-        
-    
 
-

-
-
-
-    
-    @include('layouts.shared/footer-script')
-    
-    
-    
-    
-
-    
-
+
+
+
+    @include('layouts.shared/title-meta', ['title' => "History"])
+    @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? ''])
+    
+    
+
+

+   processing...
+

+
+@php
+// echo "
"; print_r($formdata); exit;
+$logged_in_user = $formdata->user_id ?? '';
+$roles = [];
+foreach($formdata->roles as $role){
+    $roles[] = $role;
+};
+$is_authorised = in_array('1655449174-a39a5017-8232-4d58-a253-90d06bc733d0', $roles);
+@endphp
+
+
+    
+
+
+
+    
+    @include('layouts.shared/footer-script')
+    
+    
+    
+    
+
+    
+
 
\ No newline at end of file
diff --git a/resources/views/form/rapport-vitalis/list-1769675014-4dabf68d-0dcb-4c04-b10b-3e6cd2152e56.blade.php b/resources/views/form/rapport-vitalis/list-1769675014-4dabf68d-0dcb-4c04-b10b-3e6cd2152e56.blade.php
index 78047602..3ea36750 100644
--- a/resources/views/form/rapport-vitalis/list-1769675014-4dabf68d-0dcb-4c04-b10b-3e6cd2152e56.blade.php
+++ b/resources/views/form/rapport-vitalis/list-1769675014-4dabf68d-0dcb-4c04-b10b-3e6cd2152e56.blade.php
@@ -1,624 +1,624 @@
-
-
-
-    @include('layouts.shared/title-meta', ['title' => "History"])
-    @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? ''])
-    
-    
-    
-
-

-   processing...
-

-
-{{-- @php
-    echo "
";
-    print_r($questions);
-    exit;
-@endphp --}}
-
-
-    
-
-
-
-    
-    @include('layouts.shared/footer-script')
-    
-    
-    
-
-
-
-    
-
+
+
+
+    @include('layouts.shared/title-meta', ['title' => "History"])
+    @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? ''])
+    
+    
+    
+
+

+   processing...
+

+
+{{-- @php
+    echo "
";
+    print_r($questions);
+    exit;
+@endphp --}}
+
+
+    
+
+
+
+    
+    @include('layouts.shared/footer-script')
+    
+    
+    
+
+
+
+    
+
 
\ No newline at end of file
diff --git a/resources/views/form/rapport-xennex/list.blade.php b/resources/views/form/rapport-xennex/list.blade.php
index ec693308..9450f91b 100644
--- a/resources/views/form/rapport-xennex/list.blade.php
+++ b/resources/views/form/rapport-xennex/list.blade.php
@@ -191,7 +191,7 @@
                 let that = $(this)
                 $.ajax({
                     type: "GET",
-                    url: '/form/approvereject?action=approve&id=' + $(this).attr('submission'),
+                    url: '/form/approvereject?action=approve&id=' + $(this).attr('submission') + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}',
                     //data: new FormData($('#report-form')[0]),
                     processData: false,
                     contentType: false,
@@ -207,7 +207,7 @@
                 let that = $(this)
                 $.ajax({
                     type: "GET",
-                    url: '/form/approvereject?action=reject&id=' + $(this).attr('submission'),
+                    url: '/form/approvereject?action=reject&id=' + $(this).attr('submission') + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}',
                     //data: new FormData($('#report-form')[0]),
                     processData: false,
                     contentType: false,
diff --git a/resources/views/form/rapport-xennex/list_.blade.php b/resources/views/form/rapport-xennex/list_.blade.php
index ec693308..9450f91b 100644
--- a/resources/views/form/rapport-xennex/list_.blade.php
+++ b/resources/views/form/rapport-xennex/list_.blade.php
@@ -191,7 +191,7 @@
                 let that = $(this)
                 $.ajax({
                     type: "GET",
-                    url: '/form/approvereject?action=approve&id=' + $(this).attr('submission'),
+                    url: '/form/approvereject?action=approve&id=' + $(this).attr('submission') + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}',
                     //data: new FormData($('#report-form')[0]),
                     processData: false,
                     contentType: false,
@@ -207,7 +207,7 @@
                 let that = $(this)
                 $.ajax({
                     type: "GET",
-                    url: '/form/approvereject?action=reject&id=' + $(this).attr('submission'),
+                    url: '/form/approvereject?action=reject&id=' + $(this).attr('submission') + '&user_id={{ $formdata->user_id ?? '' }}&partition={{ $formdata->partition ?? '' }}',
                     //data: new FormData($('#report-form')[0]),
                     processData: false,
                     contentType: false,

From f14535d31d3c14fee66942f4a4ad93c19777eb98 Mon Sep 17 00:00:00 2001
From: Farhan Pathan 
Date: Thu, 16 Jul 2026 12:03:10 +0530
Subject: [PATCH 2/3] Titans: Validation msg change

---
 .../1781675090-edd1642b-8b21-4db0-a5b9-979efe4483fc.blade.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/form/rapport-titans/1781675090-edd1642b-8b21-4db0-a5b9-979efe4483fc.blade.php b/resources/views/form/rapport-titans/1781675090-edd1642b-8b21-4db0-a5b9-979efe4483fc.blade.php
index 827b7f3f..2e7b92ba 100644
--- a/resources/views/form/rapport-titans/1781675090-edd1642b-8b21-4db0-a5b9-979efe4483fc.blade.php
+++ b/resources/views/form/rapport-titans/1781675090-edd1642b-8b21-4db0-a5b9-979efe4483fc.blade.php
@@ -439,7 +439,7 @@
                 Swal.fire({
                     icon: 'error',
                     title: 'Validation Error',
-                    text: 'From all 11 brands, at least one field should be greater than 0.'
+                    text: 'From all brands, at least one field should be greater than 0.'
                 });
                 return false;
             }

From b2ec73222b6911d5b46fc6692d2623d03621f927 Mon Sep 17 00:00:00 2001
From: Farhan Pathan 
Date: Thu, 16 Jul 2026 12:18:04 +0530
Subject: [PATCH 3/3] Titans: form changes removed validation msg and user can
 eneter 0 or more value in brands Rx

---
 ...781675090-edd1642b-8b21-4db0-a5b9-979efe4483fc.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/form/rapport-titans/1781675090-edd1642b-8b21-4db0-a5b9-979efe4483fc.blade.php b/resources/views/form/rapport-titans/1781675090-edd1642b-8b21-4db0-a5b9-979efe4483fc.blade.php
index 2e7b92ba..747695e4 100644
--- a/resources/views/form/rapport-titans/1781675090-edd1642b-8b21-4db0-a5b9-979efe4483fc.blade.php
+++ b/resources/views/form/rapport-titans/1781675090-edd1642b-8b21-4db0-a5b9-979efe4483fc.blade.php
@@ -430,19 +430,19 @@
             let hasValue = false;
 
             brandFields.forEach(function(field) {
-                if ((parseInt($(field).val()) || 0) > 0) {
+                if ((parseInt($(field).val()) || 0) >= 0) {
                     hasValue = true;
                 }
             });
 
-            if (!hasValue) {
+          /*  if (!hasValue) {
                 Swal.fire({
                     icon: 'error',
                     title: 'Validation Error',
                     text: 'From all brands, at least one field should be greater than 0.'
                 });
                 return false;
-            }
+            } */
             const formData = new FormData($('#report-form')[0]);
             // Log form data to console
             for (let [key, value] of formData.entries()) {