From 78ee46f163600bb23d80c58068b4a182ffa173d2 Mon Sep 17 00:00:00 2001 From: vladfo Date: Tue, 24 Sep 2024 15:21:30 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?utf8?q?=D0=BE=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/actions/task/IndexAction.php | 11 ++++------- erp24/controllers/crud/TaskController.php | 15 ++++++++++++--- erp24/views/crud/task/_form.php | 20 +++----------------- erp24/views/crud/task/create.php | 2 +- erp24/views/crud/task/update.php | 2 +- 5 files changed, 21 insertions(+), 29 deletions(-) diff --git a/erp24/actions/task/IndexAction.php b/erp24/actions/task/IndexAction.php index 409918c9..6193c6d4 100755 --- a/erp24/actions/task/IndexAction.php +++ b/erp24/actions/task/IndexAction.php @@ -249,19 +249,16 @@ class IndexAction extends Action } $text = Yii::$app->request->post('name'); - // var_dump($text); + if (!isset($text)) { $text = Yii::$app->session->get('searchFilter'); } if (isset($text) && !empty($text)) { Yii::$app->session->set('searchFilter', $text); - //$text = 'Создание'; + $tasks = Task::find() - ->where( - ['ilike', 'task.name', $text], // Регистронезависимый поиск по полю name - );// Получаем все записи + ->where(['ilike', 'task.name', '%' . $text . '%', false]) ; - // var_dump($tasks); } else { Yii::$app->session->set('searchFilter', ''); @@ -296,7 +293,7 @@ class IndexAction extends Action } } $tasks = $tasks->andWhere(['or', ['task.parent_id' => 0], ['task.parent_id' => null]])->all(); - //var_dump($tasks); + if (Yii::$app->request->isPjax) { $task = Task::findOne($task_id); $balance = []; diff --git a/erp24/controllers/crud/TaskController.php b/erp24/controllers/crud/TaskController.php index ced88065..ca389869 100644 --- a/erp24/controllers/crud/TaskController.php +++ b/erp24/controllers/crud/TaskController.php @@ -188,11 +188,16 @@ class TaskController extends Controller $model->deadline = date("Y-m-d H:i:s", strtotime("+1 day", strtotime($model->data_start))); $model->data_end = date("Y-m-d H:i:s", strtotime("+1 day", strtotime($model->data_start))); $model->group_id = 1; + + $priorities = array_map(function($priority) { + return $priority['label']; + }, Task::getPriorities()); + if ($isAjax) { - return $this->renderAjax('_form', compact('model', 'entities', 'taskEntity', 'tasksType', 'taskStatus', 'taskAlertLevels', 'canUpdateAll', 'canUpdateStatusAndDuration')); + return $this->renderAjax('_form', compact('model', 'entities', 'taskEntity', 'tasksType', 'taskStatus', 'taskAlertLevels', 'canUpdateAll', 'canUpdateStatusAndDuration', 'priorities')); } - return $this->render('create', compact('model', 'entities', 'taskEntity', 'tasksType', 'taskStatus', 'taskAlertLevels')); + return $this->render('create', compact('model', 'entities', 'taskEntity', 'tasksType', 'taskStatus', 'taskAlertLevels', 'priorities')); } // Метод для сохранения пользователей задачи и наблюдателей @@ -387,6 +392,10 @@ class TaskController extends Controller $taskStatus = TaskStatus::find()->all(); $taskAlertLevels = TaskAlertLevel::find()->all(); + $priorities = array_map(function($priority) { + return $priority['label']; + }, Task::getPriorities()); + $entities = TaskService::getEntitiesByAlias(TaskEntity::findOne($model->entity_type)->alias); // Получаем данные из базы данных @@ -401,7 +410,7 @@ class TaskController extends Controller return $this->render('update', compact('model', 'entities', 'taskEntity','tasksType', 'taskStatus', 'taskAlertLevels', 'comment', - 'canUpdateAll', 'canUpdateStatusAndDuration')); + 'canUpdateAll', 'canUpdateStatusAndDuration', 'priorities')); } /** diff --git a/erp24/views/crud/task/_form.php b/erp24/views/crud/task/_form.php index 6d0c8198..ac2b3768 100755 --- a/erp24/views/crud/task/_form.php +++ b/erp24/views/crud/task/_form.php @@ -80,13 +80,11 @@ $this->registerJsFile('/js/crud/task/update.js', ['position' => \yii\web\View::P ] ])->label(false)) ?> - field($model, 'entity_id')->textInput() ?> + field($model, 'entity_id')->dropDownList($entities, ['disabled' => $canUpdateAll ? null : 'disabled'])->label(false)) ?> - field($model, 'entity_type')->dropDownList( - // ArrayHelper::map($entityType, 'id', 'name')) ?> field($model, 'status')->dropDownList( ArrayHelper::map($taskStatus, 'id','name'), ['disabled' => $canUpdateStatusAndDuration ? null : 'disabled'])->label(false)) ?> @@ -95,20 +93,8 @@ $this->registerJsFile('/js/crud/task/update.js', ['position' => \yii\web\View::P PrintBlockHelper::printBlock( 'Приоритет', $form->field($model, 'prioritet')->dropDownList( - [ - 0 => 'Очень низкий', - 1 => 'Низкий', - 2 => 'Терпит', - 3 => 'Можно не спешить', - 4 => 'Пониженный', - 5 => 'Обычный', - 6 => 'Повышенный', - 7 => 'Ниже среднего', - 8 => 'Средний', - 9 => 'Высокий', - 10 => 'Самая важная' - ], - ['prompt' => 'Выберите приоритет'] // Опционально: можно добавить "пустую" опцию + $priorities, + ['prompt' => 'Выберите приоритет'] )->label(false) ); ?> diff --git a/erp24/views/crud/task/create.php b/erp24/views/crud/task/create.php index 4a12b298..4a71e85d 100755 --- a/erp24/views/crud/task/create.php +++ b/erp24/views/crud/task/create.php @@ -19,6 +19,6 @@ $canUpdateStatusAndDuration = true;

title) ?>

render('_form', compact('model', 'entities', 'taskEntity', 'tasksType', 'taskStatus', 'taskAlertLevels', - 'canUpdateAll', 'canUpdateStatusAndDuration')) ?> + 'canUpdateAll', 'canUpdateStatusAndDuration', 'priorities')) ?> diff --git a/erp24/views/crud/task/update.php b/erp24/views/crud/task/update.php index 6972ee7a..dcbfa4bb 100755 --- a/erp24/views/crud/task/update.php +++ b/erp24/views/crud/task/update.php @@ -23,6 +23,6 @@ $this->params['breadcrumbs'][] = 'Update'; name) ?> render('_form', compact('model', 'entities', 'taskEntity', 'tasksType', 'taskStatus', 'taskAlertLevels', 'comment', - 'canUpdateAll', 'canUpdateStatusAndDuration')) ?> + 'canUpdateAll', 'canUpdateStatusAndDuration', 'priorities')) ?> -- 2.39.5