From 19b674dca67d52e7ec2ea49046f31e68fc6facf4 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Sat, 29 Jun 2019 14:08:59 +0000 Subject: [PATCH] Refactoring custom fields in progress. --- WEB-INF/templates/footer.tpl | 2 +- mobile/time.php | 2 +- mobile/time_edit.php | 2 +- mobile/timer.php | 2 +- plugins/CustomFields.class.php | 32 +++++++++++++++----------------- reports.php | 4 ++-- time.php | 2 +- time_edit.php | 2 +- user_add.php | 12 ++++++++++++ week.php | 2 +- 10 files changed, 36 insertions(+), 26 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 9888b867..47814a16 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.19.7.5022 | Copyright © Anuko | +  Anuko Time Tracker 1.19.7.5023 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/mobile/time.php b/mobile/time.php index 5a5c054d..99652169 100644 --- 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 364ebaf8..c3a7ccd7 100644 --- 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 66753632..d814637f 100644 --- 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 125e100b..4494d58e 100644 --- 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 fe545b21..aa492061 100644 --- 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 2dc8606d..f058a21a 100644 --- 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 bb045738..aceff024 100644 --- 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 5696d28f..56bd69b3 100644 --- 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 1c8efe75..9af35644 100644 --- 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')))); } } -- 2.20.1