From f5a094fd8b32d44767f7fc30a65f407f4e1d9945 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Sat, 23 Aug 2014 01:55:18 +0200 Subject: add user view, better bootstrap --- includes/pages/admin_questions.php | 2 +- includes/pages/user_messages.php | 2 +- includes/pages/user_myshifts.php | 82 +------------------------------------- includes/pages/user_news.php | 2 +- includes/pages/user_shifts.php | 4 +- 5 files changed, 7 insertions(+), 85 deletions(-) (limited to 'includes/pages') diff --git a/includes/pages/admin_questions.php b/includes/pages/admin_questions.php index 5d4fbd61..8bdde714 100644 --- a/includes/pages/admin_questions.php +++ b/includes/pages/admin_questions.php @@ -10,7 +10,7 @@ function admin_new_questions() { $new_messages = sql_num_query("SELECT * FROM `Questions` WHERE `AID` IS NULL"); if ($new_messages > 0) - return info('Es gibt unbeantwortete Fragen!', true); + info('Es gibt unbeantwortete Fragen!'); } return ""; diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php index a1b565ec..b0ac66b1 100644 --- a/includes/pages/user_messages.php +++ b/includes/pages/user_messages.php @@ -53,7 +53,7 @@ function user_messages() { return template_render('../templates/user_messages.html', array( 'title' => messages_title(), 'link' => page_link_to("user_messages"), - 'greeting' => sprintf(_("Hello %s, here can you leave messages for other angels"), User_Nick_render($user)) . '

', + 'greeting' => msg() . sprintf(_("Hello %s, here can you leave messages for other angels"), User_Nick_render($user)) . '

', 'messages' => $messages_html, 'new_label' => _("New"), 'date_label' => _("Date"), diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index 12ba5562..333f9517 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -80,86 +80,8 @@ function user_myshifts() { } else redirect(page_link_to('user_myshifts')); } - $shifts = sql_select("SELECT * FROM `ShiftEntry` JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `UID`=" . sql_escape($shifts_user['UID']) . " ORDER BY `start`"); - $myshifts_table = array(); - $html = ""; - $timesum = 0; - foreach ($shifts as $shift) { - $shift_info = $shift['name']; - $needed_angel_types_source = sql_select("SELECT DISTINCT `AngelTypes`.* FROM `ShiftEntry` JOIN `AngelTypes` ON `ShiftEntry`.`TID`=`AngelTypes`.`id` WHERE `ShiftEntry`.`SID`=" . sql_escape($shift['SID']) . " ORDER BY `AngelTypes`.`name`"); - foreach ($needed_angel_types_source as $needed_angel_type) { - $shift_info .= '
' . $needed_angel_type['name'] . ': '; - - $users_source = sql_select("SELECT `ShiftEntry`.`freeloaded`, `User`.* FROM `ShiftEntry` JOIN `User` ON `ShiftEntry`.`UID`=`User`.`UID` WHERE `ShiftEntry`.`SID`=" . sql_escape($shift['SID']) . " AND `ShiftEntry`.`TID`=" . sql_escape($needed_angel_type['id'])); - $shift_entries = array(); - foreach ($users_source as $user_source) { - if ($user['UID'] == $user_source['UID']) - $member = '' . $user_source['Nick'] . ''; - else - $member = User_Nick_render($user_source); - if ($user_source['freeloaded']) - $member = '' . $member . ''; - - $shift_entries[] = $member; - } - $shift_info .= join(", ", $shift_entries); - } - - $myshift = array( - 'date' => date("Y-m-d", $shift['start']), - 'time' => date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']), - 'room' => $shift['Name'], - 'shift_info' => $shift_info, - 'comment' => $shift['Comment'] - ); - - if ($shift['freeloaded']) { - if (in_array("user_shifts_admin", $privileges)) - $myshift['comment'] .= '

' . _("Freeloaded") . ': ' . $shift['freeload_comment'] . '

'; - else - $myshift['comment'] .= '

' . _("Freeloaded") . '

'; - } - - $myshift['actions'] = ""; - if ($id == $user['UID'] || in_array('user_shifts_admin', $privileges)) - $myshift['actions'] .= img_button(page_link_to('user_myshifts') . '&edit=' . $shift['id'] . '&id=' . $id, 'pencil', _("edit")); - if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges)) - $myshift['actions'] .= img_button(page_link_to('user_myshifts') . (($id != $user['UID']) ? '&id=' . $id : '') . '&cancel=' . $shift['id'], 'cross', _("sign off")); - - if ($shift['freeloaded']) - $timesum += - 2 * ($shift['end'] - $shift['start']); - else - $timesum += $shift['end'] - $shift['start']; - $myshifts_table[] = $myshift; - } - if (count($myshifts_table) > 0) - $myshifts_table[] = array( - 'date' => '' . _("Sum:") . '', - 'time' => "" . round($timesum / (60 * 60), 1) . " h", - 'room' => "", - 'shift_info' => "", - 'comment' => "", - 'actions' => "" - ); - - return page_with_title(myshifts_title(), array( - msg(), - $id == $user['UID'] ? sprintf(_('These are your shifts.
Please try to appear 15 minutes before your shift begins!
You can remove yourself from a shift up to %d hours before it starts.'), $LETZTES_AUSTRAGEN) : '', - $id != $user['UID'] ? info(sprintf("You are viewing %s's shifts.", $shifts_user['Nick']), true) : '', - $id != $user['UID'] ? buttons(array( - button(page_link_to('admin_user') . '&id=' . $shifts_user['UID'], "Edit " . $shifts_user['Nick'], 'edit') - )) : '', - table(array( - 'date' => _("Day"), - 'time' => _("Time"), - 'room' => _("Location"), - 'shift_info' => _("Name & workmates"), - 'comment' => _("Comment"), - 'actions' => _("Action") - ), $myshifts_table), - $id == $user['UID'] && count($shifts) == 0 ? error(sprintf(_("Go to the shifts table to sign yourself up for some shifts."), page_link_to('user_shifts')), true) : '', - '

' . _("Exports") . '

' . sprintf(_("Export of shown shifts. iCal format or JSON format available (please keep secret, otherwise reset the api key)."), page_link_to_absolute('ical') . '&key=' . $shifts_user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $shifts_user['api_key'], page_link_to('user_myshifts') . '&reset') - )); + msg(); + redirect(page_link_to('users') . '&action=view'); } ?> diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php index b8879e62..c4d243f4 100644 --- a/includes/pages/user_news.php +++ b/includes/pages/user_news.php @@ -14,7 +14,7 @@ function meetings_title() { function user_meetings() { global $DISPLAY_NEWS, $privileges, $user; - $html = '

' . meetings_title() . '

'; + $html = '

' . meetings_title() . '

' . msg(); if (isset($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page'])) $page = $_REQUEST['page']; diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 2adce0d5..faf6f162 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -6,7 +6,7 @@ function shifts_title() { function user_shifts() { global $user, $privileges, $max_freeloadable_shifts; - if (count(ShiftEntries_freeloaded_by_user($user)) >= $max_freeloadable_shifts) + if (User_is_freeloader($user)) redirect(page_link_to('user_myshifts')); // Löschen einzelner Schicht-Einträge (Also Belegung einer Schicht von Engeln) durch Admins @@ -743,7 +743,7 @@ function view_user_shifts() { 'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", _("Occupancy")), 'task_notice' => '1' . _("The tasks shown here are influenced by the preferences you defined in your settings!") . " " . _("Description of the jobs.") . "", 'new_style_checkbox' => '', - 'shifts_table' => $shifts_table, + 'shifts_table' =>msg(). $shifts_table, 'ical_text' => '

' . _("iCal export") . '

' . sprintf(_("Export of shown shifts. iCal format or JSON format available (please keep secret, otherwise reset the api key)."), page_link_to_absolute('ical') . '&key=' . $user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $user['api_key'], page_link_to('user_myshifts') . '&reset') . '

', 'filter' => _("Filter") )), -- cgit v1.2.3-70-g09d2