On branch redesign2018

Your branch is up to date with 'origin/redesign2018'.

Changes to be committed:
	modified:   homepage/redesign2018/markdownExperiment/Makefile
	modified:   homepage/redesign2018/markdownExperiment/md/wkKalender.md
	modified:   homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate
	modified:   homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
This commit is contained in:
marko
2018-06-26 15:00:37 +02:00
parent b2375f7eef
commit 22c58960e9
4 changed files with 46 additions and 3 deletions

View File

@@ -45,9 +45,9 @@ ampTest: $(ampFiles)
build/css/cwsvJudo.css: $(cssFiles)
mkdir -p $(dir $@)
cat $(cssFiles) > $@
# cat $^ | csso -o $@
# cat $(cssFiles) > $@
# cat $(cssFiles) | cleancss -o $@
cat $^ | csso -o $@
build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate
mkdir -p build

View File

@@ -1,6 +1,6 @@
---
lang: de
title: Wettkampfkalender der Judoka des Chemnitzer Freizeit- und Wohngebiets­sportverein e. V.
title: "Wettkampfkalender der Judoka des Chemnitzer Freizeit- und Wohngebiets­sportvereines e. V."
author: marko
keywords:
- Judo

View File

@@ -18,7 +18,11 @@
galleryRedirector();
$if(phpTitleString)$
PHPCount::AddHit($phpTitleString$);?>
$else$
PHPCount::AddHit("$title$");?>
$endif$
<!DOCTYPE html>
<html$if(lang)$ lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>
<head>

View File

@@ -1,4 +1,40 @@
<?php
setlocale(LC_ALL, 'de_DE.utf8');
/// Einen Wettkampfnamen per ID abfragen
function getWkName( $wkId, $alternative="Judo-Wettkampf" ){
if( !is_positive_integer($wkId) ) return $alternative;
// Datenbankverbindung bereit stellen
global $cwsvJudoConfig;
try{
$db_connection = new PDO(
'mysql:host='.$cwsvJudoConfig["db"]["host"].';dbname='.$cwsvJudoConfig["db"]["name"],
$cwsvJudoConfig["db"]["user"],
$cwsvJudoConfig["db"]["password"]
);
}
catch(PDOException $db_error){
// $siteData['errors'][] = "Error!: " . $db_error->getMessage();
return $alternative;
}
try{
$pdoStatementForQuerryingWkById = $db_connection->prepare(
"SELECT Veranstaltung FROM cwsvjudo.wettkampfkalender WHERE wettkampfkalender.lfdeNr = :wkId;"
);
$pdoStatementForQuerryingWkById->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
$pdoStatementForQuerryingWkById->execute();
$ret = $pdoStatementForQuerryingWkById->fetchAll(PDO::FETCH_ASSOC);
return $ret[0]['Veranstaltung'];
}
catch(PDOException $db_error){
// $siteData['errors'][] = "Error!: " . $db_error->getMessage();
return $alternative;
}
return $alternative;
}
/// Wettkämpfe per ID abfragen
///
@@ -97,6 +133,7 @@ return $ret;
/// Aus einer Liste von Wettkämpfen den htmlCode der Wettkampftabelle bereit stellen
function wkList2htmlWkTable( $aWkList, $someOptions = [] ){
setlocale(LC_ALL, 'de_DE.utf8');
if( empty($aWkList) )
return "";
@@ -126,6 +163,8 @@ $htmlWkTableString = "";
}
);
//echo( "locale is ".get_locale() );
if($lastMonthName != strftime("%B %Y", strtotime($wk['Datum']) )){
$lastMonthName = strftime("%B %Y", strtotime($wk['Datum']) );
$htmlWkTableString .= "<tr><th colspan=\"5\" >".$lastMonthName."</th></tr><tr style=\"display:none;\" ><th colspan=\"5\"></th></tr>";