X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_edit.php;h=3bd52e6f50e1f1f9492f6c5bdb797307b1819fde;hb=7d33cc17bc343f43f81756a1008d6658a9ebb714;hp=507f28abb7848292ee1962d0154dc1dd7194bb1f;hpb=11bfec0ff88b649a934556e8b4812d65715c7509;p=timetracker.git
diff --git a/time_edit.php b/time_edit.php
index 507f28ab..3bd52e6f 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -29,7 +29,7 @@
require_once('initialize.php');
import('form.Form');
import('ttUserHelper');
-import('ttTeamHelper');
+import('ttGroupHelper');
import('ttClientHelper');
import('ttTimeHelper');
import('DateAndTime');
@@ -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');
@@ -51,11 +52,12 @@ if (!$time_rec || $time_rec['invoice_id']) {
// Use custom fields plugin if it is enabled.
if ($user->isPluginEnabled('cf')) {
require_once('plugins/CustomFields.class.php');
- $custom_fields = new CustomFields($user->team_id);
+ $custom_fields = new CustomFields();
$smarty->assign('custom_fields', $custom_fields);
}
$item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
+$confirm_save = $user->getConfigOption('confirm_save');
// Initialize variables.
$cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null;
@@ -110,7 +112,7 @@ $form = new Form('timeRecordForm');
// Dropdown for clients in MODE_TIME. Use all active clients.
if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
- $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+ $active_clients = ttGroupHelper::getActiveClients(true);
$form->addInput(array('type'=>'combobox',
'onchange'=>'fillProjectDropdown(this.value);',
'name'=>'client',
@@ -136,7 +138,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
// Dropdown for clients if the clients plugin is enabled.
if ($user->isPluginEnabled('cl')) {
- $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+ $active_clients = ttGroupHelper::getActiveClients(true);
// We need an array of assigned project ids to do some trimming.
foreach($project_list as $project)
$projects_assigned_to_user[] = $project['id'];
@@ -164,7 +166,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
}
if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
- $task_list = ttTeamHelper::getActiveTasks($user->team_id);
+ $task_list = ttGroupHelper::getActiveTasks();
$form->addInput(array('type'=>'combobox',
'name'=>'task',
'style'=>'width: 250px;',
@@ -206,11 +208,13 @@ if ($custom_fields && $custom_fields->fields[0]) {
$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
if ($user->isPluginEnabled('iv'))
$form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
-if ($user->canManageTeam() && $user->isPluginEnabled('ps'))
+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')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.copy')));
+$on_click_action = 'browser_today.value=get_date();';
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>$on_click_action,'value'=>$i18n->get('button.copy')));
+if ($confirm_save) $on_click_action .= 'return(confirmSave());';
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>$on_click_action,'value'=>$i18n->get('button.save')));
$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
if ($request->isPost()) {
@@ -253,6 +257,7 @@ if ($request->isPost()) {
}
if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
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.
// This is a new date for the time record.
@@ -285,7 +290,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 +300,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 +309,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 +350,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 +360,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,7 +369,9 @@ if ($request->isPost()) {
$id = ttTimeHelper::insert(array(
'date'=>$new_date->toString(DB_DATEFORMAT),
- 'user_id'=>$user->getActiveUser(),
+ 'user_id'=>$user_id,
+ 'group_id'=>$user->getGroup(),
+ 'org_id' => $user->org_id,
'client'=>$cl_client,
'project'=>$cl_project,
'task'=>$cl_task,
@@ -397,6 +404,10 @@ if ($request->isPost()) {
}
} // isPost
+if ($confirm_save) {
+ $smarty->assign('confirm_save', true);
+ $smarty->assign('entry_date', $cl_date);
+}
$smarty->assign('client_list', $client_list);
$smarty->assign('project_list', $project_list);
$smarty->assign('task_list', $task_list);