Update copyrights, add counter for dashboard

wdmg · Jun 25, 2023 · 1602af6 · 1602af6
1 parent f8c72ad
commit 1602af6
Show file tree

Hide file tree

Showing 15 changed files with 75 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+## 1.2.0 (2023-06-25)
+ * Update copyrights, add counter for dashboard
+
 ## 1.1.9 (2020-07-01)
  * Update dependencies, README.md
  * Fixed error determining loading of common modules

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 - 2020 W.D.M.Group, Ukraine
+Copyright (c) 2019 - 2023 W.D.M.Group, Ukraine
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Module.php b/Module.php
@@ -6,14 +6,15 @@
  * Yii2 Tasks
  *
  * @category        Module
- * @version         1.1.9
+ * @version         1.2.0
  * @author          Alexsander Vyshnyvetskyy <alex.vyshnyvetskyy@gmail.com>
  * @link            https://github.com/wdmg/yii2-tasks
- * @copyright       Copyright (c) 2019 - 2021 W.D.M.Group, Ukraine
+ * @copyright       Copyright (c) 2019 - 2023 W.D.M.Group, Ukraine
  * @license         https://opensource.org/licenses/MIT Massachusetts Institute of Technology (MIT) License
  *
  */
 
+use wdmg\helpers\ArrayHelper;
 use Yii;
 use wdmg\base\BaseModule;
 
@@ -45,7 +46,7 @@ class Module extends BaseModule
     /**
      * @var string the module version
      */
-    private $version = "1.1.9";
+    private $version = "1.2.0";
 
     /**
      * @var integer, priority of initialization
@@ -70,18 +71,9 @@ public function init()
     /**
      * {@inheritdoc}
      */
-    public function dashboardNavItems($options = false)
+    public function dashboardNavItems($options = null)
     {
         $items = [
-            'label' => $this->name,
-            'url' => [$this->routePrefix . '/'. $this->id],
-            'icon' => 'fa fa-fw fa-tasks',
-            'active' => in_array(\Yii::$app->controller->module->id, [$this->id])
-        ];
-
-
-
-        return [
             'label' => $this->name,
             'url' => [$this->routePrefix . '/'. $this->id],
             'icon' => 'fa fa-fw fa-tasks',
@@ -99,6 +91,20 @@ public function dashboardNavItems($options = false)
                 ]
             ]
         ];
+
+	    if (!is_null($options)) {
+
+		    if (isset($options['count'])) {
+			    $items['label'] .= '<span class="badge badge-default float-right">' . $options['count'] . '</span>';
+			    unset($options['count']);
+		    }
+
+		    if (is_array($options))
+			    $items = ArrayHelper::merge($items, $options);
+
+	    }
+
+	    return $items;
     }
 
     /**

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Yii2](https://img.shields.io/badge/required-Yii2_v2.0.40-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-ready_to_use-green.svg)
@@ -11,11 +11,11 @@ Task manager for Yii2.
 
 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-2021 [W.D.M.Group, Ukraine](https://wdmg.com.ua/)
+Copyrights (c) 2019-2023 [W.D.M.Group, Ukraine](https://wdmg.com.ua/)
 
 # Requirements 
 * PHP 5.6 or higher
-* Yii2 v.2.0.40 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)
@@ -65,9 +65,7 @@ Use the `Module::dashboardNavItems()` method of the module to generate a navigat
         ]);
     ?>
 
-# Status and version [in progress development]
+# Status and version [ready to use]
+* v.1.2.0 - Update copyrights, add counter for dashboard
 * 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
-* v.1.1.5 - Added choice param for non interactive mode
+* v.1.1.8 - Added pagination, up to date dependencies
diff --git a/commands/InitController.php b/commands/InitController.php
@@ -34,7 +34,7 @@ public function actionIndex($params = null)
             '║                                                ║'. "\n" .
             '║              TASKS MODULE, v.'.$version.'             ║'. "\n" .
             '║          by Alexsander Vyshnyvetskyy           ║'. "\n" .
-            '║       (c) 2019-2021 W.D.M.Group, Ukraine       ║'. "\n" .
+            '║       (c) 2019-2023 W.D.M.Group, Ukraine       ║'. "\n" .
             '║                                                ║'. "\n" .
             '╚════════════════════════════════════════════════╝';
         echo $name = $this->ansiFormat($welcome . "\n\n", Console::FG_GREEN);

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
   "keywords": ["yii2", "yii2-tasks", "task manager", "wdmg"],
   "type": "yii2-extension",
   "license": "MIT",
-  "version": "1.1.9",
+  "version": "1.2.0",
   "homepage": "https://github.com/wdmg/yii2-tasks",
   "support": {
     "source": "https://github.com/wdmg/yii2-tasks",
@@ -21,12 +21,12 @@
     }
   ],
   "require": {
-    "yiisoft/yii2": "^2.0.40",
+    "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"
+    "wdmg/yii2-datepicker": "^1.1.0"
   },
   "minimum-stability": "dev",
   "autoload": {

diff --git a/docs/images/yii2-tasks.png b/docs/images/yii2-tasks.png
diff --git a/messages/ru-RU/app/modules/tasks.php b/messages/ru-RU/app/modules/tasks.php
@@ -60,6 +60,7 @@
     'Task has been successfully created!' => 'Задача была успешно создана!',
     'An error occurred while creating the task.' => 'Произошла ошибка при создании задачи.',
 
+	'New tasks in the last 24 hours' => 'Новых задач за последние сутки',
 
     'Update' => 'Обновить',
     'Edit' => 'Редактировать',

diff --git a/models/Tasks.php b/models/Tasks.php
@@ -198,4 +198,20 @@ public function getUser($user_id = null)
         else
             return null;
     }
+
+	/**
+	 * Return stats count by all users
+	 *
+	 * @return array|null
+	 */
+	public static function getStatsCount($asArray = false) {
+		$counts = static::find()
+			->select([new \yii\db\Expression('SUM( CASE WHEN `created_at` >= TIMESTAMP(CURRENT_TIMESTAMP() - INTERVAL 1 DAY) THEN 1 END ) AS count')])
+			->addSelect([new \yii\db\Expression('SUM( CASE WHEN `id` > 0 THEN 1 END ) AS total')]);
+
+		if ($asArray)
+			return $counts->asArray()->one();
+
+		return $counts->one();
+	}
 }
diff --git a/views/subunits/index.php b/views/subunits/index.php
@@ -48,7 +48,7 @@
                 'format' => 'raw',
                 'header' => Yii::t('app/modules/tasks', 'Users'),
                 'value' => function($model) {
-                    if (is_countable($model->users)) {
+                    if (is_array($model->users)) {
 
                         $output = '';
                         foreach ($model->users as $user) {
@@ -114,10 +114,10 @@
             ],
             'maxButtonCount' => 5,
             'activePageCssClass' => 'active',
-            'prevPageCssClass' => 'prev',
-            'nextPageCssClass' => 'next',
-            'firstPageCssClass' => 'first',
-            'lastPageCssClass' => 'last',
+            'prevPageCssClass' => '',
+            'nextPageCssClass' => '',
+            'firstPageCssClass' => 'previous',
+            'lastPageCssClass' => 'next',
             'firstPageLabel' => Yii::t('app/modules/tasks', 'First page'),
             'lastPageLabel'  => Yii::t('app/modules/tasks', 'Last page'),
             'prevPageLabel'  => Yii::t('app/modules/tasks', '&larr; Prev page'),

diff --git a/views/subunits/view.php b/views/subunits/view.php
@@ -44,7 +44,7 @@
                 'format' => 'raw',
                 'label' => Yii::t('app/modules/tasks', 'Users'),
                 'value' => function($model) {
-                    if (is_countable($model->users)) {
+                    if (is_array($model->users)) {
 
                         $output = '';
                         foreach ($model->users as $user) {

diff --git a/views/tasks/all.php b/views/tasks/all.php
@@ -180,19 +180,18 @@
             'options' => [
                 'class' => 'pagination',
             ],
+            'maxButtonCount' => 5,
             'activePageCssClass' => 'active',
             'linkContainerOptions' => [
                 'class' => 'linkContainerOptions',
             ],
             'linkOptions' => [
                 'class' => 'linkOptions',
             ],
-            'maxButtonCount' => 5,
-            'activePageCssClass' => 'active',
-            'prevPageCssClass' => 'prev',
-            'nextPageCssClass' => 'next',
-            'firstPageCssClass' => 'first',
-            'lastPageCssClass' => 'last',
+            'prevPageCssClass' => '',
+            'nextPageCssClass' => '',
+            'firstPageCssClass' => 'previous',
+            'lastPageCssClass' => 'next',
             'firstPageLabel' => Yii::t('app/modules/tasks', 'First page'),
             'lastPageLabel'  => Yii::t('app/modules/tasks', 'Last page'),
             'prevPageLabel'  => Yii::t('app/modules/tasks', '&larr; Prev page'),

diff --git a/views/tasks/current.php b/views/tasks/current.php
@@ -156,19 +156,18 @@
             'options' => [
                 'class' => 'pagination',
             ],
+            'maxButtonCount' => 5,
             'activePageCssClass' => 'active',
             'linkContainerOptions' => [
                 'class' => 'linkContainerOptions',
             ],
             'linkOptions' => [
                 'class' => 'linkOptions',
             ],
-            'maxButtonCount' => 5,
-            'activePageCssClass' => 'active',
-            'prevPageCssClass' => 'prev',
-            'nextPageCssClass' => 'next',
-            'firstPageCssClass' => 'first',
-            'lastPageCssClass' => 'last',
+            'prevPageCssClass' => '',
+            'nextPageCssClass' => '',
+            'firstPageCssClass' => 'previous',
+            'lastPageCssClass' => 'next',
             'firstPageLabel' => Yii::t('app/modules/tasks', 'First page'),
             'lastPageLabel'  => Yii::t('app/modules/tasks', 'Last page'),
             'prevPageLabel'  => Yii::t('app/modules/tasks', '&larr; Prev page'),

diff --git a/views/tasks/my.php b/views/tasks/my.php
@@ -162,19 +162,18 @@
             'options' => [
                 'class' => 'pagination',
             ],
+            'maxButtonCount' => 5,
             'activePageCssClass' => 'active',
             'linkContainerOptions' => [
                 'class' => 'linkContainerOptions',
             ],
             'linkOptions' => [
                 'class' => 'linkOptions',
             ],
-            'maxButtonCount' => 5,
-            'activePageCssClass' => 'active',
-            'prevPageCssClass' => 'prev',
-            'nextPageCssClass' => 'next',
-            'firstPageCssClass' => 'first',
-            'lastPageCssClass' => 'last',
+            'prevPageCssClass' => '',
+            'nextPageCssClass' => '',
+            'firstPageCssClass' => 'previous',
+            'lastPageCssClass' => 'next',
             'firstPageLabel' => Yii::t('app/modules/tasks', 'First page'),
             'lastPageLabel'  => Yii::t('app/modules/tasks', 'Last page'),
             'prevPageLabel'  => Yii::t('app/modules/tasks', '&larr; Prev page'),

diff --git a/views/workflow/index.php b/views/workflow/index.php
@@ -46,10 +46,10 @@
             ],
             'maxButtonCount' => 5,
             'activePageCssClass' => 'active',
-            'prevPageCssClass' => 'prev',
-            'nextPageCssClass' => 'next',
-            'firstPageCssClass' => 'first',
-            'lastPageCssClass' => 'last',
+            'prevPageCssClass' => '',
+            'nextPageCssClass' => '',
+            'firstPageCssClass' => 'previous',
+            'lastPageCssClass' => 'next',
             'firstPageLabel' => Yii::t('app/modules/tasks', 'First page'),
             'lastPageLabel'  => Yii::t('app/modules/tasks', 'Last page'),
             'prevPageLabel'  => Yii::t('app/modules/tasks', '&larr; Prev page'),