ERP-5 Доработать фактический план по сотрудникам

diff --git a/erp24/views/timetable-fact/index.php b/erp24/views/timetable-fact/index.php
index 22a929294505d70cf8fcf753bcf19551866d5ea3..d76e5ee84f81a99a37b761fd895c540230fea5ca 100644 (file)
--- a/erp24/views/timetable-fact/index.php
+++ b/erp24/views/timetable-fact/index.php
@@ -46,8 +46,11 @@ $this->params['breadcrumbs'][] = $this->title;
                 },
             ],
             [
-                'label' => 'Отработанное время',
                 'attribute' => 'work_time',
+                'format' => 'raw',
+                'value' => function ($model) {
+                    return intval($model->work_time);
+                },
             ],
             [
                 'label' => 'Дата смены',
@@ -86,7 +89,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 'format' => 'raw',
                 'value' => function ($model) {
                     if (!empty($model->checkin_end_id)) {
-                        return !empty($photo = $model->checkinStart->photo) ? Html::img($photo, ['alt' => 'selfie', 'height' => '100px']) : null;
+                        return !empty($photo = $model->checkinEnd->photo) ? Html::img($photo, ['alt' => 'selfie', 'height' => '100px']) : null;
                     };
                 },
             ],

diff --git a/erp24/views/timetable-fact/view.php b/erp24/views/timetable-fact/view.php
index 6b1308fe0c9de7ad27e8b458e073553029887fb3..22084db99c8c5fd74ad0db5702d6f4de30de7b89 100644 (file)
--- a/erp24/views/timetable-fact/view.php
+++ b/erp24/views/timetable-fact/view.php
@@ -16,14 +16,14 @@ $this->title = "Фактический табель #$model->id";
     <h1><?= Html::encode($this->title) ?></h1>
 
     <p>
-<!--        --><?php //= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
-<!--        --><?php //= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->id], [
-//            'class' => 'btn btn-danger',
-//            'data' => [
-//                'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
-//                'method' => 'post',
-//            ],
-//        ]) ?>
+        <!--        --><?php //= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
+        <!--        --><?php //= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->id], [
+        //            'class' => 'btn btn-danger',
+        //            'data' => [
+        //                'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
+        //                'method' => 'post',
+        //            ],
+        //        ]) ?>
     </p>
 
     <?= DetailView::widget([
@@ -91,7 +91,13 @@ $this->title = "Фактический табель #$model->id";
                     return Yii::$app->formatter->asDatetime($model->time_end, 'php:H:i:s');
                 },
             ],
-            'work_time',
+            [
+                'attribute' => 'work_time',
+                'format' => 'raw',
+                'value' => function ($model) {
+                    return intval($model->work_time);
+                },
+            ],
             [
                 'attribute' => 'is_opening',
                 'format' => 'raw',
@@ -118,7 +124,7 @@ $this->title = "Фактический табель #$model->id";
             [
                 'attribute' => 'admin_group_id',
                 'value' => function ($data) {
-                    return $data->shift->name;
+                    return !empty($data->shift_id) ? $data->shift->name : null;
                 }
             ],
             [
@@ -142,17 +148,22 @@ $this->title = "Фактический табель #$model->id";
                 'label' => 'Отметка о начале',
                 'format' => 'raw',
                 'value' => function ($model) {
-                    return !empty($photo = $model->checkinStart->photo) ? Html::img($photo, ['alt' => 'selfie', 'height' => '100px']) : null;
+                    if (!empty($model->checkin_start_id)) {
+                        return !empty($photo = $model->checkinStart->photo) ? Html::img($photo, ['alt' => 'selfie', 'height' => '100px']) : null;
+                    };
                 },
             ],
             [
                 'label' => 'Отметка о конце',
                 'format' => 'raw',
                 'value' => function ($model) {
-                    return !empty($photo = $model->checkinEnd->photo) ? Html::img($photo,  ['alt' => 'selfie', 'height' => '100px'])  : null;
+                    if (!empty($model->checkin_end_id)) {
+                        return !empty($photo = $model->checkinEnd->photo) ? Html::img($photo, ['alt' => 'selfie', 'height' => '100px']) : null;
+                    };
                 },
-            ],
-        ],
-    ]) ?>
+            ]
+        ]
+    ]);
+    ?>
 
 </div>