From: Nik Okuntseff Date: Wed, 19 Dec 2018 19:19:27 +0000 (+0000) Subject: A bit of cleanup. X-Git-Tag: timetracker_1.19-1~397 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5d1a946b7e54074b7a9ae0b85b73bd573ffe236b;p=timetracker.git A bit of cleanup. --- diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php index f450a4ec..5ef258ca 100644 --- a/WEB-INF/lib/ttGroup.class.php +++ b/WEB-INF/lib/ttGroup.class.php @@ -58,9 +58,6 @@ class ttGroup { var $custom_logo = 0; // Whether to use a custom logo for group. var $lock_spec = null; // Cron specification for record locking. var $workday_minutes = 480; // Number of work minutes in a regular day. - var $minutes_in_unit = 15; // Number of minutes in unit for Work units plugin. - var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin. - var $unit_totals_only = 0; // Totals only option for the Work units plugin. var $active_users = 0; // Count of active users in group. // We need a non-zero count to display some menus. @@ -112,13 +109,6 @@ class ttGroup { $this->punch_mode = $config->getDefinedValue('punch_mode'); $this->allow_overlap = $config->getDefinedValue('allow_overlap'); $this->future_entries = $config->getDefinedValue('future_entries'); - /* - if ($this->isPluginEnabled('wu')) { - $minutes_in_unit = $config->getIntValue('minutes_in_unit'); - if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit; - $this->unit_totals_only = $config->getDefinedValue('unit_totals_only'); - } - */ } // Determine active user count in a separate query. diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index 9de260b8..ab2b4bce 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -72,9 +72,6 @@ class ttUser { var $workday_minutes = 480; // Number of work minutes in a regular day. var $rights = array(); // An array of user rights such as 'track_own_time', etc. var $is_client = false; // Whether user is a client as determined by missing 'track_own_time' right. - var $minutes_in_unit = 15; // Number of minutes in unit for Work units plugin. - var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin. - var $unit_totals_only = 0; // Totals only option for the Work units plugin. var $behalfGroup = null; // A ttGroup instance with on behalf group attributes. @@ -143,13 +140,6 @@ class ttUser { $this->punch_mode = $config->getDefinedValue('punch_mode'); $this->allow_overlap = $config->getDefinedValue('allow_overlap'); $this->future_entries = $config->getDefinedValue('future_entries'); - if ($this->isPluginEnabled('wu')) { - $minutes_in_unit = $config->getIntValue('minutes_in_unit', 15); - if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit; - $first_unit_threshold = $config->getIntValue('1st_unit_threshold'); - if ($first_unit_threshold) $this->first_unit_threshold = $first_unit_threshold; - $this->unit_totals_only = $config->getDefinedValue('unit_totals_only'); - } // Set "on behalf" id and name (user). if (isset($_SESSION['behalf_id'])) { diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 920d241b..c2f3151a 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.33.4668 | Copyright © Anuko | +  Anuko Time Tracker 1.18.33.4669 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve}