X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_edit.php;h=17ba34b4130d7381ab818ab1a2df1158394b2056;hb=109089e858e28200e714a790883c236230b3922f;hp=21c3effa74963b4bd455c5c36c0a30c521270a5f;hpb=3c5f822f90846e9a65866c9e33b7e1ff81b46b1f;p=timetracker.git
diff --git a/time_edit.php b/time_edit.php
index 21c3effa..17ba34b4 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -40,7 +40,8 @@ if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
exit();
}
$cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
+$user_id = $user->getUser();
+$time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
if (!$time_rec || $time_rec['invoice_id']) {
// Prohibit editing not ours or invoiced records.
header('Location: access_denied.php');
@@ -209,7 +210,8 @@ if ($user->isPluginEnabled('iv'))
if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
$form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.save')));
+// TODO: improve on conditional confirmSave.
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date();return(confirmSave())','value'=>$i18n->get('button.save')));
$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.copy')));
$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
@@ -285,7 +287,7 @@ if ($request->isPost()) {
// 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
$uncompleted = ($cl_finish == '' && $cl_duration == '');
if ($uncompleted) {
- $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
+ $not_completed_rec = ttTimeHelper::getUncompleted($user_id);
if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
// We have another not completed record.
$err->add($i18n->get('error.uncompleted_exists')." ".$i18n->get('error.goto_uncompleted')."");
@@ -295,7 +297,7 @@ if ($request->isPost()) {
// Prohibit creating an overlapping record.
if ($err->no()) {
- if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
+ if (ttTimeHelper::overlaps($user_id, $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
$err->add($i18n->get('error.overlap'));
}
@@ -304,7 +306,7 @@ if ($request->isPost()) {
$res = ttTimeHelper::update(array(
'id'=>$cl_id,
'date'=>$new_date->toString(DB_DATEFORMAT),
- 'user_id'=>$user->getActiveUser(),
+ 'user_id'=>$user_id,
'client'=>$cl_client,
'project'=>$cl_project,
'task'=>$cl_task,
@@ -345,7 +347,7 @@ if ($request->isPost()) {
// 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
$uncompleted = ($cl_finish == '' && $cl_duration == '');
if ($uncompleted) {
- $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
+ $not_completed_rec = ttTimeHelper::getUncompleted($user_id);
if ($not_completed_rec) {
// We have another not completed record.
$err->add($i18n->get('error.uncompleted_exists')." ".$i18n->get('error.goto_uncompleted')."");
@@ -355,7 +357,7 @@ if ($request->isPost()) {
// Prohibit creating an overlapping record.
if ($err->no()) {
- if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
+ if (ttTimeHelper::overlaps($user_id, $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
$err->add($i18n->get('error.overlap'));
}
@@ -364,8 +366,8 @@ if ($request->isPost()) {
$id = ttTimeHelper::insert(array(
'date'=>$new_date->toString(DB_DATEFORMAT),
- 'user_id'=>$user->getActiveUser(),
- 'group_id'=>$user->getActiveGroup(),
+ 'user_id'=>$user_id,
+ 'group_id'=>$user->getGroup(),
'org_id' => $user->org_id,
'client'=>$cl_client,
'project'=>$cl_project,
@@ -399,6 +401,9 @@ if ($request->isPost()) {
}
} // isPost
+// TODO: improve on conditional confirmSave.
+$smarty->assign('entry_date', $cl_date);
+
$smarty->assign('client_list', $client_list);
$smarty->assign('project_list', $project_list);
$smarty->assign('task_list', $task_list);