projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduced approve_reports and approve_all_reports rights.
[timetracker.git]
/
time.php
diff --git
a/time.php
b/time.php
index
013f15c
..
e4547a9
100644
(file)
--- a/
time.php
+++ b/
time.php
@@
-85,11
+85,17
@@
if ($user->isPluginEnabled('cf')) {
if ($user->isPluginEnabled('mq')){
require_once('plugins/MonthlyQuota.class.php');
$quota = new MonthlyQuota();
if ($user->isPluginEnabled('mq')){
require_once('plugins/MonthlyQuota.class.php');
$quota = new MonthlyQuota();
- $month_quota_minutes = $quota->get($selected_date->mYear, $selected_date->mMonth);
+ $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
+ $quota_minutes_from_1st = $quota->getUserQuotaFrom1st($selected_date);
$month_total = ttTimeHelper::getTimeForMonth($selected_date);
$month_total = ttTimeHelper::getTimeForMonth($selected_date);
- $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
+ $month_total_minutes = ttTimeHelper::toMinutes($month_total);
+ $balance_left = $quota_minutes_from_1st - $month_total_minutes;
+ $minutes_left = $month_quota_minutes - $month_total_minutes;
$smarty->assign('month_total', $month_total);
$smarty->assign('month_total', $month_total);
+ $smarty->assign('month_quota', ttTimeHelper::toAbsDuration($month_quota_minutes));
+ $smarty->assign('over_balance', $balance_left < 0);
+ $smarty->assign('balance_remaining', ttTimeHelper::toAbsDuration($balance_left));
$smarty->assign('over_quota', $minutes_left < 0);
$smarty->assign('quota_remaining', ttTimeHelper::toAbsDuration($minutes_left));
}
$smarty->assign('over_quota', $minutes_left < 0);
$smarty->assign('quota_remaining', ttTimeHelper::toAbsDuration($minutes_left));
}
@@
-125,9
+131,9
@@
$form = new Form('timeRecordForm');
if ($user->can('track_time')) {
$rank = $user->getMaxRankForGroup($group_id);
if ($user->can('track_own_time'))
if ($user->can('track_time')) {
$rank = $user->getMaxRankForGroup($group_id);
if ($user->can('track_own_time'))
- $options = array('
group_id'=>$group_id,'
status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+ $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
else
else
- $options = array('
group_id'=>$group_id,'
status'=>ACTIVE,'max_rank'=>$rank);
+ $options = array('status'=>ACTIVE,'max_rank'=>$rank);
$user_list = $user->getUsers($options);
if (count($user_list) >= 1) {
$form->addInput(array('type'=>'combobox',
$user_list = $user->getUsers($options);
if (count($user_list) >= 1) {
$form->addInput(array('type'=>'combobox',
@@
-253,10
+259,10
@@
if ($request->isPost()) {
if ($custom_fields) {
if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
}
if ($custom_fields) {
if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
}
- if (MODE_PROJECTS == $user->
tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode
) {
+ if (MODE_PROJECTS == $user->
getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()
) {
if (!$cl_project) $err->add($i18n->get('error.project'));
}
if (!$cl_project) $err->add($i18n->get('error.project'));
}
- if (MODE_PROJECTS_AND_TASKS == $user->
tracking_mode
&& $user->task_required) {
+ if (MODE_PROJECTS_AND_TASKS == $user->
getTrackingMode()
&& $user->task_required) {
if (!$cl_task) $err->add($i18n->get('error.task'));
}
if (strlen($cl_duration) == 0) {
if (!$cl_task) $err->add($i18n->get('error.task'));
}
if (strlen($cl_duration) == 0) {
@@
-270,11
+276,11
@@
if ($request->isPost()) {
$err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
}
} else {
$err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
}
} else {
- if ((TYPE_START_FINISH == $user->
record_type) || (TYPE_ALL == $user->record_type
)) {
+ if ((TYPE_START_FINISH == $user->
getRecordType()) || (TYPE_ALL == $user->getRecordType()
)) {
$err->add($i18n->get('error.empty'), $i18n->get('label.start'));
$err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
}
$err->add($i18n->get('error.empty'), $i18n->get('label.start'));
$err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
}
- if ((TYPE_DURATION == $user->
record_type) || (TYPE_ALL == $user->record_type
))
+ if ((TYPE_DURATION == $user->
getRecordType()) || (TYPE_ALL == $user->getRecordType()
))
$err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
}
} else {
$err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
}
} else {
@@
-282,6
+288,7
@@
if ($request->isPost()) {
$err->add($i18n->get('error.field'), $i18n->get('label.duration'));
}
if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
$err->add($i18n->get('error.field'), $i18n->get('label.duration'));
}
if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+ if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
// Finished validating user input.
// Prohibit creating entries in future.
// Finished validating user input.
// Prohibit creating entries in future.