From c50ebba62c81678eb9beed0fb15de1fcc7a5e94e Mon Sep 17 00:00:00 2001 From: marko Date: Sun, 3 Dec 2023 19:49:59 +0100 Subject: [PATCH] Bugfix: hidden select menu in starting type selection replaced by radio buttons --- homepage/participo/event.php | 49 ++++ homepage/participo/events.inc.php | 45 ++-- homepage/participo/events.sidenav.inc.php | 18 +- homepage/participo/lib/db.php | 1 + homepage/participo/lib/participoLib/event.php | 111 +++++++-- .../participo/lib/participoLib/eventPage.php | 96 ++++++++ .../participo/lib/participoLib/participo.php | 84 ++++++- homepage/participo/lib/participoLib/shiai.php | 224 ++++++++++-------- 8 files changed, 466 insertions(+), 162 deletions(-) create mode 100644 homepage/participo/event.php create mode 100644 homepage/participo/lib/participoLib/eventPage.php diff --git a/homepage/participo/event.php b/homepage/participo/event.php new file mode 100644 index 0000000..c3bc23a --- /dev/null +++ b/homepage/participo/event.php @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + <?php echo($meta['title']); ?> + + + + + + + + +
+ + +
+ +
+ html(); ?> +
+ + + \ No newline at end of file diff --git a/homepage/participo/events.inc.php b/homepage/participo/events.inc.php index be40f9e..bdc09fe 100644 --- a/homepage/participo/events.inc.php +++ b/homepage/participo/events.inc.php @@ -1,33 +1,32 @@ "Event Planer", - 'description' => "Planung von (Nicht-)Teilnahmen an Wettkämpfen und anderen Veranstaltungen" - ); -?> \ No newline at end of file +$meta = [ + 'title' => 'Event Planer', + 'description' => 'Planung von (Nicht-)Teilnahmen an Wettkämpfen und anderen Veranstaltungen' +]; diff --git a/homepage/participo/events.sidenav.inc.php b/homepage/participo/events.sidenav.inc.php index d5a5fa7..0bfb8f9 100644 --- a/homepage/participo/events.sidenav.inc.php +++ b/homepage/participo/events.sidenav.inc.php @@ -2,16 +2,14 @@
'; } + public function getHtmlEventDetails() + { + $html .= '
'; + $html .= '
Datum
' . $this->event()->htmlDate() . '
'; + $html .= '
Deadline zum Einschreiben:
' . $this->event()->htmlDeadline() . '
'; + $html .= '
'; + $html .= $this->event()->shiai()->getHtml(); + $html .= $this->event()->getHtmlStarterStatistic(); + $html .= $this->event()->getHtmlStarterList(); + } + public function htmlTableRow() { $shiai = $this->shiai(); return '' . - '' . $this->date->format('Y-m-d') . '' . + '' . $this->htmlDate() . '' . '' . $shiai->getHtmlName() . '' . '' . $shiai->getHtmlDescriptiveAgeClasses() . '' . 'zoom_in' . @@ -146,10 +189,13 @@ class Event '
' . '
' . $this->shiai->getHtml() + . '
' . $this->getHtmlStarterStatistic() - . $this->getHtmlStarterList(); + . '
' + . $this->getHtmlStarterList() + . '
'; $modal .= '
'; - $modal .= '
Deadline zum Eintragen: ' . $this->deadline->format('Y-m-d') . '
'; + $modal .= '
Deadline zum Eintragen: ' . $this->htmlDeadLine() . '
'; $today = new DateTime(); if ( @@ -160,13 +206,6 @@ class Event foreach ($kids as $k) { $modal .= $this->getHtmlAddStarterForm($k, ['returnToUrl' => '/participo/events#' . $this->id]); } - - // foreach ($this->shiai()->ageGroups() as $ageClass => $starterList) { - // // $modal .= '

' . $ageClass ?? 'keiner Altersklasse zugeordnet' . '

'; - // foreach ($starterList as $starter) { - // $modal .= $this->getHtmlAddStarterForm($k, ['returnToUrl' => '/participo/events#' . $this->id]); - // } - // } } else { $modal .= '
Es ist leider zu spät noch jemanden einzutragen!
'; } @@ -175,7 +214,7 @@ class Event $modal .= '
' . // end modal-content '
' . - 'Zum Event im Planer' . + 'Zum Event im alten Planer' . 'Schließen' . '
' . // end modal-footer '
'; @@ -206,7 +245,7 @@ class Event * * @todo docu */ - private function getStarter() + public function getStarter() { $userId = $_SESSION['user']['userId'] ?? null; @@ -221,7 +260,7 @@ class Event $starter = []; foreach ($response as $r) { - $starter[] = Starter::loadFromDb($r['starterId']); + $starter[$r['starterId']] = Starter::loadFromDb($r['starterId']); } return $starter; } @@ -250,16 +289,21 @@ class Event public function getHtmlStarterStatistic() { + $isEmpty = true; $retHtml = '
'; foreach ([StartingType::Fighter, StartingType::NoParticipation, StartingType::Audience] as $type) { $count = $this->getStarterCount($type); if ($count > 0) { + $isEmpty = false; $retHtml .= '
' . StartingType::$AsString[$type] . '
' . $count . '
'; } } - $retHtml .= '
Mitfahrgelegenheiten
' . $this->getSeatCount() . '
'; + if ($this->getSeatCount() > 0) { + $isEmpty = false; + $retHtml .= '
Mitfahrgelegenheiten
' . $this->getSeatCount() . '
'; + } $retHtml .= '
'; - return $retHtml; + return $isEmpty ? '' : $retHtml; } public static function fromDbArray($member) @@ -305,7 +349,7 @@ class Event { $defaults = [ 'formClass' => 's12 m6 xl3', - 'inputClass' => 'input-field col s12', + 'inputClass' => 'col s12', 'buttonClass' => 'btn' ]; @@ -322,14 +366,29 @@ class Event . '' . '' . '
' - . '' - . '' + . '
' . $user->getName() . ', ' . $user->getFirstname() . '' + . '

' + . '' + . '

' + . '

' + . '' + . '

' + . '

' + . '' + . '

' + . '' + . '
' . '
' - . '' . ''; return $form; diff --git a/homepage/participo/lib/participoLib/eventPage.php b/homepage/participo/lib/participoLib/eventPage.php new file mode 100644 index 0000000..2283940 --- /dev/null +++ b/homepage/participo/lib/participoLib/eventPage.php @@ -0,0 +1,96 @@ +eventId = filterId($eventId); + } + + public function init() + { + $params = participo::parseParams( + ['eventId' => function ($param) {return filterId($param); }] + ); + $this->eventId = $params['eventId']; + + return; + } + + public function getHtmlNotFound() + { + return '
Der Event "' . $this->id . '" existiert leider nicht!
' + . '

Anstehende Termine

' + . eventPlaner::getHtmlEventTable( + eventPlaner::getComingWkEvents() + ); + } + + public function getHtml() + { + if (!$this->event()) { + return $this->getHtmlNotFound(); + } + + $html = ''; + + $html .= + '
' + . '
' + . '
Termine
' + . '
+
' + . '
Datum
' . $this->event()->htmlDate() . '
' + . '
Deadline zum Einschreiben:
' . $this->event()->htmlDeadline() . '
' + . '
'; + // Not all Events have a shiai linked to them + if ($this->event()->shiai()) { + $html .= + '
Wettkampfdetails
' . $this->event()->shiai()->getHtmlDetails() . '
'; + } + $html .= + '
Einschreibungen
' . $this->event()->getHtmlStarterStatistic() . '
' + . '
Eigene, gemeldete Starter
' . $this->event()->getHtmlStarterList() . '
' + . '
' + . '
'; + + $html .= + '
'; + foreach ($this->event()->shiai()->ageGroups() as $ageClass => $starterList) { + $html .= + '
' . + '
' . (!empty($ageClass) ? $ageClass : 'keiner Altersklasse zugeordnet') . '
' + . '
+
    '; + foreach ($starterList as $starter) { + if (!array_key_exists($starter->getId(), $this->event()->getStarter())) { + $html .= + '
  • ' . $starter->getName() . ', ' . $starter->getFirstname() . ' - ' . $starter->yearOfBirth() . ' +
    • '; + } + } + $html .= ' +
+ '; + } + $html .= '
'; + + return $html; + } + + public function html() + { + echo($this->getHtml()); + } + + private function event(bool $forceLoading = false) + { + if (!$this->event || $forceLoading) { + $this->event = Event::loadFromDb($this->eventId); + } + return $this->event; + } + + private $eventId = null; + private $event = null; +} diff --git a/homepage/participo/lib/participoLib/participo.php b/homepage/participo/lib/participoLib/participo.php index cc2241c..42fca1d 100644 --- a/homepage/participo/lib/participoLib/participo.php +++ b/homepage/participo/lib/participoLib/participo.php @@ -2,12 +2,29 @@ require_once 'participoLib/dbConnector.php'; require_once 'participoLib/user.php'; +require_once 'participoLib/event.php'; +require_once 'participoLib/eventPage.php'; +require_once 'participoLib/starter.php'; +require_once 'participoLib/planer.php'; /** * FrameWork for the participoApp */ class participo { + /** a page describing an event */ + private static $eventPage = null; + + /** getter for the eventPage, creates a new one if not already created */ + public static function eventPage() + { + if (!self::$eventPage) { + self::$eventPage = new EventPage(); + } + self::$eventPage->init(); + return self::$eventPage; + } + private static $db = null; private static $message = ['error' => null, 'success' => null, 'notice' => null]; @@ -131,6 +148,64 @@ class participo } } + /** Initialize the participoApp + * + * - validate the login + * - init the db connection + * + * @param [type] $config + * @return void + */ + public static function init($config) + { + self::authentificate(); + self::initDb( + $config['db']['host'], + $config['db']['name'], + $config['db']['user'], + $config['db']['password'] + ); + } + + private static function initDb($host, $name, $user, $password) + { + dbConnector::connect($host, $name, $user, $password); + } + + /** Framework to parse parameters get/post requests + * + * - Each param given in to this function is looked up in the request and put through the parsing function. + * - Params in the request that aren't in given a parsing function aren't parsed and hence not returned. + * + * @param [array(paramName => parseFunction)] $params array of the name of the param and a sanitizer/parsing/input function + * @return array(parsedParam=>paramValue) Associative array of the name of the param and its parsed value + */ + public static function parseParams($params) + { + $method = $_SERVER['REQUEST_METHOD']; + $request = explode('/', substr(@$_SERVER['PATH_INFO'], 1)); + + $parsedParams = []; + foreach ($params as $paramName => $parseFunction) { + $parsedParams[$paramName] = null; + switch ($method) { + // case 'PUT': + // do_something_with_put($request); + // break; + case 'POST': + $parsedParams[$paramName] = $parseFunction($_POST[$paramName]); + break; + case 'GET': + $parsedParams[$paramName] = $parseFunction($_GET[$paramName]); + break; + default: + // handle_error($request); + break; + } + } + return $parsedParams; + } + public static function getMessages() { return self::$message; @@ -209,8 +284,13 @@ class participo $query = 'SELECT * FROM `wkParticipo_Users` ' - . 'INNER JOIN `vormundschaft` ON `wkParticipo_Users`.`id` = `vormundschaft`.`kidId` ' - . 'WHERE `vormundschaft`.`userId` = :userId;'; + . 'INNER JOIN `vormundschaft` ' + . 'ON `wkParticipo_Users`.`id` = `vormundschaft`.`kidId` ' + . 'INNER JOIN `wkParticipo_user<=>userAttributes` ' + . 'ON `wkParticipo_Users`.`id` = `wkParticipo_user<=>userAttributes`.`userId`' + . 'WHERE `vormundschaft`.`userId` = :userId ' + . 'AND `vormundschaft`.`userId` = :userId ' + . 'AND `wkParticipo_user<=>userAttributes`.`attributeId` = 4;'; $params = [':userId' => ['value' => $userId, 'data_type' => PDO::PARAM_INT]]; $response = dbConnector::query($query, $params); diff --git a/homepage/participo/lib/participoLib/shiai.php b/homepage/participo/lib/participoLib/shiai.php index 84b3e36..150a1da 100644 --- a/homepage/participo/lib/participoLib/shiai.php +++ b/homepage/participo/lib/participoLib/shiai.php @@ -58,6 +58,16 @@ class Shiai return ($this->place != null ? $this->place : '-'); } + public function getAnnouncementUrl() + { + return $this->announcementUrl; + } + + public function getRouteUrl() + { + return $this->routeUrl; + } + public static function loadFromDb(int $id) { $id = filterId($id); @@ -97,16 +107,28 @@ class Shiai $retHtml = ''; $retHtml = '
' . - '

' . $this->getHtmlName() . '

' . + '

' . $this->getHtmlName() . '

' . '
' . '
Datum
' . $this->getHtmlDate() . '
' . '
Altersklassen
' . $this->getHtmlDescriptiveAgeClasses() . '
' . - '
Ort
' . $this->getPlace() . '
' . + '
Ort
' . $this->getPlace() . '
' . '
' . '
'; return $retHtml; } + public function getHtmlDetails() + { + return + '
' + . '
Name
' . $this->getHtmlName() . '
' + . '
Datum
' . $this->getHtmlDate() . '
' + . '
Altersklassen
' . $this->getHtmlDescriptiveAgeClasses() . '
' + . '
Ort
' . $this->getPlace() . '
' . + '
' + ; + } + public function getHtmlDescriptiveAgeClasses() { $retList = []; @@ -128,121 +150,121 @@ class Shiai return implode(', ', $retList); } -/** convert a list of age class formatted strings into a list of intervals of years - * - * @param string $akListString - * @param int $year - * @return list[array(int,int)] list of tupels with lower/upper bound in date year of the age classes - */ -private static function akListString2jgArray(string $akListString, int $year = null) -{ - $year = filterPosInt($year) ?? filterPosInt((new DateTime)->format('Y')); - $ret = []; - foreach (explode(' ', $akListString) as $ak) { - $ret[$ak] = self::akString2jgIntervall($ak, $year); + /** convert a list of age class formatted strings into a list of intervals of years + * + * @param string $akListString + * @param int $year + * @return list[array(int,int)] list of tupels with lower/upper bound in date year of the age classes + */ + private static function akListString2jgArray(string $akListString, int $year = null) + { + $year = filterPosInt($year) ?? filterPosInt((new DateTime)->format('Y')); + $ret = []; + foreach (explode(' ', $akListString) as $ak) { + $ret[$ak] = self::akString2jgIntervall($ak, $year); + } + return $ret; } - return $ret; -} -/** convert age class from formatted string to interval of years - * - * @param [string] $akString - * @param [type] $year - * @return array(int,int) [x,y] with x the lower bound and y the upper bound of the age class in years. Both bounds are still included in the interval. - */ -private static function akString2jgIntervall(string $akString, int $year /*= null*/) -{ - // input sanitation - $year = filterPosInt($year) ?? filterPosInt((new DateTime)->format('Y')); + /** convert age class from formatted string to interval of years + * + * @param [string] $akString + * @param [type] $year + * @return array(int,int) [x,y] with x the lower bound and y the upper bound of the age class in years. Both bounds are still included in the interval. + */ + private static function akString2jgIntervall(string $akString, int $year /*= null*/) + { + // input sanitation + $year = filterPosInt($year) ?? filterPosInt((new DateTime)->format('Y')); - $ret = [null, null]; + $ret = [null, null]; - // Matching against the different age class formats - // - ..Ux - // - Jg.x-y + // Matching against the different age class formats + // - ..Ux + // - Jg.x-y - // Case Ux - $akUmatchString = '/(.*)U(.*)/'; + // Case Ux + $akUmatchString = '/(.*)U(.*)/'; - $matches = []; + $matches = []; - preg_match($akUmatchString, $akString, $matches); - // The found match should cover the whole string. Otherwise it isn't applicable. - if ($matches[0] == $akString) { - // The x in Ux should be a positive integer. - $ageLimit = filterPosInt($matches[2]); - if ($ageLimit) { - $ret[0] = $year - $ageLimit + 1; - // lowering the lower bound according to the modifiers - if ($matches[1] == '') { - $ret[1] = $year - $ageLimit + 2; - } elseif ($matches[1] == '-') { - $ret[1] = $year - $ageLimit + 3; - } elseif ($matches[1] == '--') { - $ret[1] = $year - $ageLimit + 4; - } elseif (in_array($matches[1], ['<=', '≤', '≤', '≤', '≤'])) { - $ret[1] = $year; + preg_match($akUmatchString, $akString, $matches); + // The found match should cover the whole string. Otherwise it isn't applicable. + if ($matches[0] == $akString) { + // The x in Ux should be a positive integer. + $ageLimit = filterPosInt($matches[2]); + if ($ageLimit) { + $ret[0] = $year - $ageLimit + 1; + // lowering the lower bound according to the modifiers + if ($matches[1] == '') { + $ret[1] = $year - $ageLimit + 2; + } elseif ($matches[1] == '-') { + $ret[1] = $year - $ageLimit + 3; + } elseif ($matches[1] == '--') { + $ret[1] = $year - $ageLimit + 4; + } elseif (in_array($matches[1], ['<=', '≤', '≤', '≤', '≤'])) { + $ret[1] = $year; + } + return $ret; } + } + + // Case Jg.x-y + $akUmatchString = "/Jg\.(.*)\-{1,2}(.*)/"; + + $matches = []; + + preg_match($akUmatchString, $akString, $matches); + // The found match should cover the whole string. Otherwise it isn't applicable. + + if ($matches[0] == $akString) { + $ret[0] = filterPosInt($matches[1]); + $ret[1] = filterPosInt($matches[2]); + return $ret; } - } - - // Case Jg.x-y - $akUmatchString = "/Jg\.(.*)\-(.*)/"; - - $matches = []; - - preg_match($akUmatchString, $akString, $matches); - // The found match should cover the whole string. Otherwise it isn't applicable. - - if ($matches[0] == $akString) { - $ret[0] = filterPosInt($matches[1]); - $ret[1] = filterPosInt($matches[2]); return $ret; } - return $ret; -} - -/** grouping users kids by ageGroups - * - * @return array(ageGroup => list(users in ageGroup)) - */ -public function ageGroups() -{ - $kids = participo::getKids(); - return self::ageClassGrouping($this->ageclasses, $kids); -} - -/** grouping users by given age class - * - * @param array $ageClassList as array string representation of age class => [lower year bound, upper year bound] - * @param array $starterList list of starter (User) - * @return array of string representation of age class => array of user in this class - */ -private static function ageClassGrouping(array $ageClassList, array $starterList) -{ - $grouping = []; - foreach ($ageClassList as $ageClass => $yearBoundaries) { - $grouping[$ageClass] = []; + /** grouping users kids by ageGroups + * + * @return array(ageGroup => list(users in ageGroup)) + */ + public function ageGroups() + { + $kids = participo::getKids(); + return self::ageClassGrouping($this->ageclasses, $kids); } - $grouping[null] = []; - foreach ($starterList as $starter) { - $startersAgeClass = $starter->yearOfBirth() ? self::getAgeClassFromYear($starter->yearOfBirth(), $ageClassList) : null; - array_push($grouping[$startersAgeClass], $starter); - } - return $grouping; -} - -private static function getAgeClassFromYear(int $year, array $ageClassList) -{ - foreach ($ageClassList as $ageClass => $yearBoundaries) { - if (($yearBoundaries[0] <= $year) && ($year <= $yearBoundaries[1])) { - return $ageClass; + /** grouping users by given age class + * + * @param array $ageClassList as array string representation of age class => [lower year bound, upper year bound] + * @param array $starterList list of starter (User) + * @return array of string representation of age class => array of userId=>user in this class + */ + private static function ageClassGrouping(array $ageClassList, array $starterList) + { + $grouping = []; + foreach ($ageClassList as $ageClass => $yearBoundaries) { + $grouping[$ageClass] = []; } + $grouping[null] = []; + + foreach ($starterList as $starter) { + $startersAgeClass = $starter->yearOfBirth() ? self::getAgeClassFromYear($starter->yearOfBirth(), $ageClassList) : null; + $grouping[$startersAgeClass][$starter->getId()] = $starter; + } + return $grouping; + } + + private static function getAgeClassFromYear(int $year, array $ageClassList) + { + foreach ($ageClassList as $ageClass => $yearBoundaries) { + if (($yearBoundaries[0] <= $year) && ($year <= $yearBoundaries[1])) { + return $ageClass; + } + } + return null; } - return null; -} } // end class shiai