Refactoring custom fields in progress.

[timetracker.git] / user_add.php

diff --git a/user_add.php b/user_add.php
index 1ed0cb7253b07c6cf5691f13ad8ef955082aab89..56bd69b3c4a9a0092ded73bd269daa2bb2142eed 100644 (file)
--- a/user_add.php
+++ b/user_add.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');

+import('ttGroupHelper');

 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');
 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');


@@ -42,11 +43,19 @@ if (!ttAccessAllowed('manage_users')) {
 // End of access checks.
 
 // Use the "limit" plugin if we have one. Ignore include errors.
 // End of access checks.
 
 // Use the "limit" plugin if we have one. Ignore include errors.

-// The "limit" plugin is not required for normal operation of the Time Tracker.
+// The "limit" plugin is not required for normal operation of Time Tracker.

 @include('plugins/limit/user_add.php');
 
 @include('plugins/limit/user_add.php');
 

+$show_quota = $user->isPluginEnabled('mq');

 if ($user->isPluginEnabled('cl'))
 if ($user->isPluginEnabled('cl'))

-  $clients = ttTeamHelper::getActiveClients($user->group_id);
+  $clients = ttGroupHelper::getActiveClients();
+
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}

 
 $assigned_projects = array();
 if ($request->isPost()) {
 
 $assigned_projects = array();
 if ($request->isPost()) {


@@ -60,6 +69,7 @@ if ($request->isPost()) {
   $cl_role_id = $request->getParameter('role');
   $cl_client_id = $request->getParameter('client');
   $cl_rate = $request->getParameter('rate');
   $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) {
   $cl_projects = $request->getParameter('projects');
   if (is_array($cl_projects)) {
     foreach ($cl_projects as $p) {


@@ -88,9 +98,20 @@ $form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','na
 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'))));
 
 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'))));
 

+// If we have custom fields - add controls for them.
+if ($custom_fields && $custom_fields->userFields) {
+  // Coding in progress...
+}
+

 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 $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 = ttTeamHelper::getActiveProjects($user->group_id);
+$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 {
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {


@@ -117,7 +138,7 @@ class RateCellRenderer extends DefaultCellRenderer {
 // Create projects table.
 $table = new Table('projects');
 $table->setIAScript('setDefaultRate');
 // Create projects table.
 $table = new Table('projects');
 $table->setIAScript('setDefaultRate');

-$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));

 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');
 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');


@@ -142,6 +163,8 @@ if ($request->isPost()) {
   // Require selection of a client for a client role.
   if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
   if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
   // Require selection of a client for a client role.
   if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
   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('label.quota'));
+  if (!ttUserHelper::canAdd()) $err->add($i18n->get('error.user_count'));

 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {


@@ -150,12 +173,20 @@ if ($request->isPost()) {
         'login' => $cl_login,
         'password' => $cl_password1,
         'rate' => $cl_rate,
         'login' => $cl_login,
         'password' => $cl_password1,
         'rate' => $cl_rate,

-        'group_id' => $user->group_id,
+        'quota_percent' => $cl_quota_percent,
+        'group_id' => $user->getGroup(),
+        'org_id' => $user->org_id,

         'role_id' => $cl_role_id,
         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,
         'email' => $cl_email);
         'role_id' => $cl_role_id,
         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,
         'email' => $cl_email);

-      if (ttUserHelper::insert($fields)) {
+      $user_id = ttUserHelper::insert($fields);
+      if ($user_id) {
+        if (!$user->exists()) {
+          // We added a user to an empty subgroup. Set new user as on behalf user.
+          // Needed for user-based things to work (such as notifications config).
+          $user->setOnBehalfUser($user_id);
+        }

         header('Location: users.php');
         exit();
       } else
         header('Location: users.php');
         exit();
       } else


@@ -169,6 +200,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('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', 'user_add.tpl');
 $smarty->display('index.tpl');
 $smarty->assign('title', $i18n->get('title.add_user'));
 $smarty->assign('content_page_name', 'user_add.tpl');
 $smarty->display('index.tpl');