summaryrefslogtreecommitdiff
path: root/includes/pages
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2011-09-29 14:38:23 +0200
committerPhilip Häusler <msquare@notrademark.de>2011-09-29 14:38:23 +0200
commit402dc172b65f5315458ab6ca4acf15fd2127c417 (patch)
treeef4997d128445e6fc091773bde3b6e6b725708d1 /includes/pages
parent8a5f510da2fa2a0a4d543d436a8ca96df5d74301 (diff)
fixed shift length display
Diffstat (limited to 'includes/pages')
-rw-r--r--includes/pages/user_myshifts.php2
-rw-r--r--includes/pages/user_shifts.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index 9f344d6d..4dc4cc81 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -21,7 +21,7 @@ function user_myshifts() {
return template_render('../templates/user_shifts_add.html', array (
'angel' => $user['Nick'],
- 'date' => date("Y-m-d H:i", $shift['start']) . ', ' . date("H", $shift['end'] - $shift['start']) . ' h',
+ 'date' => date("Y-m-d H:i", $shift['start']) . ', ' . shift_length($shift),
'location' => $shift['Name'],
'title' => $shift['name'],
'type' => $shift['angel_type'],
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index c2648a78..3c2e9330 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -93,7 +93,8 @@ function user_shifts() {
$user_text = $user['Nick'];
return template_render('../templates/user_shifts_add.html', array (
- 'date' => date("Y-m-d H:i", $shift['start']) . ', ' . date("H:i", $shift['end'] - $shift['start']) . 'h',
+ //'date' => date("Y-m-d H:i", $shift['start']) . ', ' . date("H:i", $shift['end'] - $shift['start']) . 'h',
+ 'date' => date("Y-m-d H:i", $shift['start']) . ', ' . shift_length($shift),
'title' => $shift['name'],
'location' => $shift['Name'],
'angel' => $user_text,