From 2c92300710490be3c7566fb5dc3c005d6b54e516 Mon Sep 17 00:00:00 2001 From: Farhan Pathan Date: Tue, 9 Jun 2026 11:08:19 +0530 Subject: [PATCH] Revert "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" This reverts commit ac8f7de6af35a5db145727c1246ae451664f2bda. --- ...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, 20 insertions(+), 557 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 06eb0bf1..4bf6a1e3 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,4 +1,3 @@ -<<<<<<< HEAD:resources/views/form/rapport-arise/1777097685-b3bf0da9-b147-435f-a0be-e2b9087d3c49.blade.php @@ -307,373 +306,4 @@ -======= - - - - @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') - - - - ->>>>>>> 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 @@