diff --git a/resources/views/form/rapport-team3/1655458541-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php b/resources/views/form/rapport-team3/1655458541-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php
index 53c07b80..dd543459 100644
--- a/resources/views/form/rapport-team3/1655458541-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php
+++ b/resources/views/form/rapport-team3/1655458541-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php
@@ -61,10 +61,10 @@
                                                         {{-- <th>Team Name</th> --}}
                                                         <th>Type of meeting</th>
                                                         <th>Execution Date</th>
-                                                        <th>Name of speaker</th>
+                                                        {{-- <th>Name of speaker</th> --}}
                                                         <th>MSL Code</th>
                                                         <th>Speciality</th>
-                                                        <th>No. og Doctors/Paramedics attended</th>
+                                                        <th>No. of Doctors/Paramedics attended</th>
                                                     </tr>
                                                 </thead>
                                                 <tbody>
@@ -86,7 +86,7 @@
                                                             {{-- <td>{{ $sub->formdata->team_name }}</td> --}}
                                                             <td>{{ $sub->formdata->type_of_meeting }}</td>
                                                             <td>{{ $sub->formdata->record_date }}</td>
-                                                            <td>{{ $sub->formdata->name_of_the_speaker }}</td>
+                                                            {{-- <td>{{$sub->formdata->name_of_the_speaker }}</td> --}}
                                                             <td>{{ $sub->formdata->msl_code }}</td>
                                                             <td>{{ $sub->formdata->speciality }}</td>
                                                             <td>{{ $sub->formdata->attendence }}</td>
@@ -116,7 +116,7 @@
                                 </div>
                                 @endif
                                     @foreach ($questions as $question)
-                                        @if (in_array($question->code, ['record_date', 'name_of_the_speaker', 'msl_code', 'attendence','speciality','honorarium_amount','other_expenses','total_eas','no_of_patients_on_duolin','no_of_units_duolin_respules']))
+                                        @if (in_array($question->code, ['record_date', 'name_of_the_speaker', 'msl_code', 'attendence','speciality','honorarium_amount','other_expenses','total_eas','no_of_patients_on_duolin','no_of_units_duolin_respules','other_msl_code','other_speciality']))
                                             @continue
                                         @endif
                                         <div class="col-md-12 mb-2">
@@ -234,15 +234,27 @@
                                                 @break
 
                                                 @case('dropdown')
-                                                    <select class="form-control" id="execution-{{ $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>
+                                                    <select class="form-control" id="execution-{{ $question->code }}" name="{{ $question->code }}" {{ $question->required == 'yes' ? 'required' : '' }}>
+                                            <option value=""> -- Select -- </option>
+                                            @if ($question->code == 'name_of_the_speaker')
+                                                @foreach ($question->options as $option)
+                                                @if( isset($option->contact->doctor_activities_for_neb_2_top_30_next_30_doctors) && $option->contact->doctor_activities_for_neb_2_top_30_next_30_doctors == 'Yes' )
+                                                <option value="{{ $option->value }}" speciality="{{isset($option->contact->speciality)?$option->contact->speciality:''}}" msl_code="{{isset($option->contact->msl_code)?$option->contact->msl_code:''}}"
+
+                                                 {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}>
+                                                    {{ $option->display }}
+                                                </option>
+                                                @endif
+                                                @endforeach
+                                                <option value="other" speciality="" msl_code="">Other</option>
+                                            @else
+                                                @foreach ($question->options as $option)
+                                                <option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}>
+                                                    {{ $option->display }}
+                                                </option>
+                                                @endforeach
+                                            @endif
+                                        </select>
                                                 @break
 
                                                 @case('checkbox')
@@ -368,10 +380,31 @@
 
         $('.edit-btn').click(function() {
             let selected = JSON.parse($(this).attr('plan_details'))
-            for (let k of Object.keys(selected)) {
+            /*for (let k of Object.keys(selected)) {
                 if (selected[k] != '')
                     $('#execution-' + k).val(selected[k]);
-            }
+            }*/
+            for (let k of Object.keys(selected)) {
+                    if (selected[k] != '') {
+                        if (k == 'name_of_the_speaker') {
+                            console.log('cc',selected[k]);
+                            $('#execution-name_of_the_speaker').val($("#execution-name_of_the_speaker option:contains(" +
+                                selected[k] + ")").attr('value'));
+                        } else {
+                            $('#execution-' + k).val(selected[k]);
+                        }
+                    }
+                }
+
+                let docid = $('#execution-name_of_the_speaker option').map(function() {
+                    if ($(this).text().trim() == selected['name_of_the_speaker']) return this;
+                }).attr('value')
+
+                $('#execution-name_of_the_speaker').val(docid)
+                $('#execution-id').val(selected['id'])
+           
+           
+           
             $('#execution-id').val(selected['id'])
             $('#form-wrapper').hide()
             $('#execution-form-wrapper').show()
@@ -395,6 +428,10 @@
                 }
             })
 
+            $('#execution-other_msl_code,#execution-other_speciality').parent().hide();
+            $('#execution-other_msl_code,#execution-other_speciality').attr('required',false);
+
+
             let type_of_meet=$('#execution-type_of_meeting').val();
             console.log("Type of Meet without change",type_of_meet);
             
@@ -410,7 +447,33 @@
                     $('label[for="execution-name_of_the_speaker"]').html('Name of the speaker');     
                     
             }
+
+             $('#execution-name_of_the_speaker').change(function() {
+                        $('#execution-msl_code').val($('option:selected', this).attr('msl_code'))
+                    })    
+                    
+                    $('#execution-name_of_the_speaker').change(function() {
+                        $('#execution-speciality').val($('option:selected', this).attr('speciality'))
+                    })   
         })
+          $('#execution-msl_code,#execution-speciality').attr('readonly',true);
+
+           $('#execution-name_of_the_speaker').change(function() {
+                       let value=$(this).val();
+                          if(value==='other'){
+                             $('#execution-other_msl_code,#execution-other_speciality').parent().show();
+                             $('#execution-other_msl_code,#execution-other_speciality').attr('required',true);
+
+                             $('#execution-msl_code,#execution-speciality').parent().hide();
+                             $('#execution-msl_code,#execution-speciality').attr('required',false);
+                          }
+                          else{
+                             $('#execution-other_msl_code,#execution-other_speciality').parent().hide();
+                             $('#execution-other_msl_code,#execution-other_speciality').attr('required',false);
+                             $('#execution-msl_code,#execution-speciality').parent().show();
+                             $('#execution-msl_code,#execution-speciality').attr('required',true);
+                          }
+                    })    
 
         jQuery(document).ready(function($) {
             $('#field-user_id').change(function(){
@@ -431,11 +494,11 @@
                         $('#field-contact_id').append($("<option></option>").attr("value",itm.value).text(itm.display).attr("msl_code", itm.contact.msl_code).attr('speciality',itm.contact.speciality));
                     }
 
-                    $('#field-contact_id').change(function() {
+                    $('#field-name_of_the_speaker').change(function() {
                         $('#field-msl_code').val($('option:selected', this).attr('msl_code'))
                     })    
                     
-                    $('#field-contact_id').change(function() {
+                    $('#field-name_of_the_speaker').change(function() {
                         $('#field-speciality').val($('option:selected', this).attr('speciality'))
                     })    
                 },
@@ -443,6 +506,10 @@
 
             console.log(hierarchy)
         })
+
+
+
+         
             $('#report-form').on('submit', function(event) {
                 event.preventDefault();
                 $("#pageloader").fadeIn();