X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=expense_edit.php;h=abd5c39c3c9447c5f1b0c556f74add278b27faf8;hb=7fafd0cdc53c376b557a5504af53dacdfbcdb533;hp=806a02f6c6e525998f9414cf70510a33b2151849;hpb=5ef582473f6b329be18ad83c61e053fdcd9c6ed5;p=timetracker.git diff --git a/expense_edit.php b/expense_edit.php index 806a02f6..abd5c39c 100644 --- a/expense_edit.php +++ b/expense_edit.php @@ -37,7 +37,7 @@ if (!ttAccessCheck(right_data_entry)) { header('Location: access_denied.php'); exit(); } - + $cl_id = $request->getParameter('id'); // Get the expense item we are editing. @@ -45,12 +45,12 @@ $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser()); // Prohibit editing invoiced items. if ($expense_item['invoice_id']) die($i18n->getKey('error.sys')); - + $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']); // Initialize variables. $cl_date = $cl_client = $cl_project = $cl_item_name = $cl_cost = null; -if ($request->getMethod() == 'POST') { +if ($request->isPost()) { $cl_date = trim($request->getParameter('date')); $cl_client = $request->getParameter('client'); $cl_project = $request->getParameter('project'); @@ -69,16 +69,15 @@ $form = new Form('expenseItemForm'); // Dropdown for clients in MODE_TIME. Use all active clients. if (MODE_TIME == $user->tracking_mode && in_array('cl', explode(',', $user->plugins))) { - $active_clients = ttTeamHelper::getActiveClients($user->team_id, true); - $form->addInput(array('type'=>'combobox', - 'onchange'=>'fillProjectDropdown(this.value);', - 'name'=>'client', - 'style'=>'width: 250px;', - 'value'=>$cl_client, - 'data'=>$active_clients, - 'datakeys'=>array('id', 'name'), - 'empty'=>array(''=>$i18n->getKey('dropdown.select')) - )); + $active_clients = ttTeamHelper::getActiveClients($user->team_id, true); + $form->addInput(array('type'=>'combobox', + 'onchange'=>'fillProjectDropdown(this.value);', + 'name'=>'client', + 'style'=>'width: 250px;', + 'value'=>$cl_client, + 'data'=>$active_clients, + 'datakeys'=>array('id', 'name'), + 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); // Note: in other modes the client list is filtered to relevant clients only. See below. } @@ -91,8 +90,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t 'value'=>$cl_project, 'data'=>$project_list, 'datakeys'=>array('id','name'), - 'empty'=>array(''=>$i18n->getKey('dropdown.select')) - )); + 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); // Dropdown for clients if the clients plugin is enabled. if (in_array('cl', explode(',', $user->plugins))) { @@ -104,12 +102,12 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t // Build a client list out of active clients. Use only clients that are relevant to user. // Also trim their associated project list to only assigned projects (to user). foreach($active_clients as $client) { - $projects_assigned_to_client = explode(',', $client['projects']); - $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user); - if ($intersection) { + $projects_assigned_to_client = explode(',', $client['projects']); + $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user); + if ($intersection) { $client['projects'] = implode(',', $intersection); - $client_list[] = $client; - } + $client_list[] = $client; + } } $form->addInput(array('type'=>'combobox', 'onchange'=>'fillProjectDropdown(this.value);', @@ -118,8 +116,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t 'value'=>$cl_client, 'data'=>$client_list, 'datakeys'=>array('id', 'name'), - 'empty'=>array(''=>$i18n->getKey('dropdown.select')) - )); + 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); } } $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'item_name','style'=>'width: 250px;','value'=>$cl_item_name)); @@ -132,17 +129,17 @@ $form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_to $form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.copy'))); $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete'))); -if ($request->getMethod() == 'POST') { +if ($request->isPost()) { // Validate user input. if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client) - $errors->add($i18n->getKey('error.client')); + $err->add($i18n->getKey('error.client')); if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { - if (!$cl_project) $errors->add($i18n->getKey('error.project')); + if (!$cl_project) $err->add($i18n->getKey('error.project')); } - if (!ttValidString($cl_item_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.item')); - if (!ttValidFloat($cl_cost)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.cost')); - if (!ttValidDate($cl_date)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.date')); - + if (!ttValidString($cl_item_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.item')); + if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost')); + if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date')); + // Determine lock date. $lock_interval = $user->lock_interval; $lockdate = 0; @@ -153,30 +150,30 @@ if ($request->getMethod() == 'POST') { // This is a new date for the expense item. $new_date = new DateAndTime($user->date_format, $cl_date); - + // Prohibit creating entries in future. if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) { $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null)); if ($new_date->after($browser_today)) - $errors->add($i18n->getKey('error.future_date')); + $err->add($i18n->getKey('error.future_date')); } - + // Save record. if ($request->getParameter('btn_save')) { // We need to: // 1) Prohibit updating locked entries (that are in locked interval). // 2) Prohibit saving unlocked entries into locked interval. - + // Now, step by step. // 1) Prohibit updating locked entries. if($lockdate && $item_date->before($lockdate)) - $errors->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.period_locked')); // 2) Prohibit saving completed unlocked entries into locked interval. - if($errors->isEmpty() && $lockdate && $new_date->before($lockdate)) - $errors->add($i18n->getKey('error.period_locked')); - + if($err->no() && $lockdate && $new_date->before($lockdate)) + $err->add($i18n->getKey('error.period_locked')); + // Now, an update. - if ($errors->isEmpty()) { + if ($err->no()) { if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(), 'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost))) { header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT)); @@ -184,29 +181,29 @@ if ($request->getMethod() == 'POST') { } } } - + // Save as new record. if ($request->getParameter('btn_copy')) { // We need to prohibit saving into locked interval. if($lockdate && $new_date->before($lockdate)) - $errors->add($i18n->getKey('error.period_locked')); - + $err->add($i18n->getKey('error.period_locked')); + // Now, a new insert. - if ($errors->isEmpty()) { + if ($err->no()) { if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(), 'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) { header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT)); exit(); } else - $errors->add($i18n->getKey('error.db')); + $err->add($i18n->getKey('error.db')); } } - + if ($request->getParameter('btn_delete')) { header("Location: expense_delete.php?id=$cl_id"); exit(); } -} // End of if ($request->getMethod() == "POST") +} // isPost $smarty->assign('client_list', $client_list); $smarty->assign('project_list', $project_list);