merged master and issue

main
jwacalex 8 years ago
commit 45cda10479

@ -1,4 +1,5 @@
<?php <?php
use Engelsystem\ShiftSignupState;
function shift_link($shift) { function shift_link($shift) {
return page_link_to('shifts') . '&action=view&shift_id=' . $shift['SID']; return page_link_to('shifts') . '&action=view&shift_id=' . $shift['SID'];
@ -200,13 +201,13 @@ function shift_controller() {
$angeltypes = AngelTypes(); $angeltypes = AngelTypes();
$user_shifts = Shifts_by_user($user); $user_shifts = Shifts_by_user($user);
$shift_signup_state = null; $shift_signup_state = new ShiftSignupState(ShiftSignupState::OCCUPIED, 0);
foreach ($angeltypes as $angeltype) { foreach ($angeltypes as $angeltype) {
$angeltype_signup_state = Shift_signup_allowed($user, $shift, $angeltype, null, $user_shifts); $angeltype_signup_state = Shift_signup_allowed($user, $shift, $angeltype, null, $user_shifts);
if ($shift_signup_state == null) { if ($shift_signup_state == null) {
$shift_signup_state = $angeltype_signup_state; $shift_signup_state = $angeltype_signup_state;
} else { } else {
$shift_signup_state = $shift_signup_state->combineWith($angeltype_signup_state); $shift_signup_state->combineWith($angeltype_signup_state);
} }
} }
@ -285,7 +286,7 @@ function shifts_json_export_all_controller() {
* (Like iCal Export or shifts view) * (Like iCal Export or shifts view)
*/ */
function shifts_json_export_controller() { function shifts_json_export_controller() {
global $ical_shifts, $user; global $user;
if (! isset($_REQUEST['key']) || ! preg_match("/^[0-9a-f]{32}$/", $_REQUEST['key'])) { if (! isset($_REQUEST['key']) || ! preg_match("/^[0-9a-f]{32}$/", $_REQUEST['key'])) {
engelsystem_error("Missing key."); engelsystem_error("Missing key.");
@ -294,9 +295,6 @@ function shifts_json_export_controller() {
$key = $_REQUEST['key']; $key = $_REQUEST['key'];
$user = User_by_api_key($key); $user = User_by_api_key($key);
if ($user === false) {
engelsystem_error("Unable to find user.");
}
if ($user == null) { if ($user == null) {
engelsystem_error("Key invalid."); engelsystem_error("Key invalid.");
} }
@ -304,25 +302,17 @@ function shifts_json_export_controller() {
engelsystem_error("No privilege for shifts_json_export."); engelsystem_error("No privilege for shifts_json_export.");
} }
$ical_shifts = load_ical_shifts(); $shifts = load_ical_shifts();
header("Content-Type: application/json; charset=utf-8"); header("Content-Type: application/json; charset=utf-8");
raw_output(json_encode($ical_shifts)); raw_output(json_encode($shifts));
} }
/** /**
* Returns shifts to export. * Returns users shifts to export.
* Users shifts or user_shifts filter based shifts if export=user_shifts is given as param.
*/ */
function load_ical_shifts() { function load_ical_shifts() {
global $user, $ical_shifts; global $user;
if (isset($_REQUEST['export']) && $_REQUEST['export'] == 'user_shifts') {
require_once realpath(__DIR__ . '/user_shifts.php');
view_user_shifts();
return $ical_shifts;
}
return Shifts_by_user($user); return Shifts_by_user($user);
} }

@ -151,7 +151,7 @@ function user_controller() {
} }
} }
$shifts = Shifts_by_user($user_source); $shifts = Shifts_by_user($user_source, in_array("user_shifts_admin", $privileges));
foreach ($shifts as &$shift) { foreach ($shifts as &$shift) {
// TODO: Move queries to model // TODO: Move queries to model
$shift['needed_angeltypes'] = 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`"); $shift['needed_angeltypes'] = 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`");

@ -26,6 +26,7 @@ require_once realpath(__DIR__ . '/../includes/model/UserAngelTypes_model.php');
require_once realpath(__DIR__ . '/../includes/model/UserDriverLicenses_model.php'); require_once realpath(__DIR__ . '/../includes/model/UserDriverLicenses_model.php');
require_once realpath(__DIR__ . '/../includes/model/UserGroups_model.php'); require_once realpath(__DIR__ . '/../includes/model/UserGroups_model.php');
require_once realpath(__DIR__ . '/../includes/model/User_model.php'); require_once realpath(__DIR__ . '/../includes/model/User_model.php');
require_once realpath(__DIR__ . '/../includes/model/ValidationResult.php');
require_once realpath(__DIR__ . '/../includes/view/AngelTypes_view.php'); require_once realpath(__DIR__ . '/../includes/view/AngelTypes_view.php');
require_once realpath(__DIR__ . '/../includes/view/EventConfig_view.php'); require_once realpath(__DIR__ . '/../includes/view/EventConfig_view.php');

@ -1,4 +1,5 @@
<?php <?php
use Engelsystem\ValidationResult;
/** /**
* Returns an array containing the basic attributes of angeltypes. * Returns an array containing the basic attributes of angeltypes.

@ -115,6 +115,7 @@ function ShiftEntries_finished_by_user($user) {
JOIN `ShiftTypes` ON `ShiftTypes`.`id` = `Shifts`.`shifttype_id` JOIN `ShiftTypes` ON `ShiftTypes`.`id` = `Shifts`.`shifttype_id`
WHERE `ShiftEntry`.`UID`=" . sql_escape($user['UID']) . " WHERE `ShiftEntry`.`UID`=" . sql_escape($user['UID']) . "
AND `Shifts`.`end` < " . sql_escape(time()) . " AND `Shifts`.`end` < " . sql_escape(time()) . "
AND `ShiftEntry`.`freeloaded` = 0
ORDER BY `Shifts`.`end` ORDER BY `Shifts`.`end`
"); ");
} }

@ -263,9 +263,12 @@ function Shift_create($shift) {
/** /**
* Return users shifts. * Return users shifts.
*/ */
function Shifts_by_user($user) { function Shifts_by_user($user, $include_freeload_comments = false) {
$result = sql_select(" $result = sql_select("
SELECT `ShiftTypes`.`id` as `shifttype_id`, `ShiftTypes`.`name`, `ShiftEntry`.*, `Shifts`.*, `Room`.* SELECT `ShiftTypes`.`id` as `shifttype_id`, `ShiftTypes`.`name`,
`ShiftEntry`.`id`, `ShiftEntry`.`SID`, `ShiftEntry`.`TID`, `ShiftEntry`.`UID`, `ShiftEntry`.`freeloaded`, `ShiftEntry`.`Comment`,
" . ($include_freeload_comments ? "`ShiftEntry`.`freeload_comment`, " : "") . "
`Shifts`.*, `Room`.*
FROM `ShiftEntry` FROM `ShiftEntry`
JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`)
JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)

@ -1,4 +1,5 @@
<?php <?php
use Engelsystem\ValidationResult;
/** /**
* User model * User model
@ -273,23 +274,6 @@ function User($user_id) {
return null; return null;
} }
/**
* TODO: Merge into normal user function
* Returns user by id (limit informations.
*
* @param $user_id UID
*/
function mUser_Limit($user_id) {
$user_source = sql_select("SELECT `UID`, `Nick`, `Name`, `Vorname`, `Telefon`, `DECT`, `Handy`, `email`, `jabber` FROM `User` WHERE `UID`='" . sql_escape($user_id) . "' LIMIT 1");
if ($user_source === false) {
return false;
}
if (count($user_source) > 0) {
return $user_source[0];
}
return null;
}
/** /**
* Returns User by api_key. * Returns User by api_key.
* *
@ -300,7 +284,7 @@ function mUser_Limit($user_id) {
function User_by_api_key($api_key) { function User_by_api_key($api_key) {
$user = sql_select("SELECT * FROM `User` WHERE `api_key`='" . sql_escape($api_key) . "' LIMIT 1"); $user = sql_select("SELECT * FROM `User` WHERE `api_key`='" . sql_escape($api_key) . "' LIMIT 1");
if ($user === false) { if ($user === false) {
return false; engelsystem_error("Unable to find user by api key.");
} }
if (count($user) == 0) { if (count($user) == 0) {
return null; return null;

@ -0,0 +1,42 @@
<?php
namespace Engelsystem;
/**
* BO that represents the result of an entity attribute validation.
* It contains the validated value and a bool for validation success.
*/
class ValidationResult {
private $valid;
private $value;
/**
* Constructor.
*
* @param boolean $valid
* Is the value valid?
* @param * $value
* The validated value
*/
public function __construct($valid, $value) {
$this->valid = $valid;
$this->value = $value;
}
/**
* Is the value valid?
*/
public function isValid() {
return $this->valid;
}
/**
* The parsed/validated value.
*/
public function getValue() {
return $this->value;
}
}
?>

@ -106,7 +106,7 @@ function guest_register() {
$msg .= error(sprintf(_("Your password is too short (please use at least %s characters)."), MIN_PASSWORD_LENGTH), true); $msg .= error(sprintf(_("Your password is too short (please use at least %s characters)."), MIN_PASSWORD_LENGTH), true);
} }
if (isset($_REQUEST['planned_arrival_date']) && $tmp = parse_date("Y-m-d", $_REQUEST['planned_arrival_date'])) { if (isset($_REQUEST['planned_arrival_date']) && $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_arrival_date'] . " 00:00")) {
$planned_arrival_date = $tmp; $planned_arrival_date = $tmp;
} else { } else {
$valid = false; $valid = false;
@ -233,7 +233,7 @@ function guest_register() {
]) ])
]), ]),
form_checkboxes('angel_types', _("What do you want to do?") . sprintf(" (<a href=\"%s\">%s</a>)", page_link_to('angeltypes') . '&action=about', _("Description of job types")), $angel_types, $selected_angel_types), form_checkboxes('angel_types', _("What do you want to do?") . sprintf(" (<a href=\"%s\">%s</a>)", page_link_to('angeltypes') . '&action=about', _("Description of job types")), $angel_types, $selected_angel_types),
form_info("", _("Restricted angel types need will be confirmed later by an archangel. You can change your selection in the options section.")) form_info("", _("Restricted angel types need will be confirmed later by a supporter. You can change your selection in the options section."))
]), ]),
div('col-md-6', [ div('col-md-6', [
div('row', [ div('row', [
@ -286,9 +286,9 @@ function guest_login() {
$nick = ""; $nick = "";
unset($_SESSION['uid']); unset($_SESSION['uid']);
$valid = true;
if (isset($_REQUEST['submit'])) { if (isset($_REQUEST['submit'])) {
$valid = true;
if (isset($_REQUEST['nick']) && strlen(User_validate_Nick($_REQUEST['nick'])) > 0) { if (isset($_REQUEST['nick']) && strlen(User_validate_Nick($_REQUEST['nick'])) > 0) {
$nick = User_validate_Nick($_REQUEST['nick']); $nick = User_validate_Nick($_REQUEST['nick']);
@ -306,7 +306,7 @@ function guest_login() {
} }
} else { } else {
$valid = false; $valid = false;
error(_("No user was found with that Nickname. Please try again. If you are still having problems, ask an Dispatcher.")); error(_("No user was found with that Nickname. Please try again. If you are still having problems, ask a Dispatcher."));
} }
} else { } else {
$valid = false; $valid = false;
@ -326,25 +326,37 @@ function guest_login() {
return page([ return page([
div('col-md-12', [ div('col-md-12', [
div('row', [ div('row', [
div('col-md-4', [
EventConfig_countdown_page($event_config) EventConfig_countdown_page($event_config)
]), ]),
div('col-md-4', [ div('row', [
heading(login_title(), 2), div('col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4', [
div('panel panel-primary first', [
div('panel-heading', [
'<span class="icon-icon_angel"></span> ' . _("Login")
]),
div('panel-body', [
msg(), msg(),
form([ form([
form_text('nick', _("Nick"), $nick), form_text_placeholder('nick', _("Nick"), $nick),
form_password('password', _("Password")), form_password_placeholder('password', _("Password")),
form_submit('submit', _("Login")), form_submit('submit', _("Login")),
buttons([ ! $valid ? buttons([
button(page_link_to('user_password_recovery'), _("I forgot my password")) button(page_link_to('user_password_recovery'), _("I forgot my password"))
]) : ''
])
]), ]),
info(_("Please note: You have to activate cookies!"), true) div('panel-footer', [
glyph('info-sign') . _("Please note: You have to activate cookies!")
])
])
]) ])
]), ]),
div('col-md-4', [ div('row', [
div('col-sm-6 text-center', [
heading(register_title(), 2), heading(register_title(), 2),
get_register_hint(), get_register_hint()
]),
div('col-sm-6 text-center', [
heading(_("What can I do?"), 2), heading(_("What can I do?"), 2),
'<p>' . _("Please read about the jobs you can do to help us.") . '</p>', '<p>' . _("Please read about the jobs you can do to help us.") . '</p>',
buttons([ buttons([

@ -10,9 +10,6 @@ function user_atom() {
$key = $_REQUEST['key']; $key = $_REQUEST['key'];
$user = User_by_api_key($key); $user = User_by_api_key($key);
if ($user === false) {
engelsystem_error("Unable to find user.");
}
if ($user == null) { if ($user == null) {
engelsystem_error("Key invalid."); engelsystem_error("Key invalid.");
} }

@ -12,9 +12,6 @@ function user_ical() {
$key = $_REQUEST['key']; $key = $_REQUEST['key'];
$user = User_by_api_key($key); $user = User_by_api_key($key);
if ($user === false) {
engelsystem_error("Unable to find user.");
}
if ($user == null) { if ($user == null) {
engelsystem_error("Key invalid."); engelsystem_error("Key invalid.");
} }

@ -1,7 +1,7 @@
<?php <?php
function questions_title() { function questions_title() {
return _("Ask an archangel"); return _("Ask the Heaven");
} }
function user_questions() { function user_questions() {

@ -44,7 +44,7 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes) {
} }
if (isset($_REQUEST['planned_arrival_date'])) { if (isset($_REQUEST['planned_arrival_date'])) {
$tmp = parse_date("Y-m-d", $_REQUEST['planned_arrival_date']); $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_arrival_date'] . " 00:00");
$result = User_validate_planned_arrival_date($tmp); $result = User_validate_planned_arrival_date($tmp);
$user_source['planned_arrival_date'] = $result->getValue(); $user_source['planned_arrival_date'] = $result->getValue();
if (! $result->isValid()) { if (! $result->isValid()) {
@ -54,7 +54,7 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes) {
} }
if (isset($_REQUEST['planned_departure_date'])) { if (isset($_REQUEST['planned_departure_date'])) {
$tmp = parse_date("Y-m-d", $_REQUEST['planned_departure_date']); $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_departure_date'] . " 00:00");
$result = User_validate_planned_departure_date($user_source['planned_arrival_date'], $tmp); $result = User_validate_planned_departure_date($user_source['planned_arrival_date'], $tmp);
$user_source['planned_departure_date'] = $result->getValue(); $user_source['planned_departure_date'] = $result->getValue();
if (! $result->isValid()) { if (! $result->isValid()) {

@ -175,6 +175,23 @@ function form_text($name, $label, $value, $disabled = false) {
return form_element($label, '<input class="form-control" id="form_' . $name . '" type="text" name="' . $name . '" value="' . htmlspecialchars($value) . '" ' . $disabled . '/>', 'form_' . $name); return form_element($label, '<input class="form-control" id="form_' . $name . '" type="text" name="' . $name . '" value="' . htmlspecialchars($value) . '" ' . $disabled . '/>', 'form_' . $name);
} }
/**
* Renders a text input with placeholder instead of label.
*
* @param String $name
* Input name
* @param String $placeholder
* Placeholder
* @param String $value
* The value
* @param Boolean $disabled
* Is the field enabled?
*/
function form_text_placeholder($name, $placeholder, $value, $disabled = false) {
$disabled = $disabled ? ' disabled="disabled"' : '';
return form_element('', '<input class="form-control" id="form_' . $name . '" type="text" name="' . $name . '" value="' . htmlspecialchars($value) . '" placeholder="' . $placeholder . '" ' . $disabled . '/>');
}
/** /**
* Rendert ein Formular-Emailfeld * Rendert ein Formular-Emailfeld
*/ */
@ -198,6 +215,14 @@ function form_password($name, $label, $disabled = false) {
return form_element($label, '<input class="form-control" id="form_' . $name . '" type="password" name="' . $name . '" value="" ' . $disabled . '/>', 'form_' . $name); return form_element($label, '<input class="form-control" id="form_' . $name . '" type="password" name="' . $name . '" value="" ' . $disabled . '/>', 'form_' . $name);
} }
/**
* Renders a password input with placeholder instead of label.
*/
function form_password_placeholder($name, $placeholder, $disabled = false) {
$disabled = $disabled ? ' disabled="disabled"' : '';
return form_element('', '<input class="form-control" id="form_' . $name . '" type="password" name="' . $name . '" value="" placeholder="' . $placeholder . '" ' . $disabled . '/>', 'form_' . $name);
}
/** /**
* Rendert ein Formular-Textfeld * Rendert ein Formular-Textfeld
*/ */

@ -1,4 +1,5 @@
<?php <?php
use Engelsystem\ValidationResult;
/** /**
* Provide page/request helper functions * Provide page/request helper functions
@ -131,7 +132,7 @@ function check_request_date($name, $error_message = null, $null_allowed = false)
* @return ValidationResult containing the parsed date * @return ValidationResult containing the parsed date
*/ */
function check_date($input, $error_message = null, $null_allowed = false) { function check_date($input, $error_message = null, $null_allowed = false) {
if ($tmp = parse_date("Y-m-d", trim($input))) { if ($tmp = parse_date("Y-m-d H:i", trim($input) . " 00:00")) {
return new ValidationResult(true, $tmp); return new ValidationResult(true, $tmp);
} }
if ($null_allowed) { if ($null_allowed) {
@ -187,38 +188,4 @@ function check_email($email) {
return (bool) filter_var($email, FILTER_VALIDATE_EMAIL); return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
} }
class ValidationResult {
private $valid;
private $value;
/**
* Constructor.
*
* @param boolean $valid
* Is the value valid?
* @param * $value
* The validated value
*/
public function ValidationResult($valid, $value) {
$this->valid = $valid;
$this->value = $value;
}
/**
* Is the value valid?
*/
public function isValid() {
return $this->valid;
}
/**
* The parsed/validated value.
*/
public function getValue() {
return $this->value;
}
}
?> ?>

@ -4,7 +4,8 @@
* Liste der verfügbaren Themes * Liste der verfügbaren Themes
*/ */
$themes = [ $themes = [
'3' => "Engelsystem 32c3", '4' => "Engelsystem 33c3 (2016)",
'3' => "Engelsystem 32c3 (2015)",
"2" => "Engelsystem cccamp15", "2" => "Engelsystem cccamp15",
"0" => "Engelsystem light", "0" => "Engelsystem light",
"1" => "Engelsystem dark" "1" => "Engelsystem dark"
@ -32,7 +33,7 @@ function label($content, $class = 'default') {
} }
function progress_bar($valuemin, $valuemax, $valuenow, $class = '', $content = '') { function progress_bar($valuemin, $valuemax, $valuenow, $class = '', $content = '') {
return '<div class="progress"><div class="progress-bar ' . $class . '" role="progressbar" aria-valuenow="' . $valuenow . '" aria-valuemin="' . $valuemin . '" aria-valuemax="' . $valuemax . '" style="width: ' . (($valuenow - $valuemin) * 100 / ($valuemax - $valuemin)) . '%">' . $content . '</div></div>'; return '<div class="progress"><div class="progress-bar ' . $class . '" role="progressbar" aria-valuenow="' . $valuenow . '" aria-valuemin="' . $valuemin . '" aria-valuemax="' . $valuemax . '" style="width: ' . floor(($valuenow - $valuemin) * 100 / ($valuemax - $valuemin)) . '%">' . $content . '</div></div>';
} }
/** /**

@ -66,8 +66,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) {
$supporter_mode ? form_info(_("Restricted"), $angeltype['restricted'] ? _("Yes") : _("No")) : form_checkbox('restricted', _("Restricted"), $angeltype['restricted']), $supporter_mode ? form_info(_("Restricted"), $angeltype['restricted'] ? _("Yes") : _("No")) : form_checkbox('restricted', _("Restricted"), $angeltype['restricted']),
$supporter_mode ? form_info(_("No Self Sign Up"), $angeltype['no_self_signup'] ? _("Yes") : _("No")) : form_checkbox('no_self_signup', _("No Self Sign Up"), $angeltype['no_self_signup']), $supporter_mode ? form_info(_("No Self Sign Up"), $angeltype['no_self_signup'] ? _("Yes") : _("No")) : form_checkbox('no_self_signup', _("No Self Sign Up"), $angeltype['no_self_signup']),
$supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']),
form_info("", _("Restricted angel types can only be used by an angel if enabled by an archangel (double opt-in).")), form_info("", _("Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).")),
form_info("", _("Disabled Self Sign Up prevents angels form self assigning to a shift. They have to been added by coordinator.")),
form_textarea('description', _("Description"), $angeltype['description']), form_textarea('description', _("Description"), $angeltype['description']),
form_info("", _("Please use markdown for the description.")), form_info("", _("Please use markdown for the description.")),
form_submit('submit', _("Save")) form_submit('submit', _("Save"))
@ -195,8 +194,8 @@ function AngelType_view_table_headers($angeltype, $supporter, $admin_angeltypes)
*/ */
function AngelType_view($angeltype, $members, $user_angeltype, $admin_user_angeltypes, $admin_angeltypes, $supporter, $user_driver_license, $user) { function AngelType_view($angeltype, $members, $user_angeltype, $admin_user_angeltypes, $admin_angeltypes, $supporter, $user_driver_license, $user) {
$page = [ $page = [
msg(), AngelType_view_buttons($angeltype, $user_angeltype, $admin_angeltypes, $supporter, $user_driver_license, $user),
AngelType_view_buttons($angeltype, $user_angeltype, $admin_angeltypes, $supporter, $user_driver_license, $user) msg()
]; ];
$page[] = '<h3>' . _("Description") . '</h3>'; $page[] = '<h3>' . _("Description") . '</h3>';
@ -292,9 +291,6 @@ function AngelTypes_about_view_angeltype($angeltype) {
if ($angeltype['restricted']) { if ($angeltype['restricted']) {
$html .= info(_("This angeltype is restricted by double-opt-in by a team supporter. Please show up at the according introduction meetings."), true); $html .= info(_("This angeltype is restricted by double-opt-in by a team supporter. Please show up at the according introduction meetings."), true);
} }
if ($angeltype['no_self_signup']) {
$html .= info(_("This angeltype is unable to self sign up for shifts. Please show up at the according introduction meetings."), true);
}
if ($angeltype['description'] != "") { if ($angeltype['description'] != "") {
$html .= '<div class="well">' . $parsedown->parse($angeltype['description']) . '</div>'; $html .= '<div class="well">' . $parsedown->parse($angeltype['description']) . '</div>';
} }

@ -6,33 +6,49 @@
*/ */
function EventConfig_countdown_page($event_config) { function EventConfig_countdown_page($event_config) {
if ($event_config == null) { if ($event_config == null) {
return info(_("We got no information about the event right now."), true); return div('col-md-12 text-center', [
heading(sprintf(_("Welcome to the %s!"), '<span class="icon-icon_angel"></span> ENGELSYSTEM'), 2)
]);
} }
$elements = []; $elements = [];
if ($event_config['event_name'] != null) { if ($event_config['event_name'] != null) {
$elements[] = heading($event_config['event_name'], 2); $elements[] = div('col-sm-12 text-center', [
} heading(sprintf(_("Welcome to the %s!"), $event_config['event_name'] . ' <span class="icon-icon_angel"></span> ENGELSYSTEM'), 2)
]);
if ($event_config['event_start_date'] != null && $event_config['event_end_date'] != null) {
$elements[] = sprintf(_("from %s to %s"), date("Y-m-d", $event_config['event_start_date']), date("Y-m-d", $event_config['event_end_date']));
} }
if ($event_config['buildup_start_date'] != null && time() < $event_config['buildup_start_date']) { if ($event_config['buildup_start_date'] != null && time() < $event_config['buildup_start_date']) {
$elements[] = '<h2 class="moment-countdown" data-timestamp="' . $event_config['buildup_start_date'] . '">' . _("Buildup starts in %c") . '</h2>'; $elements[] = div('col-sm-3 text-center hidden-xs', [
heading(_("Buildup starts"), 4),
'<span class="moment-countdown text-big" data-timestamp="' . $event_config['buildup_start_date'] . '">%c</span>',
'<small>' . date(_("Y-m-d"), $event_config['buildup_start_date']) . '</small>'
]);
} }
if ($event_config['event_start_date'] != null && time() < $event_config['event_start_date']) { if ($event_config['event_start_date'] != null && time() < $event_config['event_start_date']) {
$elements[] = '<h2 class="moment-countdown" data-timestamp="' . $event_config['event_start_date'] . '">' . _("Event starts in %c") . '</h2>'; $elements[] = div('col-sm-3 text-center hidden-xs', [
heading(_("Event starts"), 4),
'<span class="moment-countdown text-big" data-timestamp="' . $event_config['event_start_date'] . '">%c</span>',
'<small>' . date(_("Y-m-d"), $event_config['event_start_date']) . '</small>'
]);
} }
if ($event_config['event_end_date'] != null && time() < $event_config['event_end_date'] && ($event_config['event_start_date'] == null || time() > $event_config['event_start_date'])) { if ($event_config['event_end_date'] != null && time() < $event_config['event_end_date']) {
$elements[] = '<h2 class="moment-countdown" data-timestamp="' . $event_config['event_end_date'] . '">' . _("Event ends in %c") . '</h2>'; $elements[] = div('col-sm-3 text-center hidden-xs', [
heading(_("Event ends"), 4),
'<span class="moment-countdown text-big" data-timestamp="' . $event_config['event_end_date'] . '">%c</span>',
'<small>' . date(_("Y-m-d"), $event_config['event_end_date']) . '</small>'
]);
} }
if ($event_config['teardown_end_date'] != null && time() < $event_config['teardown_end_date'] && ($event_config['event_start_date'] == null || time() > $event_config['event_start_date'])) { if ($event_config['teardown_end_date'] != null && time() < $event_config['teardown_end_date']) {
$elements[] = '<h2 class="moment-countdown" data-timestamp="' . $event_config['teardown_end_date'] . '">' . _("Teardown ends in %c") . '</h2>'; $elements[] = div('col-sm-3 text-center hidden-xs', [
heading(_("Teardown ends"), 4),
'<span class="moment-countdown text-big" data-timestamp="' . $event_config['teardown_end_date'] . '">%c</span>',
'<small>' . date(_("Y-m-d"), $event_config['teardown_end_date']) . '</small>'
]);
} }
return join("", $elements); return join("", $elements);

@ -26,7 +26,7 @@ function Questions_view($open_questions, $answered_questions, $ask_action) {
'Answer' => _("Answer"), 'Answer' => _("Answer"),
'actions' => "" 'actions' => ""
], $answered_questions), ], $answered_questions),
heading(_("Ask an archangel"), 2), heading(_("Ask the Heaven"), 2),
form([ form([
form_textarea('question', _("Your Question:"), ""), form_textarea('question', _("Your Question:"), ""),
form_submit('submit', _("Save")) form_submit('submit', _("Save"))

@ -55,6 +55,7 @@ function ShiftType_view($shifttype, $angeltype) {
button(page_link_to('shifttypes') . '&action=edit&shifttype_id=' . $shifttype['id'], _('edit'), 'edit'), button(page_link_to('shifttypes') . '&action=edit&shifttype_id=' . $shifttype['id'], _('edit'), 'edit'),
button(page_link_to('shifttypes') . '&action=delete&shifttype_id=' . $shifttype['id'], _('delete'), 'delete') button(page_link_to('shifttypes') . '&action=delete&shifttype_id=' . $shifttype['id'], _('delete'), 'delete')
]), ]),
heading(_("Description"), 2),
$parsedown->parse($shifttype['description']) $parsedown->parse($shifttype['description'])
]); ]);
} }

@ -81,7 +81,7 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, ShiftSignupSt
]), ]),
div('col-sm-3 col-xs-6', [ div('col-sm-3 col-xs-6', [
'<h4>' . _('Location') . '</h4>', '<h4>' . _('Location') . '</h4>',
'<p class="lead">' . glyph('map-marker') . $room['Name'] . '</p>' '<p class="lead">' . Room_name_render($room) . '</p>'
]) ])
]), ]),
div('row', [ div('row', [
@ -113,7 +113,9 @@ function Shift_view_render_needed_angeltype($needed_angeltype, $angeltypes, $shi
$needed_angels .= '<div class="pull-right">' . Shift_signup_button_render($shift, $angeltypes[$needed_angeltype['TID']]) . '</div>'; $needed_angels .= '<div class="pull-right">' . Shift_signup_button_render($shift, $angeltypes[$needed_angeltype['TID']]) . '</div>';
$needed_angels .= '<h3>' . AngelType_name_render($angeltypes[$needed_angeltype['TID']]) . '</h3>'; $needed_angels .= '<h3>' . AngelType_name_render($angeltypes[$needed_angeltype['TID']]) . '</h3>';
$needed_angels .= progress_bar(0, $needed_angeltype['count'], min($needed_angeltype['taken'], $needed_angeltype['count']), $class, $needed_angeltype['taken'] . ' / ' . $needed_angeltype['count']); $bar_max = max($needed_angeltype['count']*10, $needed_angeltype['taken']*10, 10);
$bar_value = max(1, $needed_angeltype['taken'] * 10);
$needed_angels .= progress_bar(0, $bar_max, $bar_value, $class, $needed_angeltype['taken'] . ' / ' . $needed_angeltype['count']);
$angels = []; $angels = [];
foreach ($shift['ShiftEntry'] as $shift_entry) { foreach ($shift['ShiftEntry'] as $shift_entry) {

@ -223,20 +223,8 @@ function User_shift_state_render($user) {
return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['end'] . '">' . _("Shift ends %c") . '</span>'; return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['end'] . '">' . _("Shift ends %c") . '</span>';
} }
function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me) { function User_view_shiftentries($needed_angel_type) {
global $LETZTES_AUSTRAGEN, $privileges; $shift_info = '<br><b>' . $needed_angel_type['name'] . ':</b> ';
$user_name = htmlspecialchars($user_source['Vorname']) . " " . htmlspecialchars($user_source['Name']);
$myshifts_table = [];
$timesum = 0;
foreach ($shifts as $shift) {
$shift_info = '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>';
if ($shift['title']) {
$shift_info .= '<br /><a href="' . shift_link($shift) . '">' . $shift['title'] . '</a>';
}
foreach ($shift['needed_angeltypes'] as $needed_angel_type) {
$shift_info .= '<br><b>' . $needed_angel_type['name'] . ':</b> ';
$shift_entries = []; $shift_entries = [];
foreach ($needed_angel_type['users'] as $user_shift) { foreach ($needed_angel_type['users'] as $user_shift) {
@ -248,6 +236,22 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
$shift_entries[] = $member; $shift_entries[] = $member;
} }
$shift_info .= join(", ", $shift_entries); $shift_info .= join(", ", $shift_entries);
return $shift_info;
}
/**
* Helper that renders a shift line for user view
*/
function User_view_myshift($shift, $user_source, $its_me) {
global $LETZTES_AUSTRAGEN, $privileges;
$shift_info = '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>';
if ($shift['title']) {
$shift_info .= '<br /><a href="' . shift_link($shift) . '">' . $shift['title'] . '</a>';
}
foreach ($shift['needed_angeltypes'] as $needed_angel_type) {
$shift_info .= User_view_shiftentries($needed_angel_type);
} }
$myshift = [ $myshift = [
@ -277,13 +281,25 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
} }
$myshift['actions'] = table_buttons($myshift['actions']); $myshift['actions'] = table_buttons($myshift['actions']);
return $myshift;
}
/**
* Helper that prepares the shift table for user view
*/
function User_view_myshifts($shifts, $user_source, $its_me) {
$myshifts_table = [];
$timesum = 0;
foreach ($shifts as $shift) {
$myshifts_table[] = User_view_myshift($shift, $user_source, $its_me);
if ($shift['freeloaded']) { if ($shift['freeloaded']) {
$timesum += (- 2 * ($shift['end'] - $shift['start'])); $timesum += (- 2 * ($shift['end'] - $shift['start']));
} else { } else {
$timesum += ($shift['end'] - $shift['start']); $timesum += ($shift['end'] - $shift['start']);
} }
$myshifts_table[] = $myshift;
} }
if (count($myshifts_table) > 0) { if (count($myshifts_table) > 0) {
$myshifts_table[] = [ $myshifts_table[] = [
'date' => '<b>' . _("Sum:") . '</b>', 'date' => '<b>' . _("Sum:") . '</b>',
@ -294,6 +310,15 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
'actions' => "" 'actions' => ""
]; ];
} }
return $myshifts_table;
}
/**
* Renders view for a single user
*/
function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me) {
$user_name = htmlspecialchars($user_source['Vorname']) . " " . htmlspecialchars($user_source['Name']);
$myshifts_table = User_view_myshifts($shifts, $user_source, $its_me);
return page_with_title('<span class="icon-icon_angel"></span> ' . htmlspecialchars($user_source['Nick']) . ' <small>' . $user_name . '</small>', [ return page_with_title('<span class="icon-icon_angel"></span> ' . htmlspecialchars($user_source['Nick']) . ' <small>' . $user_name . '</small>', [
msg(), msg(),

File diff suppressed because it is too large Load Diff

@ -6730,6 +6730,15 @@ body {
.footer a { .footer a {
color: #777777; color: #777777;
} }
.first {
margin-top: 30px;
}
.text-big {
display: block;
font-size: 30px;
line-height: 30px;
margin: 0px;
}
.panel-primary .panel-heading a { .panel-primary .panel-heading a {
color: #ffffff; color: #ffffff;
} }

@ -6753,6 +6753,15 @@ body {
.footer a { .footer a {
color: #888888; color: #888888;
} }
.first {
margin-top: 30px;
}
.text-big {
display: block;
font-size: 30px;
line-height: 30px;
margin: 0px;
}
.panel-primary .panel-heading a { .panel-primary .panel-heading a {
color: #ffffff; color: #ffffff;
} }

@ -6730,6 +6730,15 @@ body {
.footer a { .footer a {
color: #777777; color: #777777;
} }
.first {
margin-top: 30px;
}
.text-big {
display: block;
font-size: 30px;
line-height: 30px;
margin: 0px;
}
.panel-primary .panel-heading a { .panel-primary .panel-heading a {
color: #ffffff; color: #ffffff;
} }

@ -6739,6 +6739,15 @@ body {
.footer a { .footer a {
color: #777777; color: #777777;
} }
.first {
margin-top: 30px;
}
.text-big {
display: block;
font-size: 30px;
line-height: 30px;
margin: 0px;
}
.panel-primary .panel-heading a { .panel-primary .panel-heading a {
color: #ffffff; color: #ffffff;
} }

File diff suppressed because it is too large Load Diff

@ -1,6 +1,8 @@
<?php <?php
class LogEntriesModelTest extends PHPUnit_Framework_TestCase { namespace Engelsystem\Test;
class LogEntriesModelTest extends \PHPUnit_Framework_TestCase {
public function create_LogEntry() { public function create_LogEntry() {
LogEntry_create('test', 'test'); LogEntry_create('test', 'test');

@ -1,6 +1,8 @@
<?php <?php
class RoomModelTest extends PHPUnit_Framework_TestCase { namespace Engelsystem\Test;
class RoomModelTest extends \PHPUnit_Framework_TestCase {
private $room_id = null; private $room_id = null;

@ -10,6 +10,17 @@ body {
color: @text-muted; color: @text-muted;
} }
.first {
margin-top: 30px;
}
.text-big {
display: block;
font-size: 30px;
line-height: 30px;
margin: 0px;
}
.panel-primary .panel-heading a { .panel-primary .panel-heading a {
color: @panel-primary-text; color: @panel-primary-text;
} }

@ -4,3 +4,4 @@ lessc theme0.less > ../public/css/theme0.css
lessc theme1.less > ../public/css/theme1.css lessc theme1.less > ../public/css/theme1.css
lessc theme2.less > ../public/css/theme2.css lessc theme2.less > ../public/css/theme2.css
lessc theme3.less > ../public/css/theme3.css lessc theme3.less > ../public/css/theme3.css
lessc theme4.less > ../public/css/theme4.css

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save