diff --git a/ChangeLog b/ChangeLog index 7aef3a9bd..6fadf5617 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,10 @@ Breaking changes: * Remove feature "Allow everybody to access to this project" (You must define members and groups) * Composer dependencies are now included in the repository (except development dependencies) +New features: + +* Add predefined templates for task descriptions + Improvements: * You can get an archive of Kanboard by using the download button in Github or the command git archive diff --git a/app/Controller/PredefinedTaskDescriptionController.php b/app/Controller/PredefinedTaskDescriptionController.php new file mode 100644 index 000000000..1b7eca124 --- /dev/null +++ b/app/Controller/PredefinedTaskDescriptionController.php @@ -0,0 +1,116 @@ +getProject(); + + $this->response->html($this->template->render('predefined_task_description/create', array( + 'values' => $values, + 'errors' => $errors, + 'project' => $project, + ))); + } + + public function save() + { + $project = $this->getProject(); + $values = $this->request->getValues(); + + list($valid, $errors) = $this->predefinedTaskDescriptionValidator->validate($values); + + if ($valid) { + if ($this->predefinedTaskDescriptionModel->create($project['id'], $values['title'], $values['description']) !== false) { + $this->flash->success(t('Template created successfully.')); + } else { + $this->flash->failure(t('Unable to create this template.')); + } + + $this->response->redirect($this->helper->url->to('ProjectPredefinedContentController', 'show', array('project_id' => $project['id'])), true); + } else { + $this->create($values, $errors); + } + } + + public function edit(array $values = array(), array $errors = array()) + { + $project = $this->getProject(); + $template = $this->predefinedTaskDescriptionModel->getById($project['id'], $this->request->getIntegerParam('id')); + + $this->response->html($this->template->render('predefined_task_description/edit', array( + 'values' => empty($values) ? $template : $values, + 'template' => $template, + 'errors' => $errors, + 'project' => $project, + ))); + } + + public function update() + { + $project = $this->getProject(); + $template = $this->getTemplate($project); + $values = $this->request->getValues(); + + list($valid, $errors) = $this->predefinedTaskDescriptionValidator->validate($values); + + if ($valid) { + if ($this->predefinedTaskDescriptionModel->update($project['id'], $template['id'], $values['title'], $values['description']) !== false) { + $this->flash->success(t('Template updated successfully.')); + } else { + $this->flash->failure(t('Unable to update this template.')); + } + + $this->response->redirect($this->helper->url->to('ProjectPredefinedContentController', 'show', array('project_id' => $project['id'])), true); + } else { + $this->edit($values, $errors); + } + } + + public function confirm() + { + $project = $this->getProject(); + $template = $this->getTemplate($project); + + $this->response->html($this->template->render('predefined_task_description/remove', array( + 'template' => $template, + 'project' => $project, + ))); + } + + public function remove() + { + $this->checkCSRFParam(); + $project = $this->getProject(); + $template = $this->getTemplate($project); + + if ($this->predefinedTaskDescriptionModel->remove($project['id'], $template['id'])) { + $this->flash->success(t('Template removed successfully.')); + } else { + $this->flash->failure(t('Unable to remove this template.')); + } + + $this->response->redirect($this->helper->url->to('ProjectPredefinedContentController', 'show', array('project_id' => $project['id'])), true); + } + + protected function getTemplate(array $project) + { + $template = $this->predefinedTaskDescriptionModel->getById($project['id'], $this->request->getIntegerParam('id')); + + if (empty($template)) { + throw new PageNotFoundException(); + } + + return $template; + } +} \ No newline at end of file diff --git a/app/Controller/ProjectPredefinedContentController.php b/app/Controller/ProjectPredefinedContentController.php index 1195dfa3b..709d6b795 100644 --- a/app/Controller/ProjectPredefinedContentController.php +++ b/app/Controller/ProjectPredefinedContentController.php @@ -10,13 +10,6 @@ namespace Kanboard\Controller; */ class ProjectPredefinedContentController extends BaseController { - /** - * Edit project - * - * @access public - * @param array $values - * @param array $errors - */ public function show(array $values = array(), array $errors = array()) { $project = $this->getProject(); @@ -25,15 +18,11 @@ class ProjectPredefinedContentController extends BaseController 'values' => empty($values) ? $project : $values, 'errors' => $errors, 'project' => $project, - 'title' => t('Predefined Contents') + 'predefined_task_descriptions' => $this->predefinedTaskDescriptionModel->getAll($project['id']), + 'title' => t('Predefined Contents'), ))); } - /** - * Validate and update a project - * - * @access public - */ public function update() { $project = $this->getProject(); diff --git a/app/Core/Base.php b/app/Core/Base.php index bf89c00f2..4e553746e 100644 --- a/app/Core/Base.php +++ b/app/Core/Base.php @@ -105,6 +105,7 @@ use Pimple\Container; * @property \Kanboard\Model\LinkModel $linkModel * @property \Kanboard\Model\NotificationModel $notificationModel * @property \Kanboard\Model\PasswordResetModel $passwordResetModel + * @property \Kanboard\Model\PredefinedTaskDescriptionModel $predefinedTaskDescriptionModel * @property \Kanboard\Model\ProjectModel $projectModel * @property \Kanboard\Model\ProjectActivityModel $projectActivityModel * @property \Kanboard\Model\ProjectDuplicationModel $projectDuplicationModel @@ -179,6 +180,7 @@ use Pimple\Container; * @property \Kanboard\Validator\TaskLinkValidator $taskLinkValidator * @property \Kanboard\Validator\TaskValidator $taskValidator * @property \Kanboard\Validator\UserValidator $userValidator + * @property \Kanboard\Validator\PredefinedTaskDescriptionValidator $predefinedTaskDescriptionValidator * @property \Kanboard\Import\TaskImport $taskImport * @property \Kanboard\Import\UserImport $userImport * @property \Kanboard\Export\SubtaskExport $subtaskExport diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php index b105eaec7..43347a6d7 100644 --- a/app/Helper/TaskHelper.php +++ b/app/Helper/TaskHelper.php @@ -61,6 +61,30 @@ class TaskHelper extends Base return $this->helper->form->textEditor('description', $values, $errors, array('tabindex' => 2)); } + public function renderDescriptionTemplateDropdown($projectId) + { + $templates = $this->predefinedTaskDescriptionModel->getAll($projectId); + + if (! empty($templates)) { + $html = '
'; + $html .= ''.t('Description Templates').' '; + $html .= '
'; + return $html; + } + + return ''; + } + public function renderTagField(array $project, array $tags = array()) { $options = $this->tagModel->getAssignableList($project['id']); diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php index ce0374f2d..d53f9291e 100644 --- a/app/Locale/bs_BA/translations.php +++ b/app/Locale/bs_BA/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/ca_ES/translations.php b/app/Locale/ca_ES/translations.php index 8e14e2fb0..f114484f1 100644 --- a/app/Locale/ca_ES/translations.php +++ b/app/Locale/ca_ES/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php index 92645582c..8b713c8cb 100644 --- a/app/Locale/cs_CZ/translations.php +++ b/app/Locale/cs_CZ/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index cfd27c2c8..fef985b48 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index 811393778..e2d9ba5a5 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php index 9bd08132e..908c015e9 100644 --- a/app/Locale/el_GR/translations.php +++ b/app/Locale/el_GR/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index d0777c00a..b97e24eb9 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index ad2fa6b10..a508162da 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index 243673899..d281def65 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -1345,4 +1345,15 @@ return array( 'Enter one subtask by line.' => 'Entrez une sous-tâche par ligne.', 'Predefined Contents' => 'Contenus prédéfini', 'Predefined contents' => 'Contenus prédéfini', + 'Predefined Task Description' => 'Modèles de description de tâches', + 'Do you really want to remove this template? "%s"' => 'Voulez-vous vraiment supprimer ce modèle ? « %s »', + 'Add predefined task description' => 'Ajouter un modèle de description de tâche', + 'Predefined Task Descriptions' => 'Modèles de description de tâches', + 'Template created successfully.' => 'Modèle créé avec succès.', + 'Unable to create this template.' => 'Impossible de créer ce modèle.', + 'Template updated successfully.' => 'Modèle mis à jour avec succès.', + 'Unable to update this template.' => 'Impossible de mettre à jour ce modèle.', + 'Template removed successfully.' => 'Modèle supprimé avec succès.', + 'Unable to remove this template.' => 'Impossible de supprimer ce modèle.', + 'Description Templates' => 'Modèles de description', ); diff --git a/app/Locale/hr_HR/translations.php b/app/Locale/hr_HR/translations.php index fa4c87d77..5f2f0a70e 100644 --- a/app/Locale/hr_HR/translations.php +++ b/app/Locale/hr_HR/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index c8f9d8ea1..740a8e4f6 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php index aad497ade..2fcbbf76b 100644 --- a/app/Locale/id_ID/translations.php +++ b/app/Locale/id_ID/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index 986475746..13cfd247b 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index 86c4800bc..1c7c88791 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -1345,4 +1345,15 @@ return array( 'Enter one subtask by line.' => '1行に1件のサブタスクを入力', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/ko_KR/translations.php b/app/Locale/ko_KR/translations.php index 083ddc675..8eafaedba 100644 --- a/app/Locale/ko_KR/translations.php +++ b/app/Locale/ko_KR/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php index 50544f2e0..b0bcf90fe 100644 --- a/app/Locale/my_MY/translations.php +++ b/app/Locale/my_MY/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php index 3fe604245..9f563fd52 100644 --- a/app/Locale/nb_NO/translations.php +++ b/app/Locale/nb_NO/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php index 169654c42..eeb99d5f8 100644 --- a/app/Locale/nl_NL/translations.php +++ b/app/Locale/nl_NL/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index d0858db90..ec684e981 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index b9384a65b..47e7b629b 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -1345,4 +1345,15 @@ return array( 'Enter one subtask by line.' => 'Escreva uma subtarefa por linha.', 'Predefined Contents' => 'Conteúdos predefinidos', 'Predefined contents' => 'Conteúdos predefinidos', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php index 6fddbfb2b..a8abeda31 100644 --- a/app/Locale/pt_PT/translations.php +++ b/app/Locale/pt_PT/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index 6223f94c3..940e58f5e 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -1345,4 +1345,15 @@ return array( 'Enter one subtask by line.' => 'Записывайте по одной подзадаче на строку.', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php index 7d88e0af3..0628ebd54 100644 --- a/app/Locale/sr_Latn_RS/translations.php +++ b/app/Locale/sr_Latn_RS/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index 427f00a15..f20f0501b 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index ba4a587e6..0d26b3520 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php index e420eff47..a7ffda9a8 100644 --- a/app/Locale/tr_TR/translations.php +++ b/app/Locale/tr_TR/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/vi_VN/translations.php b/app/Locale/vi_VN/translations.php index dde397bb6..bf9e6ffda 100644 --- a/app/Locale/vi_VN/translations.php +++ b/app/Locale/vi_VN/translations.php @@ -1351,4 +1351,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index 9094a7b49..68bbef663 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -1345,4 +1345,15 @@ return array( // 'Enter one subtask by line.' => '', // 'Predefined Contents' => '', // 'Predefined contents' => '', + // 'Predefined Task Description' => '', + // 'Do you really want to remove this template? "%s"' => '', + // 'Add predefined task description' => '', + // 'Predefined Task Descriptions' => '', + // 'Template created successfully.' => '', + // 'Unable to create this template.' => '', + // 'Template updated successfully.' => '', + // 'Unable to update this template.' => '', + // 'Template removed successfully.' => '', + // 'Unable to remove this template.' => '', + // 'Description Templates' => '', ); diff --git a/app/Model/PredefinedTaskDescriptionModel.php b/app/Model/PredefinedTaskDescriptionModel.php new file mode 100644 index 000000000..7b8e6de22 --- /dev/null +++ b/app/Model/PredefinedTaskDescriptionModel.php @@ -0,0 +1,42 @@ +db->table(self::TABLE)->eq('project_id', $projectId)->findAll(); + } + + public function getById($projectId, $id) + { + return $this->db->table(self::TABLE)->eq('project_id', $projectId)->eq('id', $id)->findOne(); + } + + public function create($projectId, $title, $description) + { + return $this->db->table(self::TABLE)->persist(array( + 'project_id' => $projectId, + 'title' => $title, + 'description' => $description, + )); + } + + public function update($projectId, $id, $title, $description) + { + return $this->db->table(self::TABLE)->eq('project_id', $projectId)->eq('id', $id)->update(array( + 'title' => $title, + 'description' => $description, + )); + } + + public function remove($projectId, $id) + { + return $this->db->table(self::TABLE)->eq('project_id', $projectId)->eq('id', $id)->remove(); + } +} diff --git a/app/Schema/Mysql.php b/app/Schema/Mysql.php index ca284f475..5709b86d3 100644 --- a/app/Schema/Mysql.php +++ b/app/Schema/Mysql.php @@ -8,7 +8,19 @@ use PDO; use Kanboard\Core\Security\Token; use Kanboard\Core\Security\Role; -const VERSION = 125; +const VERSION = 126; + +function version_126(PDO $pdo) +{ + $pdo->exec('CREATE TABLE predefined_task_descriptions ( + id INT NOT NULL AUTO_INCREMENT, + project_id INT NOT NULL, + title TEXT NOT NULL, + description TEXT NOT NULL, + FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE, + PRIMARY KEY(id) + ) ENGINE=InnoDB CHARSET=utf8'); +} function version_125(PDO $pdo) { diff --git a/app/Schema/Postgres.php b/app/Schema/Postgres.php index 312b1dba7..bf9acaa7e 100644 --- a/app/Schema/Postgres.php +++ b/app/Schema/Postgres.php @@ -8,7 +8,18 @@ use PDO; use Kanboard\Core\Security\Token; use Kanboard\Core\Security\Role; -const VERSION = 104; +const VERSION = 105; + +function version_105(PDO $pdo) +{ + $pdo->exec('CREATE TABLE predefined_task_descriptions ( + id SERIAL PRIMARY KEY, + project_id INTEGER NOT NULL, + title TEXT NOT NULL, + description TEXT NOT NULL, + FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE + )'); +} function version_104(PDO $pdo) { diff --git a/app/Schema/Sqlite.php b/app/Schema/Sqlite.php index 3966d373d..70d13b98b 100644 --- a/app/Schema/Sqlite.php +++ b/app/Schema/Sqlite.php @@ -8,7 +8,18 @@ use Kanboard\Core\Security\Token; use Kanboard\Core\Security\Role; use PDO; -const VERSION = 115; +const VERSION = 116; + +function version_116(PDO $pdo) +{ + $pdo->exec('CREATE TABLE predefined_task_descriptions ( + id INTEGER PRIMARY KEY, + project_id INTEGER NOT NULL, + title TEXT NOT NULL, + description TEXT NOT NULL, + FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE + )'); +} function version_115(PDO $pdo) { diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php index 98212d45a..797e70d01 100644 --- a/app/ServiceProvider/AuthenticationProvider.php +++ b/app/ServiceProvider/AuthenticationProvider.php @@ -93,6 +93,7 @@ class AuthenticationProvider implements ServiceProviderInterface $acl->add('ProjectPermissionController', '*', Role::PROJECT_MANAGER); $acl->add('ProjectEditController', '*', Role::PROJECT_MANAGER); $acl->add('ProjectPredefinedContentController', '*', Role::PROJECT_MANAGER); + $acl->add('PredefinedTaskDescriptionController', '*', Role::PROJECT_MANAGER); $acl->add('ProjectFileController', '*', Role::PROJECT_MEMBER); $acl->add('ProjectUserOverviewController', '*', Role::PROJECT_MANAGER); $acl->add('ProjectStatusController', '*', Role::PROJECT_MANAGER); diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php index f8bb3ae4a..aaafafdfc 100644 --- a/app/ServiceProvider/ClassProvider.php +++ b/app/ServiceProvider/ClassProvider.php @@ -47,6 +47,7 @@ class ClassProvider implements ServiceProviderInterface 'LinkModel', 'NotificationModel', 'PasswordResetModel', + 'PredefinedTaskDescriptionModel', 'ProjectModel', 'ProjectFileModel', 'ProjectActivityModel', @@ -118,6 +119,7 @@ class ClassProvider implements ServiceProviderInterface 'TaskLinkValidator', 'TaskValidator', 'UserValidator', + 'PredefinedTaskDescriptionValidator', ), 'Import' => array( 'TaskImport', diff --git a/app/Template/predefined_task_description/create.php b/app/Template/predefined_task_description/create.php new file mode 100644 index 000000000..5a7a8d9f0 --- /dev/null +++ b/app/Template/predefined_task_description/create.php @@ -0,0 +1,14 @@ +
+

+
+
+ form->csrf() ?> + + form->label(t('Title'), 'title') ?> + form->text('title', $values, $errors, array('autofocus', 'required', 'tabindex="1"')) ?> + + form->label(t('Description'), 'description') ?> + form->textEditor('description', $values, $errors, array('tabindex' => 2)) ?> + + modal->submitButtons() ?> +
diff --git a/app/Template/predefined_task_description/edit.php b/app/Template/predefined_task_description/edit.php new file mode 100644 index 000000000..039d650bd --- /dev/null +++ b/app/Template/predefined_task_description/edit.php @@ -0,0 +1,14 @@ +
+

+
+
+ form->csrf() ?> + + form->label(t('Title'), 'title') ?> + form->text('title', $values, $errors, array('autofocus', 'required', 'tabindex="1"')) ?> + + form->label(t('Description'), 'description') ?> + form->textEditor('description', $values, $errors, array('tabindex' => 2)) ?> + + modal->submitButtons() ?> +
diff --git a/app/Template/predefined_task_description/remove.php b/app/Template/predefined_task_description/remove.php new file mode 100644 index 000000000..f60a8e751 --- /dev/null +++ b/app/Template/predefined_task_description/remove.php @@ -0,0 +1,15 @@ +
+

+
+ +
+

+ +

+ + modal->confirmButtons( + 'PredefinedTaskDescriptionController', + 'remove', + array('project_id' => $project['id'], 'id' => $template['id']) + ) ?> +
diff --git a/app/Template/project_predefined_content/show.php b/app/Template/project_predefined_content/show.php index 8e5ca3dcb..b2785ada5 100644 --- a/app/Template/project_predefined_content/show.php +++ b/app/Template/project_predefined_content/show.php @@ -1,6 +1,39 @@

+
+ + +

+ + + + + + +
+
+ +
    +
  • + modal->medium('edit', t('Edit'), 'PredefinedTaskDescriptionController', 'edit', array('project_id' => $project['id'], 'id' => $template['id'])) ?> +
    • +
  • + modal->confirm('trash-o', t('Remove'), 'PredefinedTaskDescriptionController', 'confirm', array('project_id' => $project['id'], 'id' => $template['id'])) ?> +
    • +
+
+ text->e($template['title']) ?> + + + +
+ +
form->csrf() ?> diff --git a/app/Template/task_creation/show.php b/app/Template/task_creation/show.php index e21ea8be2..935e0823f 100644 --- a/app/Template/task_creation/show.php +++ b/app/Template/task_creation/show.php @@ -8,6 +8,7 @@
task->renderTitleField($values, $errors) ?> task->renderDescriptionField($values, $errors) ?> + task->renderDescriptionTemplateDropdown($project['id']) ?> task->renderTagField($project) ?> hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?> diff --git a/app/Validator/PredefinedTaskDescriptionValidator.php b/app/Validator/PredefinedTaskDescriptionValidator.php new file mode 100644 index 000000000..3ff4e3cb2 --- /dev/null +++ b/app/Validator/PredefinedTaskDescriptionValidator.php @@ -0,0 +1,22 @@ +execute(), + $v->getErrors() + ); + } +} \ No newline at end of file diff --git a/assets/js/app.min.js b/assets/js/app.min.js index 146b3ffa8..8f3fbed43 100644 --- a/assets/js/app.min.js +++ b/assets/js/app.min.js @@ -1,2 +1,2 @@ !function(){function e(e,a,i){if(!o)throw new Error("textarea-caret-position#getCaretCoordinates should only be called in a browser");var r=i&&i.debug||!1;if(r){var d=document.querySelector("#input-textarea-caret-position-mirror-div");d&&d.parentNode.removeChild(d)}var s=document.createElement("div");s.id="input-textarea-caret-position-mirror-div",document.body.appendChild(s);var l=s.style,c=window.getComputedStyle?getComputedStyle(e):e.currentStyle;l.whiteSpace="pre-wrap","INPUT"!==e.nodeName&&(l.wordWrap="break-word"),l.position="absolute",r||(l.visibility="hidden"),t.forEach(function(e){l[e]=c[e]}),n?e.scrollHeight>parseInt(c.height)&&(l.overflowY="scroll"):l.overflow="hidden",s.textContent=e.value.substring(0,a),"INPUT"===e.nodeName&&(s.textContent=s.textContent.replace(/\s/g," "));var u=document.createElement("span");u.textContent=e.value.substring(a)||".",s.appendChild(u);var m={top:u.offsetTop+parseInt(c.borderTopWidth),left:u.offsetLeft+parseInt(c.borderLeftWidth)};return r?u.style.backgroundColor="#aaa":document.body.removeChild(s),m}var t=["direction","boxSizing","width","height","overflowX","overflowY","borderTopWidth","borderRightWidth","borderBottomWidth","borderLeftWidth","borderStyle","paddingTop","paddingRight","paddingBottom","paddingLeft","fontStyle","fontVariant","fontWeight","fontStretch","fontSize","fontSizeAdjust","lineHeight","fontFamily","textAlign","textTransform","textIndent","textDecoration","letterSpacing","wordSpacing","tabSize","MozTabSize"],o="undefined"!=typeof window,n=o&&null!=window.mozInnerScreenX;"undefined"!=typeof module&&void 0!==module.exports?module.exports=e:o&&(window.getCaretCoordinates=e)}(),function(){function e(){if(!("KeyboardEvent"in window)||"key"in KeyboardEvent.prototype)return!1;var e={get:function(e){var t=o.keys[this.which||this.keyCode];return Array.isArray(t)&&(t=t[+this.shiftKey]),t}};return Object.defineProperty(KeyboardEvent.prototype,"key",e),e}var t,o={polyfill:e,keys:{3:"Cancel",6:"Help",8:"Backspace",9:"Tab",12:"Clear",13:"Enter",16:"Shift",17:"Control",18:"Alt",19:"Pause",20:"CapsLock",27:"Escape",28:"Convert",29:"NonConvert",30:"Accept",31:"ModeChange",32:" ",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",41:"Select",42:"Print",43:"Execute",44:"PrintScreen",45:"Insert",46:"Delete",48:["0",")"],49:["1","!"],50:["2","@"],51:["3","#"],52:["4","$"],53:["5","%"],54:["6","^"],55:["7","&"],56:["8","*"],57:["9","("],91:"OS",93:"ContextMenu",144:"NumLock",145:"ScrollLock",181:"VolumeMute",182:"VolumeDown",183:"VolumeUp",186:[";",":"],187:["=","+"],188:[",","<"],189:["-","_"],190:[".",">"],191:["/","?"],192:["`","~"],219:["[","{"],220:["\\","|"],221:["]","}"],222:["'",'"'],224:"Meta",225:"AltGraph",246:"Attn",247:"CrSel",248:"ExSel",249:"EraseEof",250:"Play",251:"ZoomOut"}};for(t=1;t<25;t++)o.keys[111+t]="F"+t;var n="";for(t=65;t<91;t++)n=String.fromCharCode(t),o.keys[t]=[n.toLowerCase(),n.toUpperCase()];o.polyfill()}(),Element.prototype.matches||(Element.prototype.matches=Element.prototype.matchesSelector||Element.prototype.mozMatchesSelector||Element.prototype.msMatchesSelector||Element.prototype.oMatchesSelector||Element.prototype.webkitMatchesSelector||function(e){for(var t=(this.document||this.ownerDocument).querySelectorAll(e),o=t.length;--o>=0&&t.item(o)!==this;);return o>-1});var KB={components:{},utils:{},html:{},http:{},listeners:{clicks:{},changes:{},keys:[],internals:{}}};KB.on=function(e,t){this.listeners.internals.hasOwnProperty(e)||(this.listeners.internals[e]=[]),this.listeners.internals[e].push(t)},KB.trigger=function(e,t){if(this.listeners.internals.hasOwnProperty(e))for(var o=0;o0){for(var i=!0,r=0;r-1)window.location=t.split("#")[0];else if(t)window.location=t;else if(o)window.location=o;else if("application/json"===e.getResponseHeader("Content-Type"))try{return JSON.parse(e.responseText)}catch(e){}return e.responseText}var i=function(){},r=function(){};this.execute=function(){var d=new XMLHttpRequest;d.open(e,t,!0),d.setRequestHeader("X-Requested-With","XMLHttpRequest");for(var s in o)o.hasOwnProperty(s)&&d.setRequestHeader(s,o[s]);return d.onerror=function(){r()},d.onreadystatechange=function(){if(d.readyState===XMLHttpRequest.DONE){var e=a(d);200===d.status?i(e):r(e)}},d.send(n),this},this.success=function(e){return i=e,this},this.error=function(e){return r=e,this}},KB.http.get=function(e){return new KB.http.request("GET",e).execute()},KB.http.postJson=function(e,t){var o={"Content-Type":"application/json",Accept:"application/json"};return new KB.http.request("POST",e,o,JSON.stringify(t)).execute()},KB.http.postForm=function(e,t){var o=new FormData(t);return new KB.http.request("POST",e,{},o).execute()},KB.http.uploadFile=function(e,t,o,n,a,i){var r=new FormData;r.append("files[]",t);var d=new XMLHttpRequest;d.upload.addEventListener("progress",o),d.upload.addEventListener("error",a),d.open("POST",e,!0),d.setRequestHeader("X-Requested-With","XMLHttpRequest"),d.onreadystatechange=function(){d.readyState===XMLHttpRequest.DONE&&(200===d.status?n():void 0!==i&&i(JSON.parse(d.responseText)))},d.send(r)},function(){function e(e){e.target.matches("#modal-overlay")&&(e.stopPropagation(),e.preventDefault(),s())}function t(){KB.trigger("modal.close")}function o(){KB.trigger("modal.loading"),a()}function n(){return document.querySelector("#modal-content form:not(.js-modal-ignore-form)")}function a(){var e=n();if(e){var t=e.getAttribute("action");t&&KB.http.postForm(t,e).success(function(e){KB.trigger("modal.stop"),e?r(e):s()}).error(function(e){KB.trigger("modal.stop"),e.hasOwnProperty("message")&&window.alert(e.message)})}}function i(){var e=KB.find("#modal-content form");e&&e.on("submit",o,!1);var t=document.querySelector("#modal-content input[autofocus]");t&&t.focus(),KB.render(),_KB.datePicker(),_KB.autoComplete(),_KB.tagAutoComplete(),_KB.get("Task").onPopoverOpened(),KB.trigger("modal.afterRender")}function r(e){var t=KB.find("#modal-content");t&&(t.replace(KB.dom("div").attr("id","modal-content").html(e).build()),i())}function d(o,n,a){var r=KB.dom("a").attr("href","#").attr("id","modal-close-button").html('').click(t).build(),d=KB.dom("div").attr("id","modal-header").add(r).build(),s=KB.dom("div").attr("id","modal-content").html(o).build(),l=KB.dom("div").attr("id","modal-box").style("width",n).add(d).add(s).build(),c=KB.dom("div").attr("id","modal-overlay").add(l).build();a&&c.addEventListener("click",e,!1),document.body.appendChild(c),i()}function s(){c=!1;var e=KB.find("#modal-overlay");e&&(KB.trigger("modal.beforeDestroy"),e.remove())}function l(e){var t=KB.utils.getViewportSize();if(t.width<700)return"99%";switch(e){case"large":return t.width<1350?"98%":"1350px";case"medium":return t.width<1024?"70%":"1024px"}return t.width<800?"75%":"800px"}var c=!1;KB.on("modal.close",function(){s()}),KB.on("modal.submit",function(){a()}),KB.modal={open:function(e,t,o){KB.trigger("modal.open"),_KB.get("Dropdown").close(),s(),void 0===o&&(o=!0),KB.http.get(e).success(function(e){c=!0,d(e,l(t),o)})},close:function(){s()},isOpen:function(){return c},replace:function(e){KB.http.get(e).success(function(e){r(e)})},getForm:n,submitForm:a}}(),KB.utils.formatDuration=function(e){return e>=86400?Math.round(e/86400)+"d":e>=3600?Math.round(e/3600)+"h":e>=60?Math.round(e/60)+"m":e+"s"},KB.utils.getSelectionPosition=function(e){var t,o;return t=e.value.length0&&n.push([l]):s>0?(n[s].push(l),void 0===n[0][d]&&n[0].push(0),n[0][d]+=l):a.push(r(i.parse(l)))}KB.dom(e).add(KB.dom("div").attr("id","chart").build()),c3.generate({data:{columns:n},axis:{x:{type:"category",categories:a}}})}}),KB.component("chart-project-cumulative-flow",function(e,t){this.render=function(){for(var o=t.metrics,n=[],a=[],i=[],r=d3.time.format("%Y-%m-%d"),d=d3.time.format(t.dateFormat),s=0;s0&&(a.push(c),n.push([c])):l>0?n[l-1].push(c):i.push(d(r.parse(c)))}KB.dom(e).add(KB.dom("div").attr("id","chart").build()),c3.generate({data:{columns:n.reverse(),type:"area-spline",groups:[a],order:null},axis:{x:{type:"category",categories:i}}})}}),KB.component("chart-project-lead-cycle-time",function(e,t){this.render=function(){var o=t.metrics,n=[t.labelCycle],a=[t.labelLead],i=[],r={};r[t.labelCycle]="area",r[t.labelLead]="area-spline";var d={};d[t.labelLead]="#afb42b",d[t.labelCycle]="#4e342e";for(var s=0;s