From 93f4371093d33d7a91268849052764769780c0d8 Mon Sep 17 00:00:00 2001
From: marko <marko@helko>
Date: Mon, 12 Nov 2018 09:29:37 +0100
Subject: [PATCH] =?UTF-8?q?-=20Das=20die=20cssKomprimierung=20wieder=20akt?=
 =?UTF-8?q?iviert=20=09modified:=20=20=20Makefile=20-=20Ein=20Makefile=20z?=
 =?UTF-8?q?um=20Upload=20einer=20VideoGalerie=20auf=20eine=20ftpServer=20?=
 =?UTF-8?q?=09modified:=20=20=20src/Makefiles/Makefile.ftpUpload=20-=20Sta?=
 =?UTF-8?q?rte=20"ohne=20Teilnahme"=20werden=20nicht=20mehr=20in=20der=20G?=
 =?UTF-8?q?esamptanzahl=20ber=C3=BCcksichtigt=20=09modified:=20=20=20wkPar?=
 =?UTF-8?q?ticipo/admin/showEvent.php=20=09modified:=20=20=20wkParticipo/s?=
 =?UTF-8?q?howWkEvent.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../redesign2018/markdownExperiment/Makefile  |  4 ++--
 .../src/Makefiles/Makefile.ftpUpload          |  6 ++++--
 .../wkParticipo/admin/showEvent.php           | 20 ++++++++++++++++---
 .../wkParticipo/showWkEvent.php               | 15 ++++++++------
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile
index 036456a..00be903 100644
--- a/homepage/redesign2018/markdownExperiment/Makefile
+++ b/homepage/redesign2018/markdownExperiment/Makefile
@@ -45,10 +45,10 @@ ampTest: $(ampFiles)
 
 build/css/cwsvJudo.css: $(cssFiles)
 	mkdir -p $(dir $@)
-	cat $^ > $@
+#	cat $^ > $@
 #	cat $(cssFiles) | cleancss -o $@
 #	cat $^ | ./node_modules/.bin/csso -o $@
-#	cat $^ | csso -o $@
+	cat $^ | csso -o $@
 
 build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate
 	mkdir -p build
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
index 9a08228..34bc487 100644
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
@@ -7,12 +7,14 @@ ftpPassword = eeloor0D
 ftpPathBase = /htdocs/videoalben/videoalben.2018
 
 vidGalIndexPhp = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
-
+dryRun = --dry-run
+timeHandling= --only-newer
 
 .PHONY: all
 all:
 
 .PHONY: ftpUpload
 ftpUpload:
-	lftp -e 'set net:limit-rate 25600; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(VID_GAL_DIR)/config.inc.php; mirror -R --ignore-time videos/thumbnails $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mirror -R --ignore-time videos/webm $(ftpPathBase)/$(VID_GAL_DIR)/webm;quit' -u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
+	lftp -e 'set net:limit-rate 25600; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(VID_GAL_DIR)/webm; quit; ' \
+		-u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
 
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
index 150a3c2..37c2f19 100644
--- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
@@ -169,10 +169,24 @@
 						</li>
 <?php
 					}
+					
+					echo("<table>");
+					echo("<tr><th>Name</th><th>Vorname</th><th>Masse</th><th>Platz</th><th>starterId</th><th>fahrtId</th></tr>");
+
+					foreach( $starterData as $starter ){
+						if($starter['type'] != $typeKey) continue;
+						echo("<tr>");
+							$userData = getUserData($mysqli, $starter['userId']);
+							echo("<td>".mb_convert_encoding($userData['name'], 'UTF-8', 'ISO-8859-1')."</td>");
+							echo("<td>".mb_convert_encoding($userData['vorname'], 'UTF-8', 'ISO-8859-1')."</td>");
+							echo("<td>".$starter['masse']."</td>");
+							echo("<td>".$starter['platz']."</td>");
+							echo("<td>".$starter['id']."</td>");
+							echo("<td>".$starter['fahrtId']."</td>");
+						echo("</tr>");
+					}
+					echo("</table>");
 				}
-?>
-				</ul>
-<?php
 			}
 //			$fahrtenData = array();
 //			$fahrtenData = getFahrtenForEvent($mysqli, $eventData['id']);
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php b/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php
index 8fb4bd7..752fe58 100644
--- a/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php
@@ -94,19 +94,21 @@
 			
 			<h2>Einschreibungen:</h2>
 <?php		if( !empty($_SESSION['login']) ){
+				$wkEventStarterData = getEventsStarterData($mysqli, $eventData['id']);
 ?>
-			<?php $wkEventStarterData = getEventsStarterData($mysqli, $eventData['id']);?>
-			
 				<li>Eingeschrieben:
 <?php
 					$starters = getStarterForEvent($mysqli, $eventData['id']);
-					if( empty($starters) ){
+					$anzahlKaempfer  = array_count_values(array_column($starters, 'type'))['1'];
+					$anzahlZuschauer = array_count_values(array_column($starters, 'type'))['2'];
+//					if( empty($starters) ){
+					if( ($anzahlKaempfer+$anzahlZuschauer) <= 0 ){
 ?>
-						Noch hat sich niemand für diesen Wettkampf gemeldet!
+						Noch will niemand zu diesem Wettkampf!
 <?php
 					}
 					else{
-						echo count($starters);
+						echo($anzahlKaempfer+$anzahlZuschauer);
 					}
 ?>
 					<ul>
@@ -139,8 +141,9 @@
 					</ul>
 				</li>
 
-			
+<!--
 			<p>Es sind momentan <?php echo (count($wkEventStarterData) == 0 ? "keine" : count($wkEventStarterData));?> Starter eingeschrieben.</p>
+-->
 <?php
 			}
 ?>