marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- square date

Browse Source 
- fixed typos
- missed mCss inits
This commit is contained in:
marko
2023-01-28 13:03:59 +01:00
parent cd8f15fe25
commit 4ff0659f90
10 changed files with 109 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
homepage/participo/lib/participoLib/event.php
View File

@@ -59,7 +59,7 @@ class Event
'<dl>' .
'<dt>Datum</dt>' .
'<dd>' . $this->date->format('Y-m-d') . '</dd>' .
'<dt>Meldefrist</dt>' .
'<dt>Einschreibefrist</dt>' .
'<dd>' . $this->deadline->format('Y-m-d') . '</dd>' .
'<dt>Altersklassen</dt>' .
'<dd>' . $this->shiai->getAgeClasses() . '</dd>' .
@@ -72,7 +72,7 @@ class Event
return
'<tr>' .
'<td>' . $this->date->format('Y-m-d') . '</td>' .
'<td><a href="/pages/desktop/wkParticipo/showWkEvent.php?eventId=' . $this->id . '" >' . $this->shiai->getHtmlName() . '</a></td>' .
'<td><a href="/participo/events#' . $this->id . '" >' . $this->shiai->getHtmlName() . '</a></td>' .
'<td>' . $this->shiai->getAgeClasses() . '</td>' .
'<td><a class="waves-effect waves-light btn modal-trigger" href="#event-modal-' . $this->id . '"><i class="material-icons">zoom_in</i></a></td>' .
'</tr>';
@@ -111,7 +111,7 @@ class Event
$starterList .= 'Bereits eingetragen: <div class="row">';
foreach ($listOfStarter as $s) {
$u = $s->getUser();
$starterList .= '<div class="col s6 m3">' . $u->getName() . ', ' . $u->getFirstname() . $this->getHtmlRemoveStarterForm($s->getEventId(), $s->getUserId()) . '</div>';
$starterList .= '<div class="col s12 m6">' . $u->getName() . ', ' . $u->getFirstname() . $this->getHtmlRemoveStarterForm($s->getEventId(), $s->getUserId()) . '</div>';
}
$starterList .= '</div>';
return $starterList;
@@ -189,7 +189,7 @@ class Event
{
$key = isset($_SESSION['apiKey']) ? $_SESSION['apiKey'] : null;
$form =
'<form class="card col s6 m4" action="api.starter.add.php" method="post">'
'<form class="card col s12 m6" action="api.starter.add.php" method="post">'
. '<input type="hidden" name="eventId" id="eventId" value="' . $this->id . '">'
. '<input type="hidden" name="userId" id="userId" value="' . $user->getId() . '">'
. '<input type="hidden" name="returnToUrl" id="returnToUrl" value="' . urlencode(getCurPagesUrl()) . '" >'

26
homepage/participo/lib/participoLib/participo.php
View File

@@ -43,7 +43,7 @@ class participo
return
'<div style="border: 1px solid black">' .
'Datum: ' . date('Y-m-d') . '<br />' .
'Angemeldet als <strong>' . htmlspecialchars($_SESSION['user']['username']) . '</strong>.<br />' .
'Eingeloggt als <strong>' . htmlspecialchars($_SESSION['user']['username']) . '</strong>.<br />' .
'<a href="logout.php">Sitzung beenden</a>' .
'</div>';
}
@@ -517,3 +517,27 @@ function getCurPagesUrl()
}
return $pageURL;
}
/**
* space saving way to put a date
*
* @param [DateTime] $date
* @return string html tag containing the date
*/
function getHtmlSquareDate($date = null)
{
$date = $date ?? new DateTime;
$year = $date->format('Y');
$month = $date->format('M');
$day = $date->format('d');
return
'<div>'
. '<div>'
. '<span style="font-size:large">' . $day . '</span>'
. '<span style="writing-mode: sideways-lr">' . $month . '</span>'
. '</div>'
. '<div style="font-size: small">' . $year . '</div>'
. '</div>';
}

7
homepage/participo/lib/participoLib/planer.php
View File

@@ -1,5 +1,6 @@
<?php
require_once 'participoLib/participo.php';
require_once 'participoLib/dbConnector.php';
require_once 'participoLib/apiKey.php';
require_once 'participoLib/shiai.php';
@@ -124,12 +125,14 @@ class eventPlaner
. '<tbody>';
foreach ($comingStarts as $s) {
$eventDeadline = DateTime::createFromFormat('Y-m-d', $s['deadline']);
$eventDate = DateTime::createFromFormat('Y-m-d', $s['eventDate']);
$today = new DateTime();
$htmlTable .= '<tr>'
. '<td>' . $s['eventDate'] . '</td>'
. '<td>' . getHtmlSquareDate($eventDate) . '</td>'
. '<td>' . $s['eventName'] . '</td>'
. '<td>' . $s['userName'] . ', ' . $s['userFirstname'] . '</td>'
. '<td>' . ($eventDeadline <= $today ? Event::getHtmlRemoveStarterForm($s['eventId'], $s['userId']) : '') . '</td>'
. '<td>' . ($eventDeadline >= $today ? Event::getHtmlRemoveStarterForm($s['eventId'], $s['userId']) : '') . '</td>'
// . '<td>' . $eventDeadline->format('Y-m-d') . ' <= ' . $today->format('Y-m-d') . ': ' . ($eventDeadline <= $today ? 'true' : 'false') . '</td>'
. '</tr>';
}
$htmlTable .= '</tbody></table>';

2
homepage/participo/lib/participoLib/shiai.php
View File

@@ -37,7 +37,7 @@ class Shiai
{
$name = ($this->name != null ? $this->name : 'Wettkampf ohne Namen');
foreach (['meisterschaft', 'turnier', 'randori'] as $fragment) {
str_replace($fragment, '&shy;', $name);
$name = str_replace($fragment, '&shy;' . $fragment, $name);
}
return $name;
}