From 93bff531ddd872de349deb66a68ce3b0e3b49174 Mon Sep 17 00:00:00 2001
From: Igor Borisov <latentpickuper@gmail.com>
Date: Fri, 14 Feb 2020 15:38:43 +0300
Subject: [PATCH 1/7] sdfsf

---
 .../gii/templates/crud/simple/views/_form.php |   4 +-
 ...200214_074002_create_table_codes_table.php |  52 +++
 ...084617_alter_table_records_add_code_id.php |  38 ++
 models/Records.php                            | 400 +++++++++---------
 models/RecordsSearch.php                      |  11 +-
 models/TableCodes.php                         |  52 +++
 models/TableCodesSearch.php                   |  71 ++++
 .../controllers/TableCodesController.php      | 133 ++++++
 modules/administrator/views/records/_form.php |   7 +
 modules/administrator/views/records/index.php |   1 +
 .../administrator/views/table-codes/_form.php |  34 ++
 .../views/table-codes/_search.php             |  31 ++
 .../views/table-codes/create.php              |  19 +
 .../administrator/views/table-codes/index.php |  30 ++
 .../views/table-codes/update.php              |  19 +
 .../administrator/views/table-codes/view.php  |  34 ++
 views/layouts/left.php                        |   2 +
 17 files changed, 746 insertions(+), 192 deletions(-)
 create mode 100644 migrations/m200214_074002_create_table_codes_table.php
 create mode 100644 migrations/m200214_084617_alter_table_records_add_code_id.php
 create mode 100644 models/TableCodes.php
 create mode 100644 models/TableCodesSearch.php
 create mode 100644 modules/administrator/controllers/TableCodesController.php
 create mode 100644 modules/administrator/views/table-codes/_form.php
 create mode 100644 modules/administrator/views/table-codes/_search.php
 create mode 100644 modules/administrator/views/table-codes/create.php
 create mode 100644 modules/administrator/views/table-codes/index.php
 create mode 100644 modules/administrator/views/table-codes/update.php
 create mode 100644 modules/administrator/views/table-codes/view.php

diff --git a/generators/gii/templates/crud/simple/views/_form.php b/generators/gii/templates/crud/simple/views/_form.php
index a92e3d4..7e155c2 100644
--- a/generators/gii/templates/crud/simple/views/_form.php
+++ b/generators/gii/templates/crud/simple/views/_form.php
@@ -37,7 +37,9 @@ use yii\widgets\ActiveForm;
     <div class="box-footer">
         <?= "<?= " ?>Html::submitButton(<?= $generator->generateString('Сохранить') ?>, ['class' => 'btn btn-success
       btn-flat']) ?>
-      <?= "<?= " ?>Html::a(<?= $generator->generateString('Отменить') ?>, '/<?=$generator->getControllerID()?>/index',
+      <?= "<?= " ?>Html::a(<?= $generator->generateString('Отменить') ?>, '/<?= Yii::$app->controller->module->id
+      ?>/<?=$generator->getControllerID()
+      ?>/index',
       ['class' => 'btn
       btn-warning
       btn-flat']) ?>
diff --git a/migrations/m200214_074002_create_table_codes_table.php b/migrations/m200214_074002_create_table_codes_table.php
new file mode 100644
index 0000000..0097f5a
--- /dev/null
+++ b/migrations/m200214_074002_create_table_codes_table.php
@@ -0,0 +1,52 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles the creation of table `{{%table_codes}}`.
+ */
+class m200214_074002_create_table_codes_table extends Migration
+{
+  /**
+   * {@inheritdoc}
+   */
+  public function safeUp()
+  {
+    $codes = [
+      ['НН', 'Неявки по невыясненной причине', false, false],
+      ['В', 'Выходные дни (еженедельный отпуск) и нерабочие праздничные дни', false, false],
+      ['ОТ', 'Ежегодный дополнительный оплачиваемый отпуск', true, false],
+      ['ОЖ', 'Отпуск по уходу за ребенком до достижения им возраста трех лет', true, false],
+      ['Р', 'Отпуск по беременности и родам (отпуск в связи с усыновлением новорожденного ребенка)', true, false],
+      ['ПР', 'Прогулы (отсутствие на рабочем месте без уважительных причин в течение времени, установленного законодательством)', true, true],
+      ['Б', 'Временная нетрудоспособность (кроме случаев, предусмотренных кодом «Т») с назначением пособия, согласно законодательству', true, true],
+      ['ДО', 'Отпуск без сохранения заработной платы, предоставленный работнику по разрешению работодателя',
+        true, true],
+    ];
+
+    $this->createTable('{{%table_codes}}', [
+      'id' => $this->primaryKey(),
+      'code' => $this->string(8)->notNull(),
+      'details' => $this->string(256),
+      'is_periodic' => $this->boolean()->defaultValue(false),
+      'admin_only' => $this->boolean()->defaultValue(false),
+    ]);
+
+    foreach ($codes as $code) {
+      $this->insert('table_codes', [
+        'code' => $code[0],
+        'details' => $code[1],
+        'is_periodic' => $code[2],
+        'admin_only' => $code[3],
+      ]);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function safeDown()
+  {
+    $this->dropTable('{{%table_codes}}');
+  }
+}
diff --git a/migrations/m200214_084617_alter_table_records_add_code_id.php b/migrations/m200214_084617_alter_table_records_add_code_id.php
new file mode 100644
index 0000000..bdf3f88
--- /dev/null
+++ b/migrations/m200214_084617_alter_table_records_add_code_id.php
@@ -0,0 +1,38 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m200214_084617_alter_table_records_add_code_id
+ */
+class m200214_084617_alter_table_records_add_code_id extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+      $this->addColumn('records', 'table_code_id', 'integer default null');
+
+      $this->addForeignKey(
+        'records_table_codes_fk',
+        'records',
+        'table_code_id',
+        'table_codes',
+        'id',
+        'SET NULL'
+      );
+    }
+
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+       $this->dropForeignKey('records_table_codes_fk', 'records');
+
+       $this->dropColumn('records', 'table_code_id');
+    }
+
+}
diff --git a/models/Records.php b/models/Records.php
index 864be56..9a09b75 100644
--- a/models/Records.php
+++ b/models/Records.php
@@ -15,211 +15,231 @@ use yii\behaviors\TimestampBehavior;
  * @property int $end
  * @property int $created_at
  * @property int $type
+ * @property int|null $table_code_id
  *
  * @property Employees $employee
  * @property Objects $object
  */
 class Records extends \yii\db\ActiveRecord
 {
-    /**
-     * {@inheritdoc}
-     */
-    public static function tableName()
-    {
-        return 'records';
+  /**
+   * {@inheritdoc}
+   */
+  public static function tableName()
+  {
+    return 'records';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function rules()
+  {
+    return [
+      [['employee_id', 'object_id', 'start', 'end', 'created_at', 'type'], 'required'],
+      [['employee_id', 'object_id', 'table_code_id', 'start', 'end', 'type', 'created_at'], 'integer'],
+      [['start'], 'checkStartDayIsCreateDay', 'skipOnError' => false, 'skipOnEmpty' => false],
+      [['end'], 'checkSameDay', 'skipOnError' => false, 'skipOnEmpty' => false],
+      [['end'], 'checkEndDate', 'skipOnError' => false, 'skipOnEmpty' => false],
+      [['type'], 'checkType', 'skipOnError' => false, 'skipOnEmpty' => false],
+      [['employee_id'], 'exist', 'skipOnError' => true, 'targetClass' => Employees::className(), 'targetAttribute' => ['employee_id' => 'id']],
+      [['object_id'], 'exist', 'skipOnError' => true, 'targetClass' => Objects::className(), 'targetAttribute' => ['object_id' => 'id']],
+      [['table_code_id'], 'exist', 'skipOnError' => true, 'targetClass' => TableCodes::className(), 'targetAttribute' => ['table_code_id' => 'id']],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function attributeLabels()
+  {
+    return [
+      'id' => 'ID',
+      'employee_id' => 'ФИО соотрудника',
+      'employeeFullName' => 'ФИО соотрудника',
+      'employeeTableNumber' => 'Таб.№ сотрудника',
+      'object_id' => 'Объект',
+      'objectName' => 'Объект',
+      'objectNumber' => 'Номер объекта',
+      'start' => 'Дата/время начала',
+      'end' => 'Дата/время окончания',
+      'type' => 'Тип записи',
+      'created_at' => 'Дата/время создания',
+      'table_code_id' => 'Код учёта',
+      'code' => 'Код учёта'
+    ];
+  }
+
+  /**
+   * @return \yii\db\ActiveQuery
+   */
+  public function getEmployee()
+  {
+    return $this->hasOne(Employees::className(), ['id' => 'employee_id']);
+  }
+
+  /**
+   * @return string
+   */
+  public function getEmployeeFullName()
+  {
+    return $this->employee->full_name;
+  }
+
+  /**
+   * @return string
+   */
+  public function getEmployeeTableNumber()
+  {
+    return $this->employee->table_number;
+  }
+
+  /**
+   * @return \yii\db\ActiveQuery
+   */
+  public function getObject()
+  {
+    return $this->hasOne(Objects::className(), ['id' => 'object_id']);
+  }
+
+  /**
+   * @return string
+   */
+  public function getObjectName()
+  {
+    return $this->object->name;
+  }
+
+  /**
+   * @return string
+   */
+  public function getObjectNumber()
+  {
+    return $this->object->object_number;
+  }
+
+  /**
+   * Gets query for [[TableCode]].
+   *
+   * @return \yii\db\ActiveQuery
+   */
+  public function getTableCode()
+  {
+    return $this->hasOne(TableCodes::className(), ['id' => 'table_code_id']);
+  }
+
+  public function getCode()
+  {
+    return is_null($this->table_code_id) ? null : $this->getTableCode()->code;
+  }
+
+  /**
+   * Проверка, что дата окончания тот же день, что и дата начала
+   * @param $attribute
+   * @return bool
+   */
+  public function checkSameDay($attribute)
+  {
+    $day = $this->getDay('start');
+
+    if ($this->$attribute <= $day['dayStart'] || $this->$attribute >= $day['dayEnd']) {
+      $this->addError($attribute, 'Дата начала и окончания должны быть в пределах одного дня');
+      return false;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function rules()
-    {
-        return [
-            [['employee_id', 'object_id', 'start', 'end', 'created_at', 'type'], 'required'],
-            [['employee_id', 'object_id', 'start', 'end', 'type', 'created_at'], 'integer'],
-            [['start'], 'checkStartDayIsCreateDay', 'skipOnError' => false, 'skipOnEmpty' => false],
-            [['end'], 'checkSameDay', 'skipOnError' => false, 'skipOnEmpty' => false],
-            [['end'], 'checkEndDate', 'skipOnError' => false, 'skipOnEmpty' => false],
-            [['type'], 'checkType', 'skipOnError' => false, 'skipOnEmpty' => false],
-            [['employee_id'], 'exist', 'skipOnError' => true, 'targetClass' => Employees::className(), 'targetAttribute' => ['employee_id' => 'id']],
-            [['object_id'], 'exist', 'skipOnError' => true, 'targetClass' => Objects::className(), 'targetAttribute' => ['object_id' => 'id']],
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function attributeLabels()
-    {
-        return [
-            'id' => 'ID',
-            'employee_id' => 'ФИО соотрудника',
-            'employeeFullName' => 'ФИО соотрудника',
-            'employeeTableNumber' => 'Таб.№ сотрудника',
-            'object_id' => 'Объект',
-            'objectName' => 'Объект',
-            'objectNumber' => 'Номер объекта',
-            'start' => 'Дата/время начала',
-            'end' => 'Дата/время окончания',
-            'type' => 'Тип записи',
-            'created_at' => 'Дата/время создания',
-        ];
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getEmployee()
-    {
-        return $this->hasOne(Employees::className(), ['id' => 'employee_id']);
+    return true;
+  }
+
+
+  /**
+   * Проверка, что дата окончания не раньше даты начала
+   * @param $attribute
+   * @return bool
+   */
+  public function checkEndDate($attribute)
+  {
+    if ($this->$attribute < $this->start) {
+      $this->addError($attribute, 'Дата окончания не может быть раньше даты начала');
+      return false;
     }
-
-    /**
-     * @return string
-     */
-    public function getEmployeeFullName()
-    {
-        return $this->employee->full_name;
+  }
+
+  public function checkType($attribute)
+  {
+    $day = $this->getDay('start');
+    $query = Records::find()->where([
+      'employee_id' => $this->employee_id,
+      'type' => $this->$attribute
+    ])->andWhere([
+      'between',
+      'start',
+      $day['dayStart'],
+      $day['dayEnd']
+    ]);
+
+    if (Yii::$app->controller->action->id === 'update') {
+      $query->andWhere([
+        '!=',
+        'id',
+        $this->id
+      ]);
     }
+    $records = $query->all();
 
-    /**
-     * @return string
-     */
-    public function getEmployeeTableNumber()
-    {
-        return $this->employee->table_number;
+    if (count($records) !== 0) {
+      $this->addError($attribute, 'Не может быть более одной записи одного типа одного сотрудника в день');
+      return false;
     }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getObject()
-    {
-        return $this->hasOne(Objects::className(), ['id' => 'object_id']);
+  }
+
+  public function checkStartDayIsCreateDay($attribute)
+  {
+    if (Yii::$app->user->can('manager')) {
+      $day = $this->getDay('created_at');
+      if ($this->$attribute < $day['dayStart'] || $this->$attribute > $day['dayEnd']) {
+        $this->addError($attribute, 'Доступна запись только в текущий день');
+        return false;
+      }
     }
-
-    /**
-     * @return string
-     */
-    public function getObjectName()
-    {
-        return $this->object->name;
-    }
-    /**
-     * @return string
-     */
-    public function getObjectNumber()
-    {
-        return $this->object->object_number;
+  }
+
+  /**  Форматирование интервала между датами в часы и минуты
+   * @return string
+   */
+
+  public function formatSecondsInterval()
+  {
+    $interval = $this->end - $this->start;
+    $hours = 0;
+    $minutes = 0;
+    if ($interval > 3600) {
+      $hours = floor($interval / 3600);
+      $interval = $interval % 3600;
     }
+    $minutes += floor($interval / 60);
+    $result = '';
 
-    /**
-     * Проверка, что дата окончания тот же день, что и дата начала
-     * @param $attribute
-     * @return bool
-     */
-    public function checkSameDay($attribute)
-    {
-        $day = $this->getDay('start');
-
-        if ($this->$attribute <= $day['dayStart'] || $this->$attribute >= $day['dayEnd']) {
-            $this->addError($attribute, 'Дата начала и окончания должны быть в пределах одного дня');
-            return false;
-        }
-        return true;
+    if ((int)$hours !== 0) {
+      $result .= "{$hours}ч ";
     }
-
-
-    /**
-     * Проверка, что дата окончания не раньше даты начала
-     * @param $attribute
-     * @return bool
-     */
-    public function checkEndDate($attribute)
-    {
-        if ($this->$attribute < $this->start) {
-            $this->addError($attribute, 'Дата окончания не может быть раньше даты начала');
-            return false;
-        }
-    }
-
-    public function checkType($attribute)
-    {
-        $day = $this->getDay('start');
-        $query = Records::find()->where([
-            'employee_id' => $this->employee_id,
-            'type' => $this->$attribute
-        ])->andWhere([
-            'between',
-            'start',
-            $day['dayStart'],
-            $day['dayEnd']
-        ]);
-
-        if (Yii::$app->controller->action->id === 'update') {
-            $query->andWhere([
-                '!=',
-                'id',
-                $this->id
-            ]);
-        }
-        $records = $query->all();
-
-        if (count($records) !== 0) {
-            $this->addError($attribute, 'Не может быть более одной записи одного типа одного сотрудника в день');
-            return false;
-        }
-    }
-
-    public function checkStartDayIsCreateDay($attribute)
-    {
-        if (Yii::$app->user->can('manager')) {
-            $day = $this->getDay('created_at');
-            if ($this->$attribute < $day['dayStart'] || $this->$attribute > $day['dayEnd']) {
-                $this->addError($attribute, 'Доступна запись только в текущий день');
-                return false;
-            }
-        }
-    }
-
-    /**  Форматирование интервала между датами в часы и минуты
-     * @return string
-     */
-
-    public function formatSecondsInterval()
-    {
-        $interval = $this->end - $this->start;
-        $hours = 0;
-        $minutes = 0;
-        if ($interval > 3600) {
-            $hours = floor($interval / 3600);
-            $interval = $interval % 3600;
-        }
-        $minutes += floor($interval / 60);
-        $result = '';
-
-        if ((int)$hours !== 0) {
-            $result .= "{$hours}ч ";
-        }
-        if ((int)$minutes !== 0) {
-            $result .= "{$minutes}м ";
-        }
-        return $result;
-    }
-
-    /**
-     * Находим timestamp начала и конца дня для сравнения
-     * @param $attribute
-     * @return array
-     * @throws \yii\base\InvalidConfigException
-     */
-    public function getDay($attribute)
-    {
-        $result = [];
-        $day = Yii::$app->formatter->asDate($this->$attribute);
-        $result['dayStart'] = Yii::$app->formatter->asTimestamp($day . ' 00:00:00');
-        $result['dayEnd'] = Yii::$app->formatter->asTimestamp($day . ' 23:59:59');
-        return $result;
+    if ((int)$minutes !== 0) {
+      $result .= "{$minutes}м ";
     }
+    return $result;
+  }
+
+  /**
+   * Находим timestamp начала и конца дня для сравнения
+   * @param $attribute
+   * @return array
+   * @throws \yii\base\InvalidConfigException
+   */
+  public function getDay($attribute)
+  {
+    $result = [];
+    $day = Yii::$app->formatter->asDate($this->$attribute);
+    $result['dayStart'] = Yii::$app->formatter->asTimestamp($day . ' 00:00:00');
+    $result['dayEnd'] = Yii::$app->formatter->asTimestamp($day . ' 23:59:59');
+    return $result;
+  }
 
 }
diff --git a/models/RecordsSearch.php b/models/RecordsSearch.php
index 626042c..1ffb980 100644
--- a/models/RecordsSearch.php
+++ b/models/RecordsSearch.php
@@ -15,6 +15,7 @@ class RecordsSearch extends Records
   public $employeeFullName;
   public $employeeTableNumber;
   public $objectNumber;
+  public $code;
 
   /**
    * @inheritdoc
@@ -23,7 +24,7 @@ class RecordsSearch extends Records
   {
     return [
       [['id', 'employee_id', 'object_id', 'type', 'employeeTableNumber'], 'integer'],
-      [['objectNumber', 'employeeFullName', 'start', 'end', 'created_at'], 'safe'],
+      [['objectNumber', 'employeeFullName', 'start', 'end', 'created_at', 'code'], 'safe'],
     ];
   }
 
@@ -99,6 +100,10 @@ class RecordsSearch extends Records
           'asc' => ['created_at' => SORT_ASC],
           'desc' => ['created_at' => SORT_DESC]
         ],
+        'code' => [
+          'asc' => ['table_codes.code' => SORT_ASC],
+          'desc' => ['table_codes.code' => SORT_DESC]
+        ]
 
       ],
       'defaultOrder' => ['id' => SORT_DESC]
@@ -124,6 +129,7 @@ class RecordsSearch extends Records
       // $query->where('0=1');
       $query->joinWith(['employee']);
       $query->joinWith(['object']);
+      $query->joinWith(['tableCode']);
       return $dataProvider;
     }
 
@@ -148,6 +154,9 @@ class RecordsSearch extends Records
     $query->joinWith(['employee' => function ($q) {
       $q->where('employees.table_number LIKE "%' . $this->employeeTableNumber . '%"');
     }]);
+    $query->joinWith(['tableCode' => function ($q) {
+      $q->where('table_codes.code LIKE "%' . $this->code . '%" OR table_codes.code IS NULL');
+    }]);
 
 
     return $dataProvider;
diff --git a/models/TableCodes.php b/models/TableCodes.php
new file mode 100644
index 0000000..50ebaef
--- /dev/null
+++ b/models/TableCodes.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace app\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "table_codes".
+ *
+ * @property int $id
+ * @property string $code
+ * @property string|null $details
+ * @property int|null $is_periodic
+ * @property int|null $admin_only
+ */
+class TableCodes extends \yii\db\ActiveRecord
+{
+  /**
+   * {@inheritdoc}
+   */
+  public static function tableName()
+  {
+    return 'table_codes';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function rules()
+  {
+    return [
+      [['code'], 'required'],
+      [['code'], 'string', 'max' => 8],
+      [['is_periodic', 'admin_only'], 'integer'],
+      [['details'], 'string', 'max' => 256],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function attributeLabels()
+  {
+    return [
+      'id' => 'ID',
+      'code' => 'Код',
+      'details' => 'Расшифровка',
+      'is_periodic' => 'Период',
+      'admin_only' => 'Только админ',
+    ];
+  }
+}
diff --git a/models/TableCodesSearch.php b/models/TableCodesSearch.php
new file mode 100644
index 0000000..079b94e
--- /dev/null
+++ b/models/TableCodesSearch.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace app\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use app\models\TableCodes;
+
+/**
+ * TableCodesSearch represents the model behind the search form of `app\models\TableCodes`.
+ */
+class TableCodesSearch extends TableCodes
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id'], 'integer'],
+            [['code', 'details'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = TableCodes::find();
+
+        // add conditions that should always apply here
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+            'sort' => ['defaultOrder' => ['id' => SORT_DESC]]
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        // grid filtering conditions
+        $query->andFilterWhere([
+            'id' => $this->id,
+        ]);
+
+        $query->andFilterWhere(['like', 'code', $this->code])
+            ->andFilterWhere(['like', 'details', $this->details]);
+
+        return $dataProvider;
+    }
+}
diff --git a/modules/administrator/controllers/TableCodesController.php b/modules/administrator/controllers/TableCodesController.php
new file mode 100644
index 0000000..1a1ca86
--- /dev/null
+++ b/modules/administrator/controllers/TableCodesController.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace app\modules\administrator\controllers;
+
+use Yii;
+use app\models\TableCodes;
+use app\models\TableCodesSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * TableCodesController implements the CRUD actions for TableCodes model.
+ */
+class TableCodesController extends Controller
+{
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+          'access' => [
+            'class' => '\yii\filters\AccessControl',
+            'rules' => [
+              [
+                'allow' => true,
+                'roles' => ['superadmin']
+              ],
+            ],
+          ],
+        ];
+    }
+
+    /**
+     * Lists all TableCodes models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new TableCodesSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single TableCodes model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new TableCodes model.
+     * If creation is successful, the browser will be redirected to the 'index' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new TableCodes();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['index']);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing TableCodes model.
+     * If update is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['index']);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing TableCodes model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the TableCodes model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return TableCodes the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = TableCodes::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/modules/administrator/views/records/_form.php b/modules/administrator/views/records/_form.php
index 05b3831..f25cc70 100644
--- a/modules/administrator/views/records/_form.php
+++ b/modules/administrator/views/records/_form.php
@@ -7,6 +7,7 @@ use yii\widgets\ActiveForm;
 use kartik\depdrop\DepDrop;
 use yii\helpers\ArrayHelper;
 use app\models\Objects;
+use app\models\TableCodes;
 use yii\helpers\Url;
 use kartik\datecontrol\DateControl;
 
@@ -15,12 +16,16 @@ use kartik\datecontrol\DateControl;
 /* @var $form yii\widgets\ActiveForm */
 
 $objects[null] = '...';
+$codes[null] = '...';
+
 $query = Objects::find();
+$codesQuery = TableCodes::find();
 $user = Users::findOne(Yii::$app->user->identity->getId());
 if(Yii::$app->user->can('admin')) {
   $query->andWhere(['hub_id' => $user->hub_id]);
 }
 $objects = $objects + ArrayHelper::map($query->all(), 'id', 'name');
+$codes = $codes + ArrayHelper::map($codesQuery->all(), 'id', 'code');
 ?>
 
 <div class="records-form box box-primary">
@@ -57,6 +62,8 @@ $objects = $objects + ArrayHelper::map($query->all(), 'id', 'name');
       ]
     ]) ?>
 
+    <?= $form->field($model, 'table_code_id')->dropDownList($codes)?>
+
     <?= $form->field($model, 'start')->widget(DateControl::classname(), [
       'type' => DateControl::FORMAT_DATETIME,
       'widgetOptions' => [
diff --git a/modules/administrator/views/records/index.php b/modules/administrator/views/records/index.php
index 90761f4..dae21d4 100644
--- a/modules/administrator/views/records/index.php
+++ b/modules/administrator/views/records/index.php
@@ -111,6 +111,7 @@ $types = [
             ],
           ]),
         ],
+        'code',
         [
           'label' => 'Часы',
           'value' => function (Records $model) {
diff --git a/modules/administrator/views/table-codes/_form.php b/modules/administrator/views/table-codes/_form.php
new file mode 100644
index 0000000..707961f
--- /dev/null
+++ b/modules/administrator/views/table-codes/_form.php
@@ -0,0 +1,34 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model app\models\TableCodes */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="table-codes-form box box-primary">
+    <?php $form = ActiveForm::begin(); ?>
+    <div class="box-body table-responsive">
+
+        <?= $form->field($model, 'code')->textInput(['maxlength' => true]) ?>
+
+        <?= $form->field($model, 'details')->textInput(['maxlength' => true]) ?>
+
+        <?= $form->field($model, 'is_periodic')->dropDownList([0 => 'Нет', 1 => 'Да' ]) ?>
+
+        <?= $form->field($model, 'admin_only')->dropDownList([0 => 'Нет', 1 => 'Да' ]) ?>
+
+    </div>
+    <div class="box-footer">
+        <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success
+      btn-flat']) ?>
+      <?= Html::a('Отменить', '/administrator/table-codes/index',
+      ['class' => 'btn
+      btn-warning
+      btn-flat']) ?>
+
+    </div>
+    <?php ActiveForm::end(); ?>
+</div>
diff --git a/modules/administrator/views/table-codes/_search.php b/modules/administrator/views/table-codes/_search.php
new file mode 100644
index 0000000..4c46143
--- /dev/null
+++ b/modules/administrator/views/table-codes/_search.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model app\models\TableCodesSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="table-codes-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id') ?>
+
+    <?= $form->field($model, 'code') ?>
+
+    <?= $form->field($model, 'details') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton('Search', ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton('Reset', ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/modules/administrator/views/table-codes/create.php b/modules/administrator/views/table-codes/create.php
new file mode 100644
index 0000000..dce7d77
--- /dev/null
+++ b/modules/administrator/views/table-codes/create.php
@@ -0,0 +1,19 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model app\models\TableCodes */
+
+$this->title = 'Создание кода учёта';
+$this->params['breadcrumbs'][] = ['label' => 'Коды учёта', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="table-codes-create">
+
+    <?= $this->render('_form', [
+    'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/modules/administrator/views/table-codes/index.php b/modules/administrator/views/table-codes/index.php
new file mode 100644
index 0000000..6e3705f
--- /dev/null
+++ b/modules/administrator/views/table-codes/index.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel app\models\TableCodesSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = 'Коды учёта';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="table-codes-index box box-primary">
+    <div class="box-header with-border">
+        <?= Html::a('Добавить код', ['create'], ['class' => 'btn btn-success btn-flat']) ?>
+    </div>
+    <div class="box-body table-responsive no-padding">
+        <?= GridView::widget([
+            'dataProvider' => $dataProvider,
+            'filterModel' => $searchModel,
+            'layout' => "{items}\n{summary}\n{pager}",
+            'columns' => [
+                'code',
+                'details',
+
+                ['class' => 'yii\grid\ActionColumn'],
+            ],
+        ]); ?>
+    </div>
+</div>
diff --git a/modules/administrator/views/table-codes/update.php b/modules/administrator/views/table-codes/update.php
new file mode 100644
index 0000000..d8ec03d
--- /dev/null
+++ b/modules/administrator/views/table-codes/update.php
@@ -0,0 +1,19 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model app\models\TableCodes */
+
+$this->title = 'Редактирование кода учёта: ' . $model->code;
+$this->params['breadcrumbs'][] = ['label' => 'Table Codes', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
+$this->params['breadcrumbs'][] = 'редактирование';
+?>
+<div class="table-codes-update">
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/modules/administrator/views/table-codes/view.php b/modules/administrator/views/table-codes/view.php
new file mode 100644
index 0000000..5113909
--- /dev/null
+++ b/modules/administrator/views/table-codes/view.php
@@ -0,0 +1,34 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model app\models\TableCodes */
+
+$this->title = $model->id;
+$this->params['breadcrumbs'][] = ['label' => 'Коды учёта', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="table-codes-view box box-primary">
+    <div class="box-header">
+        <?= Html::a('Редактировать', ['update', 'id' => $model->id], ['class'
+      => 'btn btn-primary btn-flat']) ?>
+        <?= Html::a('Удалить', ['delete', 'id' => $model->id], [
+            'class' => 'btn btn-danger btn-flat',
+            'data' => [
+                'confirm' => 'Вы действительно хотите удалить?',
+                'method' => 'post',
+            ],
+        ]) ?>
+    </div>
+    <div class="box-body table-responsive no-padding">
+        <?= DetailView::widget([
+            'model' => $model,
+            'attributes' => [
+                'code',
+                'details',
+            ],
+        ]) ?>
+    </div>
+</div>
diff --git a/views/layouts/left.php b/views/layouts/left.php
index f68d382..6803649 100644
--- a/views/layouts/left.php
+++ b/views/layouts/left.php
@@ -12,6 +12,8 @@
             Yii::$app->user->can('superadmin')],
           ['label' => 'Пользователи', 'icon' => 'user-o', 'url' => ['/administrator/users'], 'visible' =>
             Yii::$app->user->can('superadmin')],
+          ['label' => 'Коды учёта', 'icon' => 'bold', 'url' => ['/administrator/table-codes'], 'visible' =>
+            Yii::$app->user->can('superadmin')],
           ['label' => 'Сотрудники', 'icon' => 'users', 'url' => ['/administrator/employees'], 'visible' =>
             Yii::$app->user->can('superadmin')],
           ['label' => 'Записи', 'icon' => 'clipboard', 'url' => ['/administrator/records'], 'visible' =>
-- 
GitLab


From db5730209b9afaf3f6f6f3629c75461fde775053 Mon Sep 17 00:00:00 2001
From: Igor Borisov <latentpickuper@gmail.com>
Date: Mon, 17 Feb 2020 17:32:19 +0300
Subject: [PATCH 2/7] sdfsdf

---
 ...120733_alter_records_table_add_details.php | 26 +++++++++++++++++++
 models/Records.php                            |  5 +++-
 models/RecordsSearch.php                      |  8 +++++-
 .../controllers/EmployeesController.php       | 22 ++++++++++++++--
 modules/administrator/views/records/_form.php | 11 +++++++-
 modules/administrator/views/records/index.php |  1 +
 6 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 migrations/m200217_120733_alter_records_table_add_details.php

diff --git a/migrations/m200217_120733_alter_records_table_add_details.php b/migrations/m200217_120733_alter_records_table_add_details.php
new file mode 100644
index 0000000..ddb0303
--- /dev/null
+++ b/migrations/m200217_120733_alter_records_table_add_details.php
@@ -0,0 +1,26 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m200217_120733_alter_records_table_add_details
+ */
+class m200217_120733_alter_records_table_add_details extends Migration
+{
+  /**
+   * {@inheritdoc}
+   */
+  public function safeUp()
+  {
+    $this->addColumn('records', 'details', 'varchar(1024) default null');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function safeDown()
+  {
+    $this->dropColumn('records', 'details');
+  }
+
+}
diff --git a/models/Records.php b/models/Records.php
index 9a09b75..18aebea 100644
--- a/models/Records.php
+++ b/models/Records.php
@@ -15,6 +15,7 @@ use yii\behaviors\TimestampBehavior;
  * @property int $end
  * @property int $created_at
  * @property int $type
+ * @property string|null $details
  * @property int|null $table_code_id
  *
  * @property Employees $employee
@@ -42,6 +43,7 @@ class Records extends \yii\db\ActiveRecord
       [['end'], 'checkSameDay', 'skipOnError' => false, 'skipOnEmpty' => false],
       [['end'], 'checkEndDate', 'skipOnError' => false, 'skipOnEmpty' => false],
       [['type'], 'checkType', 'skipOnError' => false, 'skipOnEmpty' => false],
+      [['details'], 'string', 'max' => 1024],
       [['employee_id'], 'exist', 'skipOnError' => true, 'targetClass' => Employees::className(), 'targetAttribute' => ['employee_id' => 'id']],
       [['object_id'], 'exist', 'skipOnError' => true, 'targetClass' => Objects::className(), 'targetAttribute' => ['object_id' => 'id']],
       [['table_code_id'], 'exist', 'skipOnError' => true, 'targetClass' => TableCodes::className(), 'targetAttribute' => ['table_code_id' => 'id']],
@@ -66,7 +68,8 @@ class Records extends \yii\db\ActiveRecord
       'type' => 'Тип записи',
       'created_at' => 'Дата/время создания',
       'table_code_id' => 'Код учёта',
-      'code' => 'Код учёта'
+      'code' => 'Код учёта',
+      'details' => 'Примечание',
     ];
   }
 
diff --git a/models/RecordsSearch.php b/models/RecordsSearch.php
index 1ffb980..498591c 100644
--- a/models/RecordsSearch.php
+++ b/models/RecordsSearch.php
@@ -24,7 +24,7 @@ class RecordsSearch extends Records
   {
     return [
       [['id', 'employee_id', 'object_id', 'type', 'employeeTableNumber'], 'integer'],
-      [['objectNumber', 'employeeFullName', 'start', 'end', 'created_at', 'code'], 'safe'],
+      [['objectNumber', 'employeeFullName', 'start', 'end', 'created_at', 'code', 'details'], 'safe'],
     ];
   }
 
@@ -100,6 +100,10 @@ class RecordsSearch extends Records
           'asc' => ['created_at' => SORT_ASC],
           'desc' => ['created_at' => SORT_DESC]
         ],
+        'details' => [
+          'asc' => ['details' => SORT_ASC],
+          'desc' => ['details' => SORT_DESC]
+        ],
         'code' => [
           'asc' => ['table_codes.code' => SORT_ASC],
           'desc' => ['table_codes.code' => SORT_DESC]
@@ -144,6 +148,8 @@ class RecordsSearch extends Records
 //      'created_at' => $this->created_at,
     ]);
 
+    $query->andFilterWhere(['like', 'details', $this->details]);
+
     $query->joinWith(['object' => function ($q) {
       $q->where('objects.object_number LIKE "%' . $this->objectNumber . '%"');
     }]);
diff --git a/modules/administrator/controllers/EmployeesController.php b/modules/administrator/controllers/EmployeesController.php
index 6636a86..df54f63 100644
--- a/modules/administrator/controllers/EmployeesController.php
+++ b/modules/administrator/controllers/EmployeesController.php
@@ -2,6 +2,7 @@
 
 namespace app\modules\administrator\controllers;
 
+use app\models\TableCodes;
 use Yii;
 use app\models\Employees;
 use app\models\EmployeesSearch;
@@ -125,10 +126,10 @@ class EmployeesController extends Controller
    */
   public function actionDelete($id)
   {
-    if(!Yii::$app->user->can('superadmin')) {
+    if (!Yii::$app->user->can('superadmin')) {
       throw new ForbiddenHttpException('Доступ запрещен');
     }
-    
+
     $this->findModel($id)->delete();
 
     return $this->redirect(['index']);
@@ -171,5 +172,22 @@ class EmployeesController extends Controller
     return ['output' => '', 'selected' => ''];
   }
 
+  public function actionGetCodes()
+  {
+    Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+    $out = [];
+    $parents = $_POST['depdrop_parents'];
+    $type_id = $parents[0];
+
+    if ((int)$type_id === 1) {
+      $codes = ArrayHelper::map(TableCodes::find()->all(), 'id', 'code');
+
+      foreach ($codes as $key => $code) {
+        $out[] = ['id' => $key, 'name' => $code];
+      }
+    }
+    return ['output' => $out, 'selected' => ''];
+  }
+
 
 }
diff --git a/modules/administrator/views/records/_form.php b/modules/administrator/views/records/_form.php
index f25cc70..688954d 100644
--- a/modules/administrator/views/records/_form.php
+++ b/modules/administrator/views/records/_form.php
@@ -62,7 +62,16 @@ $codes = $codes + ArrayHelper::map($codesQuery->all(), 'id', 'code');
       ]
     ]) ?>
 
-    <?= $form->field($model, 'table_code_id')->dropDownList($codes)?>
+    <?= $form->field($model, 'table_code_id')->widget(DepDrop::className(), [
+      'options' => [
+//        'placeholder' => 'Выберите код учёта'
+      ],
+      'pluginOptions' => [
+        'depends' => ['records-type'],
+        'placeholder' => 'Выбор кода учёта...',
+        'url' => Url::to(['/administrator/employees/get-codes'])
+      ]
+    ])?>
 
     <?= $form->field($model, 'start')->widget(DateControl::classname(), [
       'type' => DateControl::FORMAT_DATETIME,
diff --git a/modules/administrator/views/records/index.php b/modules/administrator/views/records/index.php
index dae21d4..aededce 100644
--- a/modules/administrator/views/records/index.php
+++ b/modules/administrator/views/records/index.php
@@ -112,6 +112,7 @@ $types = [
           ]),
         ],
         'code',
+        'details',
         [
           'label' => 'Часы',
           'value' => function (Records $model) {
-- 
GitLab


From ea575a730966f0cc96f3daec3d03de007b7227ff Mon Sep 17 00:00:00 2001
From: Igor Borisov <latentpickuper@gmail.com>
Date: Tue, 18 Feb 2020 16:26:51 +0300
Subject: [PATCH 3/7] dfgdfg

---
 models/Records.php                            | 40 +++++++++-
 .../controllers/RecordsController.php         | 16 ++--
 modules/administrator/views/records/_form.php | 76 ++++++++++++-------
 modules/administrator/views/records/view.php  |  8 ++
 web/js/admin.js                               | 27 +++++--
 5 files changed, 128 insertions(+), 39 deletions(-)

diff --git a/models/Records.php b/models/Records.php
index 18aebea..13cc578 100644
--- a/models/Records.php
+++ b/models/Records.php
@@ -13,6 +13,8 @@ use yii\behaviors\TimestampBehavior;
  * @property int $object_id
  * @property int $start
  * @property int $end
+ * @property int $start_period
+ * @property int $end_period
  * @property int $created_at
  * @property int $type
  * @property string|null $details
@@ -23,6 +25,11 @@ use yii\behaviors\TimestampBehavior;
  */
 class Records extends \yii\db\ActiveRecord
 {
+
+  public $start_period = null;
+
+  public $end_period = null;
+
   /**
    * {@inheritdoc}
    */
@@ -38,7 +45,7 @@ class Records extends \yii\db\ActiveRecord
   {
     return [
       [['employee_id', 'object_id', 'start', 'end', 'created_at', 'type'], 'required'],
-      [['employee_id', 'object_id', 'table_code_id', 'start', 'end', 'type', 'created_at'], 'integer'],
+      [['employee_id', 'object_id', 'table_code_id', 'start', 'end', 'start_period', 'end_period', 'type', 'created_at'], 'integer'],
       [['start'], 'checkStartDayIsCreateDay', 'skipOnError' => false, 'skipOnEmpty' => false],
       [['end'], 'checkSameDay', 'skipOnError' => false, 'skipOnEmpty' => false],
       [['end'], 'checkEndDate', 'skipOnError' => false, 'skipOnEmpty' => false],
@@ -65,6 +72,8 @@ class Records extends \yii\db\ActiveRecord
       'objectNumber' => 'Номер объекта',
       'start' => 'Дата/время начала',
       'end' => 'Дата/время окончания',
+      'start_period' => 'Начало периода',
+      'end_period' => 'Окончание периода',
       'type' => 'Тип записи',
       'created_at' => 'Дата/время создания',
       'table_code_id' => 'Код учёта',
@@ -245,4 +254,33 @@ class Records extends \yii\db\ActiveRecord
     return $result;
   }
 
+  public function getDaysOfPeriod($start, $end) {
+    $result = [];
+    for($currentDate = $start; $currentDate <= $end; $currentDate += 86400) {
+      $result[] = $currentDate;
+    }
+    return $result;
+  }
+
+
+
+
+//    echo 'sdfsdf';
+//    if(!empty($this->start_period) && !empty($this->end_period)){
+//      $daysOfPeriod = $this->getDaysOfPeriod($this->start_period, $this->end_period);
+//      foreach ($daysOfPeriod as $day) {
+//        $model = new Records();
+//        $model->created_at = $this->created_at;
+//        $model->object_id = $this->object_id;
+//        $model->employee_id = $this->employee_id;
+//        $model->type = $this->type;
+//        $model->start = $day;
+//        $model->end = $day + 86399;
+//        $model->table_code_id = $this->table_code_id;
+//        $model->details = $this->details;
+//        $model->save();
+//      }
+//    }
+
 }
+
diff --git a/modules/administrator/controllers/RecordsController.php b/modules/administrator/controllers/RecordsController.php
index 96ea4fb..4e9ea9a 100644
--- a/modules/administrator/controllers/RecordsController.php
+++ b/modules/administrator/controllers/RecordsController.php
@@ -74,13 +74,15 @@ class RecordsController extends Controller
     {
         $model = new Records();
 
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['index']);
-        } else {
-            return $this->render('create', [
-                'model' => $model,
-            ]);
-        }
+        var_dump($model->load(Yii::$app->request->post()));
+
+//        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+//            return $this->redirect(['index']);
+//        } else {
+//            return $this->render('create', [
+//                'model' => $model,
+//            ]);
+//        }
     }
 
     /**
diff --git a/modules/administrator/views/records/_form.php b/modules/administrator/views/records/_form.php
index 688954d..ce8f18a 100644
--- a/modules/administrator/views/records/_form.php
+++ b/modules/administrator/views/records/_form.php
@@ -1,7 +1,6 @@
 <?php
 
 use app\models\Users;
-use kartik\widgets\DateTimePicker;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use kartik\depdrop\DepDrop;
@@ -11,6 +10,8 @@ use app\models\TableCodes;
 use yii\helpers\Url;
 use kartik\datecontrol\DateControl;
 
+\app\assets\AdminAsset::register($this);
+
 /* @var $this yii\web\View */
 /* @var $model app\models\Records */
 /* @var $form yii\widgets\ActiveForm */
@@ -21,7 +22,7 @@ $codes[null] = '...';
 $query = Objects::find();
 $codesQuery = TableCodes::find();
 $user = Users::findOne(Yii::$app->user->identity->getId());
-if(Yii::$app->user->can('admin')) {
+if (Yii::$app->user->can('admin')) {
   $query->andWhere(['hub_id' => $user->hub_id]);
 }
 $objects = $objects + ArrayHelper::map($query->all(), 'id', 'name');
@@ -45,10 +46,10 @@ $codes = $codes + ArrayHelper::map($codesQuery->all(), 'id', 'code');
     <?= $form->field($model, 'object_id')->dropDownList($objects) ?>
 
     <?= $form->field($model, 'type')->dropDownList([
-        null => '...',
-        1 => 'Рабочий',
-        2 => 'Подработка',
-        3 => 'Мобильный',
+      null => '...',
+      1 => 'Рабочий',
+      2 => 'Подработка',
+      3 => 'Мобильный',
     ]) ?>
 
     <?= $form->field($model, 'employee_id')->widget(DepDrop::className(), [
@@ -63,37 +64,60 @@ $codes = $codes + ArrayHelper::map($codesQuery->all(), 'id', 'code');
     ]) ?>
 
     <?= $form->field($model, 'table_code_id')->widget(DepDrop::className(), [
-      'options' => [
-//        'placeholder' => 'Выберите код учёта'
-      ],
       'pluginOptions' => [
         'depends' => ['records-type'],
         'placeholder' => 'Выбор кода учёта...',
         'url' => Url::to(['/administrator/employees/get-codes'])
       ]
-    ])?>
+    ]) ?>
 
-    <?= $form->field($model, 'start')->widget(DateControl::classname(), [
-      'type' => DateControl::FORMAT_DATETIME,
-      'widgetOptions' => [
-        'pluginOptions' => [
-          'autoclose' => true,
-          'todayBtn' => true
+    <div class="record-day">
+      <?= $form->field($model, 'start')->widget(DateControl::classname(), [
+        'type' => DateControl::FORMAT_DATETIME,
+        'widgetOptions' => [
+          'pluginOptions' => [
+            'autoclose' => true,
+            'todayBtn' => true
+          ]
         ]
-      ]
-    ]); ?>
+      ]); ?>
 
 
-    <?= $form->field($model, 'end')->widget(DateControl::classname(), [
-      'type' => DateControl::FORMAT_DATETIME,
-      'widgetOptions' => [
-        'pluginOptions' => [
-          'autoclose' => true,
-          'todayBtn' => true
+      <?= $form->field($model, 'end')->widget(DateControl::classname(), [
+        'type' => DateControl::FORMAT_DATETIME,
+        'widgetOptions' => [
+          'pluginOptions' => [
+            'autoclose' => true,
+            'todayBtn' => true
+          ]
         ]
-      ]
-    ]); ?>
+      ]); ?>
+    </div>
+
+    <div class="record-period" style="display: none;">
+      <?= $form->field($model, 'start_period')->widget(DateControl::classname(), [
+        'type' => DateControl::FORMAT_DATE,
+        'widgetOptions' => [
+          'pluginOptions' => [
+            'autoclose' => true,
+            'todayBtn' => true
+          ]
+        ]
+      ]); ?>
+
+
+      <?= $form->field($model, 'end_period')->widget(DateControl::classname(), [
+        'type' => DateControl::FORMAT_DATE,
+        'widgetOptions' => [
+          'pluginOptions' => [
+            'autoclose' => true,
+            'todayBtn' => true
+          ]
+        ]
+      ]); ?>
 
+    </div>
+    <?= $form->field($model, 'details')->textarea() ?>
   </div>
   <div class="box-footer">
     <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success btn-flat']) ?>
diff --git a/modules/administrator/views/records/view.php b/modules/administrator/views/records/view.php
index 91ed3d1..a81531a 100644
--- a/modules/administrator/views/records/view.php
+++ b/modules/administrator/views/records/view.php
@@ -10,6 +10,14 @@ $this->title = "Запись: {$model->employee->full_name} в {$model->object->
 $this->params['breadcrumbs'][] = ['label' => 'Записи', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 
+?>
+
+<?php
+
+echo '<pre>';
+print_r ($model->getDaysOfPeriod(1580850000, 1581282000));
+echo '</pre>';
+
 ?>
 <div class="records-view box box-primary">
     <div class="box-header">
diff --git a/web/js/admin.js b/web/js/admin.js
index 4e4f45f..5f333f1 100644
--- a/web/js/admin.js
+++ b/web/js/admin.js
@@ -1,9 +1,26 @@
 "use strict";
 
 $('#users-isadmin').change(function (e) {
-    if (e.target.checked) {
-        $('#createuser-object_id').attr('disabled', true);
-    } else {
-        $('#createuser-object_id').attr('disabled', false);
+  if (e.target.checked) {
+    $('#createuser-object_id').attr('disabled', true);
+  } else {
+    $('#createuser-object_id').attr('disabled', false);
+  }
+});
+
+$('#records-table_code_id').change(function (e) {
+  let value = '';
+  $(e.target).find('option').each(function () {
+    if ($(this).get(0).selected) {
+      value = $(this).val();
     }
-});
\ No newline at end of file
+  });
+  if (value !== '') {
+    $('.record-period').show();
+    $('.record-day').hide();
+  } else {
+    $('.record-period').hide();
+    $('.record-day').show();
+  }
+});
+
-- 
GitLab


From 894890831d805fd0230e34ee494ad9515abb1931 Mon Sep 17 00:00:00 2001
From: Igor Borisov <latentpickuper@gmail.com>
Date: Wed, 19 Feb 2020 15:08:11 +0300
Subject: [PATCH 4/7] =?UTF-8?q?=D0=AB=D0=B0=D0=B0=D0=B0=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/Records.php                            |  56 +++--
 models/TableForm.php                          |  29 ++-
 .../controllers/RecordsController.php         | 230 ++++++++++--------
 modules/administrator/views/records/_form.php |   2 +-
 modules/administrator/views/records/index.php |   9 +-
 modules/manager/views/records/index.php       |  10 +-
 6 files changed, 192 insertions(+), 144 deletions(-)

diff --git a/models/Records.php b/models/Records.php
index 13cc578..b59cd63 100644
--- a/models/Records.php
+++ b/models/Records.php
@@ -19,7 +19,6 @@ use yii\behaviors\TimestampBehavior;
  * @property int $type
  * @property string|null $details
  * @property int|null $table_code_id
- *
  * @property Employees $employee
  * @property Objects $object
  */
@@ -30,6 +29,17 @@ class Records extends \yii\db\ActiveRecord
 
   public $end_period = null;
 
+  const SCENARIO_TABLE_CODE = 'table_code';
+
+  public function scenarios()
+  {
+    $scenarios = parent::scenarios();
+    $scenarios[self::SCENARIO_TABLE_CODE] = [
+      'employee_id', 'object_id', 'start_period', 'end_period', 'created_at', 'type', 'table_code_id', 'details'
+    ];
+    return $scenarios;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -54,6 +64,7 @@ class Records extends \yii\db\ActiveRecord
       [['employee_id'], 'exist', 'skipOnError' => true, 'targetClass' => Employees::className(), 'targetAttribute' => ['employee_id' => 'id']],
       [['object_id'], 'exist', 'skipOnError' => true, 'targetClass' => Objects::className(), 'targetAttribute' => ['object_id' => 'id']],
       [['table_code_id'], 'exist', 'skipOnError' => true, 'targetClass' => TableCodes::className(), 'targetAttribute' => ['table_code_id' => 'id']],
+      [['table_code_id'], 'checkIfWorkRecordExists', 'skipOnError' => false, 'skipOnEmpty' => false],
     ];
   }
 
@@ -142,7 +153,7 @@ class Records extends \yii\db\ActiveRecord
 
   public function getCode()
   {
-    return is_null($this->table_code_id) ? null : $this->getTableCode()->code;
+    return is_null($this->table_code_id) ? null : $this->tableCode->code;
   }
 
   /**
@@ -154,7 +165,7 @@ class Records extends \yii\db\ActiveRecord
   {
     $day = $this->getDay('start');
 
-    if ($this->$attribute <= $day['dayStart'] || $this->$attribute >= $day['dayEnd']) {
+    if ($this->$attribute < $day['dayStart'] || $this->$attribute > $day['dayEnd']) {
       $this->addError($attribute, 'Дата начала и окончания должны быть в пределах одного дня');
       return false;
     }
@@ -214,6 +225,20 @@ class Records extends \yii\db\ActiveRecord
     }
   }
 
+  public function checkIfWorkRecordExists($attribute) {
+       $records = Records::find()->where([
+         'between',
+         $attribute,
+         $this->start,
+         $this->end,
+       ])->all();
+
+       if(count($records) !== 0) {
+         $this->addError($attribute, 'Уже есть запись в один из дней периода');
+         return false;
+       }
+  }
+
   /**  Форматирование интервала между датами в часы и минуты
    * @return string
    */
@@ -254,33 +279,14 @@ class Records extends \yii\db\ActiveRecord
     return $result;
   }
 
-  public function getDaysOfPeriod($start, $end) {
+  public function getDaysOfPeriod($start, $end)
+  {
     $result = [];
-    for($currentDate = $start; $currentDate <= $end; $currentDate += 86400) {
+    for ($currentDate = $start; $currentDate <= $end; $currentDate += 86400) {
       $result[] = $currentDate;
     }
     return $result;
   }
 
-
-
-
-//    echo 'sdfsdf';
-//    if(!empty($this->start_period) && !empty($this->end_period)){
-//      $daysOfPeriod = $this->getDaysOfPeriod($this->start_period, $this->end_period);
-//      foreach ($daysOfPeriod as $day) {
-//        $model = new Records();
-//        $model->created_at = $this->created_at;
-//        $model->object_id = $this->object_id;
-//        $model->employee_id = $this->employee_id;
-//        $model->type = $this->type;
-//        $model->start = $day;
-//        $model->end = $day + 86399;
-//        $model->table_code_id = $this->table_code_id;
-//        $model->details = $this->details;
-//        $model->save();
-//      }
-//    }
-
 }
 
diff --git a/models/TableForm.php b/models/TableForm.php
index 24a7b49..24dabb2 100644
--- a/models/TableForm.php
+++ b/models/TableForm.php
@@ -36,10 +36,13 @@ class TableForm extends Model
           $record->employee->table_number];
         for ($i = 1; $i <= $days_count; $i++) {
           $recordDate = Yii::$app->formatter->asTimestamp("{$i}.{$date[0]}.{$date[1]}");
-          if ($recordDate >= $record->getDay('start')['dayStart'] && $recordDate <= $record->getDay('start')
-            ['dayEnd']) {
-            $table_body[$id][$i] = $record->end - $record->start;
-            $sum += $table_body[$id][$i];
+          if ($recordDate >= $record->getDay('start')['dayStart'] && $recordDate <= $record->getDay('end')['dayEnd']) {
+            if (!empty($record->table_code_id)) {
+              $table_body[$id][$i] = $record->code;
+            } else {
+              $table_body[$id][$i] = $record->end - $record->start;
+              $sum += $table_body[$id][$i];
+            }
           } else {
             $table_body[$id][$i] = 0;
           }
@@ -50,9 +53,12 @@ class TableForm extends Model
           $recordDate = Yii::$app->formatter->asTimestamp("{$i}.{$date[0]}.{$date[1]}");
           if ($recordDate >= $record->getDay('start')['dayStart'] && $recordDate <= $record->getDay('start')
             ['dayEnd']) {
-            $table_body[$id][$i] += $record->end - $record->start;
-            $table_body[$id]['sum'] += $record->end - $record->start;
-
+            if (!empty($record->table_code_id)) {
+              $table_body[$id][$i] = $record->code;
+            } else {
+              $table_body[$id][$i] += $record->end - $record->start;
+              $table_body[$id]['sum'] += $record->end - $record->start;
+            }
           } else {
             continue;
           }
@@ -60,23 +66,24 @@ class TableForm extends Model
       }
     }
 
+
     $table_body_formatted = [];
 
     foreach ($table_body as $id => $record) {
       $table_body_formatted[$id]['ФИО'] = $table_body[$id]['full_name'];
       $table_body_formatted[$id]['Таб. №'] = $table_body[$id]['table_number'];
       foreach ($record as $key => $value) {
-        if(is_integer($key) || $key === 'sum') {
+        if (is_integer($key) && is_integer($value) || $key === 'sum') {
           $table_body_formatted[$id][$key] = $this->formatInterval($value);
+        } else if ($key !== 'full_name' && $key !== 'table_number') {
+          $table_body_formatted[$id][$key] = $value;
         }
       }
-      $sum =  $table_body_formatted[$id]['sum'];
+      $sum = $table_body_formatted[$id]['sum'];
       unset($table_body_formatted[$id]['sum']);
       $table_body_formatted[$id]['Сумма'] = $sum;
-
     }
     $table['body'] = $table_body_formatted;
-    
     return $table;
   }
 
diff --git a/modules/administrator/controllers/RecordsController.php b/modules/administrator/controllers/RecordsController.php
index 4e9ea9a..fb41e0c 100644
--- a/modules/administrator/controllers/RecordsController.php
+++ b/modules/administrator/controllers/RecordsController.php
@@ -14,122 +14,142 @@ use yii\filters\VerbFilter;
  */
 class RecordsController extends Controller
 {
-    /**
-     * @inheritdoc
-     */
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['POST'],
-                ],
-            ],
-            'access' => [
-                'class' => '\yii\filters\AccessControl',
-                'rules' => [
-                    [
-                        'allow' => true,
-                        'roles' => ['admin', 'superadmin']
-                    ],
-                ],
-            ],
-        ];
-    }
-
-    /**
-     * Lists all Records models.
-     * @return mixed
-     */
-    public function actionIndex()
-    {
-        $searchModel = new RecordsSearch();
-        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
-
-        return $this->render('index', [
-            'searchModel' => $searchModel,
-            'dataProvider' => $dataProvider,
-        ]);
-    }
+  /**
+   * @inheritdoc
+   */
+  public function behaviors()
+  {
+    return [
+      'verbs' => [
+        'class' => VerbFilter::className(),
+        'actions' => [
+          'delete' => ['POST'],
+        ],
+      ],
+      'access' => [
+        'class' => '\yii\filters\AccessControl',
+        'rules' => [
+          [
+            'allow' => true,
+            'roles' => ['admin', 'superadmin']
+          ],
+        ],
+      ],
+    ];
+  }
 
-    /**
-     * Displays a single Records model.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionView($id)
-    {
-        return $this->render('view', [
-            'model' => $this->findModel($id),
-        ]);
-    }
+  /**
+   * Lists all Records models.
+   * @return mixed
+   */
+  public function actionIndex()
+  {
+    $searchModel = new RecordsSearch();
+    $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
-    /**
-     * Creates a new Records model.
-     * If creation is successful, the browser will be redirected to the 'view' page.
-     * @return mixed
-     */
-    public function actionCreate()
-    {
-        $model = new Records();
+    return $this->render('index', [
+      'searchModel' => $searchModel,
+      'dataProvider' => $dataProvider,
+    ]);
+  }
 
-        var_dump($model->load(Yii::$app->request->post()));
+  /**
+   * Displays a single Records model.
+   * @param integer $id
+   * @return mixed
+   */
+  public function actionView($id)
+  {
+    return $this->render('view', [
+      'model' => $this->findModel($id),
+    ]);
+  }
 
-//        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-//            return $this->redirect(['index']);
-//        } else {
-//            return $this->render('create', [
-//                'model' => $model,
-//            ]);
-//        }
+  /**
+   * Creates a new Records model.
+   * If creation is successful, the browser will be redirected to the 'view' page.
+   * @return mixed
+   */
+  public function actionCreate()
+  {
+    $model = new Records();
+    if (!empty($_POST['Records']['start_period']) && !empty($_POST['Records']['end_period'])) {
+      $model->scenario = Records::SCENARIO_TABLE_CODE;
+      if ($model->load(Yii::$app->request->post()) && $this->createMultipleRecords($model)) {
+        return $this->redirect(['index']);
+      }
+    } else if ($model->load(Yii::$app->request->post()) && $model->save()) {
+      return $this->redirect(['index']);
+    } else {
+      return $this->render('create', [
+        'model' => $model,
+      ]);
     }
+  }
 
-    /**
-     * Updates an existing Records model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionUpdate($id)
-    {
-        $model = $this->findModel($id);
+  /**
+   * Updates an existing Records model.
+   * If update is successful, the browser will be redirected to the 'view' page.
+   * @param integer $id
+   * @return mixed
+   */
+  public function actionUpdate($id)
+  {
+    $model = $this->findModel($id);
 
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['index']);
-        } else {
-            return $this->render('update', [
-                'model' => $model,
-            ]);
-        }
+    if ($model->load(Yii::$app->request->post()) && $model->save()) {
+      return $this->redirect(['index']);
+    } else {
+      return $this->render('update', [
+        'model' => $model,
+      ]);
     }
+  }
 
-    /**
-     * Deletes an existing Records model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
+  /**
+   * Deletes an existing Records model.
+   * If deletion is successful, the browser will be redirected to the 'index' page.
+   * @param integer $id
+   * @return mixed
+   */
+  public function actionDelete($id)
+  {
+    $this->findModel($id)->delete();
 
-        return $this->redirect(['index']);
+    return $this->redirect(['index']);
+  }
+
+  /**
+   * Finds the Records model based on its primary key value.
+   * If the model is not found, a 404 HTTP exception will be thrown.
+   * @param integer $id
+   * @return Records the loaded model
+   * @throws NotFoundHttpException if the model cannot be found
+   */
+  protected function findModel($id)
+  {
+    if (($model = Records::findOne($id)) !== null) {
+      return $model;
+    } else {
+      throw new NotFoundHttpException('The requested page does not exist.');
     }
+  }
 
-    /**
-     * Finds the Records model based on its primary key value.
-     * If the model is not found, a 404 HTTP exception will be thrown.
-     * @param integer $id
-     * @return Records the loaded model
-     * @throws NotFoundHttpException if the model cannot be found
-     */
-    protected function findModel($id)
-    {
-        if (($model = Records::findOne($id)) !== null) {
-            return $model;
-        } else {
-            throw new NotFoundHttpException('The requested page does not exist.');
-        }
+  protected function createMultipleRecords($model)
+  {
+    $daysOfPeriod = $model->getDaysOfPeriod($model->start_period, $model->end_period);
+    foreach ($daysOfPeriod as $day) {
+      $record = new Records();
+      $record->created_at = $model->created_at;
+      $record->object_id = $model->object_id;
+      $record->employee_id = $model->employee_id;
+      $record->type = $model->type;
+      $record->start = $day;
+      $record->end = $day + 86399;
+      $record->table_code_id = $model->table_code_id;
+      $record->details = $model->details;
+      $record->save();
     }
+    return true;
+  }
 }
diff --git a/modules/administrator/views/records/_form.php b/modules/administrator/views/records/_form.php
index ce8f18a..6b780e4 100644
--- a/modules/administrator/views/records/_form.php
+++ b/modules/administrator/views/records/_form.php
@@ -30,7 +30,7 @@ $codes = $codes + ArrayHelper::map($codesQuery->all(), 'id', 'code');
 ?>
 
 <div class="records-form box box-primary">
-  <?php $form = ActiveForm::begin(); ?>
+  <?php $form = ActiveForm::begin(['enableClientValidation'=>false]); ?>
   <div class="box-body table-responsive">
 
     <?= $form->field($model, 'created_at')->widget(DateControl::classname(), [
diff --git a/modules/administrator/views/records/index.php b/modules/administrator/views/records/index.php
index aededce..9fafc36 100644
--- a/modules/administrator/views/records/index.php
+++ b/modules/administrator/views/records/index.php
@@ -4,6 +4,8 @@ use yii\helpers\Html;
 use kartik\grid\GridView;
 use app\models\Records;
 use kartik\widgets\DatePicker;
+use yii\helpers\ArrayHelper;
+use app\models\TableCodes;
 
 /* @var $this yii\web\View */
 /* @var $searchModel app\models\RecordsSearch */
@@ -16,6 +18,8 @@ $types = [
   2 => 'Подработка',
   3 => 'Мобильный',
 ];
+$codes = ArrayHelper::map(TableCodes::find()->all(), 'code', 'code');
+
 
 ?>
 <div class="records-index box box-primary">
@@ -111,7 +115,10 @@ $types = [
             ],
           ]),
         ],
-        'code',
+        [
+            'attribute' => 'code',
+            'filter' => $codes
+        ],
         'details',
         [
           'label' => 'Часы',
diff --git a/modules/manager/views/records/index.php b/modules/manager/views/records/index.php
index ad5aa91..bab5533 100644
--- a/modules/manager/views/records/index.php
+++ b/modules/manager/views/records/index.php
@@ -1,5 +1,7 @@
 <?php
 
+use app\models\TableCodes;
+use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use kartik\grid\GridView;
 use app\models\Records;
@@ -16,6 +18,7 @@ $types = [
   2 => 'Подработка',
   3 => 'Мобильный',
 ];
+$codes = ArrayHelper::map(TableCodes::find()->all(), 'code', 'code');
 
 ?>
 <div class="records-index box box-primary">
@@ -111,10 +114,15 @@ $types = [
             ],
           ]),
         ],
+        [
+          'attribute' => 'code',
+          'filter' => $codes
+        ],
         [
           'label' => 'Часы',
           'value' => function (Records $model) {
-            return $model->formatSecondsInterval();
+
+            return !empty($model->table_code_id) ? '' : $model->formatSecondsInterval();
           }
 
         ],
-- 
GitLab


From 24025fce8b29fd77e1781b19efa993255bed639b Mon Sep 17 00:00:00 2001
From: Igor Borisov <latentpickuper@gmail.com>
Date: Thu, 20 Feb 2020 13:40:26 +0300
Subject: [PATCH 5/7] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=BE=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B5=D0=B9=20=D1=81=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0=D0=BC=D0=B8=20=D1=83=D1=87=D1=91=D1=82=D0=B0?=
 =?UTF-8?q?=20=D0=B8=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B8=D1=85=20=D0=B2=20=D1=82=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/TableForm.php                          |  4 +-
 .../controllers/EmployeesController.php       | 37 ++++++--
 .../manager/controllers/RecordsController.php | 19 ++--
 modules/manager/views/records/_form.php       | 92 +++++++++++--------
 web/js/admin.js                               | 30 +++++-
 5 files changed, 122 insertions(+), 60 deletions(-)

diff --git a/models/TableForm.php b/models/TableForm.php
index 24dabb2..f307df9 100644
--- a/models/TableForm.php
+++ b/models/TableForm.php
@@ -66,7 +66,6 @@ class TableForm extends Model
       }
     }
 
-
     $table_body_formatted = [];
 
     foreach ($table_body as $id => $record) {
@@ -99,7 +98,8 @@ class TableForm extends Model
 
     $dataProvider = new ActiveDataProvider([
       'query' => $query,
-      'sort' => false
+      'sort' => false,
+      'pagination' => false,
     ]);
 
     return $dataProvider;
diff --git a/modules/manager/controllers/EmployeesController.php b/modules/manager/controllers/EmployeesController.php
index 4d7d8dd..094d9c6 100644
--- a/modules/manager/controllers/EmployeesController.php
+++ b/modules/manager/controllers/EmployeesController.php
@@ -2,6 +2,7 @@
 
 namespace app\modules\manager\controllers;
 
+use app\models\TableCodes;
 use Yii;
 use app\models\Employees;
 use app\models\EmployeesSearch;
@@ -27,15 +28,15 @@ class EmployeesController extends Controller
           'delete' => ['POST'],
         ],
       ],
-        'access' => [
-            'class' => '\yii\filters\AccessControl',
-            'rules' => [
-                [
-                    'allow' => true,
-                    'roles' => ['manager']
-                ],
-            ],
+      'access' => [
+        'class' => '\yii\filters\AccessControl',
+        'rules' => [
+          [
+            'allow' => true,
+            'roles' => ['manager']
+          ],
         ],
+      ],
     ];
   }
 
@@ -54,7 +55,7 @@ class EmployeesController extends Controller
       $parents = $_POST['depdrop_parents'];
       if ($parents != null) {
         $type_id = $parents[0];
-        if((int)$type_id !== 0) {
+        if ((int)$type_id !== 0) {
           $object_id = (int)$type_id !== 3 ? $user->object_id : null;
           foreach (ArrayHelper::toArray(Employees::find()->where([
             'object_id' => $object_id, 'is_active' => true
@@ -70,5 +71,23 @@ class EmployeesController extends Controller
     return ['output' => '', 'selected' => ''];
   }
 
+  public function actionGetCodes()
+  {
+    Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+    $out = [];
+    $parents = $_POST['depdrop_parents'];
+    $type_id = $parents[0];
+
+    if ((int)$type_id === 1) {
+      $query = TableCodes::find()->where(['admin_only' => false]);
+      $codes = ArrayHelper::map($query->all(), 'id', 'code');
+
+      foreach ($codes as $key => $code) {
+        $out[] = ['id' => $key, 'name' => $code];
+      }
+    }
+    return ['output' => $out, 'selected' => ''];
+  }
+
 
 }
diff --git a/modules/manager/controllers/RecordsController.php b/modules/manager/controllers/RecordsController.php
index e26dd1e..b47cf8f 100644
--- a/modules/manager/controllers/RecordsController.php
+++ b/modules/manager/controllers/RecordsController.php
@@ -75,16 +75,19 @@ class RecordsController extends Controller
     $model = new Records();
     $user = \app\models\Users::findOne(Yii::$app->user->identity->getId());
     $model->object_id = $user->object_id;
+    if (!empty($model->table_code_id)) {
+      $model->scenario = Records::SCENARIO_TABLE_CODE;
+    }
 
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-          return $this->redirect(['index']);
-        } else {
-          $model->created_at = date('U');
-          return $this->render('create', [
-            'model' => $model,
-          ]);
-        }
+    if ($model->load(Yii::$app->request->post()) && $model->save()) {
+      return $this->redirect(['index']);
+    } else {
+      $model->created_at = date('U');
+      return $this->render('create', [
+        'model' => $model,
+      ]);
     }
+  }
 
   /**
    * Updates an existing Records model.
diff --git a/modules/manager/views/records/_form.php b/modules/manager/views/records/_form.php
index 625a002..8733d04 100644
--- a/modules/manager/views/records/_form.php
+++ b/modules/manager/views/records/_form.php
@@ -11,65 +11,79 @@ use kartik\datecontrol\DateControl;
 /* @var $this yii\web\View */
 /* @var $model app\models\Records */
 /* @var $form yii\widgets\ActiveForm */
+
+\app\assets\AdminAsset::register($this);
+
 $user = \app\models\Users::findOne(Yii::$app->user->identity->getId());
 ?>
 
 <div class="records-form box box-primary">
-    <?php $form = ActiveForm::begin(); ?>
+  <?php $form = ActiveForm::begin(['enableClientValidation' => false]); ?>
   <div class="box-body table-responsive">
 
-      <?= $form->field($model, 'created_at')->widget(DateControl::classname(), [
-          'type' => DateControl::FORMAT_DATETIME,
-          'disabled' => true,
-          'autoWidget' => false
-      ]); ?>
+    <?= $form->field($model, 'created_at')->widget(DateControl::classname(), [
+      'type' => DateControl::FORMAT_DATETIME,
+      'disabled' => true,
+      'autoWidget' => false
+    ]); ?>
 
-      <?= $form->field($model, 'object_id')->dropDownList([$user->object_id => $user->object->name], [
-        'disabled' => true,
-      ]) ?>
+    <?= $form->field($model, 'object_id')->dropDownList([$user->object_id => $user->object->name], [
+      'disabled' => true,
+    ]) ?>
 
-      <?= $form->field($model, 'type')->dropDownList([
-        0 => '...',
-        1 => 'Рабочий',
-        2 => 'Подработка',
-        3 => 'Мобильный',
-      ]) ?>
+    <?= $form->field($model, 'type')->dropDownList([
+      0 => '...',
+      1 => 'Рабочий',
+      2 => 'Подработка',
+      3 => 'Мобильный',
+    ]) ?>
 
-      <?= $form->field($model, 'employee_id')->widget(DepDrop::className(), [
-          'options' => [
-              'placeholder' => !empty($model->employee) ? $model->employee->full_name : ''
-          ],
-          'pluginOptions' => [
-              'depends' => ['records-type'],
-              'placeholder' => 'Выбор сотрудника...',
-              'url' => Url::to(['/manager/employees/get-employees'])
-          ]
-      ]) ?>
+    <?= $form->field($model, 'employee_id')->widget(DepDrop::className(), [
+      'options' => [
+        'placeholder' => !empty($model->employee) ? $model->employee->full_name : ''
+      ],
+      'pluginOptions' => [
+        'depends' => ['records-type'],
+        'placeholder' => 'Выбор сотрудника...',
+        'url' => Url::to(['/manager/employees/get-employees'])
+      ]
+    ]) ?>
+
+    <?= $form->field($model, 'table_code_id')->widget(DepDrop::className(), [
+      'pluginOptions' => [
+        'depends' => ['records-type'],
+        'placeholder' => 'Выбор кода учёта...',
+        'url' => Url::to(['/manager/employees/get-codes'])
+      ]
+    ]) ?>
+    <div class="record-day record-day_manager">
 
       <?= $form->field($model, 'start')->widget(DateControl::classname(), [
-          'type' => DateControl::FORMAT_DATETIME,
-          'widgetOptions' => [
-              'pluginOptions' => [
-                  'autoclose' => true,
-                  'todayBtn' => true
-              ]
+        'type' => DateControl::FORMAT_DATETIME,
+        'widgetOptions' => [
+          'pluginOptions' => [
+            'autoclose' => true,
+            'todayBtn' => true,
           ]
+        ]
       ]); ?>
 
 
       <?= $form->field($model, 'end')->widget(DateControl::classname(), [
-          'type' => DateControl::FORMAT_DATETIME,
-          'widgetOptions' => [
-              'pluginOptions' => [
-                  'autoclose' => true,
-                  'todayBtn' => true
-              ]
+        'type' => DateControl::FORMAT_DATETIME,
+        'widgetOptions' => [
+          'pluginOptions' => [
+            'autoclose' => true,
+            'todayBtn' => true
           ]
+        ]
       ]); ?>
 
+    </div>
+
   </div>
   <div class="box-footer">
-      <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success btn-flat']) ?>
+    <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success btn-flat']) ?>
   </div>
-    <?php ActiveForm::end(); ?>
+  <?php ActiveForm::end(); ?>
 </div>
diff --git a/web/js/admin.js b/web/js/admin.js
index 5f333f1..fb1b1b1 100644
--- a/web/js/admin.js
+++ b/web/js/admin.js
@@ -1,5 +1,7 @@
 "use strict";
 
+const isRecordManager = $('.record-day_manager').length !== 0;
+
 $('#users-isadmin').change(function (e) {
   if (e.target.checked) {
     $('#createuser-object_id').attr('disabled', true);
@@ -15,10 +17,34 @@ $('#records-table_code_id').change(function (e) {
       value = $(this).val();
     }
   });
-  if (value !== '') {
+  if (value !== '' && !isRecordManager) {
     $('.record-period').show();
     $('.record-day').hide();
-  } else {
+  } else if (value !== '' && isRecordManager) {
+    const date = new Date();
+    const dayStart = `${date.getUTCDate()}-${('0' + (date.getMonth() + 1)).slice()}-${date.getFullYear()} 00:00`;
+    const dayEnd = `${date.getUTCDate()}-${('0' + (date.getMonth() + 1)).slice()}-${date.getFullYear()} 23:59`;
+    const dayStartUnix = new Date(`${date.getFullYear()}.${('0' + (date.getMonth() + 1)).slice()}.${date.getDate()} 00:00`).getTime();
+    const dayEndUnix = new Date(`${date.getFullYear()}.${('0' + (date.getMonth() + 1)).slice()}.${date.getDate()} 23:59`).getTime();
+    $('#records-start-disp').val(dayStart).attr('disabled', true);
+    $('#records-end-disp').val(dayEnd).attr('disabled', true);
+    $('#records-start').val(dayStartUnix / 1000);
+    $('#records-end').val(dayEndUnix / 1000);
+    $('#records-start-disp').prev().prev().hide();
+    $('#records-start-disp').prev().hide();
+    $('#records-end-disp').prev().hide();
+    $('#records-end-disp').prev().prev().hide();
+    
+  } else if(value === '' && isRecordManager){
+    $('#records-start-disp').val('').attr('disabled', false);
+    $('#records-end-disp').val('').attr('disabled', false);
+    $('#records-start-disp').prev().prev().show();
+    $('#records-start-disp').prev().show();
+    $('#records-end-disp').prev().show();
+    $('#records-end-disp').prev().prev().show();
+  }
+
+    {
     $('.record-period').hide();
     $('.record-day').show();
   }
-- 
GitLab


From 4ddd0d0795eaca241f0d8973a194d3145ca84cca Mon Sep 17 00:00:00 2001
From: Igor Borisov <latentpickuper@gmail.com>
Date: Thu, 20 Feb 2020 14:57:49 +0300
Subject: [PATCH 6/7] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D0=BE=D0=BD=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BB,=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D1=83=D0=B5?=
 =?UTF-8?q?=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/TableForm.php                          | 13 +++++++++----
 modules/administrator/views/records/_form.php |  9 ++++++++-
 modules/administrator/views/records/index.php |  2 ++
 modules/administrator/views/records/view.php  |  7 -------
 modules/administrator/views/table/index.php   | 16 +++++++++++++++-
 modules/manager/views/records/index.php       |  2 ++
 modules/manager/views/table/index.php         |  7 +++++++
 web/css/site.css                              |  3 +++
 web/js/admin.js                               |  9 ++++-----
 9 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/models/TableForm.php b/models/TableForm.php
index f307df9..a1b70a5 100644
--- a/models/TableForm.php
+++ b/models/TableForm.php
@@ -10,13 +10,14 @@ class TableForm extends Model
 {
   public $month;
   public $object_id;
+  public $record_type;
 
   public function rules()
   {
     return [
       [['month'], 'string'],
-      [['object_id'], 'integer'],
-      [['month', 'object_id'], 'required'],
+      [['object_id', 'record_type'], 'integer'],
+      [['month', 'object_id', 'record_type'], 'required'],
     ];
   }
 
@@ -92,7 +93,10 @@ class TableForm extends Model
    */
   private function getRecords()
   {
-    $query = Records::find()->where(['object_id' => $this->object_id])->andWhere([
+    $query = Records::find()->where([
+      'object_id' => $this->object_id,
+      'type' => $this->record_type
+    ])->andWhere([
         'like', 'DATE_FORMAT(FROM_UNIXTIME(start), "%m-%Y")', $this->month]
     );
 
@@ -133,7 +137,8 @@ class TableForm extends Model
   {
     return [
       'objectName' => 'Объект',
-      'object_id' => 'Объект'
+      'object_id' => 'Объект',
+      'record_type' => 'Тип записи'
     ];
 
   }
diff --git a/modules/administrator/views/records/_form.php b/modules/administrator/views/records/_form.php
index 6b780e4..84d1a71 100644
--- a/modules/administrator/views/records/_form.php
+++ b/modules/administrator/views/records/_form.php
@@ -1,6 +1,7 @@
 <?php
 
 use app\models\Users;
+use kartik\widgets\Select2;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use kartik\depdrop\DepDrop;
@@ -43,7 +44,13 @@ $codes = $codes + ArrayHelper::map($codesQuery->all(), 'id', 'code');
       ]
     ]); ?>
 
-    <?= $form->field($model, 'object_id')->dropDownList($objects) ?>
+    <?= $form->field($model, 'object_id')->widget(Select2::className(), [
+      'data' => $objects,
+      'options' => ['placeholder' => 'Выберите объект ...'],
+      'pluginOptions' => [
+        'allowClear' => true
+      ],
+    ]) ?>
 
     <?= $form->field($model, 'type')->dropDownList([
       null => '...',
diff --git a/modules/administrator/views/records/index.php b/modules/administrator/views/records/index.php
index 9fafc36..a211d46 100644
--- a/modules/administrator/views/records/index.php
+++ b/modules/administrator/views/records/index.php
@@ -33,11 +33,13 @@ $codes = ArrayHelper::map(TableCodes::find()->all(), 'code', 'code');
       'layout' => "{items}\n{summary}\n{pager}",
       'responsive' => true,
       'hover' => true,
+      'krajeeDialogSettings' => ['useNative' => true],
       'toolbar' => [
         [
           'options' => ['class' => 'btn-group mr-2']
         ],
         '{export}',
+        '{toggleData}',
       ],
       'export' => [
         'label' => 'Выгрузить',
diff --git a/modules/administrator/views/records/view.php b/modules/administrator/views/records/view.php
index a81531a..e8be014 100644
--- a/modules/administrator/views/records/view.php
+++ b/modules/administrator/views/records/view.php
@@ -12,13 +12,6 @@ $this->params['breadcrumbs'][] = $this->title;
 
 ?>
 
-<?php
-
-echo '<pre>';
-print_r ($model->getDaysOfPeriod(1580850000, 1581282000));
-echo '</pre>';
-
-?>
 <div class="records-view box box-primary">
     <div class="box-header">
         <?= Html::a('Редактировать', ['update', 'id' => $model->id], ['class' => 'btn btn-primary btn-flat']) ?>
diff --git a/modules/administrator/views/table/index.php b/modules/administrator/views/table/index.php
index 50c4ff5..23144d7 100644
--- a/modules/administrator/views/table/index.php
+++ b/modules/administrator/views/table/index.php
@@ -8,6 +8,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use kartik\widgets\DatePicker;
 use kartik\grid\GridView;
+use kartik\widgets\Select2;
 
 $this->title = 'Табель';
 $this->params['breadcrumbs'][] = $this->title;
@@ -25,7 +26,20 @@ $objects = \yii\helpers\ArrayHelper::map($query->all(), 'id', 'name');
   <div class="box-header with-border">
     <?php $form = ActiveForm::begin(); ?>
 
-    <?= $form->field($model, 'object_id')->dropDownList($objects) ?>
+    <?= $form->field($model, 'object_id')->widget(Select2::className(), [
+      'data' => $objects,
+      'options' => ['placeholder' => 'Выберите объект ...'],
+      'pluginOptions' => [
+        'allowClear' => true
+      ],
+    ]) ?>
+
+    <?= $form->field($model, 'record_type')->dropDownList([
+      1 => 'Рабочий',
+      2 => 'Подработка',
+      3 => 'Мобильный',
+    ]) ?>
+
     <?= $form->field($model, 'month')->widget(DatePicker::classname(), [
       'options' => ['placeholder' => Yii::t('app', 'месяц/год')],
       'pluginOptions' => [
diff --git a/modules/manager/views/records/index.php b/modules/manager/views/records/index.php
index bab5533..c98be3c 100644
--- a/modules/manager/views/records/index.php
+++ b/modules/manager/views/records/index.php
@@ -32,11 +32,13 @@ $codes = ArrayHelper::map(TableCodes::find()->all(), 'code', 'code');
       'layout' => "{items}\n{summary}\n{pager}",
       'responsive' => true,
       'hover' => true,
+      'krajeeDialogSettings' => ['useNative' => true],
       'toolbar' => [
         [
           'options' => ['class' => 'btn-group mr-2']
         ],
         '{export}',
+        '{toggleData}',
       ],
       'export' => [
         'label' => 'Выгрузить',
diff --git a/modules/manager/views/table/index.php b/modules/manager/views/table/index.php
index bf19ce9..fb569d5 100644
--- a/modules/manager/views/table/index.php
+++ b/modules/manager/views/table/index.php
@@ -25,6 +25,13 @@ if(Yii::$app->user->can('admin')) {
     <?php $form = ActiveForm::begin(); ?>
 
     <?= $form->field($model, 'object_id')->dropDownList([$user->object_id => $user->object->name], [ 'disabled' => true]) ?>
+
+    <?= $form->field($model, 'record_type')->dropDownList([
+      1 => 'Рабочий',
+      2 => 'Подработка',
+      3 => 'Мобильный',
+    ]) ?>
+    
     <?= $form->field($model, 'month')->widget(DatePicker::classname(), [
       'options' => ['placeholder' => Yii::t('app', 'месяц/год')],
       'pluginOptions' => [
diff --git a/web/css/site.css b/web/css/site.css
index 2bfebd2..f33b2cd 100644
--- a/web/css/site.css
+++ b/web/css/site.css
@@ -113,3 +113,6 @@ a.desc:after {
 .nav > li > form > button.logout:focus {
     outline: none;
 }
+.select2-container--krajee .select2-selection {
+    border-radius: unset;
+}
\ No newline at end of file
diff --git a/web/js/admin.js b/web/js/admin.js
index fb1b1b1..9ebb9c3 100644
--- a/web/js/admin.js
+++ b/web/js/admin.js
@@ -17,6 +17,7 @@ $('#records-table_code_id').change(function (e) {
       value = $(this).val();
     }
   });
+
   if (value !== '' && !isRecordManager) {
     $('.record-period').show();
     $('.record-day').hide();
@@ -34,17 +35,15 @@ $('#records-table_code_id').change(function (e) {
     $('#records-start-disp').prev().hide();
     $('#records-end-disp').prev().hide();
     $('#records-end-disp').prev().prev().hide();
-    
-  } else if(value === '' && isRecordManager){
+
+  } else if (value === '' && isRecordManager) {
     $('#records-start-disp').val('').attr('disabled', false);
     $('#records-end-disp').val('').attr('disabled', false);
     $('#records-start-disp').prev().prev().show();
     $('#records-start-disp').prev().show();
     $('#records-end-disp').prev().show();
     $('#records-end-disp').prev().prev().show();
-  }
-
-    {
+  } else {
     $('.record-period').hide();
     $('.record-day').show();
   }
-- 
GitLab


From 5dca640b57fc9fa862fc00013fb9c9df4f6316ca Mon Sep 17 00:00:00 2001
From: Igor Borisov <latentpickuper@gmail.com>
Date: Thu, 20 Feb 2020 16:18:51 +0300
Subject: [PATCH 7/7] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D1=8B=20=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B8=D1=81=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/web.php                                |  4 +-
 models/RecordsSearch.php                      | 18 +++----
 modules/administrator/views/records/index.php |  9 ++--
 modules/administrator/views/records/view.php  | 47 ++++++++++---------
 modules/manager/views/records/_form.php       |  2 +
 modules/manager/views/records/index.php       | 10 ++--
 modules/manager/views/records/view.php        | 33 ++++++-------
 7 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/config/web.php b/config/web.php
index 8e85ecd..4f23417 100644
--- a/config/web.php
+++ b/config/web.php
@@ -61,7 +61,9 @@ $config = [
       'dateFormat' => 'dd-MM-yyyy',
       'datetimeFormat' => 'php:d.m.Y H:i'
     ],
-
+    'assetManager' => [
+      'appendTimestamp' => true,
+    ],
   ],
   'modules' => [
     'administrator' => [
diff --git a/models/RecordsSearch.php b/models/RecordsSearch.php
index 498591c..baf6523 100644
--- a/models/RecordsSearch.php
+++ b/models/RecordsSearch.php
@@ -15,7 +15,6 @@ class RecordsSearch extends Records
   public $employeeFullName;
   public $employeeTableNumber;
   public $objectNumber;
-  public $code;
 
   /**
    * @inheritdoc
@@ -23,8 +22,8 @@ class RecordsSearch extends Records
   public function rules()
   {
     return [
-      [['id', 'employee_id', 'object_id', 'type', 'employeeTableNumber'], 'integer'],
-      [['objectNumber', 'employeeFullName', 'start', 'end', 'created_at', 'code', 'details'], 'safe'],
+      [['id', 'employee_id', 'object_id', 'type', 'employeeTableNumber', 'table_code_id'], 'integer'],
+      [['objectNumber', 'employeeFullName', 'start', 'end', 'created_at', 'details'], 'safe'],
     ];
   }
 
@@ -104,9 +103,9 @@ class RecordsSearch extends Records
           'asc' => ['details' => SORT_ASC],
           'desc' => ['details' => SORT_DESC]
         ],
-        'code' => [
-          'asc' => ['table_codes.code' => SORT_ASC],
-          'desc' => ['table_codes.code' => SORT_DESC]
+        'table_code_id' => [
+          'asc' => ['table_code_id' => SORT_ASC],
+          'desc' => ['table_code_id' => SORT_DESC]
         ]
 
       ],
@@ -133,7 +132,6 @@ class RecordsSearch extends Records
       // $query->where('0=1');
       $query->joinWith(['employee']);
       $query->joinWith(['object']);
-      $query->joinWith(['tableCode']);
       return $dataProvider;
     }
 
@@ -143,12 +141,13 @@ class RecordsSearch extends Records
       'employee_id' => $this->employee_id,
       'type' => $this->type,
       'object_id' => $this->object_id,
+      'table_code_id' => $this->table_code_id,
 //      'start' => $this->start,
 //      'end' => $this->end,
 //      'created_at' => $this->created_at,
     ]);
 
-    $query->andFilterWhere(['like', 'details', $this->details]);
+    $query->andFilterWhere(['like', 'records.details', $this->details]);
 
     $query->joinWith(['object' => function ($q) {
       $q->where('objects.object_number LIKE "%' . $this->objectNumber . '%"');
@@ -160,9 +159,6 @@ class RecordsSearch extends Records
     $query->joinWith(['employee' => function ($q) {
       $q->where('employees.table_number LIKE "%' . $this->employeeTableNumber . '%"');
     }]);
-    $query->joinWith(['tableCode' => function ($q) {
-      $q->where('table_codes.code LIKE "%' . $this->code . '%" OR table_codes.code IS NULL');
-    }]);
 
 
     return $dataProvider;
diff --git a/modules/administrator/views/records/index.php b/modules/administrator/views/records/index.php
index a211d46..2c82aef 100644
--- a/modules/administrator/views/records/index.php
+++ b/modules/administrator/views/records/index.php
@@ -18,7 +18,7 @@ $types = [
   2 => 'Подработка',
   3 => 'Мобильный',
 ];
-$codes = ArrayHelper::map(TableCodes::find()->all(), 'code', 'code');
+$codes = ArrayHelper::map(TableCodes::find()->all(), 'id', 'code');
 
 
 ?>
@@ -118,8 +118,11 @@ $codes = ArrayHelper::map(TableCodes::find()->all(), 'code', 'code');
           ]),
         ],
         [
-            'attribute' => 'code',
-            'filter' => $codes
+          'attribute' => 'table_code_id',
+          'filter' => $codes,
+          'value' => function (Records $model) {
+            return $model->code;
+          }
         ],
         'details',
         [
diff --git a/modules/administrator/views/records/view.php b/modules/administrator/views/records/view.php
index e8be014..0fbbfb6 100644
--- a/modules/administrator/views/records/view.php
+++ b/modules/administrator/views/records/view.php
@@ -13,27 +13,28 @@ $this->params['breadcrumbs'][] = $this->title;
 ?>
 
 <div class="records-view box box-primary">
-    <div class="box-header">
-        <?= Html::a('Редактировать', ['update', 'id' => $model->id], ['class' => 'btn btn-primary btn-flat']) ?>
-        <?= Html::a('Удалить', ['delete', 'id' => $model->id], [
-            'class' => 'btn btn-danger btn-flat',
-            'data' => [
-                'confirm' => 'Удалить запись?',
-                'method' => 'post',
-            ],
-        ]) ?>
-    </div>
-    <div class="box-body table-responsive no-padding">
-        <?= DetailView::widget([
-            'model' => $model,
-            'attributes' => [
-                'id',
-                'employeeFullName',
-                'objectName',
-                'start:datetime',
-                'end:datetime',
-                'created_at:datetime',
-            ],
-        ]) ?>
-    </div>
+  <div class="box-header">
+    <?= Html::a('Редактировать', ['update', 'id' => $model->id], ['class' => 'btn btn-primary btn-flat']) ?>
+    <?= Html::a('Удалить', ['delete', 'id' => $model->id], [
+      'class' => 'btn btn-danger btn-flat',
+      'data' => [
+        'confirm' => 'Удалить запись?',
+        'method' => 'post',
+      ],
+    ]) ?>
+  </div>
+  <div class="box-body table-responsive no-padding">
+    <?= DetailView::widget([
+      'model' => $model,
+      'attributes' => [
+        'id',
+        'employeeFullName',
+        'objectName',
+        'start:datetime',
+        'end:datetime',
+        'created_at:datetime',
+        'details'
+      ],
+    ]) ?>
+  </div>
 </div>
diff --git a/modules/manager/views/records/_form.php b/modules/manager/views/records/_form.php
index 8733d04..29ccd77 100644
--- a/modules/manager/views/records/_form.php
+++ b/modules/manager/views/records/_form.php
@@ -80,6 +80,8 @@ $user = \app\models\Users::findOne(Yii::$app->user->identity->getId());
       ]); ?>
 
     </div>
+    
+    <?= $form->field($model, 'details')->textarea() ?>
 
   </div>
   <div class="box-footer">
diff --git a/modules/manager/views/records/index.php b/modules/manager/views/records/index.php
index c98be3c..ee83114 100644
--- a/modules/manager/views/records/index.php
+++ b/modules/manager/views/records/index.php
@@ -18,7 +18,7 @@ $types = [
   2 => 'Подработка',
   3 => 'Мобильный',
 ];
-$codes = ArrayHelper::map(TableCodes::find()->all(), 'code', 'code');
+$codes = ArrayHelper::map(TableCodes::find()->all(), 'id', 'code');
 
 ?>
 <div class="records-index box box-primary">
@@ -117,8 +117,11 @@ $codes = ArrayHelper::map(TableCodes::find()->all(), 'code', 'code');
           ]),
         ],
         [
-          'attribute' => 'code',
-          'filter' => $codes
+          'attribute' => 'table_code_id',
+          'filter' => $codes,
+          'value' => function(Records $model) {
+              return $model->code;
+          }
         ],
         [
           'label' => 'Часы',
@@ -128,6 +131,7 @@ $codes = ArrayHelper::map(TableCodes::find()->all(), 'code', 'code');
           }
 
         ],
+        'details',
         // 'updated_at',
 
         [
diff --git a/modules/manager/views/records/view.php b/modules/manager/views/records/view.php
index dba0e93..bdff903 100644
--- a/modules/manager/views/records/view.php
+++ b/modules/manager/views/records/view.php
@@ -12,20 +12,21 @@ $this->params['breadcrumbs'][] = $this->title;
 
 ?>
 <div class="records-view box box-primary">
-    <div class="box-header">
-        <?= Html::a('Редактировать', ['update', 'id' => $model->id], ['class' => 'btn btn-primary btn-flat']) ?>
-    </div>
-    <div class="box-body table-responsive no-padding">
-        <?= DetailView::widget([
-            'model' => $model,
-            'attributes' => [
-                'id',
-                'employeeFullName',
-                'objectName',
-                'start:datetime',
-                'end:datetime',
-                'created_at:datetime',
-            ],
-        ]) ?>
-    </div>
+  <div class="box-header">
+    <?= Html::a('Редактировать', ['update', 'id' => $model->id], ['class' => 'btn btn-primary btn-flat']) ?>
+  </div>
+  <div class="box-body table-responsive no-padding">
+    <?= DetailView::widget([
+      'model' => $model,
+      'attributes' => [
+        'id',
+        'employeeFullName',
+        'objectName',
+        'start:datetime',
+        'end:datetime',
+        'created_at:datetime',
+        'details'
+      ],
+    ]) ?>
+  </div>
 </div>
-- 
GitLab