From 868c05f0c1485046b549b1bb233ed96fdb23480b Mon Sep 17 00:00:00 2001 From: marko Date: Sat, 23 Dec 2023 14:32:48 +0100 Subject: [PATCH] added eventpage (not in linkstructure yet) --- homepage/participo/event.php | 47 ++++++++++++++++++ homepage/participo/lib/participoLib/event.php | 3 ++ homepage/participo/wk.api.php | 2 +- infoZettelOrg/Makefile | 8 ++- submodules/Makefile | 9 ++-- submodules/lite-youtube-embed | 2 +- submodules/materialize | 2 +- submodules/parsedown | 2 +- tShirts/tShirts.2023/groessen.gnumeric | Bin 2849 -> 3713 bytes 9 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 homepage/participo/event.php diff --git a/homepage/participo/event.php b/homepage/participo/event.php new file mode 100644 index 0000000..a74d301 --- /dev/null +++ b/homepage/participo/event.php @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + <?php echo($meta['title']); ?> + + + + + + + + +
+ + +
+ +
+ html(); ?> +
+ + + \ No newline at end of file diff --git a/homepage/participo/lib/participoLib/event.php b/homepage/participo/lib/participoLib/event.php index 5906ddc..5328cce 100644 --- a/homepage/participo/lib/participoLib/event.php +++ b/homepage/participo/lib/participoLib/event.php @@ -87,6 +87,9 @@ class Event if ((!isset($this->shiai) || $forceLoading) && isset($this->shiaiId)) { $this->shiai = Shiai::loadFromDb($this->shiaiId); } + if ($this->shiai == null){ + $this->shiai = Shiai::fromDbArray(json_decode($this->remarks, true)); + } return $this->shiai; } diff --git a/homepage/participo/wk.api.php b/homepage/participo/wk.api.php index a512f4e..2c307eb 100644 --- a/homepage/participo/wk.api.php +++ b/homepage/participo/wk.api.php @@ -13,7 +13,7 @@ $db = dbConnector::connect( $cwsvJudoConfig['db']['user'], $cwsvJudoConfig['db']['password'] ); -echo($db); +// echo($db); $wkSqlQuery = 'SELECT * FROM `wettkampfkalender` WHERE `Datum` >= CURDATE();'; $wkSqlResponse = dbConnector::query($wkSqlQuery); diff --git a/infoZettelOrg/Makefile b/infoZettelOrg/Makefile index 096d549..7f53d09 100644 --- a/infoZettelOrg/Makefile +++ b/infoZettelOrg/Makefile @@ -2,6 +2,7 @@ include Makefile.private infoZettel=$(patsubst %.md,%.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-2x2=$(patsubst %.md,%-2x2.pdf,$(wildcard wkZettel/*.md)) kyuZettel=$(patsubst %.md,%.pdf,$(wildcard kyuZettel/*.md)) @@ -37,7 +38,7 @@ aushaenge: $(aushaenge) --variable classoption="twoside=true" \ --variable classoption="DIV=28" \ --variable classoption="BCOR=0mm" \ - --variable classoption="paper=A6" \ + --variable classoption="paper=A5" \ --variable classoption="fontsize=10pt" \ --variable classoption="parskip=never" \ --variable classoption="headsepline=true" \ @@ -48,7 +49,10 @@ aushaenge: $(aushaenge) $^ %-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 pandoc \ diff --git a/submodules/Makefile b/submodules/Makefile index 1dff116..f17068a 100644 --- a/submodules/Makefile +++ b/submodules/Makefile @@ -4,7 +4,7 @@ include passwords .PHONY: updateSubmodules updateSubmodules: checkoutSubmodulesDefaultBranches git submodule foreach git pull - + .PHONY: checkoutSubmodulesDefaultBranches: git -C lite-youtube-embed checkout master @@ -13,12 +13,11 @@ checkoutSubmodulesDefaultBranches: git -C spyc checkout master git -C zopfli checkout master - .PHONY: buildMaterialize buildMaterialize: updateSubmodules ./buildMaterialize.sh .PHONY: deployMaterialize -# deployMaterialize: buildMaterialize -deployMaterialize: $(materialiceCssDist) - cd materialize/dist/ && find . -type f -exec curl --verbose -u cwsvjudo:$(ftpPassword) --ftp-create-dirs -T {} ftp://cwsvjudo.bplaced.net/www/ressourcen/materializeCss/{} \; \ No newline at end of file +deployMaterialize: buildMaterialize + # @todo correctly check the cert + lftp -e "set ftp:ssl-allow no; mirror -R 'materialize/dist' 'www/ressourcen/materializeCss'; bye;" -u cwsvjudo,$(ftpPassword) cwsvjudo.bplaced.net diff --git a/submodules/lite-youtube-embed b/submodules/lite-youtube-embed index be6f03e..f9fc3a2 160000 --- a/submodules/lite-youtube-embed +++ b/submodules/lite-youtube-embed @@ -1 +1 @@ -Subproject commit be6f03ef53b33866e38a917a256cefca95262804 +Subproject commit f9fc3a2475ade166d0cf7bb3e3caa3ec236ee74e diff --git a/submodules/materialize b/submodules/materialize index bf29da7..68e5224 160000 --- a/submodules/materialize +++ b/submodules/materialize @@ -1 +1 @@ -Subproject commit bf29da7b2a234ec3d3428b7585d5ac7f724541f2 +Subproject commit 68e5224811ba6b568316de60da5af66d9a569a48 diff --git a/submodules/parsedown b/submodules/parsedown index 6598f38..77947ed 160000 --- a/submodules/parsedown +++ b/submodules/parsedown @@ -1 +1 @@ -Subproject commit 6598f3860c2698fe2f0f1bc98212fc01d0a1893c +Subproject commit 77947eda2fdaf06b181c63a7db13e38968306aee diff --git a/tShirts/tShirts.2023/groessen.gnumeric b/tShirts/tShirts.2023/groessen.gnumeric index d5f257058393ae47d26f7248c565783a6f60ce06..ee1da88da08859a18e9b6f6870d1d8546aecfc93 100644 GIT binary patch literal 3713 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 literal 2849 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