X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/95d031241d1e1970e92171e733c81896b53f7cdc..e5129e06ab4547945e1ad3097e4193930465f93f:/plugins/CustomFields.class.php

diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index a2e88326..d58cbe53 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -29,35 +29,42 @@
 class CustomFields {
 
   // Definitions of custom field types.
+  const ENTITY_TIME = 1;    // Field is associated with time entries.
+  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($group_id) {
+  function __construct() {
+    global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     // Get fields.
-    $sql = "select id, type, label, required from tt_custom_fields where group_id = $group_id and status = 1 and type > 0";
+    $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 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;
       }
     }
   }
@@ -221,7 +228,7 @@ class CustomFields {
     $org_id = $user->org_id;
 
     $sql = "select value from tt_custom_field_options".
-      " where id = $id and group_id = $group_id and org_id = $org_id";
+      " where id = $id and group_id = $group_id and org_id = $org_id and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -240,12 +247,12 @@ class CustomFields {
     $org_id = $user->org_id;
 
     $fields = array();
-    $sql = "select id, type, label from tt_custom_fields".
+    $sql = "select id, entity_type, type, label 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()) {
-        $fields[] = array('id'=>$val['id'],'type'=>$val['type'],'label'=>$val['label']);
+        $fields[] = $val;
       }
       return $fields;
     }
@@ -260,7 +267,7 @@ class CustomFields {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select label, type, required from tt_custom_fields".
+    $sql = "select label, entity_type, type, required from tt_custom_fields".
       " where id = $id and group_id = $group_id and org_id = $org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -292,15 +299,15 @@ class CustomFields {
   }
 
   // The insertField inserts a custom field for group.
-  static function insertField($field_name, $field_type, $required) {
+  static function insertField($field_name, $entity_type, $field_type, $required) {
     global $user;
     $mdb2 = getConnection();
 
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "insert into tt_custom_fields (group_id, org_id, type, label, required, status)".
-      " values($group_id, $org_id, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
+    $sql = "insert into tt_custom_fields (group_id, org_id, entity_type, type, label, required, status)".
+      " values($group_id, $org_id, $entity_type, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }