From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 Dec 2018 13:30:57 +0000 (+0000)
Subject: Refactored project add for subgroups.
X-Git-Tag: timetracker_1.19-1~437
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a0410750589c12e822f5f3d1f6ff7f020f41e0bf;p=timetracker.git

Refactored project add for subgroups.
---

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 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4627 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4628 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
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 @@
           <td align = "right">{$i18n.label.description}:</td>
           <td>{$forms.projectForm.description.control}</td>
         </tr>
+{if $show_users}
         <tr><td>&nbsp;</td></tr>
- 
         <tr>
           <td align="right">{$i18n.label.users}:</td>
           <td>{$forms.projectForm.users.control}</td>
         </tr>
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{/if}
+{if $show_tasks}
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right">{$i18n.label.tasks}:</td>
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 @@
           <td>{$forms.projectForm.users.control}</td>
         </tr>
 {/if}
-{if $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && $show_tasks}
+{if $show_tasks}
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right">{$i18n.label.tasks}:</td>
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');