Refactoring custom fields in progress.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9888b8675ab2c35c148ee2646087e8acd6f92afe..47814a16b164ddd52cb436c1790d13412575c676 100644 (file)
--- 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.19.7.5022 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.19.7.5023 | 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/mobile/time.php b/mobile/time.php
index 5a5c054d6a310a0b08e6fde75a890954aad80b58..99652169170111f3dcda36264783fdceb70268c4 100644 (file)
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -223,7 +223,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
     $form->addInput(array('type'=>'combobox','name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }

diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 364ebaf8201e2f5803727dbe50318b0a0998f96e..c3a7ccd7825c4fc0744677b895102274e89559c3 100644 (file)
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -199,7 +199,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
       'name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty' => array('' => $i18n->get('dropdown.select'))));
   }
 }

diff --git a/mobile/timer.php b/mobile/timer.php
index 667536324de14442e359a096af24fad8db5ccba7..d814637f6ec9ac134b023e4fb5a84ad7c3fb8d24 100644 (file)
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -173,7 +173,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
     $form->addInput(array('type'=>'combobox','name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty'=>array(''=>$i18n->get('dropdown.select'))
     ));
   }

diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 125e100b4885f55a4839e93a6d690c95731fefad..4494d58e8b44f5cdf0be25845b658ff4601c5907 100644 (file)
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -33,11 +33,16 @@ class CustomFields {
   const ENTITY_USER = 2;    // Field is associated with users.
   const ENTITY_PROJECT = 3; // Field is associated with projects.
 
-  const TYPE_TEXT = 1;     // A text field.
-  const TYPE_DROPDOWN = 2; // A dropdown field with pre-defined values.
+  const TYPE_TEXT = 1;      // A text field.
+  const TYPE_DROPDOWN = 2;  // A dropdown field with pre-defined values.
 
+  // TODO: replace $fields with entity-specific arrays: timeFields, userFields, etc.
   var $fields = array();  // Array of custom fields for group.
-  var $options = array(); // Array of options for a dropdown custom field.
+
+  // Refactoring ongoing...
+  var $timeFields = null;
+  var $userFields = null;
+  var $projectFields = null;
 
   // Constructor.
   function __construct() {
@@ -48,25 +53,18 @@ class CustomFields {
     $org_id = $user->org_id;
 
     // Get fields.
-    $sql = "select id, type, label, required from tt_custom_fields".
+    $sql = "select id, entity_type, type, label, required from tt_custom_fields".
       " where group_id = $group_id and org_id = $org_id and status = 1 and type > 0";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
         $this->fields[] = array('id'=>$val['id'],'type'=>$val['type'],'label'=>$val['label'],'required'=>$val['required'],'value'=>'');
-      }
-    }
-
-    // If we have a dropdown obtain options for it.
-    if ((count($this->fields) > 0) && ($this->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)) {
-
-      $sql = "select id, value from tt_custom_field_options".
-        " where field_id = ".$this->fields[0]['id']." and group_id = $group_id and org_id = $org_id and status = 1 order by value";
-      $res = $mdb2->query($sql);
-      if (!is_a($res, 'PEAR_Error')) {
-        while ($val = $res->fetchRow()) {
-          $this->options[$val['id']] = $val['value'];
-        }
+        if (CustomFields::ENTITY_TIME == $val['entity_type'])
+          $this->timeFields[] = $val;
+        else if (CustomFields::ENTITY_USER == $val['entity_type'])
+          $this->userFields[] = $val;
+        else if (CustomFields::ENTITY_PROJECT == $val['entity_type'])
+          $this->projectFields[] = $val;
       }
     }
   }

diff --git a/reports.php b/reports.php
index fe545b2117d899607f9864c9dcf6911c71fc0294..aa492061a4ea06310478508a64f5816effbf0e07 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -58,7 +58,7 @@ if ($user->isPluginEnabled('cf')) {
   $showCustomFieldCheckbox = $custom_fields->fields[0];
   $showCustomFieldDropdown = $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN;
   if ($showCustomFieldDropdown)
-    $showCustomFieldDropdown &= count($custom_fields->options) > 0;
+    $showCustomFieldDropdown &= CustomFields::getOptions($custom_fields->fields[0]['id']);
 }
 
 $form = new Form('reportForm');
@@ -102,7 +102,7 @@ if ($showCustomFieldDropdown) {
   $form->addInput(array('type'=>'combobox','name'=>'option',
     'style'=>'width: 250px;',
     'value'=>$cl_cf_1,
-    'data'=>$custom_fields->options,
+    'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 

diff --git a/time.php b/time.php
index 2dc8606d02f98316516fca3221b0ee369b1ee4cf..f058a21a5a0ef7e625cd86094f4016b5361c64d5 100644 (file)
--- a/time.php
+++ b/time.php
@@ -280,7 +280,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
     $form->addInput(array('type'=>'combobox','name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }

diff --git a/time_edit.php b/time_edit.php
index bb0457384a2087b56cc3c88b32f67e2a11fd2b33..aceff0243fe612969c661cb42e7610d5dfa4501e 100644 (file)
--- a/time_edit.php
+++ b/time_edit.php
@@ -202,7 +202,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
       'name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty' => array('' => $i18n->get('dropdown.select'))));
   }
 }

diff --git a/user_add.php b/user_add.php
index 5696d28fa67e6735a8db905d3b107d8a62db8255..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();
 
+// 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'));
@@ -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 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));

diff --git a/week.php b/week.php
index 1c8efe75a7ecd6d5b2afa0b8d3f286a825a154cc..9af3564414f5d4e86efaccad1f6416f1b8cad5c3 100644 (file)
--- a/week.php
+++ b/week.php
@@ -338,7 +338,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
     $form->addInput(array('type'=>'combobox','name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }