X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_edit.php;h=cc3070c79dd4d9061f860888dc07fc4068d8d3a0;hb=b4b57ea6a41c263250715f72248d48eae22f5476;hp=4c255dbef2765aa0af2006adbf14df6a1aa0d6d1;hpb=098a79f0819ebb89b7d48df4a6b154af4560f68e;p=timetracker.git diff --git a/time_edit.php b/time_edit.php index 4c255dbe..cc3070c7 100644 --- a/time_edit.php +++ b/time_edit.php @@ -56,7 +56,7 @@ $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser()); if ($time_rec['invoice_id']) die($i18n->getKey('error.sys')); $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']); - + // Initialize variables. $cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null; if ($request->getMethod() == 'POST') { @@ -79,21 +79,21 @@ if ($request->getMethod() == 'POST') { $cl_start = $time_rec['start']; $cl_finish = $time_rec['finish']; $cl_duration = $time_rec['duration']; - $cl_date = $item_date->toString($user->date_format); + $cl_date = $item_date->toString($user->date_format); $cl_note = $time_rec['comment']; - + // If we have custom fields - obtain values for them. if ($custom_fields) { // Get custom field value for time record. - $fields = $custom_fields->get($time_rec['id']); - if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) + $fields = $custom_fields->get($time_rec['id']); + if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $cl_cf_1 = $fields[0]['value']; else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $cl_cf_1 = $fields[0]['option_id']; } - + $cl_billable = $time_rec['billable']; - + // Add an info message to the form if we are editing an uncompleted record. if (($cl_start == $cl_finish) && ($cl_duration == '0:00')) { $cl_finish = ''; @@ -101,22 +101,21 @@ if ($request->getMethod() == 'POST') { $messages->add($i18n->getKey('form.time_edit.uncompleted')); } } - + // Initialize elements of 'timeRecordForm'. $form = new Form('timeRecordForm'); // 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. } @@ -130,25 +129,25 @@ 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))) { $active_clients = ttTeamHelper::getActiveClients($user->team_id, true); - // We need an array of assigned project ids to do some trimming. + // We need an array of assigned project ids to do some trimming. foreach($project_list as $project) $projects_assigned_to_user[] = $project['id']; // 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']); + if (is_array($projects_assigned_to_client) && is_array($projects_assigned_to_user)) + $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);', @@ -157,8 +156,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')))); } } @@ -170,10 +168,9 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { 'value'=>$cl_task, 'data'=>$task_list, 'datakeys'=>array('id','name'), - 'empty'=>array(''=>$i18n->getKey('dropdown.select')) - )); + 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); } - + // Add other controls. if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) { $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');")); @@ -182,7 +179,7 @@ if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type if (!$user->canManageTeam() && defined('READONLY_START_FINISH') && isTrue(READONLY_START_FINISH)) { // Make the start and finish fields read-only. $form->getElement('start')->setEnable(false); - $form->getElement('finish')->setEnable(false); + $form->getElement('finish')->setEnable(false); } if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type)) $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');")); @@ -192,15 +189,14 @@ $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; if ($custom_fields && $custom_fields->fields[0]) { // Only one custom field is supported at this time. if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) { - $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1)); + $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1)); } else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { $form->addInput(array('type'=>'combobox', 'name'=>'cf_1', 'style'=>'width: 250px;', 'value'=>$cl_cf_1, 'data'=>$custom_fields->options, - 'empty' => array('' => $i18n->getKey('dropdown.select')) - )); + 'empty' => array('' => $i18n->getKey('dropdown.select')))); } } // Hidden control for record id. @@ -253,7 +249,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidDate($cl_date)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.date')); if (!ttValidString($cl_note, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.note')); // Finished validating user input. - + // Determine lock date. $lock_interval = $user->lock_interval; $lockdate = 0; @@ -278,15 +274,15 @@ if ($request->getMethod() == 'POST') { // 1) Prohibit saving locked time entries in any form. // 2) Prohibit saving completed unlocked entries into locked interval. // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists. - + // Now, step by step. - if ($errors->isEmpty()) { + if ($errors->no()) { // 1) Prohibit saving locked time entries in any form. if($lockdate && $item_date->before($lockdate)) - $errors->add($i18n->getKey('error.period_locked')); + $errors->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($errors->no() && $lockdate && $new_date->before($lockdate)) + $errors->add($i18n->getKey('error.period_locked')); // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists. $uncompleted = ($cl_finish == '' && $cl_duration == ''); if ($uncompleted) { @@ -297,28 +293,28 @@ if ($request->getMethod() == 'POST') { } } } - + // Prohibit creating an overlapping record. - if ($errors->isEmpty()) { + if ($errors->no()) { if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id)) $errors->add($i18n->getKey('error.overlap')); - } + } // Now, an update. - if ($errors->isEmpty()) { + if ($errors->no()) { $res = ttTimeHelper::update(array( - 'id'=>$cl_id, - 'date'=>$new_date->toString(DB_DATEFORMAT), - 'user_id'=>$user->getActiveUser(), - 'client'=>$cl_client, - 'project'=>$cl_project, - 'task'=>$cl_task, - 'start'=>$cl_start, - 'finish'=>$cl_finish, - 'duration'=>$cl_duration, - 'note'=>$cl_note, - 'billable'=>$cl_billable)); - + 'id'=>$cl_id, + 'date'=>$new_date->toString(DB_DATEFORMAT), + 'user_id'=>$user->getActiveUser(), + 'client'=>$cl_client, + 'project'=>$cl_project, + 'task'=>$cl_task, + 'start'=>$cl_start, + 'finish'=>$cl_finish, + 'duration'=>$cl_duration, + 'note'=>$cl_note, + 'billable'=>$cl_billable)); + // If we have custom fields - update values. if ($res && $custom_fields) { if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) @@ -333,15 +329,15 @@ if ($request->getMethod() == 'POST') { } } } - + // Save as new record. if ($request->getParameter('btn_copy')) { // We need to: // 1) Prohibit saving into locked interval. // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists. - + // Now, step by step. - if ($errors->isEmpty()) { + if ($errors->no()) { // 1) Prohibit saving into locked interval. if($lockdate && $new_date->before($lockdate)) $errors->add($i18n->getKey('error.period_locked')); @@ -355,16 +351,16 @@ if ($request->getMethod() == 'POST') { } } } - + // Prohibit creating an overlapping record. - if ($errors->isEmpty()) { + if ($errors->no()) { if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish)) $errors->add($i18n->getKey('error.overlap')); } // Now, a new insert. - if ($errors->isEmpty()) { - + if ($errors->no()) { + $id = ttTimeHelper::insert(array( 'date'=>$new_date->toString(DB_DATEFORMAT), 'user_id'=>$user->getActiveUser(), @@ -392,12 +388,12 @@ if ($request->getMethod() == 'POST') { $errors->add($i18n->getKey('error.db')); } } - + if ($request->getParameter('btn_delete')) { header("Location: time_delete.php?id=$cl_id"); exit(); } -} // End of if ($request->getMethod() == "POST") +} // POST $smarty->assign('client_list', $client_list); $smarty->assign('project_list', $project_list); @@ -407,4 +403,3 @@ $smarty->assign('onload', 'onLoad="fillDropdowns()"'); $smarty->assign('title', $i18n->getKey('title.edit_time_record')); $smarty->assign('content_page_name', 'time_edit.tpl'); $smarty->display('index.tpl'); -?> \ No newline at end of file