rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add state

Browse Source
This commit is contained in:
Roland Schneider
2021-09-24 17:39:29 +02:00
parent 34d898779c
commit c2ea538103
19 changed files with 328 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/modules/event/manager/EventManager.php
View File

@@ -9,7 +9,6 @@ use common\modules\event\models\timetable\TimeTableMonthWeek;
use customerapi\models\available\EventInterval;
use DateTime;
use Exception;
use Throwable;
use yii\db\Query;
use yii\db\StaleObjectException;
@@ -44,7 +43,7 @@ class EventManager
* @return TimeTableMonth
* @throws Exception
*/
public function loadTimeTable($interval)
public function loadTimeTable($interval , $activeOrDisplayInterval = "active" )
{
$timeTable = new TimeTableMonth();
@@ -74,8 +73,14 @@ class EventManager
$timeTable->weeks[$weekNumber]->$weekDayName = $timeTableMonthDay;
}
$dateTimeFrom = $interval->firstActiveDate;
$dateTimeTo = (clone $interval->lastActiveDate)->modify('+1 day');
if ( $activeOrDisplayInterval == "active"){
$dateTimeFrom = $interval->firstActiveDate;
$dateTimeTo = (clone $interval->lastActiveDate)->modify('+1 day');
}else{
// active
$dateTimeFrom = $interval->firstDisplayDate;
$dateTimeTo = (clone $interval->lastDisplayDate)->modify('+1 day');
}
// get events between active dates
$events =$this->getEvents($dateTimeFrom,$dateTimeTo);