diff --git a/debug-client.sh b/debug-client.sh index 5b97ded..7ddaa84 100755 --- a/debug-client.sh +++ b/debug-client.sh @@ -2,6 +2,8 @@ VERSION=$(grep '' pom.xml | head -1 | egrep -o '[0-9.]+') +echo Installing Pairgoth version $VERSION + mvn -DskipTests=true install if [ !-f "$HOME/.m2/repository/org/jeudego/pairgoth/pairgoth-common/$VERSION/pairgoth-common-$VERSION.jar" ] diff --git a/view-webapp/src/main/sass/main.scss b/view-webapp/src/main/sass/main.scss index fcc7867..8c966a8 100644 --- a/view-webapp/src/main/sass/main.scss +++ b/view-webapp/src/main/sass/main.scss @@ -520,6 +520,10 @@ @media print { + @page { + size: A4; + } + body { width: unset; height: unset; @@ -527,6 +531,14 @@ overflow: visible; } + #center #inner > .section { + margin: 0 0.5em; + } + + #players-list { + max-width: 98vw; + } + .roundbox { border: none; } @@ -537,7 +549,7 @@ margin-top: 0.1em !important; } - #logo, #lang, .steps, #filter-box, #reglist-mode, #footer, #unpairables, #pairing-buttons, button, #standings-params, #logout, .pairing-stats, .result-sheets, .toggle, #overview { + #header, #logo, #lang, .steps, #filter-box, #reglist-mode, #footer, #unpairables, #pairing-buttons, button, #standings-params, #logout, .pairing-stats, .result-sheets, .toggle, #overview { display: none !important; } @@ -545,6 +557,10 @@ overflow-y: hidden; } + #paired { + display: none !important; + } + body { &.nogame { #pairables { @@ -558,22 +574,17 @@ top: 0; } } - - #paired { + #print-pairings { display: none !important; } + } &:not(.nogame) { - #paired { - max-height: unset !important; - max-width: unset !important; - font-size: 1rem !important; - line-height: 1.1rem !important; - min-width: 60vw; - - &::before { - top: 0; + #print-pairings { + display: table; + .left { + text-align: left; } } @@ -596,7 +607,7 @@ font-size: 1.4rem; line-height: 1.5rem; height: 24vh; - border-bottom: 1px dotted gray; + border-bottom: 2px dotted gray; display: flex; flex-flow: column nowrap; justify-content: space-evenly; @@ -664,11 +675,21 @@ color: black !important; } - .participation .ui.label { + #participation-stats { + display: none; + } + + #players-list tr > :first-child { + display: none; + } + + #players-list #players .participation .ui.label { background: none; border: none; - font-weight: bold; - min-width: unset; + font-size: 1rem !important; + min-width: unset !important; + min-height: unset !important; + padding: 0 !important; &.red { color: rgba(0,0,0,0); text-decoration: solid line-through black; @@ -678,12 +699,37 @@ } } - table { border-top: none; } - table tr td, table tr th { page-break-inside:avoid; } - table thead th { - border-top: 1px solid rgba(34, 36, 38, .1); + table { + border-top: none; + font-size: 1rem; + font-weight: bold; + tr td, tr th { + page-break-inside:avoid; + height: 2em; + } + thead { + display:table-header-group; + th { + border-top: 1px solid rgba(34, 36, 38, .1); + &:after { + display: none; + } + } + } + tfoot { display:table-footer-group; } + } + #results-table td.looser { + font-weight: normal; + } + #print-pairings table { + font-size: 1.2rem; + } + #pairing-round, #results-round, #standings-round { + font-size: 1.1rem; + } + #standings-table { + font-size: 0.70rem; } - thead { display:table-header-group; } - tfoot { display:table-footer-group; } } + } diff --git a/view-webapp/src/main/sass/tour.scss b/view-webapp/src/main/sass/tour.scss index 0b288bd..d182047 100644 --- a/view-webapp/src/main/sass/tour.scss +++ b/view-webapp/src/main/sass/tour.scss @@ -99,13 +99,13 @@ background-color: #D0FFD0; } .participation { - white-space: nowrap; + /* white-space: nowrap; */ .ui.label { cursor: pointer; font-size: 0.8rem; min-width: 2em; min-height: 2em; - padding: .5em !important; + padding: .5em; line-height: 1em; text-align: center; border-radius: 500rem; @@ -360,7 +360,14 @@ width: 6em; } } - + } + #print-pairables { + width: 100%; + display: none; + } + #print-pairings { + width: 100%; + display: none; } .pairing-buttons { display: flex; diff --git a/view-webapp/src/main/webapp/WEB-INF/translations/fr b/view-webapp/src/main/webapp/WEB-INF/translations/fr index 52e80ef..e2e6932 100644 --- a/view-webapp/src/main/webapp/WEB-INF/translations/fr +++ b/view-webapp/src/main/webapp/WEB-INF/translations/fr @@ -91,7 +91,7 @@ Preliminary only Inscriptions préliminaires Publish Publier Publish standings Publier le classement Rank Niveau -Rating Classement +Rating Class. Reg Inscr. Register Inscrire Registration Inscriptions diff --git a/view-webapp/src/main/webapp/result-sheets.html b/view-webapp/src/main/webapp/result-sheets.html index ace0f08..44dd75e 100644 --- a/view-webapp/src/main/webapp/result-sheets.html +++ b/view-webapp/src/main/webapp/result-sheets.html @@ -27,7 +27,11 @@ #stop #end #set($games = $utils.removeBye($roundPairing.games)) -#foreach($game in $games) +#set($pages = ($games.size() + 3) / 4) +#foreach($i in [1..$games.size()]) + #set($j = ($i - 1) / 4 + (($i - 1) % 4) * $pages) + #if($j < $games.size()) + #set($game = $games[$j]) #set($white = $pmap[$game.w]) #set($black = $pmap[$game.b]) #if($foreach.index % 4 == 0) @@ -36,7 +40,7 @@
$tour.name
-
Result sheet
+
Table $game.t
#set($komi = $tour.komi) @@ -71,6 +75,7 @@
#end #end +#end