From a73e98a8e069074fe439d8d54c93fd35c46ace8e Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Tue, 16 Dec 2014 09:01:39 +0100
Subject: prepare shift types controller and view

---
 includes/view/ShiftTypes_view.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 includes/view/ShiftTypes_view.php

(limited to 'includes/view/ShiftTypes_view.php')

diff --git a/includes/view/ShiftTypes_view.php b/includes/view/ShiftTypes_view.php
new file mode 100644
index 00000000..c18ea493
--- /dev/null
+++ b/includes/view/ShiftTypes_view.php
@@ -0,0 +1,15 @@
+<?php
+
+function ShiftType_delete_view($shifttype) {
+}
+
+function ShiftType_edit_view($name, $angeltype_id, $angeltypes, $description, $shifttype_id) {
+}
+
+function ShiftType_view($shifttype) {
+}
+
+function ShiftTypes_list_view() {
+}
+
+?>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From c8cc46886b4a163f9408df80c3bfbdcfa4ae2f7b Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Tue, 16 Dec 2014 09:25:36 +0100
Subject: shift type list

---
 db/update.sql                                 |  4 +-
 includes/controller/shifttypes_controller.php | 13 +++++++
 includes/sys_menu.php                         | 53 ++++++++++++++-------------
 includes/view/ShiftTypes_view.php             | 19 +++++++++-
 public/index.php                              |  2 +
 5 files changed, 63 insertions(+), 28 deletions(-)

(limited to 'includes/view/ShiftTypes_view.php')

diff --git a/db/update.sql b/db/update.sql
index d7d91a80..8c9bdaec 100644
--- a/db/update.sql
+++ b/db/update.sql
@@ -5,7 +5,9 @@ CREATE TABLE IF NOT EXISTS `ShiftTypes` (
   `angeltype_id` int(11) DEFAULT NULL,
   `description` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
+INSERT INTO `engelsystem`.`Privileges` (`id`, `name`, `desc`) VALUES (NULL , 'shifttypes', 'Administrate shift types');
+INSERT INTO `GroupPrivileges` SET `group_id`=-5, `privilege_id`=(SELECT `id` FROM `Privileges` WHERE `name`='shifttypes');
 
 /* cleanup */
 ALTER TABLE `User` DROP `ICQ` ;
diff --git a/includes/controller/shifttypes_controller.php b/includes/controller/shifttypes_controller.php
index 3ceb5c0d..6d061111 100644
--- a/includes/controller/shifttypes_controller.php
+++ b/includes/controller/shifttypes_controller.php
@@ -10,6 +10,19 @@ function shifttype_controller() {
 }
 
 function shifttypes_list_controller() {
+  global $privileges, $user;
+  
+  if (! in_array('shifttypes', $privileges))
+    redirect('?');
+  
+  $shifttypes = ShiftTypes();
+  if ($shifttypes === false)
+    engelsystem_error("Unable to load shifttypes.");
+  
+  return array(
+      shifttypes_title(),
+      ShiftTypes_list_view($shifttypes) 
+  );
 }
 
 /**
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index ffe76219..75c7c3db 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -15,21 +15,21 @@ function page_link_to_absolute($page) {
  */
 function header_toolbar() {
   global $p, $privileges, $user, $enable_tshirt_size;
-
+  
   $toolbar_items = array();
-
+  
   if (isset($user))
     $toolbar_items[] = toolbar_item_link(page_link_to('users') . '&amp;action=view', 'time', User_shift_state_render($user));
-
+  
   if (! isset($user) && in_array('register', $privileges))
     $toolbar_items[] = toolbar_item_link(page_link_to('register'), 'plus', register_title(), $p == 'register');
-
+  
   if (in_array('login', $privileges))
     $toolbar_items[] = toolbar_item_link(page_link_to('login'), 'log-in', login_title(), $p == 'login');
-
+  
   if (isset($user) && in_array('user_messages', $privileges))
     $toolbar_items[] = toolbar_item_link(page_link_to('user_messages'), 'envelope', user_unread_messages());
-
+  
   $hints = [];
   if (isset($user)) {
     $hint_class = 'info';
@@ -40,30 +40,30 @@ function header_toolbar() {
       if ($new_questions != "")
         $hints[] = $new_questions;
     }
-
+    
     $unconfirmed_hint = user_angeltypes_unconfirmed_hint();
     if ($unconfirmed_hint != '')
       $hints[] = $unconfirmed_hint;
-
+    
     if (User_is_freeloader($user)) {
       $hints[] = error(sprintf(_("You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), $max_freeloadable_shifts), true);
       $hint_class = 'danger';
       $glyphicon = 'warning-sign';
     }
-
+    
     // Hinweis für Engel, die noch nicht angekommen sind
     if ($user['Gekommen'] == 0) {
       $hints[] = error(_("You are not marked as arrived. Please go to heaven's desk, get your angel badge and/or tell them that you arrived already."), true);
       $hint_class = 'danger';
       $glyphicon = 'warning-sign';
     }
-
+    
     if ($enable_tshirt_size && $user['Size'] == "") {
       $hints[] = error(_("You need to specify a tshirt size in your settings!"), true);
       $hint_class = 'danger';
       $glyphicon = 'warning-sign';
     }
-
+    
     if ($user['DECT'] == "") {
       $hints[] = error(_("You need to specify a DECT phone number in your settings! If you don't have a DECT phone, just enter \"-\"."), true);
       $hint_class = 'danger';
@@ -72,40 +72,40 @@ function header_toolbar() {
   }
   if (count($hints) > 0)
     $toolbar_items[] = toolbar_popover($glyphicon . ' text-' . $hint_class, '', $hints, 'bg-' . $hint_class);
-
+  
   $user_submenu = make_langselect();
   $user_submenu[] = toolbar_item_divider();
   if (in_array('user_myshifts', $privileges))
     $toolbar_items[] = toolbar_item_link(page_link_to('users') . '&amp;action=view', ' icon-icon_angel', $user['Nick'], $p == 'users');
-
+  
   if (in_array('user_settings', $privileges))
     $user_submenu[] = toolbar_item_link(page_link_to('user_settings'), 'list-alt', settings_title(), $p == 'user_settings');
-
+  
   if (in_array('logout', $privileges))
     $user_submenu[] = toolbar_item_link(page_link_to('logout'), 'log-out', logout_title(), $p == 'logout');
-
+  
   if (count($user_submenu) > 0)
     $toolbar_items[] = toolbar_dropdown('', '', $user_submenu);
-
+  
   return toolbar($toolbar_items, true);
 }
 
 function make_navigation() {
   global $p, $privileges;
-
+  
   $menu = array();
   $pages = array(
       "news" => news_title(),
       "user_meetings" => meetings_title(),
       "user_shifts" => shifts_title(),
       "angeltypes" => angeltypes_title(),
-      "user_questions" => questions_title()
+      "user_questions" => questions_title() 
   );
-
+  
   foreach ($pages as $page => $title)
     if (in_array($page, $privileges))
       $menu[] = toolbar_item_link(page_link_to($page), '', $title, $page == $p);
-
+  
   $admin_menu = array();
   $admin_pages = array(
       "admin_arrive" => admin_arrive_title(),
@@ -113,31 +113,32 @@ function make_navigation() {
       "admin_user" => admin_user_title(),
       "admin_free" => admin_free_title(),
       "admin_questions" => admin_questions_title(),
+      "shifttypes" => shifttypes_title(),
       "admin_shifts" => admin_shifts_title(),
       "admin_rooms" => admin_rooms_title(),
       "admin_groups" => admin_groups_title(),
       "admin_import" => admin_import_title(),
-      "admin_log" => admin_log_title()
+      "admin_log" => admin_log_title() 
   );
-
+  
   foreach ($admin_pages as $page => $title)
     if (in_array($page, $privileges))
       $admin_menu[] = toolbar_item_link(page_link_to($page), '', $title, $page == $p);
-
+  
   if (count($admin_menu) > 0)
     $menu[] = toolbar_dropdown('', _("Admin"), $admin_menu);
-
+  
   return toolbar($menu);
 }
 
 function make_navigation_for($name, $pages) {
   global $privileges, $p;
-
+  
   $menu = "";
   foreach ($pages as $page)
     if (in_array($page, $privileges))
       $menu .= '<li' . ($page == $p ? ' class="selected"' : '') . '><a href="' . page_link_to($page) . '">' . $title . '</a></li>';
-
+  
   if ($menu != "")
     $menu = '<nav class="container"><h4>' . $name . '</h4><ul class="content">' . $menu . '</ul></nav>';
   return $menu;
diff --git a/includes/view/ShiftTypes_view.php b/includes/view/ShiftTypes_view.php
index c18ea493..a7df2c87 100644
--- a/includes/view/ShiftTypes_view.php
+++ b/includes/view/ShiftTypes_view.php
@@ -9,7 +9,24 @@ function ShiftType_edit_view($name, $angeltype_id, $angeltypes, $description, $s
 function ShiftType_view($shifttype) {
 }
 
-function ShiftTypes_list_view() {
+function ShiftTypes_list_view($shifttypes) {
+  foreach ($shifttypes as &$shifttype) {
+    $shifttype['actions'] = table_buttons([
+        button(page_link_to('shifttypes') . '&action=edit&shifttype_id=' . $shifttype['id'], _("edit"), "btn-xs"),
+        button(page_link_to('shifttypes') . '&action=delete&shifttype_id=' . $shifttypes['id'], _("delete"), "btn-xs") 
+    ]);
+  }
+  
+  return page_with_title(shifttypes_title(), array(
+      msg(),
+      buttons(array(
+          button(page_link_to('shifttypes') . '&action=edit', _("New shifttype"), 'add') 
+      )),
+      table(array(
+          'name' => _("Name"),
+          'actions' => "" 
+      ), $shifttypes) 
+  ));
 }
 
 ?>
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
index 6574b619..51bd7661 100644
--- a/public/index.php
+++ b/public/index.php
@@ -131,6 +131,8 @@ if (isset($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && (i
     list($title, $content) = users_controller();
   } elseif ($p == "user_angeltypes") {
     list($title, $content) = user_angeltypes_controller();
+  } elseif ($p == "shifttypes") {
+    list($title, $content) = shifttypes_controller();
   } elseif ($p == "news") {
     $title = news_title();
     $content = user_news();
-- 
cgit v1.2.3-70-g09d2


From 526167ed11a9e13d20698029bc08f13cd574d946 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Tue, 16 Dec 2014 09:55:14 +0100
Subject: add create shift type

---
 includes/controller/shifttypes_controller.php | 61 ++++++++++++++++++++++++---
 includes/sys_template.php                     | 32 +++++++-------
 includes/view/ShiftTypes_view.php             | 41 +++++++++++++-----
 3 files changed, 100 insertions(+), 34 deletions(-)

(limited to 'includes/view/ShiftTypes_view.php')

diff --git a/includes/controller/shifttypes_controller.php b/includes/controller/shifttypes_controller.php
index 6d061111..aaefaa33 100644
--- a/includes/controller/shifttypes_controller.php
+++ b/includes/controller/shifttypes_controller.php
@@ -3,26 +3,70 @@
 function shifttype_delete_controller() {
 }
 
+/**
+ * Edit or create shift type.
+ */
 function shifttype_edit_controller() {
+  $shifttype_id = null;
+  $name = "";
+  $angeltype_id = null;
+  $description = "";
+  
+  $angeltypes = AngelTypes();
+  if ($angeltypes === false)
+    engelsystem_error("Unable to load angel types.");
+  
+  if (isset($_REQUEST['submit'])) {
+    $ok = true;
+    
+    if (isset($_REQUEST['name']) && $_REQUEST['name'] != '')
+      $name = strip_request_item('name');
+    else {
+      $ok = false;
+      error(_('Please enter a name.'));
+    }
+    
+    if (isset($_REQUEST['angeltype_id']) && preg_match("/^[0-9]+$/", $_REQUEST['angeltype_id']))
+      $angeltype_id = $_REQUEST['angeltype_id'];
+    else
+      $angeltype_id = null;
+    
+    if (isset($_REQUEST['description']))
+      $description = strip_request_item_nl('description');
+    
+    if ($ok) {
+      if ($shifttype_id) {} else {
+        $shifttype_id = ShiftType_create($name, $angeltype_id, $description);
+        if ($shifttype_id === false)
+          engelsystem_error('Unable to create shift type.');
+        engelsystem_log('Created shifttype ' . $name);
+        success(_('Created shifttype.'));
+      }
+      redirect(page_link_to('shifttypes') . '&action=view&shifttype_id=' . $shifttype_id);
+    }
+  }
+  
+  return [
+      shifttypes_title(),
+      ShiftType_edit_view($name, $angeltype_id, $angeltypes, $description, $shifttype_id) 
+  ];
 }
 
 function shifttype_controller() {
 }
 
+/**
+ * List all shift types.
+ */
 function shifttypes_list_controller() {
-  global $privileges, $user;
-  
-  if (! in_array('shifttypes', $privileges))
-    redirect('?');
-  
   $shifttypes = ShiftTypes();
   if ($shifttypes === false)
     engelsystem_error("Unable to load shifttypes.");
   
-  return array(
+  return [
       shifttypes_title(),
       ShiftTypes_list_view($shifttypes) 
-  );
+  ];
 }
 
 /**
@@ -32,6 +76,9 @@ function shifttypes_title() {
   return _("Shifttypes");
 }
 
+/**
+ * Route shift type actions
+ */
 function shifttypes_controller() {
   if (! isset($_REQUEST['action']))
     $_REQUEST['action'] = 'list';
diff --git a/includes/sys_template.php b/includes/sys_template.php
index d7017bd9..b9ae39de 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -6,13 +6,13 @@
 $themes = array(
     "0" => "Engelsystem light",
     "1" => "Engelsystem dark",
-    "2" => "Engelsystem 31c3"
+    "2" => "Engelsystem 31c3" 
 );
 
 /**
  * Render glyphicon
  *
- * @param string $glyph_name
+ * @param string $glyph_name          
  */
 function glyph($glyph_name) {
   return ' <span class="glyphicon glyphicon-' . $glyph_name . '"></span> ';
@@ -21,7 +21,7 @@ function glyph($glyph_name) {
 /**
  * Renders a tick or a cross by given boolean
  *
- * @param boolean $boolean
+ * @param boolean $boolean          
  */
 function glyph_bool($boolean) {
   return '<span class="text-' . ($boolean ? 'success' : 'danger') . '">' . glyph($boolean ? 'ok' : 'remove') . '</span>';
@@ -39,7 +39,7 @@ function heading($content, $number = 1) {
 /**
  * Render a toolbar.
  *
- * @param array $items
+ * @param array $items          
  * @return string
  */
 function toolbar($items = array(), $right = false) {
@@ -49,10 +49,10 @@ function toolbar($items = array(), $right = false) {
 /**
  * Render a link for a toolbar.
  *
- * @param string $href
- * @param string $glyphicon
- * @param string $label
- * @param bool $selected
+ * @param string $href          
+ * @param string $glyphicon          
+ * @param string $label          
+ * @param bool $selected          
  * @return string
  */
 function toolbar_item_link($href, $glyphicon, $label, $selected = false) {
@@ -125,9 +125,9 @@ function form_checkboxes($name, $label, $items, $selected) {
   $html = form_element($label, '');
   foreach ($items as $key => $item)
     $html .= form_checkbox($name . '_' . $key, $item, array_search($key, $selected) !== false);
-
+  
   return $html;
-
+  
   $html = "<ul>";
   foreach ($items as $key => $item) {
     $id = $name . '_' . $key;
@@ -283,17 +283,17 @@ function table($columns, $rows_raw, $data = true) {
   // If only one column is given
   if (! is_array($columns)) {
     $columns = array(
-        'col' => $columns
+        'col' => $columns 
     );
-
+    
     $rows = array();
     foreach ($rows_raw as $row)
       $rows[] = array(
-          'col' => $row
+          'col' => $row 
       );
   } else
     $rows = $rows_raw;
-
+  
   if (count($rows) == 0)
     return info(_("No data found."), true);
   $html = "";
@@ -381,7 +381,7 @@ function html_options($name, $options, $selected = "") {
   $html = "";
   foreach ($options as $value => $label)
     $html .= '<input type="radio"' . ($value == $selected ? ' checked="checked"' : '') . ' name="' . $name . '" value="' . $value . '"> ' . $label;
-
+  
   return $html;
 }
 
@@ -419,7 +419,7 @@ function ReplaceSmilies($neueckig) {
   $neueckig = str_replace(";P", "<img src=\"pic/smiles/icon_mad.gif\">", $neueckig);
   $neueckig = str_replace(";oP", "<img src=\"pic/smiles/icon_mad.gif\">", $neueckig);
   $neueckig = str_replace("?)", "<img src=\"pic/smiles/icon_question.gif\">", $neueckig);
-
+  
   return $neueckig;
 }
 ?>
diff --git a/includes/view/ShiftTypes_view.php b/includes/view/ShiftTypes_view.php
index a7df2c87..580e4c45 100644
--- a/includes/view/ShiftTypes_view.php
+++ b/includes/view/ShiftTypes_view.php
@@ -4,6 +4,25 @@ function ShiftType_delete_view($shifttype) {
 }
 
 function ShiftType_edit_view($name, $angeltype_id, $angeltypes, $description, $shifttype_id) {
+  $angeltypes_select = [
+      '' => _('All') 
+  ];
+  foreach ($angeltypes as $angeltype)
+    $angeltypes_select[$angeltype['id']] = $angeltype['name'];
+  
+  return page_with_title($shifttype_id ? _('Edit shifttype') : _('Create shifttype'), [
+      msg(),
+      buttons([
+          button(page_link_to('shifttypes'), shifttypes_title(), 'back') 
+      ]),
+      form([
+          form_text('name', _('Name'), $name),
+          form_select('angeltype_id', _('Angeltype'), $angeltypes_select, $angeltype_id),
+          form_textarea('description', _('Description'), $description),
+          form_info('', _('Please use markdown for the description.')),
+          form_submit('submit', _('Save')) 
+      ]) 
+  ]);
 }
 
 function ShiftType_view($shifttype) {
@@ -12,21 +31,21 @@ function ShiftType_view($shifttype) {
 function ShiftTypes_list_view($shifttypes) {
   foreach ($shifttypes as &$shifttype) {
     $shifttype['actions'] = table_buttons([
-        button(page_link_to('shifttypes') . '&action=edit&shifttype_id=' . $shifttype['id'], _("edit"), "btn-xs"),
-        button(page_link_to('shifttypes') . '&action=delete&shifttype_id=' . $shifttypes['id'], _("delete"), "btn-xs") 
+        button(page_link_to('shifttypes') . '&action=edit&shifttype_id=' . $shifttype['id'], _('edit'), 'btn-xs'),
+        button(page_link_to('shifttypes') . '&action=delete&shifttype_id=' . $shifttype['id'], _('delete'), 'btn-xs') 
     ]);
   }
   
-  return page_with_title(shifttypes_title(), array(
+  return page_with_title(shifttypes_title(), [
       msg(),
-      buttons(array(
-          button(page_link_to('shifttypes') . '&action=edit', _("New shifttype"), 'add') 
-      )),
-      table(array(
-          'name' => _("Name"),
-          'actions' => "" 
-      ), $shifttypes) 
-  ));
+      buttons([
+          button(page_link_to('shifttypes') . '&action=edit', _('New shifttype'), 'add') 
+      ]),
+      table([
+          'name' => _('Name'),
+          'actions' => '' 
+      ], $shifttypes) 
+  ]);
 }
 
 ?>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 3f8e5e47c05a2cf8fe4e51034523b0b6021b45f5 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Tue, 16 Dec 2014 10:19:38 +0100
Subject: add update, delete and view for shift type

---
 db/update.sql                                 |  2 +
 includes/controller/shifttypes_controller.php | 68 ++++++++++++++++++++++++++-
 includes/view/ShiftTypes_view.php             | 23 ++++++++-
 3 files changed, 90 insertions(+), 3 deletions(-)

(limited to 'includes/view/ShiftTypes_view.php')

diff --git a/db/update.sql b/db/update.sql
index 8c9bdaec..7375b507 100644
--- a/db/update.sql
+++ b/db/update.sql
@@ -6,6 +6,8 @@ CREATE TABLE IF NOT EXISTS `ShiftTypes` (
   `description` text NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
+ALTER TABLE `ShiftTypes` ADD INDEX ( `angeltype_id` );
+ALTER TABLE `ShiftTypes` ADD FOREIGN KEY ( `angeltype_id` ) REFERENCES `engelsystem`.`AngelTypes` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
 INSERT INTO `engelsystem`.`Privileges` (`id`, `name`, `desc`) VALUES (NULL , 'shifttypes', 'Administrate shift types');
 INSERT INTO `GroupPrivileges` SET `group_id`=-5, `privilege_id`=(SELECT `id` FROM `Privileges` WHERE `name`='shifttypes');
 
diff --git a/includes/controller/shifttypes_controller.php b/includes/controller/shifttypes_controller.php
index aaefaa33..f5760ad5 100644
--- a/includes/controller/shifttypes_controller.php
+++ b/includes/controller/shifttypes_controller.php
@@ -1,6 +1,31 @@
 <?php
 
+/**
+ * Delete a shifttype.
+ */
 function shifttype_delete_controller() {
+  if (! isset($_REQUEST['shifttype_id']))
+    redirect(page_link_to('shifttypes'));
+  $shifttype = ShiftType($_REQUEST['shifttype_id']);
+  if ($shifttype === false)
+    engelsystem_error('Unable to load shifttype.');
+  if ($shifttype == null)
+    redirect(page_link_to('shifttypes'));
+  
+  if (isset($_REQUEST['confirmed'])) {
+    $result = ShiftType_delete($shifttype['id']);
+    if ($result === false)
+      engelsystem_error('Unable to delete shifttype.');
+    
+    engelsystem_log('Deleted shifttype ' . $shifttype['name']);
+    success(sprintf(_('Shifttype %s deleted.'), $shifttype['name']));
+    redirect(page_link_to('shifttypes'));
+  }
+  
+  return array(
+      sprintf(_("Delete shifttype %s"), $shifttype['name']),
+      ShiftType_delete_view($shifttype) 
+  );
 }
 
 /**
@@ -16,6 +41,20 @@ function shifttype_edit_controller() {
   if ($angeltypes === false)
     engelsystem_error("Unable to load angel types.");
   
+  if (isset($_REQUEST['shifttype_id'])) {
+    $shifttype = ShiftType($_REQUEST['shifttype_id']);
+    if ($shifttype === false)
+      engelsystem_error('Unable to load shifttype.');
+    if ($shifttype == null) {
+      error(_('Shifttype not found.'));
+      redirect(page_link_to('shifttypes'));
+    }
+    $shifttype_id = $shifttype['id'];
+    $name = $shifttype['name'];
+    $angeltype_id = $shifttype['angeltype_id'];
+    $description = $shifttype['description'];
+  }
+  
   if (isset($_REQUEST['submit'])) {
     $ok = true;
     
@@ -35,10 +74,16 @@ function shifttype_edit_controller() {
       $description = strip_request_item_nl('description');
     
     if ($ok) {
-      if ($shifttype_id) {} else {
+      if ($shifttype_id) {
+        $result = ShiftType_update($shifttype_id, $name, $angeltype_id, $description);
+        if ($result === false)
+          engelsystem_error('Unable to update shifttype.');
+        engelsystem_log('Updated shifttype ' . $name);
+        success(_('Updated shifttype.'));
+      } else {
         $shifttype_id = ShiftType_create($name, $angeltype_id, $description);
         if ($shifttype_id === false)
-          engelsystem_error('Unable to create shift type.');
+          engelsystem_error('Unable to create shifttype.');
         engelsystem_log('Created shifttype ' . $name);
         success(_('Created shifttype.'));
       }
@@ -53,6 +98,25 @@ function shifttype_edit_controller() {
 }
 
 function shifttype_controller() {
+  if (! isset($_REQUEST['shifttype_id']))
+    redirect(page_link_to('shifttypes'));
+  $shifttype = ShiftType($_REQUEST['shifttype_id']);
+  if ($shifttype === false)
+    engelsystem_error('Unable to load shifttype.');
+  if ($shifttype == null)
+    redirect(page_link_to('shifttypes'));
+  
+  $angeltype = null;
+  if ($shifttype['angeltype_id'] != null) {
+    $angeltype = AngelType($shifttype['angeltype_id']);
+    if ($angeltype === false)
+      engelsystem_error('Unable to load angeltype.');
+  }
+  
+  return [
+      $shifttype['name'],
+      ShiftType_view($shifttype, $angeltype) 
+  ];
 }
 
 /**
diff --git a/includes/view/ShiftTypes_view.php b/includes/view/ShiftTypes_view.php
index 580e4c45..5210f29c 100644
--- a/includes/view/ShiftTypes_view.php
+++ b/includes/view/ShiftTypes_view.php
@@ -1,6 +1,13 @@
 <?php
 
 function ShiftType_delete_view($shifttype) {
+  return page_with_title(sprintf(_("Delete shifttype %s"), $shifttype['name']), array(
+      info(sprintf(_("Do you want to delete shifttype %s?"), $shifttype['name']), true),
+      buttons(array(
+          button(page_link_to('shifttypes'), _("cancel"), 'cancel'),
+          button(page_link_to('shifttypes') . '&action=delete&shifttype_id=' . $shifttype['id'] . '&confirmed', _("delete"), 'ok') 
+      )) 
+  ));
 }
 
 function ShiftType_edit_view($name, $angeltype_id, $angeltypes, $description, $shifttype_id) {
@@ -25,7 +32,21 @@ function ShiftType_edit_view($name, $angeltype_id, $angeltypes, $description, $s
   ]);
 }
 
-function ShiftType_view($shifttype) {
+function ShiftType_view($shifttype, $angeltype) {
+  $parsedown = new Parsedown();
+  $title = $shifttype['name'];
+  if ($angeltype)
+    $title .= ' <small>' . sprintf(_('for team %s'), $angeltype['name']) . '</small>';
+  return page_with_title($title, [
+      msg(),
+      buttons([
+          button(page_link_to('shifttypes'), shifttypes_title(), 'back'),
+          $angeltype ? button(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'], $angeltype['name']) : '',
+          button(page_link_to('shifttypes'), _('edit'), 'edit'),
+          button(page_link_to('shifttypes'), _('delete'), 'delete') 
+      ]),
+      $parsedown->parse($shifttype['description']) 
+  ]);
 }
 
 function ShiftTypes_list_view($shifttypes) {
-- 
cgit v1.2.3-70-g09d2


From 634a3739b25bc5167c084b431c931d6d60944a1d Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Wed, 17 Dec 2014 16:08:04 +0100
Subject: better shift type links

---
 includes/view/ShiftTypes_view.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'includes/view/ShiftTypes_view.php')

diff --git a/includes/view/ShiftTypes_view.php b/includes/view/ShiftTypes_view.php
index 5210f29c..3f538a51 100644
--- a/includes/view/ShiftTypes_view.php
+++ b/includes/view/ShiftTypes_view.php
@@ -42,8 +42,8 @@ function ShiftType_view($shifttype, $angeltype) {
       buttons([
           button(page_link_to('shifttypes'), shifttypes_title(), 'back'),
           $angeltype ? button(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'], $angeltype['name']) : '',
-          button(page_link_to('shifttypes'), _('edit'), 'edit'),
-          button(page_link_to('shifttypes'), _('delete'), 'delete') 
+          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') 
       ]),
       $parsedown->parse($shifttype['description']) 
   ]);
@@ -51,6 +51,7 @@ function ShiftType_view($shifttype, $angeltype) {
 
 function ShiftTypes_list_view($shifttypes) {
   foreach ($shifttypes as &$shifttype) {
+    $shifttype['name'] = '<a href="' . page_link_to('shifttypes') . '&action=view&shifttype_id=' . $shifttype['id'] . '">' . $shifttype['name'] . '</a>';
     $shifttype['actions'] = table_buttons([
         button(page_link_to('shifttypes') . '&action=edit&shifttype_id=' . $shifttype['id'], _('edit'), 'btn-xs'),
         button(page_link_to('shifttypes') . '&action=delete&shifttype_id=' . $shifttype['id'], _('delete'), 'btn-xs') 
-- 
cgit v1.2.3-70-g09d2


From 6a05c3d9deb306eb7f64b275f54ec9dffec31023 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Mon, 22 Dec 2014 17:55:20 +0100
Subject: rewrite create shifts for shifttypes

---
 includes/controller/rooms_controller.php      |   7 ++
 includes/controller/shifttypes_controller.php |   4 +
 includes/pages/admin_shifts.php               | 152 +++++++++++++++-----------
 includes/view/Rooms_view.php                  |  10 ++
 includes/view/ShiftTypes_view.php             |   7 ++
 public/index.php                              |   2 +
 6 files changed, 120 insertions(+), 62 deletions(-)
 create mode 100644 includes/controller/rooms_controller.php
 create mode 100644 includes/view/Rooms_view.php

(limited to 'includes/view/ShiftTypes_view.php')

diff --git a/includes/controller/rooms_controller.php b/includes/controller/rooms_controller.php
new file mode 100644
index 00000000..5d55e1b7
--- /dev/null
+++ b/includes/controller/rooms_controller.php
@@ -0,0 +1,7 @@
+<?php
+
+function room_link($room) {
+  return page_link_to('admin_rooms') . '&show=edit&id=' . $room['RID'];
+}
+
+?>
\ No newline at end of file
diff --git a/includes/controller/shifttypes_controller.php b/includes/controller/shifttypes_controller.php
index f5760ad5..443ce470 100644
--- a/includes/controller/shifttypes_controller.php
+++ b/includes/controller/shifttypes_controller.php
@@ -1,5 +1,9 @@
 <?php
 
+function shifttype_link($shifttype) {
+  return page_link_to('shifttypes') . '&action=view&shifttype_id=' . $shifttype['id'];
+}
+
 /**
  * Delete a shifttype.
  */
diff --git a/includes/pages/admin_shifts.php b/includes/pages/admin_shifts.php
index 69166380..733144b3 100644
--- a/includes/pages/admin_shifts.php
+++ b/includes/pages/admin_shifts.php
@@ -6,9 +6,8 @@ function admin_shifts_title() {
 
 // Assistent zum Anlegen mehrerer neuer Schichten
 function admin_shifts() {
-  $msg = "";
   $ok = true;
-
+  
   $rid = 0;
   $start = DateTime::createFromFormat("Y-m-d H:i", date("Y-m-d") . " 00:00")->getTimestamp();
   $end = $start + 24 * 60 * 60;
@@ -16,52 +15,75 @@ function admin_shifts() {
   $angelmode = 'manually';
   $length = '';
   $change_hours = array();
-  $name = "";
-
+  $title = "";
+  $shifttype_id = null;
+  
   // Locations laden (auch unsichtbare - fuer Erzengel ist das ok)
   $rooms = sql_select("SELECT * FROM `Room` ORDER BY `Name`");
   $room_array = array();
   foreach ($rooms as $room)
     $room_array[$room['RID']] = $room['Name'];
-
+    
     // Engeltypen laden
   $types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
   $needed_angel_types = array();
   foreach ($types as $type)
     $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['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 = strip_request_item('name');
-
+    $title = strip_request_item('title');
+    
     // Auswahl der sichtbaren Locations für die Schichten
     if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room_array[$_REQUEST['rid']]))
       $rid = $_REQUEST['rid'];
     else {
       $ok = false;
       $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'])))
       $start = $tmp->getTimestamp();
     else {
       $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'])))
       $end = $tmp->getTimestamp();
     else {
       $ok = false;
-      $msg .= error("Bitte gib einen Endzeitpunkt für die Schichten an.", true);
+      error(_('Please select an end time.'));
     }
-
+    
     if ($start >= $end) {
       $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 ($_REQUEST['mode'] == 'single') {
         $mode = 'single';
@@ -71,7 +93,7 @@ function admin_shifts() {
           $length = trim($_REQUEST['length']);
         } else {
           $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') {
         if (isset($_REQUEST['change_hours']) && preg_match("/^([0-9]{2}(,|$))/", trim(str_replace(" ", "", $_REQUEST['change_hours'])))) {
@@ -79,14 +101,14 @@ function admin_shifts() {
           $change_hours = array_map('trim', explode(",", $_REQUEST['change_hours']));
         } else {
           $ok = false;
-          $msg .= error("Bitte gib die Schichtwechsel-Stunden kommagetrennt ein.", true);
+          error(_('Please split the shift-change hours by colons.'));
         }
       }
     } else {
       $ok = false;
-      $msg .= error("Bitte wähle einen Modus.", true);
+      error(_('Please select a mode.'));
     }
-
+    
     if (isset($_REQUEST['angelmode'])) {
       if ($_REQUEST['angelmode'] == 'location') {
         $angelmode = 'location';
@@ -97,26 +119,26 @@ function admin_shifts() {
             $needed_angel_types[$type['id']] = trim($_REQUEST['type_' . $type['id']]);
           } else {
             $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) {
           $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 {
         $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 {
       $ok = false;
-      $msg .= error("Bitte wähle benötigte Engel.", true);
+      error(_('Please select needed angels.'));
     }
-
+    
     // Beim Zurück-Knopf das Formular zeigen
     if (isset($_REQUEST['back']))
       $ok = false;
-
+      
       // Alle Eingaben in Ordnung
     if ($ok) {
       if ($angelmode == 'location') {
@@ -131,25 +153,27 @@ function admin_shifts() {
             'start' => $start,
             'end' => $end,
             'RID' => $rid,
-            'name' => $name
+            'title' => $title,
+            'shifttype_id' => $shifttype_id 
         );
       } elseif ($mode == 'multi') {
         $shift_start = $start;
         do {
           $shift_end = $shift_start + $length * 60;
-
+          
           if ($shift_end > $end)
             $shift_end = $end;
           if ($shift_start >= $shift_end)
             break;
-
+          
           $shifts[] = array(
               'start' => $shift_start,
               'end' => $shift_end,
               'RID' => $rid,
-              'name' => $name
+              'title' => $title,
+              'shifttype_id' => $shifttype_id 
           );
-
+          
           $shift_start = $shift_end;
         } while ($shift_end < $end);
       } elseif ($mode == 'variable') {
@@ -167,53 +191,56 @@ function admin_shifts() {
           } else
             break;
         }
-
+        
         $shift_start = $start;
         do {
           $day = DateTime::createFromFormat("Y-m-d H:i", date("Y-m-d", $shift_start) . " 00:00")->getTimestamp();
           $shift_end = $day + $change_hours[$change_index] * 60 * 60;
-
+          
           if ($shift_end > $end)
             $shift_end = $end;
           if ($shift_start >= $shift_end)
             $shift_end += 24 * 60 * 60;
-
+          
           $shifts[] = array(
               'start' => $shift_start,
               'end' => $shift_end,
               'RID' => $rid,
-              'name' => $name
+              'name' => $title,
+              'shifttype_id' => $shifttype_id 
           );
-
+          
           $shift_start = $shift_end;
           $change_index = ($change_index + count($change_hours) - 1) % count($change_hours);
         } while ($shift_end < $end);
       }
-
+      
       $shifts_table = array();
       foreach ($shifts as $shift) {
-        $shifts_table_entry = array(
-            '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']],
-            'entries' => $shift['name']
-        );
-        foreach ($types as $type) {
+        $shifts_table_entry = [
+            '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'])),
+            'title' => ShiftType_name_render(ShiftType($shifttype_id)) . ($shift['title'] ? '<br />' . $shift['title'] : ''),
+            'needed_angels' => '' 
+        ];
+        foreach ($types as $type)
           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;
       }
-
+      
       // Fürs Anlegen zwischenspeichern:
       $_SESSION['admin_shifts_shifts'] = $shifts;
       $_SESSION['admin_shifts_types'] = $needed_angel_types;
-
+      
       $hidden_types = "";
       foreach ($needed_angel_types as $type_id => $count)
         $hidden_types .= form_hidden('type_' . $type_id, $count);
       return page_with_title(_("Preview"), array(
           form(array(
               $hidden_types,
-              form_hidden('name', $name),
+              form_hidden('shifttype_id', $shifttype_id),
+              form_hidden('title', $title),
               form_hidden('rid', $rid),
               form_hidden('start', date("Y-m-d H:i", $start)),
               form_hidden('end', date("Y-m-d H:i", $end)),
@@ -223,24 +250,25 @@ function admin_shifts() {
               form_hidden('angelmode', $angelmode),
               form_submit('back', _("back")),
               table(array(
-                  'timeslot' => _("Timeslot"),
-                  'entries' => _("Entries")
+                  'timeslot' => _('Time and location'),
+                  'title' => _('Type and title'),
+                  'needed_angels' => _('Needed angels') 
               ), $shifts_table),
-              form_submit('submit', _("Save"))
-          ))
+              form_submit('submit', _("Save")) 
+          )) 
       ));
     }
   } elseif (isset($_REQUEST['submit'])) {
     if (! is_array($_SESSION['admin_shifts_shifts']) || ! is_array($_SESSION['admin_shifts_types']))
       redirect(page_link_to('admin_shifts'));
-
+    
     foreach ($_SESSION['admin_shifts_shifts'] as $shift) {
       $shift['URL'] = null;
       $shift['PSID'] = null;
       $shift_id = Shift_create($shift);
       if ($shift_id === false)
         engelsystem_error('Unable to create shift.');
-
+      
       engelsystem_log("Shift created: " . $shift['name'] . " from " . date("Y-m-d H:i", $shift['start']) . " to " . date("Y-m-d H:i", $shift['end']));
       $needed_angel_types_info = array();
       foreach ($_SESSION['admin_shifts_types'] as $type_id => $count) {
@@ -251,27 +279,27 @@ function admin_shifts() {
         }
       }
     }
-
+    
     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 {
     unset($_SESSION['admin_shifts_shifts']);
     unset($_SESSION['admin_shifts_types']);
   }
-
+  
   if (! isset($_REQUEST['rid']))
     $_REQUEST['rid'] = null;
   $room_select = html_select_key('rid', 'rid', $room_array, $_REQUEST['rid']);
   $angel_types = "";
   foreach ($types as $type)
     $angel_types .= form_spinner('type_' . $type['id'], $type['name'], $needed_angel_types[$type['id']]);
-
+  
   return page_with_title(admin_shifts_title(), array(
       msg(),
-      $msg,
       form(array(
-          form_text('name', _("Name"), $name),
-          // TODO: form_textarea('description', _("Description"), ''),
+          form_select('shifttype_id', _('Shifttype'), $shifttypes, $shifttype_id),
+          form_text('title', _("Title"), $title),
           form_select('rid', _("Room"), $room_array, $_REQUEST['rid']),
           '<div class="row">',
           '<div class="col-md-6">',
@@ -291,8 +319,8 @@ function admin_shifts() {
           $angel_types,
           '</div>',
           '</div>',
-          form_submit('preview', _("Preview"))
-      ))
+          form_submit('preview', _("Preview")) 
+      )) 
   ));
 }
 ?>
diff --git a/includes/view/Rooms_view.php b/includes/view/Rooms_view.php
new file mode 100644
index 00000000..bb41a4d3
--- /dev/null
+++ b/includes/view/Rooms_view.php
@@ -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'];
+}
+
+?>
\ No newline at end of file
diff --git a/includes/view/ShiftTypes_view.php b/includes/view/ShiftTypes_view.php
index 3f538a51..10431440 100644
--- a/includes/view/ShiftTypes_view.php
+++ b/includes/view/ShiftTypes_view.php
@@ -1,5 +1,12 @@
 <?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) {
   return page_with_title(sprintf(_("Delete shifttype %s"), $shifttype['name']), array(
       info(sprintf(_("Do you want to delete shifttype %s?"), $shifttype['name']), true),
diff --git a/public/index.php b/public/index.php
index 230e9141..967fe3a7 100644
--- a/public/index.php
+++ b/public/index.php
@@ -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/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/ShiftEntry_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/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/shifttypes_controller.php');
 require_once realpath(__DIR__ . '/../includes/controller/users_controller.php');
-- 
cgit v1.2.3-70-g09d2