diff --git a/view-webapp/src/main/sass/main.scss b/view-webapp/src/main/sass/main.scss index 0477ee6..459bff2 100644 --- a/view-webapp/src/main/sass/main.scss +++ b/view-webapp/src/main/sass/main.scss @@ -431,4 +431,65 @@ } } + + .page { + width: 96vw; + height: 96vh; + page-break-after: always; + .page-item { + font-size: 1.4rem; + line-height: 1.5rem; + height: 24vh; + border-bottom: 1px dotted gray; + display: flex; + flex-flow: column nowrap; + justify-content: space-evenly; + .title { + margin-top: 1vh; + font-weight: bold; + text-align: center; + } + .subtitle { + font-size: 1rem; + text-align: center; + } + .details { + margin: 1vh 1em; + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + line-height: 1.1rem; + } + .instructions { + text-align: center; + font-style: italic; + } + .players { + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + gap: 1em; + .equal { + padding: 0.2em 1em; + border: solid 1px gray; + } + .player { + padding: 0.2em 1em; + border: solid 1px gray; + flex: 1; + } + } + .signatures { + height: 8vh; + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + .signature { + font-style: italic; + text-align: left; + flex: 1; + } + } + } + } } diff --git a/view-webapp/src/main/sass/tour.scss b/view-webapp/src/main/sass/tour.scss index 7d7d6d6..cef5f77 100644 --- a/view-webapp/src/main/sass/tour.scss +++ b/view-webapp/src/main/sass/tour.scss @@ -292,6 +292,12 @@ padding: 0.2em 0.8em; } + .result-sheets { + position: absolute; + bottom: 1em; + right: 1em; + } + /* results section */ #results-list { diff --git a/view-webapp/src/main/webapp/WEB-INF/translations/fr b/view-webapp/src/main/webapp/WEB-INF/translations/fr index 3444910..2c0c8b5 100644 --- a/view-webapp/src/main/webapp/WEB-INF/translations/fr +++ b/view-webapp/src/main/webapp/WEB-INF/translations/fr @@ -113,6 +113,7 @@ Your feedback is most welcome! Vos retours sont les bienvenus ! and uses the same algorithm internally, as well as import and export features towards its format. et utilise le même algorithme en interne, ainsi que des fonctionnalités d’import et d’export vers et depuis son format. apache licence licence Apache black noir +Black Noir club club country pays d d @@ -135,6 +136,7 @@ pairing system, ideal for championships with no handicap games, as well as the , pairing system, more suited for classical tournaments and cups. It is still in an alpha stage. Future versions will support more pairing systems and more features. , plus adapté pour les tournois classiques et les coupes. Il en est encore à une phase « alpha ». Les versions futures comporteront plus de systèmes d’appariements et de fonctionnalités. project is fully open source, and under the very permissive est un logiciel libre, et sous la très permissive result résultat +result sheets feuilles de résultat sources sources sources on FFG's gitlab sur le serveur gitab de la FFG standalone, standard interface indépendant, interface standard @@ -146,5 +148,6 @@ to à unpairable players joueurs non disponibles version 0.1 supports the version 0.1 supporte le système d’appariement white blanc +White Blanc white vs. black blanc vs. Noir confirmed. confirmé(s). \ No newline at end of file diff --git a/view-webapp/src/main/webapp/result-sheets.html b/view-webapp/src/main/webapp/result-sheets.html new file mode 100644 index 0000000..62530f6 --- /dev/null +++ b/view-webapp/src/main/webapp/result-sheets.html @@ -0,0 +1,73 @@ +#macro(rank $rank)#if( $rank<0 )#set( $k = -$rank )${k}k#else#set( $d=$rank+1 )${d}d#end#end +#if (!$tour) +
+

Invalid tournament id

+
+#end +#set($round = $math.toInteger($!params.round)) +#if(!$round) + #set($round = 1) +#else + #set($round = $math.min($math.max($round, 1), $tour.rounds)) +#end +
+#set($parts = $api.get("tour/${params.id}/part")) +#set($pmap = $utils.toMap($parts)) +#set($roundPairing = $api.get("tour/${params.id}/pair/$round")) +#if($roundPairing.error) + + #stop +#end +#set($games = $roundPairing.games) +#foreach($game in $games) + #set($white = $pmap[$game.w]) + #set($black = $pmap[$game.b]) + #if($foreach.index % 4 == 0) +
+ #end + +
+
$tour.name
+
Result sheet
+
+
Table $game.t
+
Hd $game.h
+
Round $round
+
+
+ Surround winner's name or ½-½ +
+
+
+
White
+
$white.name $white.firstname #rank($white.rank)
($white.country, $white.club)
+##
$white.egf
+
+
½-½
+
+
Black
+
$black.name $black.firstname #rank($black.rank)
($black.country, $black.club)
+##
$black.egf
+
+
+
+
Signature:
+
   
+
Signature:
+
+
+ + #if($foreach.index % 4 == 3) +
+ #end +#end +
+ \ No newline at end of file diff --git a/view-webapp/src/main/webapp/tour-pairing.inc.html b/view-webapp/src/main/webapp/tour-pairing.inc.html index 52d1ca3..956b0e4 100644 --- a/view-webapp/src/main/webapp/tour-pairing.inc.html +++ b/view-webapp/src/main/webapp/tour-pairing.inc.html @@ -113,3 +113,4 @@ +
result sheets
\ No newline at end of file