diff --git a/resources/views/pad/components/scripts/ajaxValidation.blade.php b/resources/views/pad/components/scripts/ajaxValidation.blade.php index 26cd7210a4aaed670bba2c38f4a1030dff1cdba3..db498240c5433aa30646b40f27288be218b1cd02 100644 --- a/resources/views/pad/components/scripts/ajaxValidation.blade.php +++ b/resources/views/pad/components/scripts/ajaxValidation.blade.php @@ -12,15 +12,15 @@ $('#{{ $btn_submit_id }}').click(function(e) { e.preventDefault() - const values = $('#{{ $form_id }}').serializeArray() + const form = $('#{{ $form_id }}').serializeArray() - $('.ajax-errors').removeClass('alert alert-danger') + $('.ajax-errors').removeClass('alert alert-danger is-valid is-invalid') $('.ajax-errors span').empty(); $.ajax({ type: 'POST', url: "{{ $route }}", - data: values + data: form }).done(function(data, status) { if(data.status == 200) { @@ -33,6 +33,15 @@ duration: 3000 }).showToast(); + let form_keys = form.map((item) => { + return item.name + }) + form_keys = cleanFormKeys(form_keys, []) + + form_keys.forEach((key) => { + $('#{{ $form_id }} #'+key).addClass('is-valid') + }) + $('#{{ $form_id }}').submit() } else { @@ -43,10 +52,20 @@ }, duration: 3000 }).showToast(); + - let keys = Object.keys(data.errors) + let form_keys = form.map((item) => { + return item.name + }) + form_keys = cleanFormKeys(form_keys, Object.keys(data.errors)) + form_keys.forEach((key) => { + $('#{{ $form_id }} #'+key).addClass('is-valid') + }) + + let keys = Object.keys(data.errors) keys.forEach((key) => { + $('#{{ $form_id }} #'+key).addClass('is-invalid') $('#'+key+'_'+'{{ $form_type }}'+'-error').addClass('alert alert-danger') $('#'+key+'_'+'{{ $form_type }}'+'-error span').text(data.errors[key].shift()) }) @@ -64,4 +83,17 @@ }) }) + + function cleanFormKeys(_form_keys, _errors_keys) + { + let errors_keys = _errors_keys + errors_keys.push('_token') + errors_keys.push('user_pad_id') + + return ( + _form_keys.filter((key) => { + return !errors_keys.includes(key) + }) + ) + } diff --git a/resources/views/pad/components/templates/dimensao/ensino/aulas/form_create.blade.php b/resources/views/pad/components/templates/dimensao/ensino/aulas/form_create.blade.php index 6805e089899f77911952e6ac6b07e2b0ad80b5c2..905bd87a2fbd8e3357c2e214ee8202d01856e545 100644 --- a/resources/views/pad/components/templates/dimensao/ensino/aulas/form_create.blade.php +++ b/resources/views/pad/components/templates/dimensao/ensino/aulas/form_create.blade.php @@ -35,12 +35,12 @@
- +
- + @include('components.divs.errors', [ 'field' => 'componente_curricular_create', @@ -49,7 +49,7 @@
- + @include('components.divs.errors', [ 'field' => 'curso_create' @@ -58,7 +58,7 @@
- @foreach($niveis as $value => $nivel) @if( $value == old('nivel') ) @@ -76,7 +76,7 @@
- @foreach($modalidades as $value => $modalidade) @if( $value == old('modalidade') ) @@ -94,7 +94,7 @@
- + @include('components.divs.errors', [ 'field' => 'ch_semanal_create' @@ -103,7 +103,7 @@
- + @include('components.divs.errors', [ 'field' => 'ch_total_create' diff --git a/resources/views/pad/components/templates/dimensao/ensino/aulas/form_update.blade.php b/resources/views/pad/components/templates/dimensao/ensino/aulas/form_update.blade.php index 68443c2b7fb4e81b0042ada2398144ecfece4d16..ec0df8770d90e178daf40b00debb74c14e4d4b65 100644 --- a/resources/views/pad/components/templates/dimensao/ensino/aulas/form_update.blade.php +++ b/resources/views/pad/components/templates/dimensao/ensino/aulas/form_update.blade.php @@ -11,12 +11,12 @@
- +
- + @include('components.divs.errors', [ 'field' => 'componente_curricular_update', @@ -26,7 +26,7 @@
- + @include('components.divs.errors', [ 'field' => 'curso_update', @@ -35,7 +35,7 @@
- @foreach($niveis as $value => $nivel) @if( $value == $model->nivel ) @@ -53,7 +53,7 @@
- @foreach($modalidades as $value => $modalidade) @if( $value == $model->modalidade ) @@ -71,7 +71,7 @@
- + @include('components.divs.errors', [ 'field' => 'ch_semanal_update', @@ -80,7 +80,7 @@
- + @include('components.divs.errors', [ 'field' => 'ch_total_update',