Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Task8 #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions assets/AppAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
class AppAsset extends AssetBundle {
public $basePath = '@webroot';
public $baseUrl = '@web';

public $css = [
'css/site.css',
'css/allTasks.css',
'css/site.css'
];
public $js = [
];

public $depends = [
'yii\web\YiiAsset',
'yii\bootstrap\BootstrapAsset',
Expand Down
22 changes: 22 additions & 0 deletions assets/CalendarAsset.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php


namespace app\assets;


use yii\web\AssetBundle;

class CalendarAsset extends AssetBundle
{
public $basePath = '@webroot';
public $baseUrl = '@web';

public $css = [
'css/allTasks.css'
];
public $js = [
];

public $depends = [
];
}
39 changes: 39 additions & 0 deletions commands/RbacController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?php


namespace app\commands;


use yii\console\Controller;

class RbacController extends Controller
{
public function actionIndex()
{
$am = \Yii::$app->authManager;

$permissionTaskCreate = $am->createPermission('TaskCreate');
$permissionTaskUpdate = $am->createPermission('TaskUpdate');
$permissionTaskDelete = $am->createPermission('TaskDelete');

$am->add($permissionTaskCreate);
$am->add($permissionTaskUpdate);
$am->add($permissionTaskDelete);

$admin = $am->createRole('admin');
$moder = $am->createRole('moder');

$am->add($admin);
$am->add($moder);

$am->addChild($admin, $permissionTaskCreate);
$am->addChild($admin, $permissionTaskUpdate);
$am->addChild($admin, $permissionTaskDelete);

$am->addChild($moder, $permissionTaskCreate);
$am->addChild($moder, $permissionTaskUpdate);

$am->assign($admin, 1);
$am->assign($moder, 2);
}
}
44 changes: 44 additions & 0 deletions commands/TaskController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php


namespace app\commands;

use app\models\mail\TaskMailer;
use app\models\tables\Tasks;
use yii\console\Controller;
use Yii;

class TaskController extends Controller
{
/**
* Отправить оповещения о приближающемся дедлайне
*/
public function actionDeadlineComing()
{
$currentDate = date('Y-m-d');
$criticalDate = date('Y-m-d', strtotime("+1 day"));
/**
* @var Tasks[] $tasks
*/
$tasks = Tasks::find()
/*->where('DATEDIFF (NOW(), tasks.deadline) <= 1')
->all();*/
->where(['>=', 'deadline', $currentDate])
->andWhere(['<=', 'deadline', $criticalDate])
->with('responsible')
->all();

$sendedMailCount = 0;
$mailer = new TaskMailer();
foreach ($tasks as $task) {
$mailer->send(
$task->responsible->email,
['[email protected]' => 'CEO'],
'Deadline is coming!',
'Come back to AI Task Manager and hurry up to complete your task! Less than 1 day available!'
);
$sendedMailCount += 1;
}
echo "Количество отправленных писем: {$sendedMailCount}";
}
}
1 change: 0 additions & 1 deletion components/Bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace app\components;

use app\models\Language;
use app\models\tables\Users;
use app\models\TaskForm;
use yii\base\BootstrapInterface;
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
},
"minimum-stability": "stable",
"require": {
"php": ">=5.4.0",
"php": ">=7.2.0",
"yiisoft/yii2": "~2.0.14",
"yiisoft/yii2-bootstrap": "~2.0.0",
"yiisoft/yii2-swiftmailer": "~2.0.0 || ~2.1.0",
"yiisoft/yii2-imagine": "^2.2"
"yiisoft/yii2-imagine": "^2.2",
"yiisoft/yii2-jui": "^2.0"
},
"require-dev": {
"yiisoft/yii2-debug": "~2.1.0",
Expand Down
73 changes: 70 additions & 3 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions config/console.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@
],
],
'db' => $db,
'mailer' => [
'class' => 'yii\swiftmailer\Mailer',
'useFileTransport' => true,
],
'authManager' => [
'class' => \yii\rbac\DbManager::class,
],
],
'params' => $params,
/*
Expand Down
27 changes: 19 additions & 8 deletions config/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,25 @@
],
],
'db' => $db,
/*
'urlManager' => [
'enablePrettyUrl' => true,
'showScriptName' => false,
'rules' => [
],
],
*/

'authManager' => [
'class' => \yii\rbac\DbManager::class,
],

'urlManager' => [
'enablePrettyUrl' => true,
'showScriptName' => false,
// 'enableStrictParsing' => true,
'rules' => [
'tasks' => 'task/index',
'task/<id\d+>' => 'task/full',
'' => 'site/index',
'<controller:\w+>/<id:\d+>' => '<controller>/view',
'<controller:\w+>/<action:\w+>/<id:\d+>' => '<controller>/<action>',
'<controller:\w+>/<action:\w+>' => '<controller>/<action>',
'<controller>' => '<controller>/index',
],
],
],
'params' => $params,
];
Expand Down
2 changes: 0 additions & 2 deletions controllers/SiteController.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@ public function actionRegister() {
*/
public function actionLogout() {
Yii::$app->user->logout();
Language::startSession();
Language::setRuLang();

return $this->goHome();
}
Expand Down
24 changes: 24 additions & 0 deletions controllers/TaskController.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,36 @@
use app\models\TaskForm;
use app\models\TasksCollection;
use Yii;
use yii\filters\AccessControl;
use yii\helpers\ArrayHelper;
use yii\helpers\FileHelper;
use yii\web\Controller;
use yii\web\UploadedFile;

class TaskController extends Controller {

public function behaviors()
{
return [
'access' => [
'class' => AccessControl::class,
'only' => ['edit', 'create'],
'rules' => [
[
'actions' => ['edit'],
'allow' => true,
'roles' => ['TaskUpdate']
],
[
'actions' => ['create'],
'allow' => true,
'roles' => ['TaskCreate']
]
]
]
];
}

public function actionIndex() {
$model = new TasksCollection();

Expand Down
19 changes: 19 additions & 0 deletions models/mail/TaskMailer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php


namespace app\models\mail;

use yii\base\BaseObject;

class TaskMailer extends BaseObject
{
public function send($to, $from = ['[email protected]' => 'AI'], $subject = 'New Task available!', $body = 'Come back to AI Task Manager and look up for your new task!')
{
\Yii::$app->mailer->compose()
->setTo($to)
->setFrom($from)
->setSubject($subject)
->setTextBody($body)
->send();
}
}
1 change: 1 addition & 0 deletions views/layouts/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use yii\widgets\Breadcrumbs;

AppAsset::register($this);
\app\assets\CalendarAsset::register($this);
?>
<?php $this->beginPage()?>
<!DOCTYPE html>
Expand Down
Loading