close #1453 Fixed: Style problem with date field after validation

akaunting · Jun 5, 2020 · 4d009e1 · 4d009e1
1 parent c1fd4a3
commit 4d009e1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/public/css/custom.css b/public/css/custom.css
@@ -826,3 +826,7 @@ table .align-items-center td span.badge {
 .navbar-vertical .navbar-nav .nav-link:not(.active) {
     color: #fff !important;
 }
+
+.form-group.has-error .el-input__inner {
+    border-color: #ef3232 !important;
+}
diff --git a/resources/assets/js/components/AkauntingDate.vue b/resources/assets/js/components/AkauntingDate.vue
@@ -6,7 +6,7 @@
             {'disabled': disabled},
             formClasses
         ]"
-        :error="formError"
+        :footer-error="formError"
         :prependIcon="icon"
         :readonly="readonly"
         :disabled="disabled"

diff --git a/resources/assets/js/components/Inputs/BaseInput.vue b/resources/assets/js/components/Inputs/BaseInput.vue
@@ -52,6 +52,11 @@
         </div>
       </slot>
     </div>
+    <slot name="error">
+      <div v-if="footerError" class="invalid-feedback d-block"
+          v-html="footerError">
+      </div>
+    </slot>
   </div>
 </template>
 <script>
@@ -84,6 +89,10 @@
         type: String,
         description: "Input error (below input)"
       },
+      footerError: {
+        type: String,
+        description: "Input error (below input)"
+      },
       successMessage: {
         type: String,
         description: "Input success message",

diff --git a/resources/views/partials/form/date_group.blade.php b/resources/views/partials/form/date_group.blade.php
@@ -9,6 +9,8 @@ class="{{ $col }}{{ isset($attributes['required']) ? ' required' : '' }}"
         :form-classes="[{'has-error': form.errors.get('{{ $name }}') }]"
         @endif
 
+        :group_class="'{{ $group_class }}'"
+
         icon="fa fa-{{ $icon }}"
         title="{{ $text }}"
         placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
@@ -47,6 +49,10 @@ class="{{ $col }}{{ isset($attributes['required']) ? ' required' : '' }}"
         @interface="form.{{ $name }} = $event"
         @endif
 
+        @if (isset($attributes['required']))
+        :required="{{ ($attributes['required']) ? 'true' : 'false' }}"
+        @endif
+
         @if (isset($attributes['readonly']))
         :readonly="{{ $attributes['readonly'] }}"
         @endif