Update dependencies, README.md

Author: alex-wdmg

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+## 1.1.9 (2020-07-01)
+ * Update dependencies, README.md
+ * Fixed error determining loading of common modules
+ * Rebased to base ActiveRecord model
+ 
 ## 1.1.8 (2020-03-27)
  * Added pagination
  * Up to date dependencies
@@ -18,7 +23,7 @@ Changelog
  * Module refactoring
 
 ## 1.1.3 (2019-06-05)
- * Module transferred to base module interface. Update Yii2 version.g
+ * Module transferred to base module interface. Update Yii2 version
 
 ## 1.1.2 (2019-06-01)
  * Bugfix, routing and refactoring

Module.php

@@ -6,7 +6,7 @@
  * Yii2 Tasks
  *
  * @category        Module
- * @version         1.1.8
+ * @version         1.1.9
  * @author          Alexsander Vyshnyvetskyy <alex.vyshnyvetskyy@gmail.com>
  * @link            https://github.com/wdmg/yii2-tasks
  * @copyright       Copyright (c) 2019 - 2020 W.D.M.Group, Ukraine
@@ -45,7 +45,7 @@ class Module extends BaseModule
     /**
      * @var string the module version
      */
-    private $version = "1.1.8";
+    private $version = "1.1.9";
 
     /**
      * @var integer, priority of initialization
@@ -78,7 +78,27 @@ public function dashboardNavItems($createLink = false)
             'icon' => 'fa fa-fw fa-tasks',
             'active' => in_array(\Yii::$app->controller->module->id, [$this->id])
         ];
-        return $items;
+
+
+
+        return [
+            'label' => $this->name,
+            'url' => [$this->routePrefix . '/'. $this->id],
+            'icon' => 'fa fa-fw fa-tasks',
+            'active' => in_array(\Yii::$app->controller->module->id, [$this->id]),
+            'items' => [
+                [
+                    'label' => Yii::t('app/modules/tasks', 'Tasks list'),
+                    'url' => [$this->routePrefix . '/tasks/list/all'],
+                    'active' => (in_array(\Yii::$app->controller->module->id, ['list']) &&  Yii::$app->controller->id == 'all'),
+                ],
+                [
+                    'label' => Yii::t('app/modules/tasks', 'Subunits list'),
+                    'url' => [$this->routePrefix . '/tasks/subunits/index'],
+                    'active' => (in_array(\Yii::$app->controller->module->id, ['subunits']) &&  Yii::$app->controller->id == 'index'),
+                ]
+            ]
+        ];
     }
 
     /**

README.md

@@ -1,15 +1,23 @@
-[![Yii2](https://img.shields.io/badge/required-Yii2_v2.0.33-blue.svg)](https://packagist.org/packages/yiisoft/yii2)
+[![Yii2](https://img.shields.io/badge/required-Yii2_v2.0.35-blue.svg)](https://packagist.org/packages/yiisoft/yii2)
 [![Downloads](https://img.shields.io/packagist/dt/wdmg/yii2-tasks.svg)](https://packagist.org/packages/wdmg/yii2-tasks)
 [![Packagist Version](https://img.shields.io/packagist/v/wdmg/yii2-tasks.svg)](https://packagist.org/packages/wdmg/yii2-tasks)
-![Progress](https://img.shields.io/badge/progress-in_development-red.svg)
+![Progress](https://img.shields.io/badge/progress-ready_to_use-green.svg)
 [![GitHub license](https://img.shields.io/github/license/wdmg/yii2-tasks.svg)](https://github.com/wdmg/yii2-tasks/blob/master/LICENSE)
 
+<img src="./docs/images/yii2-tasks.png" width="100%" alt="Yii2 Tasks Module" />
+
 # Yii2 Tasks Module
-Task manager for Yii2
+Task manager for Yii2.
+                                           
+The module implements indexed search using morphology (phpMorphy) or Porter's stemmer algorithm (LinguaStem). A live full-text search by data model is also provided.
+
+This module is an integral part of the [Butterfly.СMS](https://butterflycms.com/) content management system, but can also be used as an standalone extension.
+
+Copyrights (c) 2019-2020 [W.D.M.Group, Ukraine](https://wdmg.com.ua/)
 
 # Requirements 
 * PHP 5.6 or higher
-* Yii2 v.2.0.33 and newest
+* Yii2 v.2.0.35 and newest
 * [Yii2 Base](https://github.com/wdmg/yii2-base) module (required)
 * [Yii2 Tickets](https://github.com/wdmg/yii2-tickets) module (optionaly)
 * [Yii2 Users](https://github.com/wdmg/yii2-users) module (optionaly)
@@ -60,6 +68,7 @@ Use the `Module::dashboardNavItems()` method of the module to generate a navigat
     ?>
 
 # Status and version [in progress development]
+* v.1.1.9 - Update dependencies, README.md
 * v.1.1.8 - Added pagination, up to date dependencies
 * v.1.1.7 - Fixed deprecated class declaration
 * v.1.1.6 - Added extra options to composer.json and navbar menu icon

composer.json

@@ -4,7 +4,7 @@
   "keywords": ["yii2", "yii2-tasks", "task manager", "wdmg"],
   "type": "yii2-extension",
   "license": "MIT",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "homepage": "https://github.com/wdmg/yii2-tasks",
   "support": {
     "source": "https://github.com/wdmg/yii2-tasks",
@@ -21,8 +21,9 @@
     }
   ],
   "require": {
-    "yiisoft/yii2": "^2.0.33",
-    "wdmg/yii2-base": "^1.2.0",
+    "yiisoft/yii2": "^2.0.35",
+    "wdmg/yii2-base": "^1.2.4",
+    "wdmg/yii2-selectinput": "^1.0.9",
     "wdmg/yii2-helpers": "^1.3.2",
     "wdmg/yii2-editor": "^1.0.10",
     "wdmg/yii2-datepicker": "^1.0.8"

docs/images/yii2-tasks.png

@@ -34,13 +34,24 @@
     'Status' => 'Статус',
     'Actions' => 'Действия',
 
+    'Users' => 'Пользователи',
+    'Active' => 'Активно',
+    'Not active' => 'Не активно',
+
+    'All statuses' => 'Все статусы',
     'Wating' => 'В ожидании',
     'Progress' => 'В процессе',
     'Complete' => 'Завершено',
     'Unsuccessfully' => 'Не выполнено',
     'Suspended' => 'Остановлено',
     'Canceled' => 'Отменено',
 
+    'Tasks list' => 'Список задач',
+    'Subunits list' => 'Список подразделений',
+
+    'Subdivisions' => 'Подразделения',
+    'Create subdivision' => 'Создать подразделение',
+
     'View task: {name}' => 'Просмотр задачи: {name}',
     'Update task: {name}' => 'Редактирование задачи: {name}',
 

messages/ru-RU/app/modules/tasks.php

@@ -5,6 +5,7 @@
 use Yii;
 use \wdmg\base\models\ActiveRecord;
 use \yii\behaviors\TimeStampBehavior;
+use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "tasks".
@@ -120,6 +121,30 @@ public function attributeLabels()
         ];
     }
 
+    /**
+     * @return array
+     */
+    public function getStatusesList($allStatuses = false)
+    {
+        $list = [];
+        if ($allStatuses) {
+            $list = [
+                '*' => Yii::t('app/modules/tasks', 'All statuses')
+            ];
+        }
+
+        $list = ArrayHelper::merge($list, [
+            self::TS_STATUS_WATING => Yii::t('app/modules/tasks','Wating'),
+            self::TS_STATUS_PROGRESS => Yii::t('app/modules/tasks','Progress'),
+            self::TS_STATUS_COMPLETE => Yii::t('app/modules/tasks','Complete'),
+            self::TS_STATUS_UNSUCCESS => Yii::t('app/modules/tasks','Unsuccessfully'),
+            self::TS_STATUS_SUSPENDED => Yii::t('app/modules/tasks','Suspended'),
+            self::TS_STATUS_CANCELED => Yii::t('app/modules/tasks','Canceled'),
+        ]);
+
+        return $list;
+    }
+
     /**
      * @return \yii\db\ActiveQuery
      */

models/Tasks.php

@@ -5,6 +5,7 @@
 use Yii;
 use \wdmg\base\models\ActiveRecord;
 use \yii\behaviors\TimeStampBehavior;
+use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "tasks_subunits".
@@ -20,6 +21,13 @@
  */
 class TasksSubunits extends ActiveRecord
 {
+    /**
+     * Subdivision status
+     * const, int: 10 - Not Active, 20 - Active
+     */
+    const SUB_STATUS_DISABLE = 10;
+    const SUB_STATUS_ACTIVE = 20;
+
     /**
      * {@inheritdoc}
      */
@@ -28,6 +36,20 @@ public static function tableName()
         return '{{%tasks_subunits}}';
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function init()
+    {
+        parent::init();
+        $this->_module = parent::getModule(true);
+    }
+
+    /**
+     * @var Instance of current module
+     */
+    private $_module;
+
     /**
      * {@inheritdoc}
      */
@@ -77,4 +99,71 @@ public function attributeLabels()
             'status' => Yii::t('app/modules/tasks', 'Status'),
         ];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function afterFind()
+    {
+
+        if (is_string($this->users_id))
+            $this->users_id = \explode(',', $this->users_id);
+
+        parent::afterFind();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function beforeSave($insert)
+    {
+        if (is_array($this->users_id))
+            $this->users_id = \implode(',', $this->users_id);
+
+        return parent::beforeSave($insert);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getUsers()
+    {
+        if (class_exists('\wdmg\users\models\Users') && $this->_module->moduleLoaded('users'))
+            return $this->hasMany(\wdmg\users\models\Users::class, ['id' => 'users_id']);
+        else
+            return null;
+
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getOwner()
+    {
+        if (class_exists('\wdmg\users\models\Users') && $this->_module->moduleLoaded('users'))
+            return $this->hasOne(\wdmg\users\models\Users::class, ['id' => 'owner_id']);
+        else
+            return null;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function getStatusesList($allStatuses = false)
+    {
+        $list = [];
+        if ($allStatuses) {
+            $list = [
+                '*' => Yii::t('app/modules/tasks', 'All statuses')
+            ];
+        }
+
+        $list = ArrayHelper::merge($list, [
+            self::SUB_STATUS_DISABLE => Yii::t('app/modules/tasks','Not active'),
+            self::SUB_STATUS_ACTIVE => Yii::t('app/modules/tasks','Active'),
+        ]);
+
+        return $list;
+    }
 }

models/TasksSubunits.php

@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use wdmg\widgets\SelectInput;
 
 /* @var $this yii\web\View */
 /* @var $model wdmg\tasks\models\TasksSubunits */
@@ -18,12 +19,30 @@
 
     <?= $form->field($model, 'owner_id')->textInput() ?>
 
-    <?= $form->field($model, 'users_id')->textarea(['rows' => 6]) ?>
+    <?php
 
-    <?= $form->field($model, 'status')->textInput() ?>
+        $users_id = '';
+        if (is_array($model->users_id))
+            $users_id = \implode(',', $model->users_id);
 
+        echo $form->field($model, 'users_id')
+            ->textarea(['rows' => 6, 'value' => $users_id])
+            ->label(Yii::t('app/modules/tasks', 'Users'));
+
+    ?>
+
+    <?= $form->field($model, 'status')->widget(SelectInput::class, [
+        'items' => $model->getStatusesList(),
+        'options' => [
+            'id' => 'task-form-status',
+            'class' => 'form-control'
+        ]
+    ]); ?>
+
+    <hr/>
     <div class="form-group">
-        <?= Html::submitButton(Yii::t('app/modules/tasks', 'Save'), ['class' => 'btn btn-success']) ?>
+        <?= Html::a(Yii::t('app/modules/tasks', '&larr; Back to list'), ['list/all'], ['class' => 'btn btn-default pull-left']) ?>&nbsp;
+        <?= Html::submitButton(Yii::t('app/modules/tasks', 'Save'), ['class' => 'btn btn-save btn-success pull-right']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>

views/subunits/_form.php

@@ -7,7 +7,7 @@
 
 $this->title = Yii::t('app/modules/tasks', 'Create subunits');
 $this->params['breadcrumbs'][] = ['label' => Yii::t('app/modules/tasks', 'Tasks'), 'url' => ['../tasks']];
-$this->params['breadcrumbs'][] = ['label' => Yii::t('app/modules/tasks', 'Tasks Subunits'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app/modules/tasks', 'Subdivisions'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="page-header">