iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rewrite create shifts for shifttypes

This commit is contained in:
Philip Häusler 2014-12-22 17:55:20 +01:00
parent 0dbd0ea599
commit 6a05c3d9de
6 changed files with 120 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
includes/controller/rooms_controller.php Normal file
View File

@ -0,0 +1,7 @@
<?php
function room_link($room) {
return page_link_to('admin_rooms') . '&show=edit&id=' . $room['RID'];
}
?>

4
includes/controller/shifttypes_controller.php
View File

@ -1,5 +1,9 @@
<?php <?php
function shifttype_link($shifttype) {
return page_link_to('shifttypes') . '&action=view&shifttype_id=' . $shifttype['id'];
}
/** /**
* Delete a shifttype. * Delete a shifttype.
*/ */

90
includes/pages/admin_shifts.php
View File

@ -6,7 +6,6 @@ function admin_shifts_title() {
// Assistent zum Anlegen mehrerer neuer Schichten // Assistent zum Anlegen mehrerer neuer Schichten
function admin_shifts() { function admin_shifts() {
$msg = "";
$ok = true; $ok = true;
$rid = 0; $rid = 0;
@ -16,7 +15,8 @@ function admin_shifts() {
$angelmode = 'manually'; $angelmode = 'manually';
$length = ''; $length = '';
$change_hours = array(); $change_hours = array();
$name = ""; $title = "";
$shifttype_id = null;
// Locations laden (auch unsichtbare - fuer Erzengel ist das ok) // Locations laden (auch unsichtbare - fuer Erzengel ist das ok)
$rooms = sql_select("SELECT * FROM `Room` ORDER BY `Name`"); $rooms = sql_select("SELECT * FROM `Room` ORDER BY `Name`");
@ -30,9 +30,31 @@ function admin_shifts() {
foreach ($types as $type) foreach ($types as $type)
$needed_angel_types[$type['id']] = 0; $needed_angel_types[$type['id']] = 0;
// Load shift types
$shifttypes_source = ShiftTypes();
if ($shifttypes_source === false)
engelsystem_error('Unable to load shift types.');
$shifttypes = [];
foreach ($shifttypes_source as $shifttype)
$shifttypes[$shifttype['id']] = $shifttype['name'];
if (isset($_REQUEST['preview']) || isset($_REQUEST['back'])) { if (isset($_REQUEST['preview']) || isset($_REQUEST['back'])) {
if (isset($_REQUEST['shifttype_id'])) {
$shifttype = ShiftType($_REQUEST['shifttype_id']);
if ($shifttype === false)
engelsystem_error('Unable to load shift type.');
if ($shifttype == null) {
$ok = false;
error(_('Please select a shift type.'));
} else
$shifttype_id = $_REQUEST['shifttype_id'];
} else {
$ok = false;
error(_('Please select a shift type.'));
}
// Name/Bezeichnung der Schicht, darf leer sein // Name/Bezeichnung der Schicht, darf leer sein
$name = strip_request_item('name'); $title = strip_request_item('title');
// Auswahl der sichtbaren Locations für die Schichten // Auswahl der sichtbaren Locations für die Schichten
if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room_array[$_REQUEST['rid']])) if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room_array[$_REQUEST['rid']]))
@ -40,26 +62,26 @@ function admin_shifts() {
else { else {
$ok = false; $ok = false;
$rid = $rooms[0]['RID']; $rid = $rooms[0]['RID'];
$msg .= error("Wähle bitte einen Raum aus.", true); error(_('Please select a location.'));
} }
if (isset($_REQUEST['start']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['start']))) if (isset($_REQUEST['start']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['start'])))
$start = $tmp->getTimestamp(); $start = $tmp->getTimestamp();
else { else {
$ok = false; $ok = false;
$msg .= error("Bitte gib einen Startzeitpunkt für die Schichten an.", true); error(_('Please select a start time.'));
} }
if (isset($_REQUEST['end']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['end']))) if (isset($_REQUEST['end']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['end'])))
$end = $tmp->getTimestamp(); $end = $tmp->getTimestamp();
else { else {
$ok = false; $ok = false;
$msg .= error("Bitte gib einen Endzeitpunkt für die Schichten an.", true); error(_('Please select an end time.'));
} }
if ($start >= $end) { if ($start >= $end) {
$ok = false; $ok = false;
$msg .= error("Das Ende muss nach dem Startzeitpunkt liegen!", true); error(_('The shifts end has to be after its start.'));
} }
if (isset($_REQUEST['mode'])) { if (isset($_REQUEST['mode'])) {
@ -71,7 +93,7 @@ function admin_shifts() {
$length = trim($_REQUEST['length']); $length = trim($_REQUEST['length']);
} else { } else {
$ok = false; $ok = false;
$msg .= error("Bitte gib eine Schichtlänge in Minuten an.", true); error(_('Please enter a shift duration in minutes.'));
} }
} elseif ($_REQUEST['mode'] == 'variable') { } elseif ($_REQUEST['mode'] == 'variable') {
if (isset($_REQUEST['change_hours']) && preg_match("/^([0-9]{2}(,|$))/", trim(str_replace(" ", "", $_REQUEST['change_hours'])))) { if (isset($_REQUEST['change_hours']) && preg_match("/^([0-9]{2}(,|$))/", trim(str_replace(" ", "", $_REQUEST['change_hours'])))) {
@ -79,12 +101,12 @@ function admin_shifts() {
$change_hours = array_map('trim', explode(",", $_REQUEST['change_hours'])); $change_hours = array_map('trim', explode(",", $_REQUEST['change_hours']));
} else { } else {
$ok = false; $ok = false;
$msg .= error("Bitte gib die Schichtwechsel-Stunden kommagetrennt ein.", true); error(_('Please split the shift-change hours by colons.'));
} }
} }
} else { } else {
$ok = false; $ok = false;
$msg .= error("Bitte wähle einen Modus.", true); error(_('Please select a mode.'));
} }
if (isset($_REQUEST['angelmode'])) { if (isset($_REQUEST['angelmode'])) {
@ -97,20 +119,20 @@ function admin_shifts() {
$needed_angel_types[$type['id']] = trim($_REQUEST['type_' . $type['id']]); $needed_angel_types[$type['id']] = trim($_REQUEST['type_' . $type['id']]);
} else { } else {
$ok = false; $ok = false;
$msg .= error("Bitte überprüfe die Eingaben für die benötigten Engel des Typs " . $type['name'] . ".", true); error(sprintf(_('Please check the needed angels for team %s.'), $type['name']));
} }
} }
if (array_sum($needed_angel_types) == 0) { if (array_sum($needed_angel_types) == 0) {
$ok = false; $ok = false;
$msg .= error("Es werden 0 Engel benötigt. Bitte wähle benötigte Engel.", true); error(_('There are 0 angels needed. Please enter the amounts of needed angels.'));
} }
} else { } else {
$ok = false; $ok = false;
$msg .= error("Bitte Wähle einen Modus für die benötigten Engel.", true); error(_('Please select a mode for needed angels.'));
} }
} else { } else {
$ok = false; $ok = false;
$msg .= error("Bitte wähle benötigte Engel.", true); error(_('Please select needed angels.'));
} }
// Beim Zurück-Knopf das Formular zeigen // Beim Zurück-Knopf das Formular zeigen
@ -131,7 +153,8 @@ function admin_shifts() {
'start' => $start, 'start' => $start,
'end' => $end, 'end' => $end,
'RID' => $rid, 'RID' => $rid,
'name' => $name 'title' => $title,
'shifttype_id' => $shifttype_id
); );
} elseif ($mode == 'multi') { } elseif ($mode == 'multi') {
$shift_start = $start; $shift_start = $start;
@ -147,7 +170,8 @@ function admin_shifts() {
'start' => $shift_start, 'start' => $shift_start,
'end' => $shift_end, 'end' => $shift_end,
'RID' => $rid, 'RID' => $rid,
'name' => $name 'title' => $title,
'shifttype_id' => $shifttype_id
); );
$shift_start = $shift_end; $shift_start = $shift_end;
@ -182,7 +206,8 @@ function admin_shifts() {
'start' => $shift_start, 'start' => $shift_start,
'end' => $shift_end, 'end' => $shift_end,
'RID' => $rid, 'RID' => $rid,
'name' => $name 'name' => $title,
'shifttype_id' => $shifttype_id
); );
$shift_start = $shift_end; $shift_start = $shift_end;
@ -192,14 +217,15 @@ function admin_shifts() {
$shifts_table = array(); $shifts_table = array();
foreach ($shifts as $shift) { foreach ($shifts as $shift) {
$shifts_table_entry = array( $shifts_table_entry = [
'timeslot' => '<span class="glyphicon glyphicon-time"></span> ' . date("Y-m-d H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '<br /><span class="glyphicon glyphicon-map-marker"></span> ' . $room_array[$shift['RID']], 'timeslot' => '<span class="glyphicon glyphicon-time"></span> ' . date("Y-m-d H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '<br />' . Room_name_render(Room($shift['RID'])),
'entries' => $shift['name'] 'title' => ShiftType_name_render(ShiftType($shifttype_id)) . ($shift['title'] ? '<br />' . $shift['title'] : ''),
); 'needed_angels' => ''
foreach ($types as $type) { ];
foreach ($types as $type)
if (isset($needed_angel_types[$type['id']]) && $needed_angel_types[$type['id']] > 0) if (isset($needed_angel_types[$type['id']]) && $needed_angel_types[$type['id']] > 0)
$shifts_table_entry['entries'] .= '<br /><span class="icon-icon_angel"></span> <b>' . $type['name'] . ':</b> ' . $needed_angel_types[$type['id']] . ' missing'; $shifts_table_entry['needed_angels'] .= '<b>' . AngelType_name_render($type) . ':</b> ' . $needed_angel_types[$type['id']] . '<br />';
}
$shifts_table[] = $shifts_table_entry; $shifts_table[] = $shifts_table_entry;
} }
@ -213,7 +239,8 @@ function admin_shifts() {
return page_with_title(_("Preview"), array( return page_with_title(_("Preview"), array(
form(array( form(array(
$hidden_types, $hidden_types,
form_hidden('name', $name), form_hidden('shifttype_id', $shifttype_id),
form_hidden('title', $title),
form_hidden('rid', $rid), form_hidden('rid', $rid),
form_hidden('start', date("Y-m-d H:i", $start)), form_hidden('start', date("Y-m-d H:i", $start)),
form_hidden('end', date("Y-m-d H:i", $end)), form_hidden('end', date("Y-m-d H:i", $end)),
@ -223,8 +250,9 @@ function admin_shifts() {
form_hidden('angelmode', $angelmode), form_hidden('angelmode', $angelmode),
form_submit('back', _("back")), form_submit('back', _("back")),
table(array( table(array(
'timeslot' => _("Timeslot"), 'timeslot' => _('Time and location'),
'entries' => _("Entries") 'title' => _('Type and title'),
'needed_angels' => _('Needed angels')
), $shifts_table), ), $shifts_table),
form_submit('submit', _("Save")) form_submit('submit', _("Save"))
)) ))
@ -253,7 +281,8 @@ function admin_shifts() {
} }
engelsystem_log("Shift needs following angel types: " . join(", ", $needed_angel_types_info)); engelsystem_log("Shift needs following angel types: " . join(", ", $needed_angel_types_info));
$msg = success("Schichten angelegt.", true); success("Schichten angelegt.");
redirect(page_link_to('admin_shifts'));
} else { } else {
unset($_SESSION['admin_shifts_shifts']); unset($_SESSION['admin_shifts_shifts']);
unset($_SESSION['admin_shifts_types']); unset($_SESSION['admin_shifts_types']);
@ -268,10 +297,9 @@ function admin_shifts() {
return page_with_title(admin_shifts_title(), array( return page_with_title(admin_shifts_title(), array(
msg(), msg(),
$msg,
form(array( form(array(
form_text('name', _("Name"), $name), form_select('shifttype_id', _('Shifttype'), $shifttypes, $shifttype_id),
// TODO: form_textarea('description', _("Description"), ''), form_text('title', _("Title"), $title),
form_select('rid', _("Room"), $room_array, $_REQUEST['rid']), form_select('rid', _("Room"), $room_array, $_REQUEST['rid']),
'<div class="row">', '<div class="row">',
'<div class="col-md-6">', '<div class="col-md-6">',

10
includes/view/Rooms_view.php Normal file
View File

@ -0,0 +1,10 @@
<?php
function Room_name_render($room) {
global $privileges;
if (in_array('admin_rooms', $privileges))
return '<a href="' . room_link($room) . '">' . glyph('map-marker') . $room['Name'] . '</a>';
return $room['Name'];
}
?>

7
includes/view/ShiftTypes_view.php
View File

@ -1,5 +1,12 @@
<?php <?php
function ShiftType_name_render($shifttype) {
global $privileges;
if (in_array('shifttypes', $privileges))
return '<a href="' . shifttype_link($shifttype) . '">' . $shifttype['name'] . '</a>';
return $shifttype['name'];
}
function ShiftType_delete_view($shifttype) { function ShiftType_delete_view($shifttype) {
return page_with_title(sprintf(_("Delete shifttype %s"), $shifttype['name']), array( return page_with_title(sprintf(_("Delete shifttype %s"), $shifttype['name']), array(
info(sprintf(_("Do you want to delete shifttype %s?"), $shifttype['name']), true), info(sprintf(_("Do you want to delete shifttype %s?"), $shifttype['name']), true),

2
public/index.php
View File

@ -22,6 +22,7 @@ require_once realpath(__DIR__ . '/../includes/model/User_model.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/Questions_view.php'); require_once realpath(__DIR__ . '/../includes/view/Questions_view.php');
require_once realpath(__DIR__ . '/../includes/view/Rooms_view.php');
require_once realpath(__DIR__ . '/../includes/view/Shifts_view.php'); require_once realpath(__DIR__ . '/../includes/view/Shifts_view.php');
require_once realpath(__DIR__ . '/../includes/view/ShiftEntry_view.php'); require_once realpath(__DIR__ . '/../includes/view/ShiftEntry_view.php');
require_once realpath(__DIR__ . '/../includes/view/ShiftTypes_view.php'); require_once realpath(__DIR__ . '/../includes/view/ShiftTypes_view.php');
@ -29,6 +30,7 @@ require_once realpath(__DIR__ . '/../includes/view/UserAngelTypes_view.php');
require_once realpath(__DIR__ . '/../includes/view/User_view.php'); require_once realpath(__DIR__ . '/../includes/view/User_view.php');
require_once realpath(__DIR__ . '/../includes/controller/angeltypes_controller.php'); require_once realpath(__DIR__ . '/../includes/controller/angeltypes_controller.php');
require_once realpath(__DIR__ . '/../includes/controller/rooms_controller.php');
require_once realpath(__DIR__ . '/../includes/controller/shifts_controller.php'); require_once realpath(__DIR__ . '/../includes/controller/shifts_controller.php');
require_once realpath(__DIR__ . '/../includes/controller/shifttypes_controller.php'); require_once realpath(__DIR__ . '/../includes/controller/shifttypes_controller.php');
require_once realpath(__DIR__ . '/../includes/controller/users_controller.php'); require_once realpath(__DIR__ . '/../includes/controller/users_controller.php');