Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new display mode for individual tounaments (optimized for regional tournaments with small dispalys) #43

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9a3ad40
Add new display mode for individual tounaments (optimized for regiona…
tlehr Feb 17, 2024
f33b958
Communication betreen BUP and BTS now WS based.
Mar 29, 2024
f3fa146
No it is possible to serve an centralised setting for each client fro…
Mar 29, 2024
0e887a2
Now it is possible to persist customized settings per client an reset…
Mar 29, 2024
4cf4f68
Bugfix: Old scores of previouse matches were not be nulled
Apr 3, 2024
8f4fbb2
Bugfix: Coourt Changed does not have any effect in umpire Panel
Apr 3, 2024
1ca57ac
fix errors while starting the soreboard
tlehr Apr 4, 2024
94a7f36
remove log messages
tlehr Apr 4, 2024
6f7b9e7
fix the backgroundcolor if no match is on court (use the setting from…
tlehr Apr 4, 2024
ff33eb7
Enhancement: Now the names of the tabletoperators will be shown in ma…
Apr 28, 2024
9d791b5
Enhancement: InputElements for manual input of score was to small if …
Apr 28, 2024
69a72c6
#53: BUP: Integrate a possibilty to remove all stored Matches from lo…
tengmel Sep 8, 2024
8a1e6de
#64: Server.Core: Call Matchen in preparation after call a new match …
tengmel Oct 7, 2024
5de6f8f
#51 Admin: Edit tournament: Display battery charge levels for the ta…
tengmel Oct 14, 2024
609d3ee
#53: BUP: Integrate a possibilty to remove all stored matches from lo…
tengmel Oct 15, 2024
8e8175d
[#68] Server.Core: Conversion of communication between tablets and BT…
tengmel Oct 20, 2024
75a805f
[#69] AdminPanel: Provision of an option for games to also confirm te…
tengmel Oct 20, 2024
d1def7e
[#69] AdminPanel: Provision of an option for games to also confirm te…
tengmel Oct 20, 2024
182ad04
[#68] Server.Core: Conversion of communication between tablets and BT…
tengmel Nov 5, 2024
81dc2d1
[#68] Server.Core: Conversion of communication between tablets and BT…
tengmel Nov 5, 2024
b530de3
New feature #85: Add tournamentplayers displaymaode
tlehr Dec 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ mail.*


/vendor/
/.vs
23 changes: 15 additions & 8 deletions bup.html
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ <h2 class="setup_network_heading"><span class="setup_network_event" data-i18n="s
<div class="urlexport_links" style="display:inline-block;"></div>
<a href="#" class="netstats_link default-invisible" data-i18n="settings:Network statistics"></a>
<a href="#" class="export_link" data-i18n="settings:Export link"></a>
<a href="#" class="delete_matches_link" data-i18n="settings:Clear Match Archive"></a>
<div class="login_links" style="display:inline-block;"></div>
<a href="#" class="setup_show_manual" data-i18n="settings:Custom match details"></a>
</div>
Expand Down Expand Up @@ -349,6 +350,11 @@ <h2 data-i18n="settings:Settings"></h2>
<div data-bup-modes="display" class="settings_display_court_id"><label><span data-i18n="displaymode:court_id"></span> <select name="displaymode_court_id" size="1"><option value="" data-i18n="displaymode:court_id:loading"></option></select></label></div>
<div data-bup-modes="display" class="settings_display_reverse_order"><label><input type="checkbox" name="displaymode_reverse_order"/><span data-i18n="displaymode:reverse_order"></span></label></div>
<div data-bup-modes="display" class="settings_d_show_pause"><label><input type="checkbox" name="d_show_pause"/><span data-i18n="displaymode:show_pause"></span></label></div>
<div data-bup-modes="display" class="settings_d_show_court_number"><label><input type="checkbox" name="d_show_court_number"/><span data-i18n="displaymode:show_court_number"></span></label></div>
<div data-bup-modes="display" class="settings_d_show_competition"><label><input type="checkbox" name="d_show_competition"/><span data-i18n="displaymode:show_competition"></span></label></div>
<div data-bup-modes="display" class="settings_d_show_round"><label><input type="checkbox" name="d_show_round"/><span data-i18n="displaymode:show_round"></span></label></div>
<div data-bup-modes="display" class="settings_d_show_middle_name"><label><input type="checkbox" name="d_show_middle_name"/><span data-i18n="displaymode:show_middle_name"></span></label></div>
<div data-bup-modes="display" class="settings_d_show_doubles_receiving"><label><input type="checkbox" name="d_show_doubles_receiving"/><span data-i18n="displaymode:show_doubles_receiving"></span></label></div>
<div data-bup-modes="display" class="settings_d_colors"><span data-i18n="displaymode:colors"></span> <span class="settings_d_colors_inputs"></span> <label class="settings_d_team_colors"><input type="checkbox" name="d_team_colors" /><span data-i18n="displaymode:use team colors"></span></label></div>
<div data-bup-modes="display" class="settings_d_scale"><label><span data-i18n="displaymode:scale"></span> <input name="d_scale" type="number" min="20" max="500" /></label></div>

Expand All @@ -375,17 +381,18 @@ <h2 data-i18n="settings:Settings"></h2>
</div>

<div class="settings_mode" data-bup-modes="umpire display referee"><span data-i18n="settings:mode:label"></span>
<a href="#settings" class="settings_mode_umpire" data-i18n="settings:mode:umpire"></a>
<a href="#display" class="settings_mode_display" data-i18n="settings:mode:display"></a>
<a href="#referee_mode" class="settings_mode_referee" data-i18n="settings:mode:referee"></a>
<a href="#settings" class="settings_mode_umpire" data-i18n="settings:mode:umpire"></a>
<a href="#display" class="settings_mode_display" data-i18n="settings:mode:display"></a>
<a href="#referee_mode" class="settings_mode_referee" data-i18n="settings:mode:referee"></a>
</div>

<div class="settings_footer" data-bup-modes="umpire display referee">
<span class="settings_footer_status"></span>
<button class="settings_send_export" data-i18n="send export"></button>
<button class="settings_test_reporting default-invisible" data-i18n="report:test"></button>
<a href="mailto:[email protected]" data-i18n="report problem" class="settings_report_problem"></a>
<span class="version">[script error]</span>
<span class="settings_footer_status"></span>
<button class="settings_send_export" data-i18n="send export"></button>
<button class="settings_reset_export" data-i18n="reset export"></button>
<button class="settings_test_reporting default-invisible" data-i18n="report:test"></button>
<a href="mailto:[email protected]" data-i18n="report problem" class="settings_report_problem"></a>
<span class="version">[script error]</span>
</div>

</div>
Expand Down
30 changes: 28 additions & 2 deletions css/displaymode.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.d_international_score,
.d_tournament_score,
.d_clean_score,
.d_score_default {
font-family: 'Droid Sans', 'droid_sansregular', 'Noto Mono', Arial, sans-serif;
Expand Down Expand Up @@ -131,12 +132,14 @@
}

.d_international_team,
.d_tournament,
.d_clean_team {
font-stretch: condensed;
position: relative;
height: 50%;
}
.d_international_player_container,
.d_tournament_player_container
.d_clean_player_container,
.d_bwfonlyplayers_player_container {
position: relative;
Expand All @@ -153,13 +156,20 @@
display: flex;
align-items: center;
}
.d_tournament_player{
width: 100%;
font-size: 1vh;
display: flex;
align-items: center;
}
.d_bwf_player {
width: 100%;
font-size: 13vh;
display: flex;
align-items: center;
}
.d_international_score,
.d_tournament_score,
.d_clean_score {
font-size: 50vh;
line-height: 50vh;
Expand All @@ -172,6 +182,7 @@
overflow: hidden;
}
.d_international_score.d_international_score_dd,
.d_tournament_score.d_tournament_score_dd,
.d_clean_score.d_clean_score_dd {
letter-spacing: -4vh;
text-align: left;
Expand All @@ -191,6 +202,19 @@
justify-content: center;
}

.d_tournament_gscore {
font-size: 25vh;
line-height: 25vh;
position: absolute;
top: 0;
bottom: 0;
right: 52vh;
width: 20vh;
overflow: hidden;
display: flex;
align-items: center;
justify-content: center;
}

.d_2court_side0,
.d_2court_side1 {
Expand Down Expand Up @@ -254,7 +278,9 @@
bottom: 0;
display: flex;
align-items: center;
justify-content: center;
justify-content: right;
text-wrap: nowrap;
width: calc(50vw - 44vh - 20px);
}
.d_2court_side0 .d_2court_info,
.d_2court_side0 .d_2court_gscore {
Expand Down Expand Up @@ -471,7 +497,7 @@
bottom: 0;
display: flex;
flex-direction: column;
justify-content: center;
justify-content: space-evenly;
align-items: center;
}

Expand Down
5 changes: 5 additions & 0 deletions css/network.css
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ button > .loading-icon {
color: #444;
}

.setup_network_tabletoperator {
color: #c14949;
font-weight: bold;
}

.setup_network_heading::after {
/* Set line-height to height, so that we can vertically center with vertical-align: middle; */
content: '';
Expand Down
6 changes: 3 additions & 3 deletions css/score.css
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ table[data-game-count="5"] .score_future-game {
padding-right: 0;
}
.score > input {
max-width: 1.9em;
width: 1.9em;
vertical-align: top;
font-size: 2vh;
max-height: 3vh;
font-size: 7.5vh;
height: 8vh;
}
.score_current-game > .score > input {
font-size: 7.5vh;
Expand Down
147 changes: 82 additions & 65 deletions doc/URLs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@ import_url=https://... Import from the specified match URL (e.g. https://www.tu

There are also many demos (which only run locally) available:

demo A one-match demo (will start right in the match)
baydemo Bayernliga demo (also applies to lower divisions)
bldemo Demo of a Bundesliga match
bldemo_incomplete Demo of a Bundesliga match where not all players have been configured yet
bldemo_inprogress Demo of a Bundesliga match already running
e_bldemo Demo of a Bundesliga match where nothing has been configured yet
edemo Demo of an event (empty)
intdemo International team match demo
tdemo International tournament demo
nlademo Demo of Swiss National League
nrwdemo Demo of a match in the lower divisions in NRW
obldemo Austrian Bundesliga demo
rlmdemo German Regionalliga Mitte demo
rlndemo German Regionalliga Nord demo
rlsodemo German Regionalliga SüdOst demo
rlwdemo German Regionalliga West demo
tdemo Tournament demo
txdemo Demo for transmission to turnier.de
vdemo Demo of an event (in progress)
wdmudemo Youth tournament demo (with lots of finals on Sunday)
demo A one-match demo (will start right in the match)
baydemo Bayernliga demo (also applies to lower divisions)
bldemo Demo of a Bundesliga match
bldemo_incomplete Demo of a Bundesliga match where not all players have been configured yet
bldemo_inprogress Demo of a Bundesliga match already running
e_bldemo Demo of a Bundesliga match where nothing has been configured yet
edemo Demo of an event (empty)
intdemo International team match demo
tdemo International tournament demo
nlademo Demo of Swiss National League
nrwdemo Demo of a match in the lower divisions in NRW
obldemo Austrian Bundesliga demo
rlmdemo German Regionalliga Mitte demo
rlndemo German Regionalliga Nord demo
rlsodemo German Regionalliga SüdOst demo
rlwdemo German Regionalliga West demo
tdemo Tournament demo
txdemo Demo for transmission to turnier.de
vdemo Demo of an event (in progress)
wdmudemo Youth tournament demo (with lots of finals on Sunday)

There is also:

Expand All @@ -44,19 +44,19 @@ Initial UI

These can be combined with any other options (but not each other), as in #bldemo&display .

settings Show settings UI (currently the default)
nosettings Hide settings by default (click to see)
neversettings Completely hide settings in displaymode
display Start in display mode
referee_mode Start in referee mode
eventsheet=foo Show the dialog for generating the eventsheet named foo
order Show the match order dialog
mo Start with the manual order dialog (allows easy match creation and import)
settings Show settings UI (currently the default)
nosettings Hide settings by default (click to see)
neversettings Completely hide settings in displaymode
display Start in display mode
referee_mode Start in referee mode
eventsheet=foo Show the dialog for generating the eventsheet named foo
order Show the match order dialog
mo Start with the manual order dialog (allows easy match creation and import)

Settings
========

lang=LANGCODE Set language to the specified one.
lang=LANGCODE Set language to the specified one.
LANGCODE can be one of:
en English
de German (Germany)
Expand All @@ -67,39 +67,56 @@ lang=LANGCODE Set language to the specified one.
court=COURTCODE Run on the specified court. COURTCODE depends on the network. Normally, a number like 1, 2, or the string "referee".
dm_style=STYLECODE In display mode, start with the specified style.
Available styles:
teamcourt Best for team matches. Supports interval timer.
international Best for individual international tournaments
bwf Like international, but geared towards the BWF understanding of names ("LASTNAME, Firstname")
clean Classic style for (national) individual tournaments
2court Large scores for 2 courts. Supports interval timer.
andre Simple 1-court display, shows game count to the left
castall Greenscreen (all courts)
stream Transparent video overlay
streamcourt Transparent video overlay, one court only (to be scaled in streaming software)
streamteam Transparent video overlay, only team names & match result (scales by width)
greyish Overview for team competitions with muted gray colors
oncourt court score with teams, not colored, including points in all games
onlyplayers players only
bwfonlyplayers players only, in BWF definition of names ("LASTNAME, Firstname" and fixed font size)
onlyscore score (all games) only
giantscore score (current game + game count) only, for very small screens
clubplayers team + players
clubplayerslr team + players (home left / away right)
stripes stripes (vertically: team names, clubs, all scores, for one court)
teamscore Just team names and number of won matches
tim Colored overview of a team competition
top+list Current matches on top, list of all matches below
tournament_overview Shows all courts at once
show_pause=BOOLEAN Show or hide interval timers.
BOOLEAN can be either "true" or "false".
At the moment only supported for some styles, see above.
team_colors=BOOLEAN Use team colors (if applicable in the given style).
BOOLEAN can be either "true" or "false".
d_c0=COLOR, This group of options can be used to set displaymode colors.
d_c1=COLOR, COLOR can be an RGB color value, for instance "0f0" or "00ff00" for lime.
d_cfg=COLOR, d_c0 and d_c1 are the colors for the home and away team,
d_cbg=COLOR, d_cfg the foreground and d_bg the background color,
d_cbg2=COLOR, ... and there are a lot more color names available.
Different styles use different color names.
Hover over a color input in the displaymode or referee UI to get the color names.
hub_url=WSURL WebSocket URL (starting with ws:// or wss://) of the referee mode hub.
teamcourt Best for team matches. Supports interval timer.
international Best for individual international tournaments
bwf Like international, but geared towards the BWF understanding of names ("LASTNAME, Firstname")
tournamentcourt Best for (national) individual tournaments. Supports interval timer, court number, competition, round, remove middle names and underline the receiving player in doubles.
tournamentplayers Best for (national) individual tournaments. Supports interval timer, court number, competition, round, remove middle names and underline the receiving player in doubles. Show only the Players. Use it in combination with onlyscore.
clean Classic style for (national) individual tournaments
2court Large scores for 2 courts. Supports interval timer.
andre Simple 1-court display, shows game count to the left
castall Greenscreen (all courts)
stream Transparent video overlay
streamcourt Transparent video overlay, one court only (to be scaled in streaming software)
streamteam Transparent video overlay, only team names & match result (scales by width)
greyish Overview for team competitions with muted gray colors
oncourt court score with teams, not colored, including points in all games
onlyplayers players only
bwfonlyplayers players only, in BWF definition of names ("LASTNAME, Firstname" and fixed font size)
onlyscore score (all games) only
giantscore score (current game + game count) only, for very small screens
clubplayers team + players
clubplayerslr team + players (home left / away right)
stripes stripes (vertically: team names, clubs, all scores, for one court)
teamscore Just team names and number of won matches
tim Colored overview of a team competition
top+list Current matches on top, list of all matches below
tournament_overview Shows all courts at once
show_pause=BOOLEAN Show or hide interval timers.
BOOLEAN can be either "true" or "false".
At the moment only supported for some styles, see above.
show_court_number=BOOLEAN Show or hide court number.
BOOLEAN can be either "true" or "false".
At the moment only supported for some styles, see above.
show_competition=BOOLEAN Show or hide competition.
BOOLEAN can be either "true" or "false".
At the moment only supported for some styles, see above.
show_round=BOOLEAN Show or hide round.
BOOLEAN can be either "true" or "false".
At the moment only supported for some styles, see above.
show_middle_name=BOOLEAN Show or hide the middle name of the players.
BOOLEAN can be either "true" or "false".
At the moment only supported for some styles, see above.
show_doubles_receiving=BOOLEAN Underline the receiving player in doubles.
BOOLEAN can be either "true" or "false".
At the moment only supported for some styles, see above.
team_colors=BOOLEAN Use team colors (if applicable in the given style).
BOOLEAN can be either "true" or "false".
d_c0=COLOR, This group of options can be used to set displaymode colors.
d_c1=COLOR, COLOR can be an RGB color value, for instance "0f0" or "00ff00" for lime.
d_cfg=COLOR, d_c0 and d_c1 are the colors for the home and away team,
d_cbg=COLOR, d_cfg the foreground and d_bg the background color,
d_cbg2=COLOR, ... and there are a lot more color names available.
Different styles use different color names.
Hover over a color input in the displaymode or referee UI to get the color names.
hub_url=WSURL WebSocket URL (starting with ws:// or wss://) of the referee mode hub.
Loading