Merge pull request #389 from dbarzin/dev

Dev

Author: dbarzin

app/Http/Controllers/ActionController.php

@@ -400,7 +400,7 @@ public function store(Request $request)
         // for Postegres
         $action->criticity = 0;
         $action->status = 0;
-
+        
         // Save
         $action->save();
 

app/Http/Controllers/ControlController.php

@@ -329,7 +329,8 @@ public function create()
                 ->get();
         foreach ($attributes as $key) {
             foreach (explode(' ', $key->values) as $value) {
-                array_push($values, $value);
+                if (strlen($value)>0)
+                    array_push($values, $value);
             }
         }
         sort($values);
@@ -592,7 +593,8 @@ public function edit(int $id)
                 ->get();
         foreach ($attributes as $key) {
             foreach (explode(' ', $key->values) as $value) {
-                array_push($values, $value);
+                if (strlen($value)>0)
+                    array_push($values, $value);
             }
         }
         sort($values);
@@ -650,7 +652,8 @@ public function clone(Request $request)
                 ->get();
         foreach ($attributes as $key) {
             foreach (explode(' ', $key->values) as $value) {
-                array_push($values, $value);
+                if (strlen($value)>0)
+                    array_push($values, $value);
             }
         }
         sort($values);

app/Http/Controllers/MeasureController.php

@@ -101,7 +101,8 @@ public function create()
                 ->get();
         foreach ($attributes as $key) {
             foreach (explode(' ', $key->values) as $value) {
-                array_push($values, $value);
+                if (strlen($value)>0)
+                    array_push($values, $value);
             }
         }
         sort($values);
@@ -241,7 +242,8 @@ public function edit(int $id)
                 ->get();
         foreach ($attributes as $key) {
             foreach (explode(' ', $key->values) as $value) {
-                array_push($values, $value);
+                if (strlen($value)>0)
+                    array_push($values, $value);
             }
         }
         sort($values);

resources/views/actions/create.blade.php

@@ -38,7 +38,11 @@
                                 <strong>{{ trans('cruds.action.fields.due_date') }}</strong>
                             </td>
                             <td>
-                                <input type="text" data-role="calendarpicker" name="due_date" value=" {{ old('due_date') }}" data-input-format="%Y-%m-%d">
+                                <input type="text"
+                                    data-role="calendarpicker"
+                                    name="due_date"
+                                    value=" {{ old('due_date') }}"
+            						data-format="YYYY-MM-DD"/>
                             </td>
                         </tr>
                     </table>

resources/views/actions/edit.blade.php

@@ -43,8 +43,7 @@
                             data-role="calendarpicker"
                             name="due_date"
                             value="{{$action->due_date}}"
-        					data-format="YYYY-MM-DD"
-                            data-inputFormat="YYYY-MM-DD"/>
+                            data-format="YYYY-MM-DD"/>
                         </td>
                     </tr>
                 </table>

resources/views/controls/create.blade.php

@@ -93,7 +93,6 @@
 					<input
 						data-role="calendarpicker"
 						data-format="YYYY-MM-DD"
-						data-inputFormat="YYYY-MM-DD"
 						name="plan_date"
 						value="{{ old('plan_date') }}"/>
 				</div>

resources/views/controls/edit.blade.php

@@ -93,7 +93,6 @@
 					<input
 					data-role="calendarpicker"
 					data-format="YYYY-MM-DD"
-					data-inputFormat="YYYY-MM-DD"
 					name="plan_date"
 					value="{{ $control->plan_date }}"
 					/>
@@ -107,7 +106,6 @@
 					<input
 					data-role="calendarpicker"
 					data-format="YYYY-MM-DD"
-					data-inputFormat="YYYY-MM-DD"
 					name="realisation_date"
 					value="{{ $control->realisation_date == '0000-00-00' ? null : $control->realisation_date}}"
 					data-clear-button="true"