Поправлены временные интервалы для выборки смен

diff --git a/erp24/actions/timetable/AddFactHandAction.php b/erp24/actions/timetable/AddFactHandAction.php
index 0397e175082fda81fd257cdaf00fe773c5d19346..294f2ebf9ecb6d52a8b406f61a7104ad6861cc00 100644 (file)
--- a/erp24/actions/timetable/AddFactHandAction.php
+++ b/erp24/actions/timetable/AddFactHandAction.php
@@ -110,6 +110,8 @@ class AddFactHandAction extends Action
                         throw new \Exception(Json::encode($timetableFactModel->getErrors()));
                     }
 
+                    Yii::$app->session->setFlash('success', "Факт смены был создан");
+
                     return $this->controller->redirect('/timetable/add-fact-hand');
                 }
             } else {
@@ -146,18 +148,13 @@ class AddFactHandAction extends Action
                 [
                     'and',
                     ['<=', 'datetime_start', date('Y-m-d H:i:s', strtotime("+6 hour", strtotime($model->shift_start)))],
-                    ['>=', 'datetime_end', date('Y-m-d H:i:s', strtotime("+6 hour", strtotime($model->shift_start)))],
+                    ['>=', 'datetime_end', date('Y-m-d H:i:s', strtotime("-6 hour", strtotime($model->shift_start)))],
                 ],
                 [
                     'and',
-                    ['<=', 'datetime_start', date('Y-m-d H:i:s', strtotime("-6 hour", strtotime($model->shift_end)))],
+                    ['<=', 'datetime_start', date('Y-m-d H:i:s', strtotime("+6 hour", strtotime($model->shift_end)))],
                     ['>=', 'datetime_end', date('Y-m-d H:i:s', strtotime("-6 hour", strtotime($model->shift_end)))],
-                ],
-                [
-                    'and',
-                    ['>=', 'datetime_start', date('Y-m-d H:i:s', strtotime("+6 hour", strtotime($model->shift_start)))],
-                    ['<=', 'datetime_end', date('Y-m-d H:i:s', strtotime("-6 hour", strtotime($model->shift_end)))],
-                ],
+                ]
             ])->andWhere(['admin_id' => $model->admin_id])->all();
 
             $checkIns = AdminCheckin::find()->where(['admin_id' => $model->admin_id])

diff --git a/erp24/views/timetable/add-fact-hand.php b/erp24/views/timetable/add-fact-hand.php
index 8080aa53cb9e5af7ab9f95ac1af0484e704d99f7..d46a189d8eadce9a2f3641a447b5c09d24a5e1fc 100644 (file)
--- a/erp24/views/timetable/add-fact-hand.php
+++ b/erp24/views/timetable/add-fact-hand.php
@@ -21,6 +21,13 @@ use \yii\base\DynamicModel;
 
     <?php $form = ActiveForm::begin(['enableClientScript' => false]) ?>
 
+    <?php if (Yii::$app->session->hasFlash('success')): ?>
+        <div class="alert alert-success alert-dismissable">
+            <button aria-hidden="true" data-dismiss="alert" class="close" type="button">×</button>
+            <?= Yii::$app->session->getFlash('success') ?>
+        </div>
+    <?php endif; ?>
+
     <div class="row">
         <div class="col-12">
             Сотрудник: <div style="display:inline-block"><?= $form->field($model, 'admin_id')->dropDownList($admins)->label(false) ?></div>
@@ -29,7 +36,7 @@ use \yii\base\DynamicModel;
             <br>
             <span style="text-decoration: underline; color: blue;" title="Выберите кликом из Смены (/timetable/fact, /timetable/plan):">plan_id</span>: <div style="display:inline-block"><?= $form->field($model, 'plan_id')->textInput(['type' => 'number'])->label(false) ?></div>
             <span style="text-decoration: underline; color: blue;" title="Выберите кликом из Смены (/timetable/fact, /timetable/plan):">tabel</span>: <div style="display:inline-block"><?= $form->field($model, 'tabel')->textInput(['type' => 'number'])->label(false) ?></div>
-            <span style="text-decoration: underline; color: blue;" title="Выберите кликом из Смены (/timetable/fact, /timetable/plan):">admin_group_id</span>: <div style="display:inline-block"><?= $form->field($model, 'admin_group_id')->dropDownList($adminGroups)->label(false) ?></div>
+            <span style="text-decoration: underline; color: blue;" title="Выберите кликом из Смены (/timetable/fact, /timetable/plan):">Должность в которой сотрудник работал на смене(admin_group_id)</span>: <div style="display:inline-block"><?= $form->field($model, 'admin_group_id')->dropDownList($adminGroups)->label(false) ?></div>
             <br>
             Начало смены: <div style="display:inline-block"><?= $form->field($model, 'shift_start')->widget(DateTimePicker::class, [
                     'language' => 'ru',
@@ -54,6 +61,7 @@ use \yii\base\DynamicModel;
             <?php if ($allowAdd): ?>
                 <?= Html::submitButton('Создать факт и чикины', ['class' => 'btn btn-danger btn-sm', 'name' => 'action', 'value' => 'createFact'])?>
                 <?= Html::submitButton('Создать факт и чикин (открыть смену)', ['class' => 'btn btn-danger btn-sm', 'name' => 'action', 'value' => 'createFactOpenShift'])?>
+                <br>
                 <span style="text-decoration: underline; color: blue;" title="Выберите кликом из Смены-Факта (/timetable-fact):">timetable_fact_id</span>: <div style="display:inline-block"><?= $form->field($model, 'timetable_fact_id')->textInput(['type' => 'number'])->label(false) ?></div>
                 <?= Html::submitButton('Создать чикин (закрыть смену)', ['class' => 'btn btn-danger btn-sm', 'name' => 'action', 'value' => 'createFactCloseShift'])?>
             <?php endif; ?>