diff --git a/resources/views/form/rapport-team4/1774621694-60538ad9-1e71-4afa-9138-7787c06a7c7b.blade.php b/resources/views/form/rapport-team4/1774621694-60538ad9-1e71-4afa-9138-7787c06a7c7b.blade.php
index 35a56329..3fbfdd97 100644
--- a/resources/views/form/rapport-team4/1774621694-60538ad9-1e71-4afa-9138-7787c06a7c7b.blade.php
+++ b/resources/views/form/rapport-team4/1774621694-60538ad9-1e71-4afa-9138-7787c06a7c7b.blade.php
@@ -75,128 +75,128 @@
 
                             @if(count($submissions) < 5 )
 
-                            <form method="POST" action="/form/submit" id="report-form" enctype="multipart/form-data">
-                                <input type="hidden" name="form_id" value="{{$form_id}}">
-                                <input type="hidden" name="user_id" value="{{$form->user_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)
+                                <form method="POST" action="/form/submit" id="report-form" enctype="multipart/form-data">
+                                    <input type="hidden" name="form_id" value="{{$form_id}}">
+                                    <input type="hidden" name="user_id" value="{{$form->user_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-{{$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}}">
-                                            @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')
-                                        @if ($question->code == 'contact_id')
-                                                            <select class="form-control" id="field-{{ $question->code }}"
-                                                                name="{{ $question->code }}"
-                                                                {{ $question->required == 'yes' ? 'required' : '' }}>
-                                                                <option value=""> -- Select -- </option>
-                                                                @foreach ($question->options as $option)
-                                                                    @php $spec = $option->contact->speciality ?? ''; @endphp
-                                                                    @if (in_array($spec, ['ANAESTHETIST','CARDIOLOGIST','Chemist','Chemist/Pharmacy','CHEST PHYSICIAN','Consultant Physician','Consulting Physician','CVTS','DENTIST','DERMATOLOGIST','DIABETOLOGIST','ENT SURGEON','GASTROENTEROLOGIST','GENERAL PHYSICIAN','GP NON MBBS','GYNAECOLOGIST','INTENSIVE CARE','Intensivist','Nephrologist','NEUROLOGIST','ONCOLOGIST','OPHTHALMOLOGIST','ORTHOPEDICIAN','OTHERS SPECIALITIES','PAEDIATRICIAN','PEAD CARDIOLOGIST','PEDIATRICIAN','Physician Consulting','POST GRADUATE','PRACTICING DIABETOLOGIST','PSYCHIATRIST','PULMONOLOGIST','RHEUMATOLOGIST','SURGEON','Test DIABETOLOGIST','UROLOGIST']))
-                                                                        <option value="{{ $option->value }}"
-                                                                            {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}
-                                                                            legacy_code="{{ $option->contact->legacy_code ?? '' }}"
-                                                                            speciality="{{ $spec }}">
-                                                                            {{ $option->display }}
-                                                                        </option>
-                                                                    @endif
-                                                                @endforeach
-                                                            </select>
-                                                        @else
-                                                            <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 }}"
-                                                                        {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}>
-                                                                        {{ $option->display }}</option>
-                                                                @endforeach
-                                                            </select>
-                                                        @endif
-                                            @break
-                                        @case('checkbox')
-                                            @foreach($question->options as $option)
-                                            <div class="form-check mb-2 form-check-primary">
-                                                <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>
+                                        <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
-                                            @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">
+                                        </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}}">
+                                                @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')
+                                            @if ($question->code == 'contact_id')
+                                                                <select class="form-control" id="field-{{ $question->code }}"
+                                                                    name="{{ $question->code }}"
+                                                                    {{ $question->required == 'yes' ? 'required' : '' }}>
+                                                                    <option value=""> -- Select -- </option>
+                                                                    @foreach ($question->options as $option)
+                                                                        @php $spec = $option->contact->speciality ?? ''; @endphp
+                                                                        @if (in_array($spec, ['ANAESTHETIST','CARDIOLOGIST','Chemist','Chemist/Pharmacy','CHEST PHYSICIAN','Consultant Physician','Consulting Physician','CVTS','DENTIST','DERMATOLOGIST','DIABETOLOGIST','ENT SURGEON','GASTROENTEROLOGIST','GENERAL PHYSICIAN','GP NON MBBS','GYNAECOLOGIST','INTENSIVE CARE','Intensivist','Nephrologist','NEUROLOGIST','ONCOLOGIST','OPHTHALMOLOGIST','ORTHOPEDICIAN','OTHERS SPECIALITIES','PAEDIATRICIAN','PEAD CARDIOLOGIST','PEDIATRICIAN','Physician Consulting','POST GRADUATE','PRACTICING DIABETOLOGIST','PSYCHIATRIST','PULMONOLOGIST','RHEUMATOLOGIST','SURGEON','Test DIABETOLOGIST','UROLOGIST']))
+                                                                            <option value="{{ $option->value }}"
+                                                                                {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}
+                                                                                legacy_code="{{ $option->contact->legacy_code ?? '' }}"
+                                                                                speciality="{{ $spec }}">
+                                                                                {{ $option->display }}
+                                                                            </option>
+                                                                        @endif
+                                                                    @endforeach
+                                                                </select>
+                                                            @else
+                                                                <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 }}"
+                                                                            {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}>
+                                                                            {{ $option->display }}</option>
+                                                                    @endforeach
+                                                                </select>
+                                                            @endif
+                                                @break
+                                            @case('checkbox')
                                                 @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 class="form-check mb-2 form-check-primary">
+                                                    <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
-                                            </div>
-                                            @break
+                                                @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
 
-                                            @case('time')
-                                            <input type="time" 
-                                                id="field-{{$question->code}}" 
-                                                name="{{$question->code}}" 
-                                                class="form-control" 
-                                                {{$question->required == 'yes' ? 'required' : ''}} 
-                                                value="{{isset($question->value) ? $question->value : ''}}">
-                                            @break
-                                    @endswitch
-                                    </div>
-                                @endforeach
-                               
+                                                @case('time')
+                                                <input type="time" 
+                                                    id="field-{{$question->code}}" 
+                                                    name="{{$question->code}}" 
+                                                    class="form-control" 
+                                                    {{$question->required == 'yes' ? 'required' : ''}} 
+                                                    value="{{isset($question->value) ? $question->value : ''}}">
+                                                @break
+                                        @endswitch
+                                        </div>
+                                    @endforeach
+                                
 
-                                @if((!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>
-                                {{-- @else
-                                    <div class="alert alert-warning text-center mt-3">
-                                        You have already submitted this form for this month.
-                                    </div> --}}
-                                @endif
-                            </form>
+                                    @if((!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>
+                                    {{-- @else
+                                        <div class="alert alert-warning text-center mt-3">
+                                            You have already submitted this form for this month.
+                                        </div> --}}
+                                    @endif
+                                </form>
 
                             @elseif($submissions[0]->workflow_status=='rejected')
                                 @if(!request()->has('edit'))
@@ -211,7 +211,7 @@
                                     </script>
                                 @endif
 
-                            <form method="POST" action="/form/submit" id="report-form" enctype="multipart/form-data">
+                                <form method="POST" action="/form/submit" id="report-form" enctype="multipart/form-data">
                                 <input type="hidden" name="form_id" value="{{$form_id}}">
                                 <input type="hidden" name="user_id" value="{{$form->user_id}}">
                                 @csrf
@@ -330,7 +330,7 @@
 
                             @else
                                 <div class="alert alert-warning text-center mt-3">
-                                    You have already submitted this form
+                                    You have already submitted this forms
                                 </div>
                             @endif