Refactoring custom fields in progress.

[timetracker.git] / user_add.php

diff --git a/user_add.php b/user_add.php
index 6f1e02c11310992cbe3a0aac820b4f3da936c1ee..56bd69b3c4a9a0092ded73bd269daa2bb2142eed 100644 (file)
--- a/user_add.php
+++ b/user_add.php
@@ -50,6 +50,13 @@ $show_quota = $user->isPluginEnabled('mq');
 if ($user->isPluginEnabled('cl'))
   $clients = ttGroupHelper::getActiveClients();
 
 if ($user->isPluginEnabled('cl'))
   $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()) {
   $cl_name = trim($request->getParameter('name'));
 $assigned_projects = array();
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));


@@ -91,6 +98,11 @@ $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));
 if ($show_quota)
   $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
 $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));


@@ -126,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');


@@ -151,7 +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('form.quota.quota'));
+  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)) {


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