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

- Das die cssKomprimierung wieder aktiviert

Browse Source 
modified:   Makefile
- Ein Makefile zum Upload einer VideoGalerie auf eine ftpServer
	modified:   src/Makefiles/Makefile.ftpUpload
- Starte "ohne Teilnahme" werden nicht mehr in der Gesamptanzahl
berücksichtigt
	modified:   wkParticipo/admin/showEvent.php
	modified:   wkParticipo/showWkEvent.php
This commit is contained in:
marko
2018-11-12 09:29:37 +01:00
parent 2b7ab02db4
commit 93f4371093
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
homepage/redesign2018/markdownExperiment/Makefile
View File

@@ -45,10 +45,10 @@ ampTest: $(ampFiles)
build/css/cwsvJudo.css: $(cssFiles) build/css/cwsvJudo.css: $(cssFiles)
mkdir -p $(dir $@) mkdir -p $(dir $@)
cat $^ > $@ # cat $^ > $@
# cat $(cssFiles) | cleancss -o $@ # cat $(cssFiles) | cleancss -o $@
# cat $^ | ./node_modules/.bin/csso -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 build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate
mkdir -p build mkdir -p build

6
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
View File

@@ -7,12 +7,14 @@ ftpPassword = eeloor0D
ftpPathBase = /htdocs/videoalben/videoalben.2018 ftpPathBase = /htdocs/videoalben/videoalben.2018
vidGalIndexPhp = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php vidGalIndexPhp = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
dryRun = --dry-run
timeHandling= --only-newer
.PHONY: all .PHONY: all
all: all:
.PHONY: ftpUpload .PHONY: ftpUpload
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)

20
homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
View File

@@ -169,10 +169,24 @@
</li> </li>
<?php <?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 = array();
// $fahrtenData = getFahrtenForEvent($mysqli, $eventData['id']); // $fahrtenData = getFahrtenForEvent($mysqli, $eventData['id']);

15
homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php
View File

@@ -94,19 +94,21 @@
<h2>Einschreibungen:</h2> <h2>Einschreibungen:</h2>
<?php if( !empty($_SESSION['login']) ){ <?php if( !empty($_SESSION['login']) ){
$wkEventStarterData = getEventsStarterData($mysqli, $eventData['id']);
?> ?>
<?php $wkEventStarterData = getEventsStarterData($mysqli, $eventData['id']);?>
<li>Eingeschrieben: <li>Eingeschrieben:
<?php <?php
$starters = getStarterForEvent($mysqli, $eventData['id']); $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 <?php
} }
else{ else{
echo count($starters); echo($anzahlKaempfer+$anzahlZuschauer);
} }
?> ?>
<ul> <ul>
@@ -139,8 +141,9 @@
</ul> </ul>
</li> </li>
<!--
<p>Es sind momentan <?php echo (count($wkEventStarterData) == 0 ? "keine" : count($wkEventStarterData));?> Starter eingeschrieben.</p> <p>Es sind momentan <?php echo (count($wkEventStarterData) == 0 ? "keine" : count($wkEventStarterData));?> Starter eingeschrieben.</p>
-->
<?php <?php
} }
?> ?>