diff --git a/app/Http/Controllers/FormController.php b/app/Http/Controllers/FormController.php
index d4066dcd..fab9a407 100644
--- a/app/Http/Controllers/FormController.php
+++ b/app/Http/Controllers/FormController.php
@@ -53,30 +53,30 @@ class FormController extends Controller
         //     // For debug: print $data
         //     echo '<pre>' . print_r($data, true) . '</pre>'; exit;
         // }
-        $pid = $formdata->partition;
-        $fid = $formdata->form_id;
-        $base = '/var/www/rapport/resources/views/form';
-        if (is_file("$base/$pid/$fid.blade.php")) {
-            return view("form.$pid.$fid", $data);
-        } elseif (is_file("$base/$fid.blade.php")) {
-            return view("form.$fid", $data);
-        }
-        elseif(isset($formdata->form_type) && $formdata->form_type == 'enrollment_form'){
-            return view('form.common-enrollmentform', $data);
-        }
-        elseif(isset($formdata->form_type) && $formdata->form_type == 'plan_vs_execution'){
-            return view('form.common-planexecution', $data);
-        }
-        else {
-            return view('form.common', $data);
-        }
-        // if (\View::exists('form.'.$formdata->partition.'.'.$formdata->form_id)) {
-        //     return view('form.'.$formdata->partition.'.'.$formdata->form_id)->with($data);
-        // } elseif (\View::exists('form.'.$formdata->form_id)) {
-        //     return view('form.'.$formdata->form_id)->with($data);
-        // } else {
-        //     return view('form.common')->with($data);
+        // $pid = $formdata->partition;
+        // $fid = $formdata->form_id;
+        // $base = '/var/www/rapport/resources/views/form';
+        // if (is_file("$base/$pid/$fid.blade.php")) {
+        //     return view("form.$pid.$fid", $data);
+        // } elseif (is_file("$base/$fid.blade.php")) {
+        //     return view("form.$fid", $data);
         // }
+        // elseif(isset($formdata->form_type) && $formdata->form_type == 'enrollment_form'){
+        //     return view('form.common-enrollmentform', $data);
+        // }
+        // elseif(isset($formdata->form_type) && $formdata->form_type == 'plan_vs_execution'){
+        //     return view('form.common-planexecution', $data);
+        // }
+        // else {
+        //     return view('form.common', $data);
+        // }
+        if (\View::exists('form.'.$formdata->partition.'.'.$formdata->form_id)) {
+            return view('form.'.$formdata->partition.'.'.$formdata->form_id)->with($data);
+        } elseif (\View::exists('form.'.$formdata->form_id)) {
+            return view('form.'.$formdata->form_id)->with($data);
+        } else {
+            return view('form.common')->with($data);
+        }
     }
 
     protected function muscle_questions($formdata) {
diff --git a/app/Http/Controllers/FormactionController.php b/app/Http/Controllers/FormactionController.php
index 4bfd348f..ce183436 100644
--- a/app/Http/Controllers/FormactionController.php
+++ b/app/Http/Controllers/FormactionController.php
@@ -109,18 +109,15 @@ class FormactionController extends Controller
     public function consolelist(Request $request) {
         $actions = $this->getlambda('get', 'form', 'formaction', 'list');
         //echo '<pre>'; print_r($actions); exit;
-        // For all actions, replace external form links with the localhost link
-        // if (isset($actions->data->actions) && is_array($actions->data->actions)) {
-        //     foreach ($actions->data->actions as &$action) {
-        //         if (isset($action->url) && is_string($action->url)) {
-        //             $action->url = str_replace([
-        //                 "https://stage.buildrapport.co/form/",
-        //                 "https://form.buildrapport.co/index.php?finfo="
-        //             ], "http://127.0.0.1:8005/index.php?finfo=", $action->url);
-        //         }
-        //     }
-        //     unset($action); // break reference
-        // }
+        //For all actions, replace external form links with the localhost link
+        if (isset($actions->data->actions) && is_array($actions->data->actions)) {
+            foreach ($actions->data->actions as &$action) {
+                if (isset($action->url) && is_string($action->url)) {
+                    $action->url = str_replace("https://stage.buildrapport.co/", "http://127.0.0.1:8000/", $action->url);
+                }
+            }
+            unset($action); // break reference
+        }
         //echo '<pre>'; print_r($actions); exit;
         return view('form.list-console')->with(['actions' => $actions->data->actions]);
     }
diff --git a/resources/views/form/rapport-iva/1778666430-5f5eac47-e017-4fb1-b00a-429dbb2ce6ce.blade.php b/resources/views/form/rapport-iva/1778666430-5f5eac47-e017-4fb1-b00a-429dbb2ce6ce.blade.php
new file mode 100644
index 00000000..430d5eaf
--- /dev/null
+++ b/resources/views/form/rapport-iva/1778666430-5f5eac47-e017-4fb1-b00a-429dbb2ce6ce.blade.php
@@ -0,0 +1,336 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    @include('layouts.shared/title-meta', ['title' => "Form"])
+    @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? ''])
+    <link href="{{asset('assets/libs/sweetalert2/sweetalert2.min.css')}}" rel="stylesheet" type="text/css" />
+</head>
+<div id="pageloader">
+   <img src="http://cdnjs.cloudflare.com/ajax/libs/semantic-ui/0.16.1/images/loader-large.gif" alt="processing..." />
+</div>
+<body class="loading">
+    <div class="account-pages">
+        <div class="container">
+            <div class="row justify-content-center">
+                <div class="col-md-8 col-lg-6 col-xl-5 p-0">
+                    <div class="card bg-pattern">
+                        <div class="card-body p-3 row">
+
+                            @if(Session::has('error'))<div class="alert alert-danger">{{Session::get('error')}}</div>
+                            <br>@endif
+                            @if(session('success'))<div class=" alert alert-success">{{ session('success') }}
+                            </div>
+                            <br>@endif
+                            <div class="col-8">
+                                <h4 class="page-title">{{$form->title}}</h4>
+                            </div>
+                            @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                            <div class="col-4">
+                                @if($form->link_type == 'form')
+                                <a href="/form/history" class="float-end pt-1">View History</a>
+                                @else
+                                <a href="{{url()->previous()}}" class="float-end pt-1">Back</a>
+                                @endif
+                            </div>
+                            @endif
+                            @if(isset($form->user_info))
+                            <div class="col-12">
+                                <h6>Submitted By: {{$form->user_info->name}}</h6>
+                            </div>
+                            @endif
+                            <form method="POST" action="/form/submit" id="report-form" enctype="multipart/form-data">
+                                <input type="hidden" name="form_id" value="{{$form_id}}">
+                                @csrf
+                                @if($id)
+                                <input type="hidden" name="id" value="{{$id}}">
+                                @endif
+                                @if(isset($form->manager_can_submit) && $form->manager_can_submit == true)
+                                <div class="col-md-12 mb-2">
+                                    <label for="field-user_id" class="form-label"> Select User / Territory <span class="text-danger">*</span> </label>
+                                    <select class="form-control" id="field-user_id" name="user_id" required>
+                                        <option value=""> -- Select -- </option>
+                                        @foreach($form->users as $option)
+                                        <option value="{{$option->value}}" hierarchy="{{$option->hierarchy_id}}" {{isset($question->value) && $question->value == $option->value ? 'selected':''}}>{{$option->display}}</option>
+                                        @endforeach
+                                    </select>
+                                    <input type="hidden" id="field-hierarchy_id" name="hierarchy_id" value="">
+                                </div>
+                                @endif
+
+                                @foreach($questions as $question)
+                                    <div class="col-md-12 mb-2">
+                                    <label for="field-{{$question->code}}" class="form-label">{{$question->question}} {!!$question->required == 'yes' ? '<span class="text-danger">*</span>':''!!} </label>
+                                    @switch($question->type)
+                                        @case('hidden')
+                                            <input type="{{$question->type}}" id="field-{{$question->code}}" name="{{$question->code}}" value="{{isset($question->value)?$question->value:''}}">
+                                            @break
+                                        @case('text')
+                                        @case('email')
+                                        @case('tel')
+                                        @case('date')
+                                            <input type="{{$question->type}}" id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" {{$question->required == 'yes'?'required':'' }} value="{{isset($question->value)?$question->value:''}}">
+                                            @break
+                                        @case('number')
+                                            <!-- <input type="{{$question->type}}" min="0" max="9999999999" step="1" id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" {{$question->required == 'yes'?'required':'' }}  value="{{isset($question->value)?$question->value:0}}"> -->
+                                             <input type="{{$question->type}}" min="0" max="9999999999" step="1" id="field-{{$question->code}}" name="{{$question->code}}" class="form-control"
+                                                {{$question->required == 'yes'?'required':'' }}
+                                                value="{{isset($question->value)?$question->value:0}}"
+                                                {{$question->code == 'value-plan' ? 'readonly' : ''}}>
+                                            @break
+                                        @case('textarea')
+                                            <textarea id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" {{$question->required == 'yes'?'required':'' }}>{{isset($question->value)?$question->value:''}}</textarea>
+                                            @break
+                                        @case('dropdown')
+                                            <select class="form-control" id="field-{{$question->code}}" name="{{$question->code}}" {{$question->required == 'yes'?'required':'' }}>
+                                                <option value=""> -- Select -- </option>
+                                            
+                                                @foreach($question->options as $option)
+                                                <option value="{{$option->value}}"
+                                                    msl_code="{{isset($option->contact->msl_code) ? $option->contact->msl_code : ''}}"
+                                                    uid_number="{{isset($option->contact->uid_number) ? $option->contact->uid_number : ''}}"
+                                                    {{isset($question->value) && $question->value == $option->value ? 'selected':''}}>
+                                                    {{$option->display}}
+                                                </option>
+                                                @endforeach
+                                            </select>
+                                            @break
+                                        @case('radio')
+                                            @foreach($question->options as $option)
+                                            <div class="form-check mb-2 form-check-success">
+                                                <input class="form-check-input" type="radio" name="{{$question->code}}" id="field-{{$question->code}}_{{$option->value}}" value="{{$option->value}}">
+                                                <label class="form-check-label" for="field-{{$question->code}}_{{$option->value}}">{{$option->display}}</label>
+                                            </div>
+                                            @endforeach
+                                            @break
+                                        @case('radiometrix')
+                                            @php
+                                                // Decode the first option's value to use as heading labels
+                                                $headings =
+                                                    count($question->options) > 0
+                                                        ? json_decode($question->options[0]->value)
+                                                        : [];
+                                            @endphp
+
+                                            {{-- Matrix Wrapper with Horizontal Scroll on Small Screens --}}
+                                            <div class="table-responsive">
+                                                <div class="d-table w-100">
+                                                    {{-- Table Headers --}}
+                                                    <div class="d-table-row font-weight-bold">
+                                                        <div class="d-table-cell p-2" style="width: 150px;"></div>
+                                                        {{-- Placeholder for row labels --}}
+                                                        @foreach ($headings as $head)
+                                                            <div class="d-table-cell text-center p-2">{{ $head }}
+                                                            </div>
+                                                        @endforeach
+                                                    </div>
+
+                                                    {{-- Table Rows --}}
+                                                    @foreach ($question->options as $option)
+                                                        @php $nn = json_decode($option->value); @endphp
+                                                        <div class="d-table-row align-middle">
+                                                            <div class="d-table-cell font-weight-bold p-2"
+                                                                style="width: 150px;">
+                                                                {{ $option->display }}
+                                                            </div>
+
+                                                            @foreach ($nn as $value)
+                                                                <div class="d-table-cell text-center p-2">
+                                                                    <input type="radio"
+                                                                id="field-{{ $option->display }}-{{ $value }}"
+                                                                name="{{ $question->code }}[{{$option->display}}]" value="{{$value}}" class="form-check-input"
+                                                                {{ isset($question->display) && $option->display != $option->display ? 'checked' : '' }}>
+
+                                                                </div>
+                                                            @endforeach
+                                                        </div>
+                                                    @endforeach
+                                                </div>
+                                            </div>
+                                        @break    
+                                        @case('checkbox')
+                                            @foreach($question->options as $option)
+                                            <div class="form-check mb-2 form-check-primary ms-2">
+                                                <input class="form-check-input" type="checkbox" id="field-{{$question->code}}-{{$option->value}}" name="{{$question->code}}[]" value="{{$option->value}}" {{isset($question->value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked':''}}>
+                                                <label class="form-check-label" for="field-{{$question->code}}-{{$option->value}}">{{$option->display}}</label>
+                                            </div>
+                                            @endforeach
+                                            @break
+                                        @case('file')
+                                        @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                                             <input type="file" id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" value="" {{$question->required == 'yes'?'required':'' }}>
+                                        @elseif(isset($question->value))
+                                             <img src="{{$question->value}}" class="img-fluid">
+                                        @endif
+                                           
+                                            @break
+                                        @case('multitextbox')
+                                            <div class="row">
+                                                @foreach($question->options as $option)
+                                                <div class="col-6">{{$option->display}}</div>
+                                                <div class="col-6 mb-1">
+                                                    <input type="number" id="field-{{$option->value}}" name="{{$option->value}}" class="form-control" required value="{{isset($option->val)?$option->val:0}}">
+                                                </div>
+                                                @endforeach
+                                            </div>
+                                            @break
+                                    @endswitch
+                                    </div>
+                                @endforeach
+                                @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                                <div class="text-center d-grid mt-3">
+                                    <button class="btn btn-primary" type="submit" id="submit-btn"> Submit </button>
+                                </div>
+                                @endif
+                            </form>
+
+                        </div> <!-- end card-body -->
+                    </div>
+                    <!-- end card -->
+
+                    <!-- end row -->
+
+                </div> <!-- end col -->
+            </div>
+            <!-- end row -->
+        </div>
+        <!-- end container -->
+    </div>
+    <!-- end page -->
+<style type="text/css">
+#pageloader {
+  background: rgba( 255, 255, 255, 0.8 );
+  display: none;
+  height: 100%;
+  position: fixed;
+  width: 100%;
+  z-index: 9999;
+}
+
+#pageloader img {
+  left: 50%;
+  margin-left: -32px;
+  margin-top: -32px;
+  position: absolute;
+  top: 50%;
+}
+.form-label {
+    font-weight:bold;
+    font-size:16px;
+}
+</style>
+@include('layouts.shared/footer-script')
+<script src="{{asset('assets/libs/sweetalert2/sweetalert2.min.js')}}"></script>
+<script type="text/javascript">
+    jQuery(document).ready(function($){
+    
+        // $('#field-user_id').change(function(){
+        //     let hierarchy = $('option:selected', this).attr('hierarchy');
+        //     $('#field-hierarchy_id').val(hierarchy)
+        //     event.preventDefault();
+        //     $.ajax({
+        //         type: "GET",
+        //         url: '/form/getdoctorlist?partition={{$form->partition}}&hierarchy='+hierarchy,
+        //         processData: false,
+        //         contentType: false,
+        //         success: function( data ) {
+        //             $("#pageloader").fadeOut();
+        //             $('#field-contact_id').html('')
+        //             $('#field-contact_id').append($("<option></option>").attr("value",'').text('-- Select --'));
+        //             for(let itm of data) { $('#field-contact_id').append(
+        //             $("<option></option>")
+                        
+        //                 .text(itm.display)
+        //         );
+        //     }                   
+        //         },
+        //     });
+
+        //     console.log(hierarchy)
+        // })
+
+
+
+
+
+        // $("#field-contact_id").change(function(){
+        //     let msl_code = $('option:selected', this).attr('msl_code');
+        //     $('#field-msl_code').val(msl_code);
+        // });     
+        //  $("#field-contact_id").change(function(){
+        //     let uid_number = $('option:selected', this).attr('uid_number');
+        //     $('#field-uid_number').val(uid_number);
+        // });
+
+        $("#field-contact_id").change(function(){
+
+            let selected = $('option:selected', this);
+
+            // console.log(selected.attr('msl_code'));
+            // console.log(selected.attr('uid_number'));
+
+            $('#field-msl_code').val(selected.attr('msl_code'));
+            $('#field-uid_number').val(selected.attr('uid_number'));
+
+        });
+
+        function calculateValuePlan() {
+
+            let unitPlan = parseFloat($('#field-unit-plan').val()) || 0;
+            let ratePlan = parseFloat($('#field-rate-plan').val()) || 0;
+
+            let valuePlan = unitPlan * ratePlan;
+
+            $('#field-value-plan').val(valuePlan);
+        }
+
+        $('#field-unit-plan, #field-rate-plan').on('keyup change', function () {
+            calculateValuePlan();
+        });
+
+
+
+
+
+        $('#report-form').on('submit', function(event){
+            event.preventDefault();
+            $("#pageloader").fadeIn();
+            $.ajax({
+                type: "POST",
+                url: '/form/ajaxsubmit',
+                data: new FormData($('#report-form')[0]),
+                processData: false,
+                contentType: false,
+                success: function( data ) {
+                    $("#pageloader").fadeOut();
+                    if(data.status == 'success') {
+                        Swal.fire({
+                          title: 'Great!',
+                          text: 'Your data is successfully submitted!',
+                          icon: 'success'
+                        })
+                        $('#report-form').trigger("reset");
+                    } else {
+                        Swal.fire({
+                            icon: 'error',
+                            title: data.hasOwnProperty('message') ? 'You are not mapped to any position code' : 'Data not submitted',
+                            text: data.hasOwnProperty('message') ? 'for resolution please email Position code, L1 Manager and L2 Manager details to support1@stratawiz.com':'Something went wrong, please try again after some time!'
+                        })
+                    }
+                },
+            });
+        });
+
+            var today = new Date();
+            var dd = String(today.getDate()).padStart(2, '0');
+            var mm = String(today.getMonth() + 1).padStart(2, '0');
+            var yyyy = today.getFullYear();
+            today = yyyy + '-' + mm + '-' + dd;
+
+            var plandateField = document.getElementById('field-record_date');
+
+            plandateField.setAttribute('max', today);
+    });
+</script>
+</body>
+
+</html>
\ No newline at end of file