Merge branch 'wkParticipo' of /media/marko/mmcblk0p1-mmc-USD00_0x62b76940/gitReops/cwsvJudo into wkParticipo

This commit is contained in:
marko
2021-06-13 07:58:11 +02:00
10 changed files with 484 additions and 22 deletions

View File

@@ -72,11 +72,8 @@ return $ret;
<nav class="navBar">
<ul>
<<<<<<< Updated upstream
=======
<li><a href="/machs">Achievementsystem</a></li>
<li><a href="./infoZettel.php">Infozettel</a></li>
>>>>>>> Stashed changes
<li>
<a href ="./eventKalender.php">alle geplanten Wettkämpfe als Liste</a>
</li>
@@ -134,7 +131,6 @@ return $ret;
}
else{
foreach($wkEventData as $wkEvent){
// var_dump($wkEvent);
?>
<div class="wkInfoCard">
<time class="wkInfoCardDate" datetime="<?php echo( $wkEvent['date'] );?>">
@@ -241,14 +237,11 @@ return $ret;
<?php
}
else{
// var_dump($wkEvents);
foreach( $wkEvents as $wk){
//print_r($wk);
$wkEvent = getWkEventData($mysqlConn, $wk['id'], array('outCharset'=>"UTF-8"));
?>
<h3><?php echo( $wkEvent['Veranstaltung'] );?></h3>
<?php
//var_dump($wkEvent);
echo(
htmlWkEvent(
$wkEvent,