diff --git a/homepage/participo/lib/participoLib/ageGroup.php b/homepage/participo/lib/participoLib/ageGroup.php
new file mode 100644
index 0000000..82978a8
--- /dev/null
+++ b/homepage/participo/lib/participoLib/ageGroup.php
@@ -0,0 +1,145 @@
+lowerBound = $lowerBound;
+ $this->upperBound = $upperBound;
+ $this->lowerClosed = $lowerClosed;
+ $this->upperClosed = $upperClosed;
+ }
+ function __toString(): string
+ {
+ return ($this->lowerClosed ? "[" : "(") .
+ $this->lowerBound .
+ ", " .
+ $this->upperBound .
+ ($this->upperClosed ? "]" : ")");
+ }
+ function contains($value)
+ {
+ return ($this->lowerClosed
+ ? $this->lowerBound <= $value
+ : $this->lowerBound < $value) &&
+ ($this->upperClosed
+ ? $value <= $this->upperBound
+ : $value < $this->upperBound);
+ }
+ // private member
+ //- variables
+ // upper/lower bounds for the interval
+ private $lowerBound;
+ private $upperBound;
+ // on true the bound is in the interval, otherwise not
+ private $lowerClosed;
+ private $upperClosed;
+}
+// data type for an age class
+class AgeGroup
+{
+ // public member
+ // - functions
+ function __construct(string $label, Interval $years)
+ {
+ $this->label = $label;
+ $this->years = $years;
+ }
+ function __toString(): string
+ {
+ return $this->label . " " . $this->years;
+ }
+ function years()
+ {
+ return $this->years;
+ }
+ /** factory method for AgeGroup-s
+ *
+ * @param [string] $label string denoting the AgeGroup
+ * @param [type] $year the year to reference the AgeGroup to
+ * @return AgeGroup interval of years of the age group
+ */
+ public static function create(string $label, ?int $year = null)
+ {
+ // input sanitation
+ $year =
+ filterPosInt($year) ?? filterPosInt((new DateTime())->format("Y"));
+
+ $lowerYear = null;
+ $upperYear = null;
+
+ // Matching against the different age class formats
+ // - ..Ux
+ // - Jg.x-y
+
+ // Case Ux
+ $akUmatchString = "/(.*)U([0-9]+)(.*)/";
+
+ $matches = [];
+
+ preg_match($akUmatchString, $label, $matches);
+ // The found match should cover the whole string. Otherwise it isn't applicable.
+ if ($matches[0] == $label) {
+ // The x in Ux should be a positive integer.
+ $ageLimit = filterPosInt($matches[2]);
+ if ($ageLimit) {
+ $lowerYear = $year - $ageLimit + 1;
+ // lowering the lower bound according to the modifiers
+ if ($matches[3] == "") {
+ $upperYear = $year - $ageLimit + 2;
+ } elseif ($matches[3] == "-") {
+ $upperYear = $year - $ageLimit + 3;
+ } elseif ($matches[3] == "--") {
+ $upperYear = $year - $ageLimit + 4;
+ } elseif (
+ in_array($matches[1], [
+ "<=",
+ "≤",
+ "≤",
+ "≤",
+ "≤",
+ ])
+ ) {
+ $upperYear = $year;
+ }
+ return new AgeGroup(
+ $label,
+ new Interval($lowerYear, $upperYear, true, true)
+ );
+ }
+ }
+
+ // Case Jg.x-y
+ $akUmatchString = "/Jg\.(.*)\-{1,2}(.*)/";
+
+ $matches = [];
+
+ preg_match($akUmatchString, $label, $matches);
+ // The found match should cover the whole string. Otherwise it isn't applicable.
+
+ if ($matches[0] == $label) {
+ $lowerYear = filterPosInt($matches[1]);
+ $upperYear = filterPosInt($matches[2]);
+
+ return new AgeGroup(
+ $label,
+ new Interval($lowerYear, $upperYear, true, true)
+ );
+ }
+
+ return new AgeGroup(
+ $label,
+ new Interval($lowerYear, $upperYear, true, true)
+ );
+ }
+
+ // private member
+ // - functions
+ // - variables
+ private $label;
+ private $years;
+}
diff --git a/homepage/participo/lib/participoLib/eventPage.php b/homepage/participo/lib/participoLib/eventPage.php
index 2283940..177cae9 100644
--- a/homepage/participo/lib/participoLib/eventPage.php
+++ b/homepage/participo/lib/participoLib/eventPage.php
@@ -1,96 +1,132 @@
eventId = filterId($eventId);
- }
+ public function __construct($eventId = null)
+ {
+ $this->eventId = filterId($eventId);
+ }
- public function init()
- {
- $params = participo::parseParams(
- ['eventId' => function ($param) {return filterId($param); }]
- );
- $this->eventId = $params['eventId'];
+ public function init()
+ {
+ $params = participo::parseParams([
+ "eventId" => function ($param) {
+ return filterId($param);
+ },
+ ]);
+ $this->eventId = $params["eventId"];
- return;
- }
+ return;
+ }
- public function getHtmlNotFound()
- {
- return 'Der Event "' . $this->id . '" existiert leider nicht!
'
- . 'Anstehende Termine
'
- . eventPlaner::getHtmlEventTable(
- eventPlaner::getComingWkEvents()
- );
- }
+ 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();
- }
+ public function getHtml()
+ {
+ if (!$this->event()) {
+ return $this->getHtmlNotFound();
+ }
- $html = '';
+ $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() . '
'
- . '
'
- . '
" .
+ "
" .
+ "- 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() .
+ "
" .
+ "
" .
+ "
';
- foreach ($this->event()->shiai()->ageGroups() as $ageClass => $starterList) {
- $html .=
- '
' .
- '- ' . (!empty($ageClass) ? $ageClass : 'keiner Altersklasse zugeordnet') . '
'
- . '-
+ $html .= "
";
+
+ foreach (
+ $this->event()
+ ->shiai()
+ ->ageGroups()
+ as $ageClass => $starterList
+ ) {
+ $html .=
+ "
" .
+ "- " .
+ (!empty($ageClass)
+ ? AgeGroup::create($ageClass)
+ : "keiner Altersklasse zugeordnet") .
+ "
" .
+ '-
';
- foreach ($starterList as $starter) {
- if (!array_key_exists($starter->getId(), $this->event()->getStarter())) {
- $html .=
- '- ' . $starter->getName() . ', ' . $starter->getFirstname() . ' - ' . $starter->yearOfBirth() . '
+ foreach ($starterList as $starter) {
+ if (
+ !array_key_exists(
+ $starter->getId(),
+ $this->event()->getStarter()
+ )
+ ) {
+ $html .=
+ "
- " .
+ $starter->getName() .
+ ", " .
+ $starter->getFirstname() .
+ " - " .
+ $starter->yearOfBirth() .
+ '
';
- }
- }
- $html .= '
+ }
+ }
+ $html .= '
';
- }
- $html .= '
' .
- '
' .
- '
' .
- '- Datum
- ' . $this->getHtmlDate() . '
' .
- '- Altersklassen
- ' . $this->getHtmlDescriptiveAgeClasses() . '
' .
- '- Ort
- ' . $this->getPlace() . '
' .
- '
' .
- '
" .
+ '
" .
+ "
" .
+ "- Datum
- " .
+ $this->getHtmlDate() .
+ "
" .
+ "- Altersklassen
- " .
+ $this->getHtmlDescriptiveAgeClasses() .
+ "
" .
+ '- Ort
- ' .
+ $this->getPlace() .
+ "
" .
+ "
" .
+ "
'
- . '- Name
- ' . $this->getHtmlName() . '
'
- . '- Datum
- ' . $this->getHtmlDate() . '
'
- . '- Altersklassen
- ' . $this->getHtmlDescriptiveAgeClasses() . '
'
- . '- Ort
- ' . $this->getPlace() . '
' .
- '
'
- ;
- }
+ public function getHtmlDetails()
+ {
+ return "" .
+ '- Name
- ' .
+ $this->getHtmlName() .
+ "
" .
+ "- Datum
- " .
+ $this->getHtmlDate() .
+ "
" .
+ "- Altersklassen
- " .
+ $this->getHtmlDescriptiveAgeClasses() .
+ "
" .
+ '- Ort
- ' .
+ $this->getPlace() .
+ "
" .
+ "
";
+ }
- public function getHtmlDescriptiveAgeClasses()
- {
- $retList = [];
- foreach ($this->ageclasses as $ageclass => $years) {
- $htmlFragment = $ageclass;
- $years = $years[0];
+ public function getHtmlDescriptiveAgeClasses()
+ {
+ return join(", ", $this->ageclasses);
+ }
- if ($years[0] || $years[1]) {
- $htmlFragment .= '(';
- if ($years[1]) {
- $htmlFragment .= strval($years[0]) . '-' . strval($years[1]);
- } else {
- $htmlFragment .= '<=' . strval($years[0]);
- }
- $htmlFragment .= ')';
- }
- $retList[] = $htmlFragment;
- }
- 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"));
- /** 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;
- }
+ $ageGroups = [];
+ foreach (explode(" ", $akListString) as $label) {
+ $ageGroups[$label] = AgeGroup::create($label, $year);
+ }
- /** 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'));
+ return $ageGroups;
+ }
- $ret = [null, null];
+ /** 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"));
- // Matching against the different age class formats
- // - ..Ux
- // - Jg.x-y
+ $ret = [null, null];
- // Case Ux
- $akUmatchString = '/(.*)U(.*)/';
+ // Matching against the different age class formats
+ // - ..Ux
+ // - Jg.x-y
- $matches = [];
+ // Case Ux
+ $akUmatchString = "/(.*)U(.*)/";
- 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;
- }
- }
+ $matches = [];
- // Case Jg.x-y
- $akUmatchString = "/Jg\.(.*)\-{1,2}(.*)/";
+ 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;
+ }
+ }
- $matches = [];
+ // Case Jg.x-y
+ $akUmatchString = "/Jg\.(.*)\-{1,2}(.*)/";
- preg_match($akUmatchString, $akString, $matches);
- // The found match should cover the whole string. Otherwise it isn't applicable.
+ $matches = [];
- if ($matches[0] == $akString) {
- $ret[0] = filterPosInt($matches[1]);
- $ret[1] = filterPosInt($matches[2]);
+ preg_match($akUmatchString, $akString, $matches);
+ // The found match should cover the whole string. Otherwise it isn't applicable.
- return $ret;
- }
+ 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);
- }
+ return $ret;
+ }
- /** 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] = [];
+ /** grouping users kids by ageGroups
+ *
+ * @return array(ageGroup => list(users in ageGroup))
+ */
+ public function ageGroups()
+ {
+ $kids = participo::getKids();
+ return self::ageClassGrouping($this->ageclasses, $kids);
+ }
- foreach ($starterList as $starter) {
- $startersAgeClass = $starter->yearOfBirth() ? self::getAgeClassFromYear($starter->yearOfBirth(), $ageClassList) : null;
- $grouping[$startersAgeClass][$starter->getId()] = $starter;
- }
- return $grouping;
- }
+ /** 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 = [];
- private static function getAgeClassFromYear(int $year, array $ageClassList)
- {
- foreach ($ageClassList as $ageClass => $yearBoundaries) {
- if (($yearBoundaries[0] <= $year) && ($year <= $yearBoundaries[1])) {
- return $ageClass;
- }
- }
- return null;
- }
+ 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 $label => $ageGroup) {
+ if ($ageGroup->years()->contains($year)) {
+ return $label;
+ }
+ }
+ return null;
+ }
} // end class shiai
diff --git a/submodules/Makefile.materialize b/submodules/Makefile.materialize
new file mode 100644
index 0000000..b47348c
--- /dev/null
+++ b/submodules/Makefile.materialize
@@ -0,0 +1,5 @@
+.PHONY: build
+
+build:
+ npm install
+ npm run release
\ No newline at end of file
diff --git a/submodules/buildVideoJs.sh b/submodules/buildVideoJs.sh
new file mode 100755
index 0000000..f737d7f
--- /dev/null
+++ b/submodules/buildVideoJs.sh
@@ -0,0 +1,5 @@
+#! /usr/bin/env bash
+
+cd video.js
+npm install
+npm run release
\ No newline at end of file