summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorIgor Scheller <igor.scheller@igorshp.de>2017-07-19 23:35:20 +0200
committerIgor Scheller <igor.scheller@igorshp.de>2017-07-19 23:35:20 +0200
commitec45216899b192789c2fd88f6dc057937f5927cc (patch)
tree540aa8a5a1a08f4b547083341a4bc423f0af3c29 /includes
parent6cfd309bef050fbf9b9e2eba0af32962485f840a (diff)
parent9b3f6f557a127fef16be267c26f8239dc1c22126 (diff)
Merge remote-tracking branch 'engelsystem/feature-igel-rewrite'
Diffstat (limited to 'includes')
-rw-r--r--includes/model/EventConfig_model.php2
-rw-r--r--includes/model/ShiftsFilter.php9
-rw-r--r--includes/model/Shifts_model.php4
3 files changed, 1 insertions, 14 deletions
diff --git a/includes/model/EventConfig_model.php b/includes/model/EventConfig_model.php
index f5846870..112ad457 100644
--- a/includes/model/EventConfig_model.php
+++ b/includes/model/EventConfig_model.php
@@ -64,7 +64,7 @@ function EventConfig_update(
);
}
- return (bool)DB::update('
+ return DB::update('
UPDATE `EventConfig` SET
`event_name` = ?,
`buildup_start_date` = ?,
diff --git a/includes/model/ShiftsFilter.php b/includes/model/ShiftsFilter.php
index 47ef50d7..3b691b55 100644
--- a/includes/model/ShiftsFilter.php
+++ b/includes/model/ShiftsFilter.php
@@ -10,12 +10,6 @@ namespace Engelsystem;
class ShiftsFilter
{
/**
- * How long can the time interval be?
- * 86400 = one day
- */
- const MAX_DURATION = 86400;
-
- /**
* Shift is completely full.
*/
const FILLED_FILLED = 1;
@@ -98,9 +92,6 @@ class ShiftsFilter
*/
public function setEndTime($endTime)
{
- if ($endTime - $this->startTime > ShiftsFilter::MAX_DURATION) {
- $endTime = $this->startTime + ShiftsFilter::MAX_DURATION;
- }
$this->endTime = $endTime;
}
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php
index b0269362..21abc888 100644
--- a/includes/model/Shifts_model.php
+++ b/includes/model/Shifts_model.php
@@ -266,10 +266,6 @@ function Shift_signup_allowed_angel(
) {
$free_entries = Shift_free_entries($needed_angeltype, $shift_entries);
- if ($user['Gekommen'] == 0) {
- return new ShiftSignupState(ShiftSignupState::SHIFT_ENDED, $free_entries);
- }
-
if ($user_shifts == null) {
$user_shifts = Shifts_by_user($user);
}