<br>
<table cellspacing="0" cellpadding="4" width="100%" border="0">
<tr>
- <td align="center"> Anuko Time Tracker 1.19.7.5022 | Copyright © <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+ <td align="center"> Anuko Time Tracker 1.19.7.5023 | Copyright © <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>
$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'))));
}
}
'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'))));
}
}
$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'))
));
}
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() {
$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;
}
}
}
$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');
$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'))));
}
$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'))));
}
}
'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'))));
}
}
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'));
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'=>'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'))));
}
}