From a0410750589c12e822f5f3d1f6ff7f020f41e0bf Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Mon, 10 Dec 2018 13:30:57 +0000 Subject: [PATCH] Refactored project add for subgroups. --- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/mobile/project_add.tpl | 5 +++-- WEB-INF/templates/project_add.tpl | 2 +- mobile/project_add.php | 5 ++++- project_add.php | 7 ++++--- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 9e1ca140..1903310b 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- +{if $show_users} - -{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} +{/if} +{if $show_tasks} diff --git a/WEB-INF/templates/project_add.tpl b/WEB-INF/templates/project_add.tpl index 2f2fb996..d49b9a33 100644 --- a/WEB-INF/templates/project_add.tpl +++ b/WEB-INF/templates/project_add.tpl @@ -18,7 +18,7 @@ {/if} -{if $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && $show_tasks} +{if $show_tasks} diff --git a/mobile/project_add.php b/mobile/project_add.php index 6f6f452d..c8c661ed 100644 --- a/mobile/project_add.php +++ b/mobile/project_add.php @@ -49,6 +49,7 @@ foreach ($users as $user_item) $tasks = ttGroupHelper::getActiveTasks(); foreach ($tasks as $task_item) $all_tasks[$task_item['id']] = $task_item['name']; +$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0; if ($request->isPost()) { $cl_name = trim($request->getParameter('project_name')); @@ -66,7 +67,7 @@ $form = new Form('projectForm'); $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','value'=>$cl_name)); $form->addInput(array('type'=>'textarea','name'=>'description','class'=>'mobile-textarea','value'=>$cl_description)); $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users)); -if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) +if ($show_tasks) $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks)); $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add'))); @@ -95,6 +96,8 @@ if ($request->isPost()) { $smarty->assign('forms', array($form->getName()=>$form->toArray())); $smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"'); +$smarty->assign('show_users', count($users) > 0); +$smarty->assign('show_tasks', $show_tasks); $smarty->assign('title', $i18n->get('title.add_project')); $smarty->assign('content_page_name', 'mobile/project_add.tpl'); $smarty->display('mobile/index.tpl'); diff --git a/project_add.php b/project_add.php index 70327eb3..00416804 100644 --- a/project_add.php +++ b/project_add.php @@ -49,6 +49,7 @@ foreach ($users as $user_item) $tasks = ttGroupHelper::getActiveTasks(); foreach ($tasks as $task_item) $all_tasks[$task_item['id']] = $task_item['name']; +$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0; if ($request->isPost()) { $cl_name = trim($request->getParameter('project_name')); @@ -66,7 +67,7 @@ $form = new Form('projectForm'); $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name)); $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description)); $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users)); -if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) +if ($show_tasks) $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks)); $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add'))); @@ -94,9 +95,9 @@ if ($request->isPost()) { } // isPost $smarty->assign('forms', array($form->getName()=>$form->toArray())); -$smarty->assign('show_users', count($users) > 0); -$smarty->assign('show_tasks', count($tasks) > 0); $smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"'); +$smarty->assign('show_users', count($users) > 0); +$smarty->assign('show_tasks', $show_tasks); $smarty->assign('title', $i18n->get('title.add_project')); $smarty->assign('content_page_name', 'project_add.tpl'); $smarty->display('index.tpl'); -- 2.20.1
 Anuko Time Tracker 1.18.29.4627 | Copyright © Anuko | +  Anuko Time Tracker 1.18.29.4628 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/mobile/project_add.tpl b/WEB-INF/templates/mobile/project_add.tpl index 3aad22c2..d49b9a33 100644 --- a/WEB-INF/templates/mobile/project_add.tpl +++ b/WEB-INF/templates/mobile/project_add.tpl @@ -11,13 +11,14 @@ {$i18n.label.description}: {$forms.projectForm.description.control}
 
{$i18n.label.users}: {$forms.projectForm.users.control}
 
{$i18n.label.tasks}:{$forms.projectForm.users.control}
 
{$i18n.label.tasks}: