X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Ftime.php;h=2dfe239c46b00e838d2be8157cc53b01ce4d1481;hb=23ab58c659b527891568a385d8762bf3e6561adf;hp=21c438511ef12c79f779394f1bbd8f82db984d75;hpb=73a32cebd81029a0251f1e6d6b71b93fb9603a3a;p=timetracker.git
diff --git a/mobile/time.php b/mobile/time.php
index 21c43851..2dfe239c 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -48,13 +48,13 @@ if($selected_date->isError())
if(!$cl_date)
$cl_date = $selected_date->toString(DB_DATEFORMAT);
$_SESSION['date'] = $cl_date;
-
+
// Determine previous and next dates for simple navigation.
$prev_date = date('Y-m-d', strtotime('-1 day', strtotime($cl_date)));
$next_date = date('Y-m-d', strtotime('+1 day', strtotime($cl_date)));
// Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
require_once('../plugins/CustomFields.class.php');
$custom_fields = new CustomFields($user->team_id);
$smarty->assign('custom_fields', $custom_fields);
@@ -69,8 +69,8 @@ $cl_note = trim($request->getParameter('note'));
$cl_cf_1 = trim($request->getParameter('cf_1', ($request->getMethod()=='POST'? null : @$_SESSION['cf_1'])));
$_SESSION['cf_1'] = $cl_cf_1;
$cl_billable = 1;
-if (in_array('iv', explode(',', $user->plugins))) {
- if ($request->getMethod() == 'POST') {
+if ($user->isPluginEnabled('iv')) {
+ if ($request->isPost()) {
$cl_billable = $request->getParameter('billable');
$_SESSION['billable'] = (int) $cl_billable;
} else
@@ -88,7 +88,7 @@ $_SESSION['task'] = $cl_task;
$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))) {
+if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
$active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
$form->addInput(array('type'=>'combobox',
'onchange'=>'fillProjectDropdown(this.value);',
@@ -97,8 +97,7 @@ if (MODE_TIME == $user->tracking_mode && in_array('cl', explode(',', $user->plug
'value'=>$cl_client,
'data'=>$active_clients,
'datakeys'=>array('id', 'name'),
- 'empty'=>array(''=>$i18n->getKey('dropdown.select'))
- ));
+ 'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
// Note: in other modes the client list is filtered to relevant clients only. See below.
}
@@ -112,11 +111,10 @@ 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))) {
+ if ($user->isPluginEnabled('cl')) {
$active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
// We need an array of assigned project ids to do some trimming.
foreach($project_list as $project)
@@ -125,12 +123,13 @@ 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) {
- $client['projects'] = implode(',', $intersection);
- $client_list[] = $client;
- }
+ $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;
+ }
}
$form->addInput(array('type'=>'combobox',
'onchange'=>'fillProjectDropdown(this.value);',
@@ -139,8 +138,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'))));
}
}
@@ -152,8 +150,7 @@ 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'))));
}
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');"));
@@ -162,106 +159,95 @@ 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');"));
$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height: 60px;','value'=>$cl_note));
-if (in_array('iv', explode(',', $user->plugins)))
+if ($user->isPluginEnabled('iv'))
$form->addInput(array('type'=>'checkbox','name'=>'billable','data'=>1,'value'=>$cl_billable));
$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.submit')));
-
+
// If we have custom fields - add controls for them.
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));
- } else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
+ $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1));
+ } elseif ($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'))));
}
}
-// Determine lock date. Time entries earlier than lock date cannot be created or modified.
-$lock_interval = $user->lock_interval;
-$lockdate = 0;
-if ($lock_interval > 0) {
- $lockdate = new DateAndTime();
- $lockdate->decDay($lock_interval);
-}
-
// Submit.
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
if ($request->getParameter('btn_submit')) {
// Validate user input.
- if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client)
- $errors->add($i18n->getKey('error.client'));
+ if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+ $err->add($i18n->getKey('error.client'));
if ($custom_fields) {
- if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $errors->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+ if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
}
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 (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
- if (!$cl_task) $errors->add($i18n->getKey('error.task'));
+ if (!$cl_task) $err->add($i18n->getKey('error.task'));
}
- if (!$cl_duration) {
- if ('0' == $cl_duration)
- $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
- else if ($cl_start || $cl_finish) {
+ if (strlen($cl_duration) == 0) {
+ if ($cl_start || $cl_finish) {
if (!ttTimeHelper::isValidTime($cl_start))
- $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
+ $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
if ($cl_finish) {
if (!ttTimeHelper::isValidTime($cl_finish))
- $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
+ $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
- $errors->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
+ $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
}
} else {
- if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
- $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
- $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
- }
+ if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
+ $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
+ $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
+ }
if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
- $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+ $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
}
} else {
if (!ttTimeHelper::isValidDuration($cl_duration))
- $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+ $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
}
- if (!ttValidString($cl_note, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+ if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
// Finished validating user input.
-
+
// Prohibit creating entries in future.
if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
$browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
if ($selected_date->after($browser_today))
- $errors->add($i18n->getKey('error.future_date'));
+ $err->add($i18n->getKey('error.future_date'));
}
-
- // Prohibit creating time entries in locked interval.
- if($lockdate && $selected_date->before($lockdate))
- $errors->add($i18n->getKey('error.period_locked'));
-
+
+ // Prohibit creating entries in locked range.
+ if ($user->isDateLocked($selected_date))
+ $err->add($i18n->getKey('error.range_locked'));
+
// Prohibit creating another uncompleted record.
- if ($errors->isEmpty()) {
+ if ($err->no()) {
if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser())) && (($cl_finish == '') && ($cl_duration == '')))
- $errors->add($i18n->getKey('error.uncompleted_exists')." ".$i18n->getKey('error.goto_uncompleted')."");
+ $err->add($i18n->getKey('error.uncompleted_exists')." ".$i18n->getKey('error.goto_uncompleted')."");
}
-
+
// Prohibit creating an overlapping record.
- if ($errors->isEmpty()) {
+ if ($err->no()) {
if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
- $errors->add($i18n->getKey('error.overlap'));
- }
-
- if ($errors->isEmpty()) {
+ $err->add($i18n->getKey('error.overlap'));
+ }
+
+ if ($err->no()) {
$id = ttTimeHelper::insert(array(
'date' => $cl_date,
'user_id' => $user->getActiveUser(),
@@ -273,13 +259,13 @@ if ($request->getMethod() == 'POST') {
'duration' => $cl_duration,
'note' => $cl_note,
'billable' => $cl_billable));
-
+
// Insert a custom field if we have it.
$result = true;
if ($id && $custom_fields && $cl_cf_1) {
if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
$result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
- else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+ elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
$result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
}
@@ -287,10 +273,10 @@ if ($request->getMethod() == 'POST') {
header('Location: time.php');
exit();
}
- $errors->add($i18n->getKey('error.db'));
+ $err->add($i18n->getKey('error.db'));
}
}
-}
+} // isPost
$smarty->assign('next_date', $next_date);
$smarty->assign('prev_date', $prev_date);
@@ -305,4 +291,3 @@ $smarty->assign('timestring', $selected_date->toString($user->date_format));
$smarty->assign('title', $i18n->getKey('title.time'));
$smarty->assign('content_page_name', 'mobile/time.tpl');
$smarty->display('mobile/index.tpl');
-?>
\ No newline at end of file