Скоректирована валидация замен и оторабжения списка замен

langovoi · Oct 15, 2014 · 9091c9e · 9091c9e
1 parent c8dd54f
commit 9091c9e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/controllers/GroupController.php b/controllers/GroupController.php
@@ -226,7 +226,7 @@ public function actionReplaces()
     {
         /** @var Semesters $semester */
         $semester = Semesters::model()->byStartDate()->find();
-        $replaces = GroupReplace::model()->byDate()->findAllByAttributes(['group_id' => self::$group->id], 'date >= :start_date AND date <= :end_date', [':start_date' => $semester->start_date, ':end_date' => $semester->end_date]);
+        $replaces = GroupReplace::model()->byDate()->findAllByAttributes(['group_id' => self::$group->id], 'date >= :start_date AND date <= :end_date AND date >= :current_date', [':current_date' => date('Y-m-d'), ':start_date' => $semester->start_date, ':end_date' => $semester->end_date]);
 
         $this->render('replaces', ['replaces' => $replaces, 'group' => self::$group]);
     }
@@ -266,6 +266,8 @@ public function actionUpdateReplace($replace_id)
         $model = GroupReplace::model()->findByPk($replace_id);
         if (!$model)
             throw new CHttpException(404, 'Замена не найдена');
+        if(strtotime($model->date) < strtotime(date('Y-m-d')))
+            throw new CHttpException(403, 'Нельзя редактировать старую замену!');
         $classrooms = ['' => '-'];
         $subjects = ['' => '-'];
         $teachers = ['' => '-'];
@@ -298,6 +300,8 @@ public function actionDeleteReplace($replace_id, $confirm = 0)
         $model = GroupReplace::model()->findByPk($replace_id);
         if (!$model)
             throw new CHttpException(404, 'Элемент не найден');
+        if(strtotime($model->date) < strtotime(date('Y-m-d')))
+            throw new CHttpException(403, 'Нельзя удалить старую замену!');
         if ($confirm) {
             if ($model->delete())
                 Yii::app()->user->setFlash('success', 'Замена успешно удален');

diff --git a/models/GroupReplace.php b/models/GroupReplace.php
@@ -75,6 +75,10 @@ public function dateCheck($attribute)
         /** @var Semesters $semester */
         $semester = Semesters::model()->byStartDate()->find();
         $time = strtotime($this->$attribute);
+        if($time < strtotime(date('Y-m-d'))) {
+            $this->addError($attribute, 'Нельзя установить дату меньше сегоднешней');
+            return false;
+        }
         if($time < strtotime($semester->start_date) || $time > strtotime($semester->end_date))
             $this->addError($attribute, 'Дата не может быть за пределами текущего семестра');
     }