- 'btn btn-success']) ?> -
- render('_search', ['model' => $searchModel]); ?> - - - $dataProvider, - 'summaryOptions' => ['class' => 'alert alert-info'], - 'layout' => '{summary}- $model->id], ['class' => 'btn btn-primary']) ?> - $model->id], [ - 'class' => 'btn btn-danger', - 'data' => [ - 'confirm' => 'Are you sure you want to delete this item?', - 'method' => 'post', - ], - ]) ?> -
- - $model, - 'attributes' => [ - 'id', - 'type', - 'item_id', - 'item_value', - 'name', - ], - ]) ?> - -'btn btn-success']) ?>
- render('_search', ['model' => $searchModel]); ?> params['breadcrumbs'][] = $this->title; 'filterModel' => $searchModel, 'columns' => [ 'id', + [ + 'filter' => Task::getTypes(), + 'attribute' => 'type', + 'value' => function (Task $model) { + return $model->getTypeLabel(); + }, + ], +// 'item_id', +// 'item_value', 'name', - ['class' => 'yii\grid\ActionColumn'], + ['class' => 'app\components\ActionButtonColumn'], ], ]); ?> diff --git a/modules/admin/views/task/view.php b/modules/admin/views/task/view.php index 4e8fb46..960eeb6 100644 --- a/modules/admin/views/task/view.php +++ b/modules/admin/views/task/view.php @@ -27,6 +27,9 @@ $this->params['breadcrumbs'][] = $this->title; 'model' => $model, 'attributes' => [ 'id', + 'type', + 'item_id', + 'item_value', 'name', ], ]) ?> diff --git a/modules/admin/views/trigger/_form.php b/modules/admin/views/trigger/_form.php new file mode 100644 index 0000000..2509f62 --- /dev/null +++ b/modules/admin/views/trigger/_form.php @@ -0,0 +1,96 @@ + + +'btn btn-success']) ?>
- render('_search', ['model' => $searchModel]); ?> params['breadcrumbs'][] = $this->title; 'filterModel' => $searchModel, 'columns' => [ 'id', - 'type', - 'item_id', - 'item_value', 'name', + [ + 'filter' => Trigger::getTypes(), + 'attribute' => 'type', + 'value' => function (Trigger $model) { + return $model->getTypeLabel(); + }, + ], +// 'trig_date', +// 'trig_time', +// 'trig_time_wdays', +// 'trig_item_id', +// 'trig_item_value', - ['class' => 'yii\grid\ActionColumn'], + ['class' => 'app\components\ActionButtonColumn'], ], ]); ?> diff --git a/modules/admin/views/event/update.php b/modules/admin/views/trigger/update.php similarity index 60% rename from modules/admin/views/event/update.php rename to modules/admin/views/trigger/update.php index c23321c..5d3a28a 100644 --- a/modules/admin/views/event/update.php +++ b/modules/admin/views/trigger/update.php @@ -1,16 +1,16 @@ title = 'Изменить Event: ' . $model->name; -$this->params['breadcrumbs'][] = ['label' => 'Events', 'url' => ['index']]; +$this->title = 'Изменить Trigger: ' . $model->name; +$this->params['breadcrumbs'][] = ['label' => 'Triggers', 'url' => ['index']]; $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]]; $this->params['breadcrumbs'][] = 'Редактирование'; ?> -$model->id], ['class' => 'btn btn-primary']) ?> @@ -27,13 +27,15 @@ $this->params['breadcrumbs'][] = $this->title; 'model' => $model, 'attributes' => [ 'id', - 'type', - 'trig_date', - 'trig_time', + [ + 'attribute' => 'type', + 'value' => $model->getTypeLabel(), + ], + 'trig_date:datetime', + 'trig_time:time', 'trig_time_wdays', 'trig_item_id', 'trig_item_value', - 'task_id', 'name', ], ]) ?> diff --git a/scheme.jpg b/scheme.jpg deleted file mode 100644 index 0a660c5..0000000 Binary files a/scheme.jpg and /dev/null differ diff --git a/servers/Panel.php b/servers/Panel.php index 5cd0574..8ac703a 100644 --- a/servers/Panel.php +++ b/servers/Panel.php @@ -3,7 +3,8 @@ namespace app\servers; use app\models\Board; -use app\models\Event; +use app\models\Task; +use app\models\Trigger; use app\models\History; use app\models\Item; use app\models\TaskAction; @@ -117,7 +118,7 @@ class Panel implements MessageComponentInterface } } - $this->scheduleEvents(); + $this->scheduleTriggers(); $this->log('Server started'); } @@ -354,7 +355,7 @@ class Panel implements MessageComponentInterface } // Trig event - $this->trigItemValueEvent($item, $value); + $this->triggerItemValue($item, $value); if (in_array($item->type, [ Item::TYPE_SWITCH, @@ -418,7 +419,7 @@ class Panel implements MessageComponentInterface } // Trig event - $this->trigItemValueEvent($item, $value); + $this->triggerItemValue($item, $value); if (in_array($item->type, [ Item::TYPE_SWITCH, @@ -933,10 +934,10 @@ class Panel implements MessageComponentInterface * @param Item $item * @param string $value */ - private function trigItemValueEvent($item, $value) + private function triggerItemValue($item, $value) { // Find event - $event = Event::findOne([ + $event = Trigger::findOne([ 'trig_item_id' => $item->id, 'trig_item_value' => $value, ]); @@ -945,28 +946,29 @@ class Panel implements MessageComponentInterface return; } - $this->trigEvent($event); + $this->trigger($event); } /** - * @param TaskAction $action + * @param Task $task */ - private function doTaskAction($action) + private function doTask($task) { - switch ($action->type) { - case TaskAction::TYPE_CHANGE_ITEM_VALUE: - $item = $action->item; + switch ($task->type) { + case Task::TYPE_ITEM_VALUE: + $item = $task->item; switch ($item->type) { case Item::TYPE_SWITCH: $data = [ - 'type' => $action->item_value == '1' ? 'turnON' : 'turnOFF', + 'type' => $task->item_value == '1' ? 'turnON' : 'turnOFF', 'pin' => $item->pin, ]; break; case Item::TYPE_RGB: - $rgbData = $this->valueToRgbData($action->item_value); + $rgbData = $this->valueToRgbData($task->item_value); + $red = $rgbData[0]; $green = $rgbData[1]; $blue = $rgbData[2]; @@ -984,7 +986,7 @@ class Panel implements MessageComponentInterface default: $data = [ 'type' => 'value', - 'value' => $action->item_value, + 'value' => $task->item_value, 'pin' => $item->pin, ]; @@ -997,171 +999,173 @@ class Panel implements MessageComponentInterface } } + /** + * @param string $value + * @return array + */ private function valueToRgbData($value) { return explode(',', $value); } /** - * @param Event $event + * @param Trigger $trigger */ - private function trigEvent($event) + private function trigger($trigger) { - $this->log("Event [{$event->id}] triggered. Doing the tasks..."); + $this->log("Trigger [{$trigger->id}] triggered. Doing the tasks..."); // Do the tasks - $task = $event->task; - - foreach ($task->taskActions as $action) { - $this->doTaskAction($action); + foreach ($trigger->tasks as $task) { + $this->doTask($task); } - $this->log("Tasks for Event [{$event->id}] done!"); + $this->log("Tasks for Trigger [{$trigger->id}] done!"); } /** - * @param Event $event + * @param Trigger $trigger */ - private function trigDateEvent($event) + private function triggerDate($trigger) { - $this->trigEvent($event); + $this->trigger($trigger); } /** - * @param Event $event + * @param Trigger $trigger */ - private function trigTimeEvent($event) + private function triggerTime($trigger) { - $this->trigEvent($event); + $this->trigger($trigger); - $this->scheduleEvents(); + $this->scheduleTriggers(); } - protected function scheduleEvents() + protected function scheduleTriggers() { - $this->log("Scheduling Events..."); + $this->log("Scheduling Triggers..."); - /** @var Event[] $events */ - $events = Event::find()->where([ + /** @var Trigger[] $triggers */ + $triggers = Trigger::find()->where([ 'type' => [ - Event::TYPE_BY_DATE, - Event::TYPE_BY_TIME, + Trigger::TYPE_BY_DATE, + Trigger::TYPE_BY_TIME, ], ])->all(); - foreach ($events as $event) { - switch ($event->type) { - case Event::TYPE_BY_DATE: - if (isset($this->eventTimers[$event->id])) { - $this->log("Event [{$event->id}] already scheduled"); + foreach ($triggers as $trigger) { + switch ($trigger->type) { + case Trigger::TYPE_BY_DATE: + if (isset($this->eventTimers[$trigger->id])) { + $this->log("Trigger [{$trigger->id}] already scheduled"); break; } - if ($event->trig_date and $event->trig_date > time()) { - $timeout = $event->trig_date - time(); + if ($trigger->trig_date and $trigger->trig_date > time()) { + $timeout = $trigger->trig_date - time(); - $this->log("Scheduling Event [{$event->id}] with timeout $timeout sec."); + $this->log("Scheduling Trigger [{$trigger->id}] with timeout $timeout sec."); - $this->eventTimers[$event->id] = $this->loop->addTimer( + $this->eventTimers[$trigger->id] = $this->loop->addTimer( $timeout, - function () use ($event) { - $this->log("Event [{$event->id}] triggered by date"); + function () use ($trigger) { + $this->log("Trigger [{$trigger->id}] triggered by date"); - if (isset($this->eventTimers[$event->id])) { - unset($this->eventTimers[$event->id]); + if (isset($this->eventTimers[$trigger->id])) { + unset($this->eventTimers[$trigger->id]); } - return $this->trigDateEvent($event); + return $this->triggerDate($trigger); }); } else { - $this->log("Event [{$event->id}] expired by date"); + $this->log("Trigger [{$trigger->id}] expired by date"); } break; - case Event::TYPE_BY_TIME: - if ($event->trig_time_wdays != '') { // Every week events - $this->log("Event [{$event->id}] runs every week"); + case Trigger::TYPE_BY_TIME: + if ($trigger->trig_time_wdays != '') { // Every week triggers + $this->log("Trigger [{$trigger->id}] runs every week"); - $days = explode(',', $event->trig_time_wdays); + $days = explode(',', $trigger->trig_time_wdays); foreach ($days as $day) { - $trigTimestamp = strtotime($day . ', ' . $event->trig_time); + $trigTimestamp = strtotime($day . ', ' . $trigger->trig_time); if (strtolower(date('l')) == $day) { - $trigTimestamp = strtotime('+1 week, ' . $event->trig_time); + $trigTimestamp = strtotime('+1 week, ' . $trigger->trig_time); } - if (isset($this->eventTimers[$event->id][$trigTimestamp])) { - $this->log("Event [{$event->id}] already scheduled by time [$trigTimestamp]"); + if (isset($this->eventTimers[$trigger->id][$trigTimestamp])) { + $this->log("Trigger [{$trigger->id}] already scheduled by time [$trigTimestamp]"); break; } if (time() < $trigTimestamp) { $timeout = $trigTimestamp - time(); - $this->log("Scheduling Event [{$event->id}] with timeout $timeout sec. for timeout [$trigTimestamp]"); + $this->log("Scheduling Trigger [{$trigger->id}] with timeout $timeout sec. for timeout [$trigTimestamp]"); - $this->eventTimers[$event->id][$trigTimestamp] = $this->loop->addTimer( + $this->eventTimers[$trigger->id][$trigTimestamp] = $this->loop->addTimer( $timeout, - function () use ($event, $trigTimestamp) { - $this->log("Event [{$event->id}] triggered by time [$trigTimestamp]"); + function () use ($trigger, $trigTimestamp) { + $this->log("Trigger [{$trigger->id}] triggered by time [$trigTimestamp]"); - if (isset($this->eventTimers[$event->id][$trigTimestamp])) { - unset($this->eventTimers[$event->id][$trigTimestamp]); + if (isset($this->eventTimers[$trigger->id][$trigTimestamp])) { + unset($this->eventTimers[$trigger->id][$trigTimestamp]); } - return $this->trigTimeEvent($event); + return $this->triggerTime($trigger); } ); } else { $this->log("Trigger time $trigTimestamp is lower than current time " . time()); } } - } else { // Everyday events - $this->log("Event [{$event->id}] runs every day"); + } else { // Everyday triggers + $this->log("Trigger [{$trigger->id}] runs every day"); - if (isset($this->eventTimers[$event->id])) { - $this->log("Event [{$event->id}] already scheduled by time"); + if (isset($this->eventTimers[$trigger->id])) { + $this->log("Trigger [{$trigger->id}] already scheduled by time"); break; } - // Schedule event for today - $trigTimestamp = strtotime('today, ' . $event->trig_time); + // Schedule trigger for today + $trigTimestamp = strtotime('today, ' . $trigger->trig_time); if (time() < $trigTimestamp) { $timeout = $trigTimestamp - time(); - $this->log("Scheduling Event [{$event->id}] with timeout $timeout sec."); + $this->log("Scheduling Trigger [{$trigger->id}] with timeout $timeout sec."); - $this->eventTimers[$event->id] = $this->loop->addTimer( + $this->eventTimers[$trigger->id] = $this->loop->addTimer( $timeout, - function () use ($event) { - $this->log("Event [{$event->id}] triggered by time"); + function () use ($trigger) { + $this->log("Trigger [{$trigger->id}] triggered by time"); - if (isset($this->eventTimers[$event->id])) { - unset($this->eventTimers[$event->id]); + if (isset($this->eventTimers[$trigger->id])) { + unset($this->eventTimers[$trigger->id]); } - return $this->trigTimeEvent($event); + return $this->triggerTime($trigger); } ); } else { - $trigTimestamp = strtotime('tomorrow, ' . $event->trig_time); + $trigTimestamp = strtotime('tomorrow, ' . $trigger->trig_time); $timeout = $trigTimestamp - time(); - $this->log("Event [{$event->id}] expired by time. Scheduling for the next day ($timeout sec.)..."); + $this->log("Trigger [{$trigger->id}] expired by time. Scheduling for the next day ($timeout sec.)..."); - $this->eventTimers[$event->id] = $this->loop->addTimer( + $this->eventTimers[$trigger->id] = $this->loop->addTimer( $timeout, - function () use ($event) { - $this->log("Event [{$event->id}] triggered by time"); + function () use ($trigger) { + $this->log("Trigger [{$trigger->id}] triggered by time"); - if (isset($this->eventTimers[$event->id])) { - unset($this->eventTimers[$event->id]); + if (isset($this->eventTimers[$trigger->id])) { + unset($this->eventTimers[$trigger->id]); } - return $this->trigTimeEvent($event); + return $this->triggerTime($trigger); } ); } diff --git a/smarthome.sql b/smarthome.sql deleted file mode 100644 index 69b080b..0000000 --- a/smarthome.sql +++ /dev/null @@ -1,125 +0,0 @@ --- phpMyAdmin SQL Dump --- version 4.4.15.5 --- http://www.phpmyadmin.net --- --- Хост: 127.0.0.1:3306 --- Время создания: Авг 15 2016 г., 01:06 --- Версия сервера: 5.6.29 --- Версия PHP: 7.0.4 - -SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; -SET time_zone = "+00:00"; - - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8mb4 */; - --- --- База данных: `smarthome` --- - --- -------------------------------------------------------- - --- --- Структура таблицы `history` --- - -CREATE TABLE IF NOT EXISTS `history` ( - `id` int(11) NOT NULL, - `item_id` int(11) NOT NULL, - `commited_at` int(11) NOT NULL, - `value` int(11) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- -------------------------------------------------------- - --- --- Структура таблицы `item` --- - -CREATE TABLE IF NOT EXISTS `item` ( - `id` int(11) NOT NULL, - `type` int(11) NOT NULL, - `update_interval` int(11) NOT NULL, - `save_history_interval` int(11) DEFAULT '0', - `room_id` int(11) DEFAULT NULL, - `url` varchar(255) NOT NULL, - `name` varchar(255) NOT NULL, - `sort_order` int(11) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- -------------------------------------------------------- - --- --- Структура таблицы `room` --- - -CREATE TABLE IF NOT EXISTS `room` ( - `id` int(11) NOT NULL, - `name` varchar(255) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- --- Индексы сохранённых таблиц --- - --- --- Индексы таблицы `history` --- -ALTER TABLE `history` - ADD PRIMARY KEY (`id`), - ADD KEY `item_id` (`item_id`); - --- --- Индексы таблицы `item` --- -ALTER TABLE `item` - ADD PRIMARY KEY (`id`), - ADD KEY `group_id` (`room_id`); - --- --- Индексы таблицы `room` --- -ALTER TABLE `room` - ADD PRIMARY KEY (`id`); - --- --- AUTO_INCREMENT для сохранённых таблиц --- - --- --- AUTO_INCREMENT для таблицы `history` --- -ALTER TABLE `history` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT для таблицы `item` --- -ALTER TABLE `item` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT для таблицы `room` --- -ALTER TABLE `room` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- Ограничения внешнего ключа сохраненных таблиц --- - --- --- Ограничения внешнего ключа таблицы `history` --- -ALTER TABLE `history` - ADD CONSTRAINT `history_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `item` (`id`) ON DELETE CASCADE; - --- --- Ограничения внешнего ключа таблицы `item` --- -ALTER TABLE `item` - ADD CONSTRAINT `item_ibfk_1` FOREIGN KEY (`room_id`) REFERENCES `room` (`id`) ON DELETE CASCADE; - -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; diff --git a/views/layouts/_left.php b/views/layouts/_left.php index 5072cea..5f06c9b 100644 --- a/views/layouts/_left.php +++ b/views/layouts/_left.php @@ -27,13 +27,10 @@ ['label' => 'Настройки', 'options' => ['class' => 'header']], ['label' => 'Элементы', 'icon' => 'fa fa-cubes', 'url' => ['/admin/item/index']], ['label' => 'Платы', 'icon' => 'fa fa-cogs', 'url' => ['/admin/board/index']], - ['label' => 'Events', 'icon' => 'fa fa-cogs', 'items' => [ - ['label' => 'События', 'icon' => 'fa fa-cubes', 'url' => ['/admin/event/index']], - ['label' => 'Задачи', 'icon' => 'fa fa-cubes', 'url' => ['/admin/task/index']], - ['label' => 'Действия', 'icon' => 'fa fa-cubes', 'url' => ['/admin/task-action/index']], - ]], + ['label' => 'Triggers', 'icon' => 'fa fa-feed', 'url' => ['/admin/trigger/index']], + ['label' => 'Задачи', 'icon' => 'fa fa-check', 'url' => ['/admin/task/index']], ['label' => 'Комнаты', 'icon' => 'fa fa-folder-open', 'url' => ['/admin/room/index']], - ['label' => 'История', 'icon' => 'fa fa-bar-chart', 'url' => ['/admin/history/index']], +// ['label' => 'История', 'icon' => 'fa fa-bar-chart', 'url' => ['/admin/history/index']], ['label' => 'Пользователи', 'icon' => 'fa fa-users', 'url' => ['/admin/user/index']], ['label' => 'Yii2', 'options' => ['class' => 'header'], 'visible' => YII_DEBUG], diff --git a/web/css/site.css b/web/css/site.css index adaa987..1cf2c4f 100644 --- a/web/css/site.css +++ b/web/css/site.css @@ -141,8 +141,8 @@ position: absolute; top: 50px; display: block; - width: 20px; - height: 20px; + width: 30px; + height: 30px; background: #605ca8; border-radius: 50%; } @@ -185,3 +185,7 @@ transform: translateY(-25px); } } + +.select2-container--krajee .select2-selection--single { + line-height: 2; +}