From eace765d915534ea565a8d593c46da99bb52b66a Mon Sep 17 00:00:00 2001 From: marina Date: Mon, 17 Jun 2024 12:23:37 +0300 Subject: [PATCH] =?utf8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=B4?= =?utf8?q?=D0=BB=D1=8F=20=D0=B5=D1=80=D0=BF5?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/TimetableFactController.php | 3 ++- erp24/views/timetable-fact/index.php | 2 +- erp24/views/timetable-fact/view.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php index 820302c5..40781e51 100644 --- 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 be6f0ced..62136097 100644 --- 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 83437bc1..a553499a 100644 --- 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; }, ], [ -- 2.39.5