From fec361583dcdb716abd921ca19f68c9d6e98b9f0 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Fri, 21 Dec 2018 15:31:47 +0000 Subject: [PATCH] Added quota percent on mobile user add page. --- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/mobile/user_add.tpl | 8 +++++++- mobile/user_add.php | 16 ++++++++++++++-- user_add.php | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 15742240..63745713 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- -{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} +{if $show_quota} + + + + +{/if} +{if $show_projects} diff --git a/mobile/user_add.php b/mobile/user_add.php index ab6f5e2d..3ffaa01a 100644 --- a/mobile/user_add.php +++ b/mobile/user_add.php @@ -45,6 +45,7 @@ if (!ttAccessAllowed('manage_users')) { // The "limit" plugin is not required for normal operation of Time Tracker. @include('../plugins/limit/user_add.php'); +$show_quota = $user->isPluginEnabled('mq'); if ($user->isPluginEnabled('cl')) $clients = ttGroupHelper::getActiveClients(); @@ -60,6 +61,7 @@ if ($request->isPost()) { $cl_role_id = $request->getParameter('role'); $cl_client_id = $request->getParameter('client'); $cl_rate = $request->getParameter('rate'); + $cl_quota_percent = $request->getParameter('quota_percent'); $cl_projects = $request->getParameter('projects'); if (is_array($cl_projects)) { foreach ($cl_projects as $p) { @@ -89,8 +91,14 @@ if ($user->isPluginEnabled('cl')) $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select')))); $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate)); +if ($show_quota) + $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent)); -$projects = ttGroupHelper::getActiveProjects(); +$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode(); +if ($show_projects) { + $projects = ttGroupHelper::getActiveProjects(); + if (count($projects) == 0) $show_projects = false; +} // Define classes for the projects table. class NameCellRenderer extends DefaultCellRenderer { @@ -140,6 +148,7 @@ if ($request->isPost()) { } if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email')); if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate')); + if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('form.quota.quota')); if ($err->no()) { if (!ttUserHelper::getUserByLogin($cl_login)) { @@ -148,7 +157,8 @@ if ($request->isPost()) { 'login' => $cl_login, 'password' => $cl_password1, 'rate' => $cl_rate, - 'group_id' => $user->group_id, + 'quota_percent' => $cl_quota_percent, + 'group_id' => $user->getGroup(), 'role_id' => $cl_role_id, 'client_id' => $cl_client_id, 'projects' => $assigned_projects, @@ -167,6 +177,8 @@ $smarty->assign('auth_external', $auth->isPasswordExternal()); $smarty->assign('active_roles', $active_roles); $smarty->assign('forms', array($form->getName()=>$form->toArray())); $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"'); +$smarty->assign('show_quota', $show_quota); +$smarty->assign('show_projects', $show_projects); $smarty->assign('title', $i18n->get('title.add_user')); $smarty->assign('content_page_name', 'mobile/user_add.tpl'); $smarty->display('mobile/index.tpl'); diff --git a/user_add.php b/user_add.php index 6f1e02c1..afe0a846 100644 --- a/user_add.php +++ b/user_add.php @@ -186,9 +186,9 @@ if ($request->isPost()) { $smarty->assign('auth_external', $auth->isPasswordExternal()); $smarty->assign('active_roles', $active_roles); $smarty->assign('forms', array($form->getName()=>$form->toArray())); +$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"'); $smarty->assign('show_quota', $show_quota); $smarty->assign('show_projects', $show_projects); -$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"'); $smarty->assign('title', $i18n->get('title.add_user')); $smarty->assign('content_page_name', 'user_add.tpl'); $smarty->display('index.tpl'); -- 2.20.1
 Anuko Time Tracker 1.18.34.4674 | Copyright © Anuko | +  Anuko Time Tracker 1.18.34.4675 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/mobile/user_add.tpl b/WEB-INF/templates/mobile/user_add.tpl index e1a05350..9fe22314 100644 --- a/WEB-INF/templates/mobile/user_add.tpl +++ b/WEB-INF/templates/mobile/user_add.tpl @@ -81,7 +81,13 @@ function handleClientControl() { {$i18n.form.users.default_rate} (0{$user->decimal_mark}00): {$forms.userForm.rate.control}
{$i18n.form.quota.quota} (%):{$forms.userForm.quota_percent.control}
{$i18n.label.projects}: {$forms.userForm.projects.control}