правка для ерп5

diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php
index 820302c5ad5136dd3ff07c750275e438fa669e36..40781e51f110e0476c1e81a47ff6bfbc14c937a6 100644 (file)
--- a/erp24/controllers/TimetableFactController.php
+++ b/erp24/controllers/TimetableFactController.php
@@ -44,12 +44,13 @@ class TimetableFactController extends Controller
             'pagination' => [
                 'pageSize' => 50
             ],
+            */
             'sort' => [
                 'defaultOrder' => [
                     'id' => SORT_DESC,
                 ]
             ],
-            */
+
         ]);
 
         return $this->render('index', [

diff --git a/erp24/views/timetable-fact/index.php b/erp24/views/timetable-fact/index.php
index be6f0ced2bbbcde18bf93c31f8ebe4f1cfa62956..62136097e27e540bb973602629256cbfdd5ac3f6 100644 (file)
--- a/erp24/views/timetable-fact/index.php
+++ b/erp24/views/timetable-fact/index.php
@@ -49,7 +49,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 'attribute' => 'work_time',
                 'format' => 'raw',
                 'value' => function ($model) {
-                    return abs(intval($model->work_time));
+                    return $model->work_time;
                 },
             ],
             [

diff --git a/erp24/views/timetable-fact/view.php b/erp24/views/timetable-fact/view.php
index 83437bc17e4915f7ad096b8ba9b5286667a2348f..a553499a5c899de1ca476859777f772c018b0389 100644 (file)
--- a/erp24/views/timetable-fact/view.php
+++ b/erp24/views/timetable-fact/view.php
@@ -95,7 +95,7 @@ $this->title = "Фактический табель #$model->id";
                 'attribute' => 'work_time',
                 'format' => 'raw',
                 'value' => function ($model) {
-                    return abs(intval($model->work_time));
+                    return $model->work_time;
                 },
             ],
             [