Merge branch 'Lang_function_update' of https://git.softuniq.eu/NW/Aknaproff into Lang_function_update

app/Http/Controllers/HomeController.php

@@ -278,7 +278,7 @@ class HomeController extends Controller
             $forms = UserForm::join('forms', 'user_forms.form_id', '=', 'forms.id')
                 ->leftJoin('users', 'forms.created_by', '=', 'users.id')
                 ->where('user_forms.assigned_to', \Auth::id())
-                ->select('user_forms.permissions as permissions', 'forms.name as name', 'forms.description as description', 'forms.id as form_id', 'forms.created_at as created_at', 'forms.slug as slug', 'users.name as created_by');
+                ->select('user_forms.permissions as permissions', 'forms.name as name', 'forms.name_ru as name_ru', 'forms.name_est as name_est', 'forms.description as description', 'forms.description_ru as description_ru', 'forms.description_est as description_est', 'forms.id as form_id', 'forms.created_at as created_at', 'forms.slug as slug', 'users.name as created_by');
 
             return DataTables::of($forms)
                 ->addColumn(

resources/views/home.blade.php

@@ -141,9 +141,10 @@
                                 <div class="table-responsive">
                                     <table class="table" id="assigned_form_table" style="width: 100%;">
                                         <thead>
+
                                             <tr>
-                                                <th>@lang('messages.name')</th>
                                                 <th>@lang('messages.description')</th>
+                                                <th>@lang('messages.name')</th>
                                                 @if (auth()->user()->hasRole(\App\Enums\User\RoleEnum::SUPERVISOR->value))
                                                     <th>@lang('messages.created_by')</th>
                                                 @endif
@@ -407,12 +408,22 @@
                     }
                 ],
                 columns: [{
-                        data: 'name',
+                        data: descColName,
-                        name: 'forms.name'
+                        name: 'forms.' + descColName,
+                        createdCell: function(td, cellData, rowData, row, col) {
+                            if (td.innerHTML.length === 0) {
+                                td.innerHTML = rowData.description
+                            }
+                        },
                     },
                     {
-                        data: 'description',
+                        data: titleColName,
-                        name: 'forms.description'
+                        name: 'forms.' + titleColName,
+                        createdCell: function(td, cellData, rowData, row, col) {
+                            if (td.innerHTML.length === 0) {
+                                td.innerHTML = rowData.name
+                            }
+                        },
                     },
                     @if (auth()->user()->hasRole(\App\Enums\User\RoleEnum::SUPERVISOR->value))
                         {
@@ -427,6 +438,7 @@
                 ]
             });
 
+
             //form collaborate
             $(document).on('click', '.collab_btn', function() {
                 var url = $(this).data('href');