gitmedia/sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1352 - Anpassungen

Browse source 
git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3355 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
valentin.wacker 2017-10-26 14:14:55 +00:00
parent a2d4159c88
commit 8240ce87f9
9 changed files with 670 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

384
trunk/src/AppBundle/Util/LodgingCalendarUtil.php
View file

@ -8,6 +8,7 @@ use AppBundle\Entity\FewoReservation;
use AppBundle\Entity\FewoSeason;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\EntityManager;
use AppBundle\Util\CalendarDayState;
class LodgingCalendarUtil
{
@ -62,19 +63,43 @@ class LodgingCalendarUtil
for($fwd = 0; $fwd < $actualStartingWeekDay - 1; $fwd++)
{
$data[] = 0;
$day = new CalendarDayState();
$day->setDay(0);
$day->setIsBookable(false);
$day->setIsInSeason(false);
$day->setIsReserved(false);
$day->setIsReservationBegin(false);
$day->setIsReservationEnd(false);
$data[] = $day;
}
for($d = 1; $d <= $numberDays; $d++)
{
$data[] = $d;
$day = new CalendarDayState();
$day->setDay($d);
$day->setIsBookable(false);
$day->setIsInSeason(false);
$day->setIsReserved(false);
$day->setIsReservationBegin(false);
$day->setIsReservationEnd(false);
$data[] = $day;
}
$startIndex = count($data);
for($lwd = $startIndex; $lwd < 42; $lwd++)
{
$data[] = 0;
$day = new CalendarDayState();
$day->setDay(0);
$day->setIsBookable(false);
$day->setIsInSeason(false);
$day->setIsReserved(false);
$day->setIsReservationBegin(false);
$day->setIsReservationEnd(false);
$data[] = $day;
}
$calendar[] = [
@ -119,12 +144,23 @@ class LodgingCalendarUtil
$weekDay = $weekDays[$date['wday']];
$numberDays = $this->daysInMonth($actualMonth, $actualCurrentYear);
/** @var CalendarDayState[] $data */
$data = null;
// alle Wochentage
for($d = 1; $d <= $numberDays; $d++)
{
$data[] = $d;
// standard-vorbelegung
$day = new CalendarDayState();
$day->setDay($d);
$day->setIsBookable(false);
$day->setIsInSeason(false);
$day->setIsReserved(false);
$day->setIsReservationBegin(false);
$day->setIsReservationEnd(false);
$data[] = $day;
}
$calendar[] = [
@ -141,6 +177,7 @@ class LodgingCalendarUtil
return $calendar;
}
/**
* @param FewoLodging $lodging
* @return array|null
@ -190,7 +227,9 @@ class LodgingCalendarUtil
* @param $appendix
* @return mixed
*/
private function markCalendarDays($calendar, \DateTime $fromDate, \DateTime $toDate, $appendix, $reservationMode = false)
private function markCalendarDays($calendar, \DateTime $fromDate, \DateTime $toDate,
$reservationMode = false,
FewoPrice $price = null, FewoReservation $reservation = null)
{
$startDay = $fromDate->format('j');
$startMonth = $fromDate->format('n');
@ -215,8 +254,10 @@ class LodgingCalendarUtil
$endCalendarIndex = $this->getMonthIndex($calendar, $endMonth);
// anfang und ende innerhalb eines monats
if($startCalendarIndex == $endCalendarIndex)
{
/** @var CalendarDayState[] $data */
$data = $calendar[$startCalendarIndex]['data'];
$calendar[$startCalendarIndex]['marked'] = 1;
@ -224,50 +265,90 @@ class LodgingCalendarUtil
$startIndex = $startDay - 1;
$endIndex = $endDay - 1;
$firstDay = explode(',', $data[$startIndex]);
if(count($firstDay) > 1 && $reservationMode == false)
$startIndex = $startIndex + 1;
for($i = $startIndex; $i <= $endIndex; $i++)
for ($i = $startIndex; $i <= $endIndex; $i++)
{
if($i == $startIndex && $reservationMode)
if ($reservationMode)
{
$data[$i] = $data[$i].$appendix.",from";
} elseif($i == $endIndex && $reservationMode) {
$data[$i] = $data[$i].$appendix.",to";
} else {
$data[$i] = $data[$i].$appendix;
if ($i == $startIndex)
{
$data[$i]->setIsReserved(true);
$data[$i]->setIsReservationBegin(true);
$data[$i]->setReservation($reservation);
$data[$i]->setIsInSeason(true);
$data[$i]->setIsBookable(false);
}
elseif ($i == $endIndex)
{
$data[$i]->setIsReserved(true);
$data[$i]->setIsReservationEnd(true);
$data[$i]->setReservation($reservation);
$data[$i]->setIsInSeason(true);
$data[$i]->setIsBookable(false);
//$data[$i]->setIsBookable(true);
}
else
{
$data[$i]->setIsReserved(true);
$data[$i]->setReservation($reservation);
$data[$i]->setIsInSeason(true);
$data[$i]->setIsBookable(false);
}
}
else
{
$data[$i]->setIsReserved(false);
$data[$i]->setPrice($price);
$data[$i]->setIsInSeason(true);
$data[$i]->setIsBookable(true);
}
}
$calendar[$startCalendarIndex]['data'] = $data;
}
else
{
// erster monat
/** @var CalendarDayState[] $data */
$data = $calendar[$startCalendarIndex]['data'];
$calendar[$startCalendarIndex]['marked'] = 1;
$startIndex = $startDay - 1;
$firstDay = explode(',', $data[$startIndex]);
if(count($firstDay) > 1 && $reservationMode == false)
$startIndex = $startIndex + 1;
$endIndex = count($data) - 1;
for($i = $startIndex; $i <= $endIndex; $i++)
{
if($i == $startIndex && $reservationMode)
if ($reservationMode)
{
$data[$i] = $data[$i].$appendix.",from";
} else {
$data[$i] = $data[$i].$appendix;
if ($i == $startIndex)
{
$data[$i]->setIsReserved(true);
$data[$i]->setIsReservationBegin(true);
$data[$i]->setReservation($reservation);
$data[$i]->setIsInSeason(true);
$data[$i]->setIsBookable(false);
}
else
{
$data[$i]->setIsReserved(true);
$data[$i]->setReservation($reservation);
$data[$i]->setIsInSeason(true);
$data[$i]->setIsBookable(false);
}
}
else
{
$data[$i]->setIsReserved(false);
$data[$i]->setPrice($price);
$data[$i]->setIsInSeason(true);
$data[$i]->setIsBookable(true);
}
}
$calendar[$startCalendarIndex]['data'] = $data;
// letzter monat
/** @var CalendarDayState[] $data */
$data = $calendar[$endCalendarIndex]['data'];
$calendar[$endCalendarIndex]['marked'] = 1;
@ -276,17 +357,41 @@ class LodgingCalendarUtil
$endIndex = $endDay - 1;
for($i = $startIndex; $i <= $endIndex; $i++)
{
if($i == $endIndex && $reservationMode)
if ($reservationMode)
{
$data[$i] = $data[$i].$appendix.",to";
} else {
$data[$i] = $data[$i].$appendix;
if ($i == $endIndex)
{
$data[$i]->setIsReserved(true);
$data[$i]->setIsReservationEnd(true);
$data[$i]->setReservation($reservation);
$data[$i]->setIsInSeason(true);
$data[$i]->setIsBookable(false); // todo, hier evtl direkt true
//$data[$i]->setIsBookable(true);
}
else
{
$data[$i]->setIsReserved(true);
$data[$i]->setReservation($reservation);
$data[$i]->setIsInSeason(true);
$data[$i]->setIsBookable(false);
}
}
else
{
$data[$i]->setIsReserved(false);
$data[$i]->setPrice($price);
$data[$i]->setIsInSeason(true);
$data[$i]->setIsBookable(true);
}
}
$calendar[$endCalendarIndex]['data'] = $data;
// alle monate dazwischen
for($i = $startCalendarIndex + 1; $i < $endCalendarIndex; $i++)
{
/** @var CalendarDayState[] $data */
$data = $calendar[$i]['data'];
$calendar[$i]['marked'] = 1;
@ -295,7 +400,20 @@ class LodgingCalendarUtil
$endIndex = count($data) - 1;
for($j = $startIndex; $j <= $endIndex; $j++)
{
$data[$j] = $data[$j].$appendix;
if ($reservationMode)
{
$data[$j]->setIsReserved(true);
$data[$j]->setReservation($reservation);
$data[$j]->setIsInSeason(true);
$data[$j]->setIsBookable(false);
}
else
{
$data[$j]->setIsReserved(false);
$data[$j]->setPrice($price);
$data[$j]->setIsInSeason(true);
$data[$j]->setIsBookable(true);
}
}
$calendar[$i]['data'] = $data;
}
@ -307,42 +425,107 @@ class LodgingCalendarUtil
{
for($i = 0; $i < 12; $i++)
{
if($calendar[$i]['marked'] == 1 && $extensionCalendar[$i]['marked'] == 1)
/** @var CalendarDayState[] $calendarData */
$calendarData = $calendar[$i]['data'];
/** @var CalendarDayState[] $extensionCalendarData */
$extensionCalendarData = $extensionCalendar[$i]['data'];
$endIndex = count($calendarData);
for($j = 0; $j < $endIndex; $j++)
{
$calendarData = $calendar[$i]['data'];
$extensionCalendarData = $extensionCalendar[$i]['data'];
//$mergedPricesAndReservationsCalendar = $this->mergeCalendarsNew($pricesCalendar, $reservationsCalendar, false);
//$actuallyReservableDaysCalendar = $this->filterReservableDays($lodging, $mergedPricesAndReservationsCalendar);
//$resultCalendar = $this->mergeCalendars($actuallyReservableDaysCalendar, $reservationsCalendar, true);
$endIndex = count($calendarData);
for($j = 0; $j < $endIndex; $j++)
if ($withFromTo)
{
if(strlen($extensionCalendarData[$j]) > 2)
if ($extensionCalendarData[$j]->getIsInSeason())
{
if($withFromTo)
{
$calDay = explode(',', $calendarData[$j]);
$extCalDay = explode(',', $extensionCalendarData[$j]);
if(count ($calDay) > 1 && $calDay[1] == "reservable" && count($extCalDay) > 2 && $extCalDay[2] == 'to')
{
$calendarData[$j] = $extensionCalendarData[$j].",reservable".','.$calDay[2];
}
else
$calendarData[$j] = $extensionCalendarData[$j];
}
else
{
$calendarData[$j] = $extensionCalendarData[$j];
}
//$calendarData[$j] = $extensionCalendarData[$j];
$price = $extensionCalendarData[$j]->getPrice();
$calendarData[$j]->setIsInSeason(true);
$calendarData[$j]->setPrice($price);
}
}
$calendar[$i]['data'] = $calendarData;
if ($extensionCalendarData[$j]->getIsReserved())
{
// braucht man das überhaupt noch?
if ($withFromTo)
{
// zweite runde $actuallyReservableDaysCalendar merge mit $reservationsCalendar
if (!($calendarData[$j]->getIsBookable() && $extensionCalendarData[$j]->getIsReservationEnd()))
{
//$calendarData[$j] = $extensionCalendarData[$j];
$price = $calendarData[$j]->getPrice();
//$calendarData[$j] = $extensionCalendarData[$j];// todo
$calendarData[$j]->setIsBookable(false);
$calendarData[$j]->setIsReserved(true);
$calendarData[$j]->setReservation($extensionCalendarData[$j]->getReservation());
$calendarData[$j]->setIsReservationBegin($extensionCalendarData[$j]->getIsReservationBegin());
$calendarData[$j]->setIsReservationEnd($extensionCalendarData[$j]->getIsReservationEnd());
if ($calendarData[$j]->getIsReservationEnd() && $extensionCalendarData[$j]->getIsReservationBegin())
{
$calendarData[$j]->setIsReservationBegin(false);
$calendarData[$j]->setIsReservationEnd(false);
}
$calendarData[$j]->setIsInSeason(true);
$calendarData[$j]->setPrice($price);
}
}
else
{
// erste runde $pricesCalendar merge mit $reservationsCalendar
$price = $calendarData[$j]->getPrice();
$reservation = $calendarData[$j]->getReservation();
$calendarData[$j] = $extensionCalendarData[$j];
if ($calendarData[$j]->getIsReservationEnd() && $extensionCalendarData[$j]->getIsReservationBegin())
{
$calendarData[$j]->setReservation($reservation);
$calendarData[$j]->setIsReservationBegin(false);
$calendarData[$j]->setIsReservationEnd(false);
}
/** @var FewoPrice $price */
$calendarData[$j]->setIsInSeason(true);
$calendarData[$j]->setPrice($price);
}
}
}
$calendar[$i]['data'] = $calendarData;
}
return $calendar;
}
/** @var CalendarDayState[] $calendarMonth */
private function findCalendarDayIndexInMonth($dayNumber, $calendarMonth)
{
$result = 0;
for ($i = 0; $i < count($calendarMonth); $i++)
{
if ($calendarMonth[$i]->getDay() == $dayNumber)
{
$result = $i;
break;
}
}
return $calendar;
return $result;
}
public function mergeWithPaddedCalendar($calendar, $paddedCalendar)
@ -351,7 +534,10 @@ class LodgingCalendarUtil
{
$calendarDataCurrMonth = $calendar[$i]['data'];
$paddedCalendarDataCurrMonth = $paddedCalendar[$i]['data'];
$startIndex = array_search(1, $paddedCalendarDataCurrMonth);
$startIndex = $this->findCalendarDayIndexInMonth(1, $paddedCalendarDataCurrMonth);
//$startIndex = array_search(1, $paddedCalendarDataCurrMonth);
for($j = 0; $j < count($calendarDataCurrMonth); $j++, $startIndex++)
{
$paddedCalendarDataCurrMonth[$startIndex] = $calendarDataCurrMonth[$j];
@ -361,6 +547,7 @@ class LodgingCalendarUtil
return $paddedCalendar;
}
private function isNextDay($current, $next)
{
$result = false;
@ -413,69 +600,73 @@ class LodgingCalendarUtil
for($currMonthIndex = 0; $currMonthIndex < count($calendar); $currMonthIndex++)
{
$currMonth = $calendar[$currMonthIndex];
/** @var CalendarDayState[] $data */
$data = $currMonth['data'];
for($currDayIndex = 0; $currDayIndex < count($data); $currDayIndex++)
{
$currDay = explode(',', $data[$currDayIndex]);
//$currDay = explode(',', $data[$currDayIndex]);
$currDay = $data[$currDayIndex];
if(count($currDay) > 1)
if ($currDay->getIsBookable() || $currDay->getIsReserved())
{
if($currDay[1] == "reservable")
if ($currDay->getIsBookable())
{
$priceId = $currDay[2];
$price = $currDay->getPrice();
$priceId = $price->getId();
if($lastReservablePriceId == 0)
if ($lastReservablePriceId == 0)
{
$lastReservablePriceId = $priceId;
}
if($lastReservablePriceId != $priceId)
{
$price = $priceRepo->find($lastReservablePriceId);
$lastPrice = $priceRepo->find($lastReservablePriceId);
/** @var FewoSeason $season */
$season = $price->getSeason();
$season = $lastPrice->getSeason();
$actuallyReservableDays = $this->processPotentiallyReservableDays($potentiallyReservableDays, $season->getMinimumStay());
$this->processRest($actuallyReservableDays, $lastReservablePriceId, $cleanCalendar);
$this->processRest($actuallyReservableDays, $lastPrice, $cleanCalendar); //todo
$lastReservablePriceId = $priceId;
$potentiallyReservableDays = [];
$actuallyReservableDays = [];
}
$currentDayDate = date("d.m.Y", strtotime($currMonth['year']."-".$currMonth['monthNumber']."-".$currDay[0]));
$currentDayDate = date("d.m.Y", strtotime($currMonth['year']."-".$currMonth['monthNumber']."-".$currDay->getDay()));
$potentiallyReservableDays[] = $currentDayDate;
}
elseif(count($currDay) > 2 && $currDay[2] == "from")
elseif ($currDay->getIsReserved() && $currDay->getIsReservationBegin())
{
$currentDayDate = date("d.m.Y", strtotime($currMonth['year']."-".$currMonth['monthNumber']."-".$currDay[0]));
$currentDayDate = date("d.m.Y", strtotime($currMonth['year']."-".$currMonth['monthNumber']."-".$currDay->getDay()));
$potentiallyReservableDays[] = $currentDayDate;
}
}
else
{
if($lastReservablePriceId == $priceId && $lastReservablePriceId != 0)
{
$price = $priceRepo->find($lastReservablePriceId);
$lastPrice = $priceRepo->find($lastReservablePriceId);
/** @var FewoSeason $season */
$season = $price->getSeason();
$season = $lastPrice->getSeason();
$actuallyReservableDays = $this->processPotentiallyReservableDays($potentiallyReservableDays, $season->getMinimumStay());
$this->processRest($actuallyReservableDays, $lastReservablePriceId, $cleanCalendar);
$this->processRest($actuallyReservableDays, $lastPrice, $cleanCalendar); //todo
$lastReservablePriceId = $priceId;
$potentiallyReservableDays = [];
$actuallyReservableDays = [];
}
}
}
}
return $cleanCalendar;
}
private function processPotentiallyReservableDays($potentiallyReservableDays, $minimumStay)
{
$coherentDays = [];
@ -531,35 +722,40 @@ class LodgingCalendarUtil
return $actuallyReservableDays;
}
private function processRest($actuallyReservableDays, $priceId, &$cleanCalendar)
private function processRest($actuallyReservableDays, FewoPrice $price, &$cleanCalendar)
{
for($currMonthIndex = 0; $currMonthIndex < count($cleanCalendar); $currMonthIndex++)
{
$currMonth = $cleanCalendar[$currMonthIndex];
/** @var CalendarDayState[] $data */
$data = $currMonth['data'];
$startIndex = array_search(1, $data);
$endIndex = $startIndex + ($currMonth['numberDays']);
for($currDayIndex = $startIndex; $currDayIndex < $endIndex; $currDayIndex++)
for($currDayIndex = 0; $currDayIndex < count($data); $currDayIndex++)
{
$currDay = explode(',', $data[$currDayIndex]);
$currDay = $data[$currDayIndex];
$currentDate = date("d.m.Y", strtotime($currMonth['year']."-".$currMonth['monthNumber']."-".$currDay[0]));
$currentDate = date("d.m.Y", strtotime($currMonth['year']."-".$currMonth['monthNumber']."-".$currDay->getDay()));
if(in_array($currentDate, $actuallyReservableDays))
if (in_array($currentDate, $actuallyReservableDays))
{
$data[$currDayIndex] = $data[$currDayIndex].",reservable,".$priceId;
$data[$currDayIndex]->setIsInSeason(true);
$data[$currDayIndex]->setIsReserved(false); // todo ?
$data[$currDayIndex]->setIsBookable(true);
$data[$currDayIndex]->setIsReservationBegin(false);
$data[$currDayIndex]->setIsReservationEnd(false); // todo ?
$data[$currDayIndex]->setPrice($price);
$currMonth['marked'] = 1;
}
}
$currMonth['data'] = $data;
$cleanCalendar[$currMonthIndex] = $currMonth;
}
}
/**
* @param FewoLodging $lodging
* @param $calendar
@ -580,17 +776,12 @@ class LodgingCalendarUtil
{
/** @var FewoSeason $season */
$season = $price->getSeason();
$appendix = ',reservable,'.$price->getId();
$fromDate = $season->getFromDate();
$toDate = $season->getToDate();
if($toDate < $today)
if(!($toDate < $today))
{
}
else
{
$pricesCalendar = $this->markCalendarDays($pricesCalendar, $fromDate, $toDate, $appendix, false);
$pricesCalendar = $this->markCalendarDays($pricesCalendar, $fromDate, $toDate, false, $price, null); //TODO fast fertig
}
}
@ -601,7 +792,7 @@ class LodgingCalendarUtil
$fromDate = $reservation->getFromDate();
$toDate = $reservation->getToDate();
$reservationsCalendar = $this->markCalendarDays($reservationsCalendar, $fromDate, $toDate, $appendix, true);
$reservationsCalendar = $this->markCalendarDays($reservationsCalendar, $fromDate, $toDate, true, null, $reservation); //TODO fast fertig
}
$mergedPricesAndReservationsCalendar = $this->mergeCalendars($pricesCalendar, $reservationsCalendar, false);
@ -611,6 +802,7 @@ class LodgingCalendarUtil
return $resultCalendar;
}
public function convertDate($date)
{
$result = substr($date, 0, 2).'.'.substr($date, 2, 2).'.'.substr($date, 4, 4);