Merge branch 'master' of git.task-on.com:ktask/task-on.com

common/modules/triggers/components/conditions/conditions/CheckPresenceTime.php

@@ -11,6 +11,7 @@ namespace common\modules\triggers\components\conditions\conditions;
 
 use common\modules\triggers\components\conditions\vendor\ConditionBase;
 use common\modules\triggers\components\conditions\vendor\ConditionInterface;
+use common\modules\triggers\models\TriggerCondition;
 use common\modules\triggers\models\TriggerParam;
 use common\modules\triggers\models\TriggerTrigger;
 
@@ -30,17 +31,34 @@ class CheckPresenceTime extends ConditionBase implements ConditionInterface {
     }
 
     public function initScript(){
+        return true;
         /** @var TriggerTrigger[] $actualTriggers */
-//        $actualTriggers = TriggerTrigger::getActualTriggers(self::CONDITION_ID);
-//        foreach($actualTriggers as $trigger) {
-//            foreach($trigger->getTriggerConditions() as $condition) {
-//                /** @var TriggerParam $paramUrl */
-//                $paramUrl = TriggerParam::find()->where(['condition_id'=>$condition->getPrimaryKey(), 'key'=>'url']);
-//                if ($condition->condition_id==self::CONDITION_ID && $paramUrl!==null && $paramUrl->value==\Yii::$app->request->getUrl()) {
-//                    echo '<script type="text/javascript">$(document).ready(function(){alert("ASD")});</script>';
-//                }
-//            }
-//        }
+        $actualTriggers = TriggerTrigger::getActualTriggers(self::CONDITION_ID);
+        foreach($actualTriggers as $trigger) {
+            $conditions = TriggerCondition::find()->where(['trigger_id' => $trigger->getPrimaryKey()])->all();
+            foreach($conditions as $condition) {
+                /** @var TriggerParam $paramUrl */
+                $paramUrl = TriggerParam::find()->where(['condition_id'=>$condition->getPrimaryKey(), 'key'=>'url'])->one();
+                $paramTime = TriggerParam::find()->where(['condition_id'=>$condition->getPrimaryKey(), 'key'=>'time'])->one();
+                if ($condition->condition_id==self::CONDITION_ID && $paramUrl!==null && $paramUrl->value==\Yii::$app->request->getUrl()) {
+                    $view = \Yii::$app->controller->view;
+                    $script ='$(window).on("beforeunload", function() {
+                                    var timer='.(($paramTime!==null) ? $paramTime->value : 0).';
+                                    if(timer>0){
+                                        $.ajax({
+                                            url: "/triggers/default/inittrigger",
+                                            method: "GET",
+                                            async: false,
+                                            data: {
+                                                id: '.$trigger->getPrimaryKey().'
+                                            },
+                                        });
+                                    }
+                               });';
+                    echo $view->registerJs($script, $view::POS_READY);
+                }
+            }
+        }
     }
 
     /**

common/modules/triggers/controllers/DefaultController.php

@@ -7,6 +7,7 @@ use common\modules\triggers\components\conditions\Conditions;
 use common\modules\triggers\models\TriggerSchedule;
 use common\modules\triggers\models\TriggerTrigger;
 use \DateTime;
+use yii\helpers\Json;
 
 /**
  * Default controller for the `triggers` module

common/modules/triggers/models/TriggerTrigger.php

@@ -3,6 +3,7 @@
 namespace common\modules\triggers\models;
 
 use common\modules\triggers\components\conditions\Conditions;
+use Faker\Provider\tr_TR\DateTime;
 use Yii;
 use common\modules\users\models\User;
 
@@ -204,7 +205,7 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
 
     /**
      * Тут выполняем то, что произойдет когда триггер сработает
-     * @param $message
+     * @param null $message
      */
     public function initAction($message=null){
         echo "ASD";