added eventpage (not in linkstructure yet)

This commit is contained in:
marko
2023-12-23 14:32:48 +01:00
parent b42197852c
commit 868c05f0c1
9 changed files with 64 additions and 11 deletions

View File

@@ -0,0 +1,47 @@
<?php
setlocale(LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
set_include_path(get_include_path() . PATH_SEPARATOR . './lib/');
require_once 'participoLib/event.php';
// Configs
require_once 'config/participo.php';
require_once $config['basePath'] . '/config/cwsvJudo.config.php';
participo::init($cwsvJudoConfig);
?>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- shared imports (common css, MaterializeCss) -->
<?php readfile('shared/imports.php'); ?>
<!-- inits for the materializeCss -->
<script src="events.js"></script>
<title><?php echo($meta['title']); ?></title>
<meta name="description"
content="<?php echo($meta['description']); ?>" />
<link rel="icon" href="<?echo($config['ressourceUrl']);?>/graphiken/icons/cwsv.ico" />
<link rel="apple-touch-icon" href="<?echo($config['baseUrl']);?>/apple-touch-icon.png">
</head>
<body>
<header>
<!-- The sidenav -->
<?php require './events.sidenav.inc.php'; ?>
</header>
<main>
<?php participo::eventPage()->html(); ?>
</main>
</body>
</html>

View File

@@ -87,6 +87,9 @@ class Event
if ((!isset($this->shiai) || $forceLoading) && isset($this->shiaiId)) { if ((!isset($this->shiai) || $forceLoading) && isset($this->shiaiId)) {
$this->shiai = Shiai::loadFromDb($this->shiaiId); $this->shiai = Shiai::loadFromDb($this->shiaiId);
} }
if ($this->shiai == null){
$this->shiai = Shiai::fromDbArray(json_decode($this->remarks, true));
}
return $this->shiai; return $this->shiai;
} }

View File

@@ -13,7 +13,7 @@ $db = dbConnector::connect(
$cwsvJudoConfig['db']['user'], $cwsvJudoConfig['db']['user'],
$cwsvJudoConfig['db']['password'] $cwsvJudoConfig['db']['password']
); );
echo($db); // echo($db);
$wkSqlQuery = 'SELECT * FROM `wettkampfkalender` WHERE `Datum` >= CURDATE();'; $wkSqlQuery = 'SELECT * FROM `wettkampfkalender` WHERE `Datum` >= CURDATE();';
$wkSqlResponse = dbConnector::query($wkSqlQuery); $wkSqlResponse = dbConnector::query($wkSqlQuery);

View File

@@ -2,6 +2,7 @@ include Makefile.private
infoZettel=$(patsubst %.md,%.pdf,$(wildcard *.md)) infoZettel=$(patsubst %.md,%.pdf,$(wildcard *.md))
infoZettel-2x2=$(patsubst %.md,%-2x2.pdf,$(wildcard *.md)) infoZettel-2x2=$(patsubst %.md,%-2x2.pdf,$(wildcard *.md))
infoZettel-booklet=$(patsubst %.md,%-booklet.pdf,$(wildcard *.md))
wkZettel=$(patsubst %.md,%.pdf,$(wildcard wkZettel/*.md)) wkZettel=$(patsubst %.md,%.pdf,$(wildcard wkZettel/*.md))
wkZettel-2x2=$(patsubst %.md,%-2x2.pdf,$(wildcard wkZettel/*.md)) wkZettel-2x2=$(patsubst %.md,%-2x2.pdf,$(wildcard wkZettel/*.md))
kyuZettel=$(patsubst %.md,%.pdf,$(wildcard kyuZettel/*.md)) kyuZettel=$(patsubst %.md,%.pdf,$(wildcard kyuZettel/*.md))
@@ -37,7 +38,7 @@ aushaenge: $(aushaenge)
--variable classoption="twoside=true" \ --variable classoption="twoside=true" \
--variable classoption="DIV=28" \ --variable classoption="DIV=28" \
--variable classoption="BCOR=0mm" \ --variable classoption="BCOR=0mm" \
--variable classoption="paper=A6" \ --variable classoption="paper=A5" \
--variable classoption="fontsize=10pt" \ --variable classoption="fontsize=10pt" \
--variable classoption="parskip=never" \ --variable classoption="parskip=never" \
--variable classoption="headsepline=true" \ --variable classoption="headsepline=true" \
@@ -48,7 +49,10 @@ aushaenge: $(aushaenge)
$^ $^
%-2x2.pdf: %.pdf %-2x2.pdf: %.pdf
pdfjam --no-landscape --nup 2x2 --suffix '2x2' $^ '1,1,1,1,2,2,2,2' --outfile $@ pdfjam --no-landscape --nup 2x1 --suffix '2x2' $^ '2,3,1,4,2,2,2,2' --outfile $@
%-booklet.pdf: %.pdf
pdfjam --landscape --nup 2x1 --suffix 'booklet' $^ '2,3,1,4' --outfile $@
aushang/%.pdf: aushang/%.md aushang/%.pdf: aushang/%.md
pandoc \ pandoc \

View File

@@ -4,7 +4,7 @@ include passwords
.PHONY: updateSubmodules .PHONY: updateSubmodules
updateSubmodules: checkoutSubmodulesDefaultBranches updateSubmodules: checkoutSubmodulesDefaultBranches
git submodule foreach git pull git submodule foreach git pull
.PHONY: .PHONY:
checkoutSubmodulesDefaultBranches: checkoutSubmodulesDefaultBranches:
git -C lite-youtube-embed checkout master git -C lite-youtube-embed checkout master
@@ -13,12 +13,11 @@ checkoutSubmodulesDefaultBranches:
git -C spyc checkout master git -C spyc checkout master
git -C zopfli checkout master git -C zopfli checkout master
.PHONY: buildMaterialize .PHONY: buildMaterialize
buildMaterialize: updateSubmodules buildMaterialize: updateSubmodules
./buildMaterialize.sh ./buildMaterialize.sh
.PHONY: deployMaterialize .PHONY: deployMaterialize
# deployMaterialize: buildMaterialize deployMaterialize: buildMaterialize
deployMaterialize: $(materialiceCssDist) # @todo correctly check the cert
cd materialize/dist/ && find . -type f -exec curl --verbose -u cwsvjudo:$(ftpPassword) --ftp-create-dirs -T {} ftp://cwsvjudo.bplaced.net/www/ressourcen/materializeCss/{} \; lftp -e "set ftp:ssl-allow no; mirror -R 'materialize/dist' 'www/ressourcen/materializeCss'; bye;" -u cwsvjudo,$(ftpPassword) cwsvjudo.bplaced.net