keep assignments in repeatable behavior

updated to do to sort repeatable tasks correctly

Author: Simon Karlen

src/behaviors/RepeatableBehavior.php

@@ -14,7 +14,6 @@
 use yii\behaviors\BlameableBehavior;
 use yii\behaviors\TimestampBehavior;
 use yii\db\ActiveRecord;
-use yii\db\Expression;
 use yii\db\Query;
 use yii\di\Instance;
 use yii\helpers\ArrayHelper;
@@ -73,6 +72,13 @@ class RepeatableBehavior extends Behavior
      */
     public $recurrenceDoneRelationProperty = 'task_id';
 
+    /**
+     * @var array An array of relation names to keep in recurrent instance
+     */
+    public $keepRelations = [
+        'assignments'
+    ];
+
     /**
      * @var bool If instance of this task is recurrent
      */
@@ -100,13 +106,16 @@ public function deleteRecurrentInstance(\yii\base\ModelEvent $event)
         if (!$this->isRecurrentInstance()) {
             if ($this->owner->{$this->recurrenceParentIdProperty}) {
                 /** @var \yii\db\ActiveRecord $record */
-                $record = call_user_func([$this->owner, 'findOne'], $this->owner->getAttribute($this->recurrenceParentIdProperty))->getOriginalRecord();
+                $record = call_user_func([$this->owner, 'findOne'],
+                    $this->owner->getAttribute($this->recurrenceParentIdProperty))->getOriginalRecord();
                 /** @var \Recurr\Rule $rule */
                 $rule = $record->{$this->recurrencePatternProperty};
 
                 $exDates = [];
                 foreach ($rule->getExDates() as $exDate) {
-                    if (Yii::$app->formatter->asDate($exDate->date, 'yyyy-MM-dd') !== Yii::$app->formatter->asDate($this->owner->{$this->endDateProperty}, 'yyyy-MM-dd')) {
+                    if (Yii::$app->formatter->asDate($exDate->date,
+                            'yyyy-MM-dd') !== Yii::$app->formatter->asDate($this->owner->{$this->endDateProperty},
+                            'yyyy-MM-dd')) {
                         $exDates[] = Yii::$app->formatter->asDate($exDate->date, 'yyyy-MM-dd');
                     }
                 }
@@ -247,7 +256,9 @@ public function createRecurrentInstance()
         $this->owner->setAttribute($this->statusProperty, $status);
 
         foreach ($this->owner->getRelatedRecords() as $relatedRecordName => $relatedRecord) {
-            unset($this->owner->{$relatedRecordName});
+            if (!in_array($relatedRecordName, $this->keepRelations)) {
+                unset($this->owner->{$relatedRecordName});
+            }
         }
     }
 

src/widgets/ToDo.php

@@ -9,17 +9,15 @@
 
 use kartik\select2\Select2;
 use rmrevin\yii\fontawesome\FAR;
+use rmrevin\yii\fontawesome\FAS;
 use simialbi\yii2\kanban\KanbanAsset;
 use simialbi\yii2\kanban\KanbanSwiperAsset;
-use simialbi\yii2\kanban\models\ChecklistElement;
 use simialbi\yii2\kanban\models\Task;
 use simialbi\yii2\turbo\Frame;
 use simialbi\yii2\turbo\Modal;
 use simialbi\yii2\widgets\Widget;
 use Yii;
 use yii\bootstrap4\Html;
-use yii\db\Expression;
-use yii\db\Query;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Url;
 use yii\web\JsExpression;
@@ -85,34 +83,31 @@ public function run()
         $this->view->registerAssetBundle(KanbanSwiperAsset::class);
         $this->view->registerAssetBundle(KanbanAsset::class);
 
-        $checklistQuery = new Query();
-        $checklistQuery
-            ->select('end_date')
-            ->from(ChecklistElement::tableName())
-            ->where(new Expression('[[task_id]] = {{t}}.[[id]]'))
-            ->andWhere(['is_done' => false])
-            ->orderBy(['end_date' => SORT_ASC])
-            ->limit(1);
         $tasks = Task::find()
-            ->select([
-                '{{t}}.*',
-                'cEndDate' => $checklistQuery,
-                'endDate' => new Expression('IF({{t}}.[[end_date]], {{t}}.[[end_date]], (SELECT [[cEndDate]]))')
-            ])
             ->cache(60)
             ->alias('t')
             ->with(['checklistElements', 'comments'])
             ->innerJoinWith('bucket bu')
             ->innerJoinWith('board b')
             ->innerJoinWith('assignments u')
             ->where(['not', ['{{t}}.[[status]]' => Task::STATUS_DONE]])
-            ->andWhere(['{{u}}.[[user_id]]' => Yii::$app->user->id])
-            ->addOrderBy(new Expression('-[[endDate]] DESC'))
-            ->addOrderBy(new Expression('-{{t}}.[[start_date]] DESC'))
-            ->addOrderBy(['{{t}}.[[created_at]]' => SORT_ASC])
-            ->asArray(true);
+            ->andWhere(['{{u}}.[[user_id]]' => Yii::$app->user->id]);
 
         $results = $tasks->all();
+        usort($results, function ($a, $b) {
+            /** @var $a Task */
+            /** @var $b Task */
+            if ($a->endDate === $b->endDate) {
+                return 0;
+            }
+            if ($a->endDate === null && $b->endDate !== null) {
+                return 1;
+            }
+            if ($a->endDate !== null && $b->endDate === null) {
+                return -1;
+            }
+            return ($a->endDate < $b->endDate) ? -1 : 1;
+        });
 
         ob_start();
         if ($this->renderModal) {
@@ -182,15 +177,23 @@ function onHide() {
 
         foreach ($results as $task) {
             $options = $this->itemOptions;
-            $options['href'] = Url::to(["/{$this->kanbanModuleName}/task/update", 'id' => $task['id'], 'return' => 'todo']);
+            $options['href'] = Url::to([
+                "/{$this->kanbanModuleName}/task/update",
+                'id' => $task['id'],
+                'return' => 'todo'
+            ]);
             $options['data'] = [
                 'toggle' => 'modal',
                 'pjax' => '0',
                 'turbo-frame' => 'task-modal-frame',
                 'target' => '#task-modal'
             ];
 
-            $content = Html::tag('h6', $task['subject'], ['class' => ['m-0']]);
+            $subject = $task['subject'];
+            if ($task->isRecurrentInstance()) {
+                $subject = FAS::i('infinity')->transform('shrink-4.5')->mask('circle') . $subject;
+            }
+            $content = Html::tag('h6', $subject, ['class' => ['m-0']]);
             $small = $task['board']['name'];
 
             if (($cnt = count($task['checklistElements'])) > 0) {