diff --git a/resources/views/form/rapport-lifemankind/1789720913-7a40c0f0-2aef-4fd4-9c6c-355f8cb40322.blade.php b/resources/views/form/rapport-lifemankind/1789720913-7a40c0f0-2aef-4fd4-9c6c-355f8cb40322.blade.php index ab8943c4..8604ca77 100644 --- a/resources/views/form/rapport-lifemankind/1789720913-7a40c0f0-2aef-4fd4-9c6c-355f8cb40322.blade.php +++ b/resources/views/form/rapport-lifemankind/1789720913-7a40c0f0-2aef-4fd4-9c6c-355f8cb40322.blade.php @@ -288,15 +288,17 @@ }); $('#field-name_of_the_second_converted_doctor,#field-second_doctor_WFSA_code,#field-current_new_order_received').parent().hide(); - $('#field-name_of_the_second_converted_doctor,#field-second_doctor_WFSA_code,#field-current_new_order_received').attr('required', false); + $('#field-name_of_the_second_converted_doctor,#field-second_doctor_WFSA_code,#field-current_new_order_received').attr('required',false); $('#field-doctor_converted').change(function () { if ($(this).val() === 'Yes') { $('#field-name_of_the_second_converted_doctor,#field-second_doctor_WFSA_code,#field-current_new_order_received').parent().show(); - $('#field-name_of_the_second_converted_doctor,#field-second_doctor_WFSA_code,#field-current_new_order_received').attr('required', true); + $('#field-name_of_the_second_converted_doctor,#field-second_doctor_WFSA_code,#field-current_new_order_received').attr('required',true); } else { $('#field-name_of_the_second_converted_doctor,#field-second_doctor_WFSA_code,#field-current_new_order_received').parent().hide(); - $('#field-name_of_the_second_converted_doctor,#field-second_doctor_WFSA_code,#field-current_new_order_received').attr('required', false); + $('#field-name_of_the_second_converted_doctor,#field-second_doctor_WFSA_code,#field-current_new_order_received').attr('required',false); + $('#field-second_doctor_WFSA_code').val('').focus(); + } }); @@ -320,10 +322,11 @@ return false; } - if (!/^[1-9]/.test(second_doctor_code)) { + if(second_doctor_code !== '' && !/^[1-9]/.test(second_doctor_code)) { + $('#field-second_doctor_WFSA_code').val('').focus(); alert('Second Doctor WFSA Code must not start with 0.'); - $('#field-second_doctor_WFSA_code').val('').focus(); + return false; }