diff --git a/.github/workflows/modern-ui.yml b/.github/workflows/modern-ui.yml index d475c98..3e561f0 100644 --- a/.github/workflows/modern-ui.yml +++ b/.github/workflows/modern-ui.yml @@ -52,9 +52,9 @@ jobs: - name: Configure opt-in UI without external assets run: cmake -S . -B build-ui -G Ninja -DCMAKE_BUILD_TYPE=Release -DOPENBMH_BUILD_MODERN_UI=ON -DOPENBMH_BUILD_EDITOR=OFF -DBMH_DATA= - name: Compile native frontend and synthetic checks - run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests --parallel 2 + run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_career_reports_tests modern_rankings_tests --parallel 2 - name: Check controls, fonts, density and draft cancellation - run: ctest --test-dir build-ui -R "^modern_(ui_|ticket_|control_|reports_|planning_|almanac_ui_|finance_ui_|environment_ui_|advertising_ui_|toto_ui_|lineup_ui_|transfer_ui_)" --output-on-failure --output-junit modern-ui-results.xml + run: ctest --test-dir build-ui -R "^modern_(ui_|ticket_|control_|reports_|planning_|almanac_ui_|finance_ui_|environment_ui_|advertising_ui_|toto_ui_|lineup_ui_|transfer_ui_|career_reports_|rankings_)" --output-on-failure --output-junit modern-ui-results.xml - name: Upload test report if: always() uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 diff --git a/assets/modern/career_reports.rcss b/assets/modern/career_reports.rcss new file mode 100644 index 0000000..48be2b2 --- /dev/null +++ b/assets/modern/career_reports.rcss @@ -0,0 +1,84 @@ +/* SPDX-License-Identifier: GPL-3.0-only */ +.career-achievements,.career-highscore {position:absolute;left:0;top:0;width:2612dp;height:1864dp;color:var(--text);} +.career-achievements-heading {position:absolute;left:0;top:0;width:2612dp;height:118dp;display:flex;align-items:center;justify-content:space-between;} +.career-heading-copy {height:86dp;} +.career-heading-copy h2 {height:44dp;line-height:44dp;margin:0;font-size:38dp;font-weight:normal;} +.career-heading-copy p {height:30dp;line-height:30dp;margin:12dp 0 0;font-size:26dp;color:var(--muted);} +.career-range {display:block;height:39dp;line-height:39dp;white-space:nowrap;font-size:34dp;color:#abc5d6;} +.career-chart {position:absolute;border:2dp #c5d9e726;border-radius:18dp;background-color:#12243140;} +.career-chart>header {position:absolute;left:30dp;top:24dp;width:2548dp;height:54dp;display:flex;align-items:center;justify-content:space-between;} +.career-chart h2 {margin:0;font-size:33dp;font-weight:normal;white-space:nowrap;color:#dbe7ef;} +.career-chart-summary {display:flex;align-items:baseline;justify-content:flex-end;} +.career-chart-summary>span {display:block;white-space:nowrap;} +.career-chart-year {font-size:26dp;color:#92adc0;} +.career-chart-result {font-size:30dp;margin-left:20dp;color:#c4dce9;} +.career-chart-art {position:absolute;left:30dp;top:78dp;width:2548dp;height:403.333333dp;pointer-events:none;} +.career-report-actions {position:absolute;left:0;top:1770dp;width:2612dp;height:94dp;display:flex;} +.career-report-actions .career-action {width:854.666667dp;height:94dp;margin-right:24dp;padding:12dp 24dp;font-size:30dp;flex-shrink:0;} +.career-report-actions .career-action:last-child {margin-right:0;} +.career-action {border:2dp #d4e0ec29;border-radius:12dp;background-color:transparent;decorator:linear-gradient(180deg,#c1d1e31c,#869eb312);color:#e0e6ec;font-weight:normal;} +.career-action .control-label {display:block;width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.career-action:hover {decorator:none;background-color:var(--hover);} +.career-action:focus-visible {border-color:var(--accent);} +.career-report-empty {margin:0;padding:40dp;font-size:30dp;color:var(--muted);} +.career-achievements>.career-report-empty {position:absolute;left:0;top:150dp;} +.career-history-layer {position:absolute;left:0;top:0;width:2612dp;height:1864dp;z-index:20;background-color:#08101980;} +.career-history-dialog {position:absolute;left:64dp;top:314dp;width:2484dp;height:1236dp;border:2dp #e1ecf429;border-radius:22dp;background-color:#283542f5;color:#d7e5cf;} +.career-history-dialog h2 {position:absolute;left:52dp;top:40dp;width:2376dp;height:48dp;line-height:48dp;margin:0;font-size:42dp;font-weight:bold;letter-spacing:-0.4dp;text-align:center;color:#e3ecf3;} +.career-history-club {position:absolute;left:52dp;top:123dp;width:2376dp;height:45dp;display:flex;align-items:center;justify-content:space-between;font-size:30dp;} +.career-history-club>.report-club-button {max-width:1120dp;padding:0;font-size:30dp;} +.career-history-club>.report-club-button .report-club-name {width:1058dp;} +.career-history-club>span {display:block;white-space:nowrap;font-size:26dp;color:#98b2c5;} +.career-history-table {position:absolute;left:52dp;top:198dp;width:2376dp;height:884dp;overflow-x:hidden;overflow-y:auto;} +.career-history-row {display:flex;width:2376dp;height:68dp;align-items:center;font-size:30dp;} +.career-history-row.striped {background-color:#38706b19;} +.career-history-head {font-size:28dp;color:#9fb8ca;border-bottom:4dp #4e8b7b;} +.career-cell {display:flex;align-items:center;justify-content:center;min-width:0;flex-shrink:0;overflow:hidden;} +.career-cell>span {display:block;width:100%;max-width:100%;min-width:0;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.history-season {width:380.16dp;height:68dp;padding:6dp 16dp;} +.history-result {width:665.28dp;height:68dp;padding:6dp 16dp;} +.history-heading-season>span {text-align:left;} +.career-title {color:#a9dccb;} +.career-history-actions {position:absolute;left:52dp;top:1127dp;width:2376dp;height:65dp;display:flex;} +.career-history-actions .career-action {width:2376dp;height:65dp;padding:12dp 24dp;font-size:32dp;} +.career-highscore-art {position:absolute;left:636dp;top:10dp;width:1180dp;height:393.333333dp;pointer-events:none;} +.career-highscore-table {position:absolute;left:0;top:440dp;width:2612dp;height:1424dp;border:2dp #c5d9e720;border-radius:18dp;background-color:#13263526;overflow-x:hidden;overflow-y:auto;} +.career-highscore-row {display:flex;width:2608dp;height:118dp;align-items:center;font-size:32dp;color:#d4e0e9;} +.career-highscore-head {font-size:27dp;color:#a8bdcc;border-bottom:2dp #c5d9e72b;} +.career-highscore-row.striped {background-color:#e3edf605;} +.career-highscore-row>.career-cell {height:118dp;padding:14dp 24dp;} +.highscore-col-0 {width:560dp;justify-content:flex-start;} +.highscore-col-0>span {text-align:left;} +.highscore-col-1 {width:680dp;justify-content:flex-start;} +.highscore-col-2 {width:350dp;color:#c7ded7;} +.highscore-col-3,.highscore-col-4,.highscore-col-5 {width:339.333333dp;} +.career-highscore .report-club-button {width:100%;max-width:100%;padding:0;font-size:32dp;color:#d4e0e9;} +.career-highscore .report-club-name {width:570dp;max-width:100%;} +body.silver .career-range,body.matchday .career-range,body.silver .career-chart h2,body.matchday .career-chart h2,body.silver .career-chart-result,body.matchday .career-chart-result {color:var(--text);} +body.silver .career-chart-year,body.matchday .career-chart-year,body.silver .career-history-club>span,body.matchday .career-history-club>span {color:var(--muted);} +body.silver .career-chart,body.matchday .career-chart {border-color:var(--border);background-color:var(--panel);} +body.silver .career-action,body.matchday .career-action {border-color:var(--border);color:var(--text);} +body.silver .career-action {decorator:linear-gradient(180deg,#ffffffb0,#bfd0e259);} +body.matchday .career-action {decorator:linear-gradient(180deg,#e8d6dc12,#a1a0aa0d);} +body.silver .career-history-dialog {border-color:var(--border);background-color:#eaf1f7fc;color:var(--text);} +body.matchday .career-history-dialog {border-color:var(--border);background-color:#2c2c32fc;color:var(--text);} +body.silver .career-history-dialog h2,body.matchday .career-history-dialog h2 {color:var(--text);} +body.silver .career-history-head,body.matchday .career-history-head {color:var(--muted);border-color:var(--border);} +body.silver .career-history-row.striped {background-color:#42627d09;} +body.matchday .career-history-row.striped {background-color:#f8e7e00a;} +body.silver .career-title,body.matchday .career-title {color:var(--accent);} +body.silver .career-highscore-table,body.matchday .career-highscore-table {border-color:var(--border);background-color:var(--soft);} +body.silver .career-highscore-row,body.matchday .career-highscore-row,body.silver .career-highscore .report-club-button,body.matchday .career-highscore .report-club-button {color:var(--text);} +body.silver .career-highscore-head,body.matchday .career-highscore-head {color:var(--muted);border-color:var(--border);} +body.silver .highscore-col-2,body.matchday .highscore-col-2 {color:var(--accent);} +body.silver .career-highscore-row.striped {background-color:#42627d09;} +body.matchday .career-highscore-row.striped {background-color:#f8e7e00a;} +/* Gold uses plain club labels: retain profile behaviour without centring or accenting names. */ +.highscore-col-1>span {text-align:left;} +.career-highscore .report-club-name,.career-history-club .report-club-name {text-align:left;} +.career-highscore .report-club-button.current,.career-highscore .report-club-name {color:#d4e0e9;} +.career-history-club .report-club-button.current,.career-history-club .report-club-name {color:#bed3e1;} +body.silver .career-highscore .report-club-button.current,body.matchday .career-highscore .report-club-button.current, +body.silver .career-highscore .report-club-name,body.matchday .career-highscore .report-club-name, +body.silver .career-history-club .report-club-button.current,body.matchday .career-history-club .report-club-button.current, +body.silver .career-history-club .report-club-name,body.matchday .career-history-club .report-club-name {color:var(--text);} diff --git a/assets/modern/modern.rml b/assets/modern/modern.rml index ccb6518..e98e9de 100644 --- a/assets/modern/modern.rml +++ b/assets/modern/modern.rml @@ -1,6 +1,6 @@ OpenBMH - +
diff --git a/assets/modern/rankings.rcss b/assets/modern/rankings.rcss new file mode 100644 index 0000000..05e2977 --- /dev/null +++ b/assets/modern/rankings.rcss @@ -0,0 +1,132 @@ +/* SPDX-License-Identifier: GPL-3.0-only */ +.rankings-scorers,.rankings-fairplay {position:absolute;left:0;right:0;top:0;bottom:0;} +.rankings-heading {height:92dp;display:flex;align-items:center;justify-content:space-between;gap:30dp;} +.rankings-heading>div {display:flex;align-items:baseline;gap:24dp;min-width:0;flex:1;} +.rankings-heading h2 {font-size:38dp;font-weight:normal;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.rankings-heading span {font-size:28dp;white-space:nowrap;flex-shrink:0;} +.rankings-heading p {font-size:24dp;color:var(--muted);white-space:nowrap;flex-shrink:0;} +.rankings-tabs {position:absolute;left:0;right:0;top:104dp;height:106dp;display:flex;gap:8dp;border-bottom:2dp var(--border);} +.rankings-tab {position:relative;display:flex;align-items:center;justify-content:center;gap:20dp;flex:1;min-width:0;padding:0;border:0dp;border-radius:12dp 12dp 0dp 0dp;background-color:transparent;font-size:34dp;font-weight:normal;} +.rankings-tab:hover {background-color:var(--hover);} +.rankings-tab[aria-selected=true] {background-color:#8dbfaf0e;color:#c7eadf;} +.rankings-tab-underline {display:none;position:absolute;left:28dp;right:28dp;bottom:-2dp;height:5dp;border-radius:5dp 5dp 0dp 0dp;background-color:#a9dccb;} +.rankings-tab[aria-selected=true] .rankings-tab-underline {display:block;} +.rankings-tab-icon {display:flex;align-items:center;justify-content:center;width:34dp;height:34dp;flex-shrink:0;} +.rankings-card-icon {display:block;width:24dp;height:34dp;border-radius:4dp;transform:rotate(-7deg);} +.rankings-card-icon.yellow {background-color:#e0c56e;} +.rankings-card-icon.red {background-color:#dc8078;} +.rankings-panel {position:absolute;left:0;right:0;top:244dp;bottom:148dp;} +.rankings-leaders {display:flex;gap:24dp;height:320dp;} +.rankings-leader {position:relative;display:flex;align-items:center;gap:20dp;width:854.666667dp;flex-shrink:0;min-width:0;height:320dp;padding:58dp 28dp 26dp;border:2dp var(--border);border-radius:18dp;decorator:linear-gradient(145deg,#b7d4e90a,#12233242);} +.rankings-leader.first {border-color:#a9dccb5e;decorator:linear-gradient(145deg,#a9dccb12,#12233242);} +.rankings-leader-rank {position:absolute;left:28dp;top:22dp;font-size:26dp;color:var(--muted);} +.rankings-leader-person {display:flex;flex-direction:column;gap:24dp;flex:1;min-width:0;} +.rankings-player-button {display:flex;align-items:center;gap:26dp;width:100%;min-width:0;padding:0;border:0dp;border-radius:10dp;background-color:transparent;text-align:left;font-size:34dp;} +.rankings-player-button:hover {background-color:transparent;} +.rankings-player-button:focus-visible {background-color:var(--hover);} +.rankings-player-name {display:block;flex:1;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.rankings-photo {display:block;flex-shrink:0;border:2dp var(--border);border-radius:44dp;overflow:hidden;background-color:var(--panel);} +.rankings-leader .rankings-photo {border-radius:63dp;} +.rankings-photo .image-frame {max-width:100%;max-height:100%;} +.rankings-leader .rankings-player-button {gap:22dp;font-size:36dp;line-height:41.4dp;} +.rankings-leader .rankings-player-name {white-space:normal;max-height:124.2dp;overflow:hidden;} +.rankings-club-button {display:flex;align-items:center;width:100%;min-width:0;max-width:100%;padding:0;border:0dp;background-color:transparent;color:var(--muted);text-align:left;font-size:36dp;} +.rankings-club-button.current {color:var(--accent);} +.rankings-club-button:hover {background-color:transparent;} +.rankings-club-button:focus-visible {background-color:var(--hover);} +.rankings-club-button .club-label {width:100%;min-width:0;max-width:100%;gap:12dp;} +.rankings-club-button .image-frame {flex-shrink:0;} +.rankings-club-button .club-label>span {display:block;flex:1;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.rankings-leader .rankings-club-button {font-size:26dp;} +.rankings-leader-value {display:flex;flex-direction:column;align-items:center;justify-content:center;gap:14dp;width:146dp;flex-shrink:0;} +.rankings-leader-value strong {font-size:88dp;font-weight:normal;line-height:88dp;} +.rankings-leader-value>span {font-size:24dp;line-height:28.8dp;color:var(--muted);text-align:center;} +.kind-2 .rankings-leader-value strong {color:#e0c98b;} +.kind-3 .rankings-leader-value strong {color:#e3aaa2;} +.rankings-scorer-list {position:absolute;left:0;right:0;top:352dp;bottom:0;border:2dp var(--border);border-radius:18dp;background-color:#13263526;overflow-x:hidden;overflow-y:auto;} +.rankings-table {width:100%;} +.rankings-row {display:flex;align-items:stretch;height:118dp;font-size:36dp;} +.rankings-row>div {display:flex;align-items:center;flex:1;min-width:0;padding:12dp 28dp;overflow:hidden;} +.rankings-row>div:first-child {width:47%;flex:none;} +.rankings-row>div:last-child {width:290dp;flex:none;justify-content:center;} +.rankings-cell-value {display:block;width:100%;min-width:0;white-space:nowrap;} +.rankings-row>div:last-child .rankings-cell-value,.rankings-fair-row>div:not(:first-child) .rankings-cell-value {text-align:center;} +.rankings-row.rankings-head {height:74dp;font-size:28dp;} +.rankings-head {color:var(--muted);border-bottom:2dp var(--border);} +.rankings-row.striped,.rankings-fair-row.striped {background-color:var(--soft);} +.rankings-row:hover,.rankings-fair-row:hover {background-color:var(--hover);} +.rankings-rest-player {gap:24dp;} +.rankings-rest-player .rankings-player-button {flex:1;} +.rankings-scorer-list .rankings-player-button,.rankings-scorer-list .rankings-club-button {padding:2dp 6dp;color:var(--text);} +.rankings-scorer-list .rankings-club-button.current {color:var(--accent);} +.rankings-rank {display:block;width:64dp;flex-shrink:0;font-size:30dp;color:var(--muted);text-align:right;} +.rankings-footer .report-picker-trigger {font-size:30dp;} +.rankings-own-club {display:flex;align-items:center;width:1725.333333dp;height:94dp;max-width:1725.333333dp;padding-right:28dp;font-size:32dp;} +.rankings-own-club .club-label {min-width:0;max-width:1100dp;gap:14dp;} +.rankings-own-club .club-label>span {white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.rankings-empty {padding:28dp;font-size:30dp;color:var(--muted);} +.rankings-fair-heading {height:100dp;display:flex;align-items:center;justify-content:space-between;gap:24dp;font-size:30dp;color:var(--muted);} +.rankings-fair-heading>div {display:flex;gap:20dp;} +.rankings-fair-heading span {padding:12dp 20dp;border:2dp var(--border);border-radius:12dp;background-color:var(--panel);white-space:nowrap;} +.rankings-yellow {color:#e0cc92;} +.rankings-red {color:#dfa69d;} +.rankings-fair-list {position:absolute;left:0;right:0;top:130dp;bottom:0;border:2dp var(--border);border-radius:18dp;background-color:#12243140;overflow-x:hidden;overflow-y:auto;} +.rankings-fair-row {display:flex;align-items:stretch;height:66dp;font-size:36dp;} +.rankings-fair-row>div {display:flex;align-items:center;justify-content:center;width:15%;flex-shrink:0;min-width:0;padding:7dp 14dp;overflow:hidden;} +.rankings-fair-row>div:first-child {width:55%;justify-content:flex-start;gap:14dp;} +.rankings-fair-row>div:nth-child(2) {color:#e0cc92;} +.rankings-fair-row>div:nth-child(3) {color:#dfa69d;} +.rankings-fair-row:not(.rankings-head)>div:last-child {color:var(--accent);} +.rankings-fair-rank {display:block;width:64dp;flex-shrink:0;text-align:right;} +.rankings-fair-row .report-club-button {min-width:0;max-width:100%;} +.rankings-fair-row.rankings-head {font-size:30dp;} +body.midnight .rankings-row.striped,body.midnight .rankings-fair-row.striped {background-color:#e3edf605;} +body.midnight .rankings-row,body.midnight .rankings-fair-row {color:#d8e0e8;} +body.midnight .rankings-head {color:#a0aebc;} +.rankings-fair-row .report-club-button {color:var(--text);} +.rankings-fair-row .report-club-button.current {color:var(--accent);} +body.midnight .rankings-row:hover,body.midnight .rankings-fair-row:hover {background-color:#bad5f20d;} +body.silver .rankings-tab[aria-selected=true] {background-color:#a3c3dd54;color:#193b52;} +body.silver .rankings-tab-underline {background-color:#a3c3dd54;} +body.silver .rankings-leader {background-color:#f1f6fa80;decorator:none;} +body.silver .rankings-leader.first {border-color:#356f966e;decorator:linear-gradient(145deg,#a9dccb12,#12233242);} +body.silver .rankings-scorer-list,body.silver .rankings-fair-list {background-color:#42627d09;} +body.silver .kind-2 .rankings-leader-value strong,body.silver .kind-3 .rankings-leader-value strong {color:#193b52;} +body.silver .rankings-yellow,body.silver .rankings-fair-row>div:nth-child(2) {color:#805b18;} +body.silver .rankings-red,body.silver .rankings-fair-row>div:nth-child(3) {color:#a23f45;} +body.matchday .rankings-tab[aria-selected=true] {background-color:#d48c7b26;color:#ffe5de;} +body.matchday .rankings-tab-underline {background-color:#d48c7b26;} +body.matchday .rankings-leader {background-color:#1d1e2466;decorator:none;} +body.matchday .rankings-leader.first {border-color:#e5a19770;decorator:linear-gradient(145deg,#a9dccb12,#12233242);} +body.matchday .rankings-scorer-list,body.matchday .rankings-fair-list {background-color:#f8e7e00a;} +body.matchday .kind-2 .rankings-leader-value strong,body.matchday .kind-3 .rankings-leader-value strong {color:#ffe5de;} +body.matchday .rankings-yellow,body.matchday .rankings-fair-row>div:nth-child(2) {color:#e1c68b;} +body.matchday .rankings-red,body.matchday .rankings-fair-row>div:nth-child(3) {color:#f0a6a7;} + +/* Midnight component fallbacks from the current HTML reference. */ +body.midnight .rankings-heading h2 {color:#e3ecf3;} +body.midnight .rankings-heading span {color:#a7becf;} +body.midnight .rankings-heading p {color:#8fa8ba;} +body.midnight .rankings-tab {color:#aebfcd;} +body.midnight .rankings-tab[aria-selected=true] {color:#c7eadf;} +body.midnight .rankings-leader {border-color:#c6dce82b;} +body.midnight .rankings-leader.first {border-color:#a9dccb5e;} +body.midnight .rankings-leader-rank {color:#9eb5c5;} +body.midnight .rankings-leader .rankings-player-button {color:#e0ebf3;} +body.midnight .rankings-leader .rankings-club-button {color:#a6bdce;} +body.midnight .rankings-leader-value strong {color:#e0ecf5;} +body.midnight .kind-2 .rankings-leader-value strong {color:#e0c98b;} +body.midnight .kind-3 .rankings-leader-value strong {color:#e3aaa2;} +body.midnight .rankings-leader-value>span {color:#9fb8c9;} +body.midnight .rankings-scorer-list,body.midnight .rankings-fair-list {border-color:#c5d9e726;} +body.midnight .rankings-fair-row:not(.rankings-head)>div:last-child {color:#b8dbd0;} +.rankings-leader .rankings-club-button.current {color:var(--muted);} +body.midnight .rankings-leader .rankings-club-button.current {color:#a6bdce;} + +body.midnight .rankings-scorer-list .rankings-player-button,body.midnight .rankings-scorer-list .rankings-club-button,body.midnight .rankings-fair-row .report-club-button {color:#d8e0e8;} +body.midnight .rankings-scorer-list .rankings-club-button.current,body.midnight .rankings-fair-row .report-club-button.current {color:#a9dccb;} + +.rankings-scorer-list .rankings-club-button .club-label {gap:14dp;} +body.silver .rankings-fair-list,body.matchday .rankings-fair-list {background-color:var(--panel);} +body.silver .rankings-row.striped,body.silver .rankings-fair-row.striped {background-color:#42627d09;} +body.matchday .rankings-row.striped,body.matchday .rankings-fair-row.striped {background-color:#f8e7e00a;} diff --git a/docs/new_ui/NATIVE_STATUS.md b/docs/new_ui/NATIVE_STATUS.md index bc810a7..bb35aec 100644 --- a/docs/new_ui/NATIVE_STATUS.md +++ b/docs/new_ui/NATIVE_STATUS.md @@ -88,6 +88,20 @@ wird ausdrücklich mit `OPENBMH_BUILD_MODERN_UI=ON` gebaut. Listings und vorgemerkte Aufträge. Die numerische Stärkeübersicht verwendet wahlweise die aktive Elf oder den gesamten Kader. +- [Erfolge](desktop/achievements/README.md): drei proportionale Saisonverläufe, + vier farbige Ligaabschnitte, acht sichtbare Saisons, fünf überlappende Seiten + und eine Vereinsgeschichte mit zwölf abgeschlossenen Demo-Saisons. +- [Spielerstatistiken](desktop/scorers/README.md): Tore, Vorlagen und gelbe/rote + Karten, drei Fotokarten und Restliste, Länder-/Liga-/Vereinsauswahl sowie + gebundene Spieler- und Vereinsprofile. Die tatsächliche Kategorie entscheidet + über Sortierung, Gleichstandsplatzierung und das Ausblenden von Nullwerten. +- [Fairplay](desktop/fairplay/README.md): erste deutsche Liga mit aufsteigenden + Strafpunkten (Gelb + viermal Rot), Kartenfarben und Vereinsprofilen. +- [Highscore](desktop/highscore/README.md): acht fiktive Manager mit echten + Katalogvereinen, freigegebenem Logo und zentrierten Zahlenfeldern. + Diese vier Ansichten verwenden fiktive Statistikwerte und lokale + Ansichtsfilter; sie verändern weder Spielrevision noch Spiel-Dirty-Zustand. + **Anstoß führt keine Aktion aus**, weder per Maus noch per Tastatur. Das gilt auch für die direkte Aktionsschnittstelle des Demoanbieters. diff --git a/docs/new_ui/README.md b/docs/new_ui/README.md index 6368931..fbd0b22 100644 --- a/docs/new_ui/README.md +++ b/docs/new_ui/README.md @@ -34,6 +34,10 @@ Implementierung in der Spiel-Engine. | Verlegen | [Kalendergestützte Verlegung mit Rücknahme](desktop/postpone/README.md) | | Hallentabellen | [16 Vereine, Sortierung und Hallenmasters-Info](desktop/indoor/README.md) | | Transfermarkt | [Suche, Angebote, Listings und Vormerkungen](desktop/transfer/README.md) | +| Erfolge | [Saisonverläufe, Ligafarben und Vereinsgeschichte](desktop/achievements/README.md) | +| Spielerstatistiken | [Tore, Vorlagen, Karten, Fotokarten und Bereichsauswahl](desktop/scorers/README.md) | +| Fairplay | [Strafpunkte, Karten und Vereinsprofile](desktop/fairplay/README.md) | +| Highscore | [Manager-Rangliste und zentrierte Kennzahlen](desktop/highscore/README.md) | Jeder Bereich nennt die geprüfte Quelle, bestehende Funktionen und offene Entscheidungen für die Engine-Anbindung. Die Architekturgrundlage bleibt der diff --git a/docs/new_ui/desktop/achievements/README.md b/docs/new_ui/desktop/achievements/README.md new file mode 100644 index 0000000..83a4564 --- /dev/null +++ b/docs/new_ui/desktop/achievements/README.md @@ -0,0 +1,11 @@ +# Erfolge + +Die native Ansicht übernimmt die Saisonbilanz aus dem HTML-Gold `787df640`: drei übereinander angeordnete Diagramme für Meisterschaft, DFB-Pokal und Europapokal. Jedes Diagramm zeigt acht Saisons, die Meisterschaft zusätzlich vier farbige Ligaabschnitte. Ältere beziehungsweise neuere Saisons verschieben das Fenster um ein Jahr, begrenzt auf die fünf lokalen Seiten 0 bis 4. Die Diagramme werden proportional dargestellt; ihr freier vertikaler Raum gehört zur Referenzgeometrie. + +Der erste Manager und dessen Verein werden aus dem aktuellen Snapshot gelesen. Vereinsnamen, IDs und Wappen stammen ausschließlich aus dem schreibgeschützten Katalog. Saisonplätze, Pokalrunden und Titelmarkierungen sind deterministische fiktive Beispieldaten. Die jüngste abgeschlossene Saison ergibt sich aus dem Snapshotdatum, ersatzweise dem Weltstartdatum; vor Juli endet die Vorschau entsprechend ein Jahr früher. Es werden keine tatsächlichen historischen Vereinsleistungen behauptet. + +„Vereinsgeschichte“ öffnet die zwölf jüngsten abgeschlossenen Saisons des aktuellen Vereins, unabhängig von der gewählten Diagrammseite. Der Dialog kennzeichnet die Ergebnisse ausdrücklich als fiktiv. Escape und Rechtsklick schließen zuerst den Dialog; Tab bleibt innerhalb seiner Bedienelemente. Die im HTML nur beschriftete Vereinsangabe ist im nativen Port als Profilbutton bedienbar. Das Vereinsprofil verwendet die bereits vorhandene Profilauflage einschließlich Kader und Rückfokus. Fehlende Vereine ergeben eine ruhige leere Ansicht ohne erfundene IDs. + +Seite und Dialog liegen ausschließlich in `career_view_`. Öffnen, Blättern, Profilansicht und Schließen verändern weder den kanonischen Demozustand noch Revision, Wallet, RNG, Engine oder OBW. Ein Vereins-/Weltwechsel darf keine alte Vereinsgeschichte stillschweigend einem anderen Verein zuordnen. Später muss ein Sitzungsadapter die Diagramm- und Historienwerte aus tatsächlichen Saisonaufzeichnungen liefern. + +Synthetische Providerprüfungen decken die fünf Fenster, acht beziehungsweise zwölf Saisons, vier Ligafarben, Titel und Nichtteilnahme, Saisonwechsel, ungültige Seiten, kurze/leere Kataloge, aktuelle Manageridentität, Filterunabhängigkeit und unveränderte Eingaben ab. Der gemeinsame Linux-Build und alle 28 Regressionstests sind bestanden. Die native Abnahme umfasst alle drei Themes bei 1920×1080 und 1280×720, die fünf Seiten samt Grenzen, zwölf Historienzeilen, Tabumlauf, Profilrücknavigation, unveränderte Fullstate-/Revisions-/Dirtywerte und einen tatsächlichen Checkpoint-Neustart. Gezielte Nachbilder bestätigen die korrigierte Linksausrichtung der Vereinsangabe. Ein zusätzlicher unabhängiger Silver-720-Lauf bestätigt das erneute Öffnen von Profil und Vereinsgeschichte per Tastatur. Die privaten Nachweise liegen im Statistik-QA-Paket; eine Windows-/macOS-Laufzeitabnahme wird damit nicht behauptet. diff --git a/docs/new_ui/desktop/fairplay/README.md b/docs/new_ui/desktop/fairplay/README.md new file mode 100644 index 0000000..d0f840c --- /dev/null +++ b/docs/new_ui/desktop/fairplay/README.md @@ -0,0 +1,75 @@ +# Fairplay · native Modern UI + +Stand: 25. Oktober 2026. Route: `fairplay`. Maßgeblich sind der aktuelle +private HTML-Stand `787df640`, `desktop/report-menus.js` (`fair()`), +`table-window.css` und die Theme-Regeln in `menu-themes.css`. + +Die Ansicht zeigt eine Rangliste mit Verein, Gelb, Rot und Strafpunkten. +Gelb zählt einen, Rot vier Punkte. Weniger Punkte stehen weiter oben. +Die Wertung lautet ausdrücklich `Gelb + 4 × Rot`; identische Strafpunkte +behalten die ursprüngliche Vereinsreihenfolge. Wie im HTML bleiben die +angezeigten Vereinsplätze fortlaufend. Gelbe, rote und gesamte Strafpunkte +verwenden die belegten Kategorie- und Themefarben. + +Die Vorlage besitzt hier weder Liga-/Länderfooter noch anklickbare +Sortierüberschriften. Nativ werden daher keine zusätzlichen Filter oder +Sortieraktionen eingeführt. Ein Vereinsname öffnet das vorhandene native +Vereinsprofil mit der stabilen Katalog-ID und dessen tatsächlichem Kader. +Nach der Rückkehr bleibt der Listenscroll erhalten. + +Auf der logischen Inhaltsfläche 2612 × 1864 steht ein 100 hoher Kopf mit +„Strafpunkte · weniger ist besser“ und den beiden Wertungsmarken. Die +Tabelle beginnt bei y=130 und reicht bis unten. Kopf und Datenzeilen sind +66 hoch; die Vereinsspalte belegt 55 Prozent der inneren Tabellenbreite, +die drei Zahlenspalten jeweils 15 Prozent. Der Tabellenkopf verwendet +Schriftgröße 30, der Körper 36. Midnight, Silver und Matchday übernehmen +ihre jeweiligen belegten Farben. + +## Unveränderliche Demo-Projektion + +[demo_rankings.hpp](../../../../src/modern/ui/demo_rankings.hpp) und +[demo_rankings.cpp](../../../../src/modern/ui/demo_rankings.cpp) liefern +`demo_fairplay_rows(catalog)`. Wie die feste Vereinsliste der Vorlage +verwendet die native Projektion die erste deutsche Liga und deren +tatsächliche Vereine in Katalogreihenfolge. Die Auswahl ist unabhängig von +anderen Berichtsfiltern. Fehlt eine deutsche Liga oder enthält sie keine +Vereine, erscheint eine saubere leere Ansicht. + +Zeilen enthalten `club`, `name`, `crest`, `yellow`, `red`, `points`, +`rank` und `original`. Name, Wappenreferenz und Profilbindung stammen aus +dem unveränderten Katalog. Die gelben und roten Karten sind ausschließlich +deterministische, fiktive Präsentationswerte; daraus werden die +Strafpunkte berechnet und aufsteigend sortiert. + +**OpenBMH deviates from the original:** Vereinsidentitäten werden über +stabile Katalog-IDs statt über HTML-Indizes gebunden. Der Provider kann +auch kurze oder größere synthetische Ligakataloge vollständig darstellen; +ein 20er-Test ist keine Behauptung einer entsprechenden HTML-Goldansicht. + +Der Provider erhält keinen veränderlichen Modell- oder Enginezustand. +Das Öffnen und Schließen von Profilen sowie Scrollen bleiben lokale +App-Navigation. Es gibt keine `Source.apply`-Aktion, neue Save-Tabelle, +Migration, Buchung, Engine-/Classic-Initialisierung oder RNG-Nutzung. + +## Prüfstand + +[modern_rankings_tests.cpp](../../../../tests/modern_rankings_tests.cpp) +prüft die Strafpunktformel, aufsteigende Reihenfolge, stabile Gleichstände, +vollständige echte Vereinsbindung, unveränderte Katalogdaten und fehlende +bzw. leere deutsche Ligen. Der isolierte synthetische Komponententest +ist grün. Die native Linux-Matrix mit Midnight, Silver und Matchday +jeweils in 1920 × 1080 und 1280 × 720 ist bestanden. Zahlen, Reihenfolge, +Vereinsnamen, Farbkategorien sowie das gebundene Vereinsprofil mit +Rückkehr sind geprüft. Navigation erhält Demomodell, Source-Revision, +Spiel-Dirty und Desktop unverändert. + +Nach der vollständigen Matrix wurden die abschließenden Panel- und +Streifenfarben für Silver und Matchday sowie der Titel „Fairplaywertung“ +gezielt mit der letzten Runtime bestätigt. Private Bilder, zugehörige +RML-/JSON-Snapshots, tatsächliche UI-Checkpoints, Eingabeabläufe und +Hashmetadaten liegen in +`bmh_4k_ui/docs/qa/statistics-batch-2026-10-25/rankings/`. Matrix und +Abschlussläufe sind ihren tatsächlichen Runtimehashes zugeordnet; der +portable Replay-Helfer wurde ausgeführt. Diagnose-Snapshots sind keine +ladbaren Spielstände. Tatsächliche saisonale Fairplaywerte bleiben eine +spätere Aufgabe des Modern-Sessionadapters. diff --git a/docs/new_ui/desktop/highscore/README.md b/docs/new_ui/desktop/highscore/README.md new file mode 100644 index 0000000..6bd6f43 --- /dev/null +++ b/docs/new_ui/desktop/highscore/README.md @@ -0,0 +1,9 @@ +# Highscore + +Die native Rangliste übernimmt den HTML-Goldstand `787df640`: das vorhandene Highscore-SVG über einer Tabelle mit Manager, Verein, Punkten, Meisterschaften, Pokal- und Europatiteln. Die vier Zahlenspalten sind zentriert. Midnight, Silver und Matchday verwenden dieselbe Geometrie. Silver nutzt eine aus demselben GUI-SVG abgeleitete Variante mit dem Helligkeits-/Sättigungsfilter der Referenz; die Grafik gehört weiterhin zum getrennten GUI-Paket. + +Die bis zu acht Zeilen sind ausdrücklich eine deterministische Demorangliste. Der erste Name und Verein stammen vom ersten Manager des aktuellen Snapshots; weitere Managernamen und sämtliche Punkt-/Titelwerte sind fiktive Referenzwerte. Die Vereine sind vorhandene, verschiedene Katalog-IDs mit echten Katalognamen und Wappen. Bei kurzen Katalogen werden entsprechend weniger Zeilen gezeigt, bei fehlendem verwalteten Verein eine leere Vorschau. Ein unbekannter Managername bleibt ein Gedankenstrich. Es gibt weder Phantomvereine noch eine automatische Umleitung auf einen anderen Manager. + +Die im HTML rein beschrifteten Vereinsangaben sind im nativen Port Profilbuttons und öffnen die bestehende Profilauflage mit ihrem üblichen Rückfokus. Es wird kein zweiter Profilpfad implementiert. Die Rangliste speichert keine Source-Aktion und verändert keine Revision, Geldwerte, Engine, Zufallsfolge oder Weltdatei. Eine echte spätere Highscore-Abfrage und deren Regeln bleiben Aufgabe der Sitzungs-/Engineanbindung. + +Synthetische Tests prüfen Rangfolge und Goldwerte, Begrenzung auf vorhandene Vereine, eindeutige IDs, den aktuellen ersten Manager, leere/kurze Kataloge und unveränderte Eingaben. Der gemeinsame Linux-Build und alle 28 Regressionstests sind bestanden. Native Bilder und Profil-/Readonly-Prüfungen decken drei Themes bei 1920×1080 und 1280×720 ab. Die gezielten Abschlussbilder bestätigen linke Vereinsheader und -namen direkt neben dem Wappen, unveränderte Zahlenzentren und die lesbare Silver-Logovariante. Die anfängliche Buttonzentrierung und ein unbeabsichtigter Current-Club-Akzent wurden per CSS korrigiert; die ursprünglichen Nachweise bleiben als Vorher-Beleg erhalten. Die privaten Prüfdaten und Checkpoints liegen im Statistik-QA-Paket. Dies ist eine Linux-Abnahme, keine Windows-/macOS-Laufzeitbehauptung. diff --git a/docs/new_ui/desktop/scorers/README.md b/docs/new_ui/desktop/scorers/README.md new file mode 100644 index 0000000..a521d3a --- /dev/null +++ b/docs/new_ui/desktop/scorers/README.md @@ -0,0 +1,104 @@ +# Spielerstatistiken · native Modern UI + +Stand: 25. Oktober 2026. Route: `scorers`. Vorlage ist der aktuelle +private HTML-Stand `787df640`: `desktop/report-menus.js` (`scorer()`), +`player-statistics.css`, `table-window.css`, `menu-themes.css` und die +gemeinsamen Liga-Auswahllisten. Proprietäre Daten und Referenzbilder +gehören nicht in das öffentliche Repository. + +Die native Ansicht besitzt vier Tabs: Tore, Vorlagen, Gelbe Karten und +Rote Karten. Drei Fotokarten zeigen die Spitzenreiter; darunter folgt die +Restliste mit Spieler, Verein und dem jeweiligen Wert. Nullwerte werden +ausgeblendet. Jede Kategorie sortiert ihre eigene Metrik absteigend; +Gleichstände erhalten Wettbewerbsplätze wie `1, 2, 2, 4`. In der roten +Demokategorie stehen deshalb die Plätze `1, 2, 2, 4, 4, 4, 4` bei den +Werten `3, 2, 2, 1, 1, 1, 1`. + +Land, Liga und Bereich verwenden die bestehenden Footer-Auswahllisten. +„Eigener Verein“ ersetzt Land/Liga durch den tatsächlichen Vereinsnamen. +Der gewählte Ligakontext bleibt beim Wechsel des Bereichs erhalten. +Die Tabs unterstützen Links/Rechts mit Umlauf sowie Home/End. Nur der +aktive Tab gehört zum normalen Tabulatorweg; Auf/Ab wechseln keine Kategorie. Spieler und +Vereine öffnen die vorhandenen nativen Profile. Spielerprofile sind an +die stabile Spieler-ID und deren tatsächlichen Katalogverein gebunden. +Nach der Rückkehr bleiben Kategorie, Bereich, Liga und Listenscroll erhalten. + +Die logische Inhaltsfläche ist 2612 × 1864 groß. Auf den 92 hohen Kopf +folgen Tabs bei y=104 mit Höhe 106. Das Statistikpanel beginnt bei y=244; +drei 854,667 breite und 320 hohe Karten stehen mit Abstand 24 nebeneinander. +Die Restliste beginnt bei y=596. Ihre Kopfzeile ist 74, eine Datenzeile +118 hoch. Die Footerfelder stehen bei y=1770 mit Höhe 94. Farben und +Abstände berücksichtigen die späteren Regeln der HTML-Stylesheets und +die Themes Midnight, Silver und Matchday. + +## Datenquelle und lokale Navigation + +[demo_rankings.hpp](../../../../src/modern/ui/demo_rankings.hpp) und +[demo_rankings.cpp](../../../../src/modern/ui/demo_rankings.cpp) liefern +`demo_scorer_rows(catalog, league, managed_club, scope, kind)`. Die +Projektion empfängt ausschließlich den unveränderlichen Katalog sowie +Auswahlparameter. Sie erhält keinen Engine-, Sitzungs-, Finanz- oder +Zufallszustand und schreibt kein Demomodell. + +Ein gemeinsamer Ausschnitt von höchstens zehn tatsächlichen Feldspielern +wird für alle vier Kategorien verwendet. Die Ligaansicht wählt passende +Angreifer, Mittelfeldspieler und Verteidiger aus tatsächlichen Ligakadern; +der Vereinsbereich aus dem tatsächlichen eigenen Kader. Stabile IDs sind +eindeutig, Torhüter und Spieler ohne belegte Feldposition werden nicht als +Ersatz erfunden. Kurze oder leere Kataloge ergeben entsprechend weniger +oder keine Einträge. + +Jede Zeile enthält `player`, `club`, `name`, `club_name`, `photo`, `crest`, +`goals`, `assists`, `yellow`, `red`, `value`, `rank` und `original`. +Namen, Zuordnung und Bildreferenzen stammen aus dem Katalog. Eine fehlende +Fotoreferenz nutzt nur dessen deklarierten Fotofallback, falls vorhanden. +Die vier Statistikwerte sind deterministische, ausdrücklich fiktive +Präsentationsdaten aus der Vorlage. Sie sind keine Saisonstatistiken der +Engine und keine aus Spielerfähigkeiten abgeleiteten Leistungen. + +Die App hält Liga, Bereich, Tab und Scrollpositionen ausschließlich in +`rankings_view_`. Die offenen Auswahllisten verwenden den vorhandenen +flüchtigen Report-Picker. Eine einmalige Scrollwiederherstellung nach +DOM-Neuaufbau erhält den Rückweg aus Profilen, ohne Nutzerscrollen auf +späteren Frames zurückzusetzen. Navigation löst kein `Source.apply` aus +und verändert weder Revision noch Dirty-Zustand oder gespeicherte +Berichtsfilter. Bestehende UI-Demostände benötigen keine Migration und +enthalten keine neue Statistik-Tabelle. + +**OpenBMH deviates from the original:** Die zehn indexbasierten +HTML-Beispielpersonen werden durch tatsächlich vorhandene Feldspieler +mit korrekter Vereinsbindung ersetzt. Die Saisonbeschriftung folgt dem +Demodatum statt dem festen HTML-Jahr 2027/28. Weil Fotos Katalogdaten +sind, lautet der Hinweis „Spielwerte fiktiv“. + +## Prüfung und Enginegrenze + +[modern_rankings_tests.cpp](../../../../tests/modern_rankings_tests.cpp) +prüft synthetisch Metriksortierung, gemeinsame Identitäten, rote Nullfilter +und Gleichstände, korrekte Vereins-/Ligabindung, Bildreferenzen, +unveränderte Katalogdaten sowie kleine und leere Feldspielerkader. +Der isolierte Komponententest, die integrierte C++-Syntaxprüfung und die +Rml-Stylesheetprüfung sind grün. Die native Linux-Matrix mit Midnight, +Silver und Matchday jeweils in 1920 × 1080 und 1280 × 720 ist bestanden. +Alle vier sichtbaren Metriken, rote Gleichstände, der Tabulatorweg ohne +inaktive Kategorien, Links/Rechts/Home/End, unveränderte Kategorie bei +Auf/Ab, England, der eigene Bereich, gebundene Profile und Pickerabbruch +sind geprüft. Demomodell, Source-Revision, Spiel-Dirty und Desktop bleiben +bei sämtlichen Navigationsschritten unverändert. Ein echter UI-Checkpoint +wurde in einem neuen Prozess mit identischem Modell geladen. + +Nach der vollständigen Funktionsmatrix wurden die abschließenden +Layoutkorrekturen gezielt mit der letzten Runtime nachgeprüft: sichtbare +Tabellentexte, Restwappen 42 mit Abstand 14, Leaderwappen 34 mit Abstand 12 +und der eigene Footer im Verhältnis 2:1 mit 24 Abstand und 42er-Wappen. +Das private Paket `bmh_4k_ui/docs/qa/statistics-batch-2026-10-25/rankings/` +enthält ausgewählte Bilder, passende RML-/JSON-Snapshots, tatsächliche +UI-Checkpoints, Eingabeabläufe und Hashmetadaten. Die vollständige Matrix +und der gezielte Abschlusslauf sind dort ihren jeweiligen tatsächlichen +Runtimehashes zugeordnet. Der portable Replay-Helfer wurde ausgeführt. +Diagnose-Snapshots sind keine Spielstände; flüchtige Auswahl wird durch +den zugehörigen Ablauf reproduziert. + +Ein späterer Modern-Sessionadapter muss tatsächliche, zeitlich definierte +Statistikprojektionen liefern. Der Renderer greift weder auf Enginearchive +noch auf `.obs` oder Classic-Spielstände zu. diff --git a/docs/new_ui/menu-qa.md b/docs/new_ui/menu-qa.md index ff3cc6e..fbf2b6f 100644 --- a/docs/new_ui/menu-qa.md +++ b/docs/new_ui/menu-qa.md @@ -142,3 +142,19 @@ Aufstellung ein Drittel der Höhe. Die Namensspalte wächst von 390 auf nebeneinanderliegende Schützenfelder erhalten eigene Nachweise unter `docs/qa/lineup-table-focus-2026-10-25/`; auch Daten B und die Sichtgrenzen aller drei Schützenlisten gehören zum Vergleich. + +Das Statistikpaket ergänzt [Erfolge](desktop/achievements/README.md), +[Spielerstatistiken](desktop/scorers/README.md), +[Fairplay](desktop/fairplay/README.md) und [Highscore](desktop/highscore/README.md). +Die 28 ausgewählten Regressionstests bestehen. Die nativen Prüfungen decken +alle vier Ansichten in drei Themes bei 720p/1080p ab, ergänzt durch +Seiten-/Kategoriegrenzen, Karten-Gleichstände, Länder-/Ligawahl, +Vereins-/Spielerprofile, Dialog-/Pickerabbruch und echte Checkpoint-Neustarts. +Alle Statistik- und Filteraktionen lassen Demomodell, Revision und +Spiel-Dirty-Zustand unverändert. Sichtbar geprüft und korrigiert sind +Textspans in Flexzellen, Wappen-/Namensabstände, eigene Footerproportionen, +Fairplay-Farben sowie Highscore-Header und Zahlenzentren. +Private Screenshots, UI-Demostände, Replays und Quell-/Runtimehashes: +`docs/qa/statistics-batch-2026-10-25/`. +Der Gesamtkatalog umfasst damit **31 native und 6 offene Routen**; +die allgemeine Ansicht „Statistiken“ bleibt ein eigenes späteres Paket. diff --git a/docs/new_ui/qa-findings.md b/docs/new_ui/qa-findings.md index 10df53a..00a594a 100644 --- a/docs/new_ui/qa-findings.md +++ b/docs/new_ui/qa-findings.md @@ -32,7 +32,7 @@ gemeinsamen Controländerungen zusätzlich in mehreren Menüs nachgeprüft. Die erste Gesamterfassung enthält 36 Routen, davon zwölf native Aufnahmen und 24 ausstehende Ports. Diese historische Matrix bleibt unverändert. Der anschließend übertragene Kalender bekommt einen eigenen Vergleich; -der aktuelle Runner erfasst 27 native Routen und 10 offene Ports. +der aktuelle Runner erfasst 31 native Routen und 6 offene Ports. Spätere Meilensteine erfassen denselben Gesamtkatalog erneut. Siehe [QA-Ablauf](menu-qa.md), [Typografie](typography-qa.md) und @@ -70,3 +70,12 @@ Im gezielten Nachtest behoben: Ganzzahlige RmlUI- Reglerschritte kommen als Dezimaltext an und wurden bisher verworfen. Anweisungswert, Revision und rote Fläche aktualisieren sich jetzt gemeinsam; die Änderung wurde mit 20 und 24 Spielern tatsächlich nachgeprüft. + +Im Statistikpaket behoben: anonyme Textknoten in RmlUI-Flexzellen wurden +nicht angezeigt und sind jetzt ausdrücklich in Textspans gefasst. Die +Scorer-Restliste erhält 42-Pixel-Wappen und den Referenzabstand, der eigene +Vereinsbereich die 2:1-Footeraufteilung. Fairplay behält seine Panel- und +Streifenfarben in allen Themes. Highscore und Vereinsgeschichte verwenden +linke Vereinsnamen direkt neben den Wappen; die Kennzahlen bleiben +zentriert. Kleine Unterschiede der Font-/Ziffernraster bei 720p sind im +privaten Bildnachweis dokumentiert, keine verdeckten Geometriefehler. diff --git a/src/modern/ui/CMakeLists.txt b/src/modern/ui/CMakeLists.txt index ba46c9a..e8636b9 100644 --- a/src/modern/ui/CMakeLists.txt +++ b/src/modern/ui/CMakeLists.txt @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-only -add_library(bmh_modern_ui_core STATIC catalog.cpp model.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_transfer.cpp) +add_library(bmh_modern_ui_core STATIC catalog.cpp model.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp) target_include_directories(bmh_modern_ui_core PUBLIC ../..) target_link_libraries(bmh_modern_ui_core PUBLIC bmh_asset_io) add_library(bmh_modern_ui STATIC view.cpp ticket_popover.cpp) @@ -14,9 +14,20 @@ endif() set(modern_assets "${CMAKE_BINARY_DIR}/assets/modern") FetchContent_GetProperties(rmlui) file(MAKE_DIRECTORY "${modern_assets}") -foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss transfer.rcss) +foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss transfer.rcss career_reports.rcss rankings.rcss) configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY) endforeach() + +foreach(component career_reports rankings) + add_executable(modern_${component}_tests ../../../tests/modern_${component}_tests.cpp) + target_link_libraries(modern_${component}_tests PRIVATE bmh_modern_ui_core) + if(MSVC) + target_compile_options(modern_${component}_tests PRIVATE /W4 /utf-8) + else() + target_compile_options(modern_${component}_tests PRIVATE -Wall -Wextra -Wpedantic) + endif() + add_test(NAME modern_${component}_tests COMMAND modern_${component}_tests) +endforeach() file(GLOB modern_icons CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/assets/modern/icons/*.svg") file(MAKE_DIRECTORY "${modern_assets}/icons") foreach(icon ${modern_icons}) diff --git a/src/modern/ui/career_report_controls.inc b/src/modern/ui/career_report_controls.inc new file mode 100644 index 0000000..ce8e16a --- /dev/null +++ b/src/modern/ui/career_report_controls.inc @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-3.0-only +bool App::career_report_action(const std::string &action,Rml::Element *target) { + if(action!="career-report-page"&&action!="career-history"&&action!="career-history-close")return false; + if(menu_!="achievements"||!popup_.empty()||amount_||!report_detail_kind_.empty())return true; + const int page=career_page(career_view_); + if(action=="career-history-close") { + if(career_view_.at("dialog")!="history")return true; + focus_after_render_=career_view_.at("return_focus").get(); + if(focus_after_render_.empty())focus_after_render_="career-history"; + career_view_["dialog"]="";career_view_["return_focus"]="";career_view_["bound_club"]=""; + refresh();return true; + } + if(career_view_.at("dialog")!=""||!target)return true; + const auto snapshot=snap(); + if(!snapshot.world)return true; + const auto data=demo_achievements(*snapshot.world,snapshot.state,page); + if(!data.value("ok",false)||!data.value("available",false))return true; + if(action=="career-history") { + career_view_["dialog"]="history";career_view_["return_focus"]=target->GetId(); + career_view_["bound_club"]=data.at("club");focus_after_render_="career-history-close"; + refresh();return true; + } + const auto id=target->GetAttribute("data-id",""); + if(id!="older"&&id!="newer")return true; + const int next=std::clamp(page+(id=="older"?1:-1),0,4); + if(next==page)return true; + career_view_["page"]=next; + focus_after_render_=(id=="older"&&next==4)?"career-page-newer":(id=="newer"&&next==0)?"career-page-older":target->GetId(); + refresh();return true; +} +bool App::career_report_event(Rml::Event &event) { + if(menu_!="achievements"||!popup_.empty()||amount_||!report_detail_kind_.empty())return false; + career_page(career_view_); + if(career_view_.at("dialog")!="history")return false; + const auto type=event.GetType();const bool keyboard=type=="keydown"; + const auto key=keyboard?Rml::Input::KeyIdentifier(event.GetParameter("key_identifier",0)):Rml::Input::KI_UNKNOWN; + if((keyboard&&key==Rml::Input::KI_ESCAPE)||(type=="mouseup"&&event.GetParameter("button",0)==1)) { + career_report_action("career-history-close",nullptr);event.StopImmediatePropagation();return true; + } + if(keyboard&&key==Rml::Input::KI_TAB) { + Rml::ElementList controls; + if(auto *dialog=element("career-history-layer"))dialog->QuerySelectorAll(controls,"button:not([disabled])"); + controls.erase(std::remove_if(controls.begin(),controls.end(),[](auto *control){return !control->IsVisible(true);}),controls.end()); + if(!controls.empty()) { + const auto current=context_->GetFocusElement();const auto it=std::find(controls.begin(),controls.end(),current); + const int old=it==controls.end()?-1:int(it-controls.begin());const bool back=event.GetParameter("shift_key",0)!=0; + const int next=(old+(back?-1:1)+int(controls.size()))%int(controls.size());controls[size_t(next)]->Focus(true); + } + event.StopImmediatePropagation();return true; + } + bool inside=false; + for(auto *node=event.GetTargetElement();node&&node!=doc_;node=node->GetParentNode())if(node->GetId()=="career-history-layer")inside=true; + if(!inside&&(type=="click"||type=="dblclick"||type=="mousedown"||type=="mouseup"||keyboard)) { + event.StopImmediatePropagation();return true; + } + return false; +} diff --git a/src/modern/ui/career_report_screens.inc b/src/modern/ui/career_report_screens.inc new file mode 100644 index 0000000..9081288 --- /dev/null +++ b/src/modern/ui/career_report_screens.inc @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: GPL-3.0-only +namespace { +int career_page(Json &view) { + if(!view.is_object())view=Json::object(); + if(!view.contains("page")||!view.at("page").is_number_integer()||view.at("page")<0||view.at("page")>4)view["page"]=0; + for(const auto *key:{"dialog","return_focus","bound_club"})if(!view.contains(key)||!view.at(key).is_string())view[key]=""; + if(view.at("dialog")!=""&&view.at("dialog")!="history")view["dialog"]=""; + return view.at("page").get(); +} +std::string career_svg(const Json &chart,const std::string &theme) { + const int kind=chart.at("kind").get(); + constexpr std::array bar_tiers{"#8ac9b0","#8bb6dd","#d8b879","#b19ad1"}; + const std::array text_tiers=theme=="silver" + ?std::array{"#34715a","#356c9e","#846416","#775b91"} + :std::array{"#8ac9b0","#8bb6dd","#d8b879","#b19ad1"}; + const std::string text=theme=="silver"?"#233443":theme=="matchday"?"#efeded":"#c8dce9"; + const std::string muted=theme=="silver"?"#526779":theme=="matchday"?"#b7b4b9":"#91aabd"; + const std::string grid=theme=="silver"?"#6c879c28":theme=="matchday"?"#ead9da16":"#a4bdcf29"; + // Gold permits SVG text above its viewBox. Symmetric padding preserves the + // original meet-transform while retaining those captions in the raster. + std::string svg=""; + if(!kind) { + constexpr std::array names{"Bundesliga","2. Bundesliga","3. Bundesliga","Regionalliga"}; + for(int i=0;i<4;++i)svg+=""+names[size_t(i)]+""; + } else svg+=""; + size_t i=0; + for(const auto &row:chart.at("seasons")) { + const int value=row.at("value").get(),tier=!kind?row.at("tier").get():1; + const double height=!kind?std::max(8.0,218-((tier-1)*49+18+(value-1)/19.0*29)) + :value?22+(6-std::log2(double(value)))*27:3; + const int x=124+int(i)*232; + const std::string fill=!kind?bar_tiers[size_t(tier-1)]:kind==1?"#8cacc9":"#c5b384"; + svg+=""+esc(row.at("season").get()+": "+(!kind?row.at("tier_name").get()+" · ":"")+row.at("label").get())+""+esc(row.at("caption").get())+""+esc(row.at("season").get())+""; + ++i; + } + return svg+""; +} +std::string career_cell(const std::string &text,const std::string &css) { + return "
"+esc(text)+"
"; +} +} // namespace + +std::string App::render_achievements() { + const auto snapshot=snap();const int page=career_page(career_view_); + const auto data=snapshot.world?demo_achievements(*snapshot.world,snapshot.state,page):Json{{"ok",false},{"available",false}}; + const bool ready=data.value("ok",false)&&data.value("available",false); + const auto club=ready?data.at("club").get():std::string(); + if(career_view_.at("dialog")=="history"&&career_view_.at("bound_club")!=club) { + career_view_["dialog"]="";career_view_["return_focus"]="";career_view_["bound_club"]=""; + } + std::string out="

Saisonbilanz

Meisterschaft, DFB-Pokal und Europapokal im Saisonvergleich

"+(ready?esc(data.at("range").get()):"—")+"
"; + if(ready) { + for(const auto &chart:data.at("charts")) { + const int kind=chart.at("kind").get();const auto &last=chart.at("latest"); + const auto summary=(kind==0?last.at("tier_name").get()+" · ":std::string())+last.at("label").get(); + const auto svg=career_svg(chart,theme_); + out+="

"+esc(chart.at("title").get())+"

"+esc(last.at("season").get())+""+esc(summary)+"
()+"-Ergebnisse")+"\">"+picture(renderer_.diagram("career-chart-"+std::to_string(kind),svg,4480),2548,403.333333333)+"
"; + } + } else out+="

Für den aktuellen Verein ist keine Saisonvorschau verfügbar.

"; + out+="
"; + if(ready&&career_view_.at("dialog")=="history") { + out+="

Vereinsgeschichte

"+report_club_button(club)+"Zwölf abgeschlossene Saisons · fiktive Ergebnisse
"; + const std::array heads{"Saison","Meisterschaft","DFB-Pokal","Europapokal"}; + for(int i=0;i<4;++i)out+=career_cell(heads[size_t(i)],i?"history-result":"history-season history-heading-season"); + out+="
"; + size_t i=0; + for(const auto &row:data.at("history")) { + out+="
"+career_cell(row.at("season").get(),"history-season"); + for(const auto &result:row.at("results"))out+=career_cell(result.at("label").get(),std::string("history-result ")+(result.at("winner").get()?"career-title":"")); + out+="
";++i; + } + out+="
"; + } + return out+render_report_detail(); +} +std::string App::render_highscore() { + const auto snapshot=snap();career_page(career_view_); + const auto data=snapshot.world?demo_highscores(*snapshot.world,snapshot.state):Json{{"ok",false},{"available",false}}; + const bool ready=data.value("ok",false)&&data.value("available",false); + const auto key=theme_=="silver"?"art.highscore-mark-silver.svg":"art.highscore-mark-v1.svg"; + std::string out="
"+img(key,1180,1180.0/3.0,false,false,2048)+"
"; + const std::array heads{"Manager","Verein","Punkte","Meister","Pokal","Europa"}; + for(int i=0;i<6;++i)out+=career_cell(heads[size_t(i)],"highscore-col-"+std::to_string(i)); + out+="
"; + if(ready) { + size_t i=0;for(const auto &row:data.at("rows")) { + out+="
"+career_cell(std::to_string(row.at("rank").get())+". "+row.at("manager").get(),"highscore-col-0")+"
"+report_club_button(row.at("club").get())+"
"; + int col=2;for(const auto *field:{"points","championships","cups","europe"})out+=career_cell(std::to_string(row.at(field).get()),"highscore-col-"+std::to_string(col++)); + out+="
";++i; + } + } else out+="

Für den aktuellen Verein ist keine Ranglistenvorschau verfügbar.

"; + return out+"
"+render_report_detail(); +} diff --git a/src/modern/ui/controls.inc b/src/modern/ui/controls.inc index cf0b09f..b995875 100644 --- a/src/modern/ui/controls.inc +++ b/src/modern/ui/controls.inc @@ -164,6 +164,7 @@ void App::ProcessEvent(Rml::Event &event) try { } if (popup_.empty() && amount_trigger_event(event)) return; if (popup_.empty() && report_detail_kind_.empty() && (lineup_event(event) || transfer_event(event))) return; + if (popup_.empty() && report_detail_kind_.empty() && (career_report_event(event) || rankings_event(event))) return; if (popup_.empty() && contracts_event(event)) return; if (popup_.empty() && (advertising_event(event) || toto_event(event))) return; if (popup_.empty() && (bank_event(event) || finance_event(event))) return; @@ -386,15 +387,19 @@ void App::ProcessEvent(Rml::Event &event) try { auto *root = !popup_.empty() ? element("popup") : !planning_dialog_.empty() ? element("planning-layer") : !report_detail_kind_.empty() ? element("report-detail-layer") + : !career_view_.value("dialog", "").empty() ? element("career-history-layer") : element("canvas"); root->QuerySelectorAll( - controls, !popup_.empty() || !report_detail_kind_.empty() || !planning_dialog_.empty() + controls, !popup_.empty() || !report_detail_kind_.empty() || !planning_dialog_.empty() || !career_view_.value("dialog", "").empty() ? "button,input,select" : ".window button,.window input,.window select"); controls.erase(std::remove_if(controls.begin(), controls.end(), - [](auto *n) { + [this](auto *n) { return !n->IsVisible(true) || - n->HasAttribute("disabled"); + n->HasAttribute("disabled") || + (menu_ == "scorers" && + n->GetId().starts_with("player-stat-tab-") && + n->template GetAttribute("aria-selected", "false") != "true"); }), controls.end()); const auto current = context_->GetFocusElement(); @@ -452,6 +457,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) { const auto id = target ? target->GetAttribute("data-id", "") : std::string(); if (lineup_action(action, target) || transfer_action(action, target)) return; + if (career_report_action(action, target) || rankings_action(action, target)) return; if (environment_action(action, target) || advertising_action(action, target) || toto_action(action, target)) return; if (amount_action(action, target) || bank_action(action, target) || finance_action(action, target) || contracts_action(action, target)) return; if (almanac_action(action, target) || planning_action(action, target) || indoor_action(action, target)) return; @@ -1065,7 +1071,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) { } static const std::set available = { "tables", "strengths", "camp", "settings", - "save", "load", "training", "tactics", "calendar", "league", "other", "postpone", "friendlies", "indoor", "almanac", "bank", "balance", "contracts", "environment", "advertising", "toto", "lineup", "transfer"}; + "save", "load", "training", "tactics", "calendar", "league", "other", "postpone", "friendlies", "indoor", "almanac", "bank", "balance", "contracts", "environment", "advertising", "toto", "lineup", "transfer", "achievements", "scorers", "fairplay", "highscore"}; if (!available.contains(route)) { message("Diese native Ansicht wird im nächsten Menüpaket übertragen."); return; @@ -1456,6 +1462,7 @@ void App::script() { {"toto_view", {{"column", toto_column_}, {"dialog", toto_dialog_}}}, {"lineup_view", {{"pitch", lineup_pitch_}, {"data", lineup_data_}, {"page", lineup_page_}, {"side", lineup_side_}, {"selected", lineup_selected_}, {"drag", lineup_drag_}}}, {"transfer_view", transfer_view_}, {"transfer_dialog", transfer_dialog_}, {"transfer_draft", transfer_draft_}, + {"career_view", career_view_}, {"rankings_view", rankings_view_}, {"contracts_view", {{"dialog", contracts_dialog_}, {"player", contracts_player_}, {"tab", contracts_tab_}, {"draft", contract_draft_}}}, {"amount_editor", amount_ ? Json{{"title", amount_->request.title}, {"raw", amount_->raw}, {"review", amount_->review}, {"error", amount_error()}} : Json()}, {"source_revision", source_ ? Json(snap().revision) : Json()}, diff --git a/src/modern/ui/demo_career_reports.cpp b/src/modern/ui/demo_career_reports.cpp new file mode 100644 index 0000000..e302c54 --- /dev/null +++ b/src/modern/ui/demo_career_reports.cpp @@ -0,0 +1,105 @@ +// SPDX-License-Identifier: GPL-3.0-only +#include "modern/ui/demo_career_reports.hpp" +#include +#include +#include +#include + +namespace bmh::modern_ui { +namespace { +constexpr std::array titles{"Meisterschaft","DFB-Pokal","Europapokal"}; +constexpr std::array league_names{"Bundesliga","2. Bundesliga","3. Bundesliga","Regionalliga"}; +constexpr std::array,3> samples{{ + {{8,7,5,6,4,3,1,5,4,2,3,1}},{{32,1,8,16,4,8,4,8,16,8,2,1}},{{0,0,16,8,0,4,16,8,32,4,8,8}} +}}; +constexpr std::array tiers{4,4,3,3,2,2,1,1,1,1,1,1}; +const Json &field(const Json &j,const char *key) { + static const Json missing; + if(j.is_object())if(const auto i=j.find(key);i!=j.end())return *i; + return missing; +} +std::string text(const Json &j,const std::string &fallback="—") { + return j.is_string()&&!j.get_ref().empty()?j.get():fallback; +} +bool date(const Json &value) { + if(!value.is_string())return false; + const auto &s=value.get_ref(); + if(s.size()!=10||s[4]!='-'||s[7]!='-')return false; + for(size_t i=0;i'9'))return false; + const int year=std::stoi(s.substr(0,4)); + return year>=1900&&std::chrono::year_month_day{std::chrono::year{year}, + std::chrono::month{unsigned(std::stoi(s.substr(5,2)))},std::chrono::day{unsigned(std::stoi(s.substr(8,2)))}}.ok(); +} +struct Context {std::string club,manager="—";int last_year=2025;}; +Context context(const Catalog &world,const Json &state) { + Context c; + const auto &managers=field(state,"managers"); + if(managers.is_array()&&!managers.empty()&&managers[0].is_object()) { + c.manager=text(field(managers[0],"name")); + const auto id=text(field(managers[0],"club"),""); + if(!id.empty())if(const auto *club=world.find("clubs",id);club&&club->value("type",std::string("club"))=="club")c.club=id; + } + auto reference=field(state,"date"); + if(!date(reference))reference=world.manifest().value("start_date",Json()); + if(date(reference)) { + const auto s=reference.get(); + c.last_year=std::stoi(s.substr(0,4))-(std::stoi(s.substr(5,2))<7?2:1); + } + return c; +} +int index(int year) {return ((year-2015)%12+12)%12;} +std::string season(int year) { + const int next=(year+1)%100; + return std::to_string(year)+"/"+(next<10?"0":"")+std::to_string(next); +} +std::string label(int value,int competition) { + if(!competition)return std::to_string(value)+". Platz"; + switch(value){case 0:return "Nicht teilgenommen";case 1:return "Sieger";case 2:return "Finale"; + case 4:return "Halbfinale";case 8:return "Viertelfinale";case 16:return "Achtelfinale";default:return "1. Runde";} +} +Json result(int year,int competition) { + const int i=index(year),value=samples[size_t(competition)][size_t(i)],tier=tiers[size_t(i)]; + return {{"year",year},{"season",season(year)},{"value",value},{"label",label(value,competition)}, + {"caption",competition==0?std::to_string(value)+".":value==0?"–":label(value,competition)}, + {"tier",competition==0?Json(tier):Json()},{"tier_name",competition==0?Json(league_names[size_t(tier-1)]):Json()}, + {"winner",value==1},{"fictional",true}}; +} +Json envelope(const Context &c) { + return {{"ok",true},{"available",!c.club.empty()},{"fictional",true}, + {"club",c.club.empty()?Json():Json(c.club)},{"manager",c.manager}}; +} +} // namespace +Json demo_achievements(const Catalog &world,const Json &state,int page) { + if(page<0||page>4)return {{"ok",false},{"error","invalid_career_page"}}; + const auto c=context(world,state);auto response=envelope(c); + const int end=c.last_year-page; + response["page"]=page;response["first_year"]=end-7;response["last_year"]=end; + response["range"]=season(end-7)+" – "+season(end); + response["charts"]=Json::array();response["history"]=Json::array(); + if(c.club.empty())return response; + for(int k=0;k<3;++k) { + Json rows=Json::array();for(int year=end-7;year<=end;++year)rows.push_back(result(year,k)); + response["charts"].push_back({{"kind",k},{"title",titles[size_t(k)]},{"latest",result(end,k)},{"seasons",rows}}); + } + for(int i=0;i<12;++i) { + const int year=c.last_year-i;Json values=Json::array(); + for(int k=0;k<3;++k)values.push_back(result(year,k)); + response["history"].push_back({{"year",year},{"season",season(year)},{"results",values}}); + } + return response; +} +Json demo_highscores(const Catalog &world,const Json &state) { + const auto c=context(world,state);auto response=envelope(c);response["rows"]=Json::array(); + if(c.club.empty())return response; + std::vector clubs{c.club}; + for(const auto *club:world.clubs()) { + const auto id=club->value("id",""); + if(id!=c.club&&clubs.size()<8&&club->value("type",std::string("club"))=="club")clubs.push_back(id); + } + constexpr std::array managers{"","Chris Winter","Sam Keller","Robin Faber","Kim Seidel","Dani Koch","Mika Sommer","Jules Walter"}; + for(size_t i=0;i +#include +#include + +namespace bmh::modern_ui { +namespace { +bool position(const Json &player, const std::string &role) { + const auto it = player.find("positions"); + return it != player.end() && it->is_array() && + std::find(it->begin(), it->end(), role) != it->end(); +} +bool outfield(const Json &player) { + return position(player, "def") || position(player, "mid") || + position(player, "fwd"); +} +std::string photo(const Json &player) { + const auto explicit_photo = player.value("photo", std::string()); + if (!explicit_photo.empty()) return explicit_photo; + const auto id = player.value("id", std::string()); + // Catalog::asset resolves a world's declared silhouette fallback, if any. + return "asset:player/" + (id.starts_with("player:") ? id.substr(7) : id) + + "/photo"; +} +} // namespace + +Json demo_scorer_rows(const Catalog &world, const std::string &league, + const std::string &managed_club, int scope, int kind) { + Json rows = Json::array(); + if (scope < 0 || scope > 1 || kind < 0 || kind > 3) return rows; + std::vector clubs; + if (scope == 1) { + if (const auto *club = world.find("clubs", managed_club); + club && club->value("type", "club") == "club") clubs.push_back(club); + } else { + const auto *competition = world.find("competitions", league); + if (!competition || competition->value("type", "") != "league") return rows; + clubs = world.clubs(league); + } + if (clubs.empty()) return rows; + const std::array preferred{ + "fwd", "fwd", "fwd", "fwd", "mid", "mid", "mid", "mid", "def", "def"}; + const std::array assists{9, 12, 7, 11, 6, 8, 4, 5, 3, 10}, + yellow{2, 5, 3, 8, 7, 1, 9, 6, 4, 10}, + red{0, 1, 1, 2, 0, 1, 3, 0, 2, 1}; + std::set used; + for (size_t i = 0; i < preferred.size(); ++i) { + const Json *selected = nullptr, *selected_club = nullptr; + // Round-robin clubs preserve Gold's ten-club preview; short worlds may + // supply additional distinct outfield players from their actual squads. + for (size_t offset = 0; offset < clubs.size() && !selected; ++offset) { + const auto *club = clubs[(i + offset) % clubs.size()]; + const auto squad = world.squad(club->at("id").get()); + for (bool exact : {true, false}) { + for (const auto *player : squad) + if (outfield(*player) && !used.contains(player->at("id").get()) && + (!exact || position(*player, preferred[i]))) { + selected = player; selected_club = club; break; + } + if (selected) break; + } + } + if (!selected) break; + used.insert(selected->at("id").get()); + const std::array values{19 - int(i), assists[i], yellow[i], red[i]}; + if (!values[size_t(kind)]) continue; + rows.push_back({{"player", selected->at("id")}, + {"club", selected_club->at("id")}, + {"name", world.name(*selected)}, + {"club_name", world.name(*selected_club)}, + {"photo", photo(*selected)}, + {"crest", selected_club->value("crest", "")}, + {"goals", values[0]}, {"assists", values[1]}, + {"yellow", values[2]}, {"red", values[3]}, + {"value", values[size_t(kind)]}, {"original", i}}); + } + std::stable_sort(rows.begin(), rows.end(), [](const Json &a, const Json &b) { + return a.at("value").get() > b.at("value").get(); + }); + for (size_t i = 0; i < rows.size(); ++i) + rows[i]["rank"] = i && rows[i].at("value") == rows[i - 1].at("value") + ? rows[i - 1].at("rank") : Json(i + 1); + return rows; +} + +Json demo_fairplay_rows(const Catalog &world) { + Json rows = Json::array(); + const auto leagues = world.leagues("nation:de"); + if (leagues.empty()) return rows; + const auto clubs = world.clubs(leagues.front()->at("id").get()); + for (size_t i = 0; i < clubs.size(); ++i) { + const int yellow = 18 + int(i), red = int(i % 5); + rows.push_back({{"club", clubs[i]->at("id")}, + {"name", world.name(*clubs[i])}, + {"crest", clubs[i]->value("crest", "")}, + {"yellow", yellow}, {"red", red}, + {"points", yellow + 4 * red}, {"original", i}}); + } + std::stable_sort(rows.begin(), rows.end(), [](const Json &a, const Json &b) { + return a.at("points").get() < b.at("points").get(); + }); + for (size_t i = 0; i < rows.size(); ++i) rows[i]["rank"] = i + 1; + return rows; +} +} // namespace bmh::modern_ui diff --git a/src/modern/ui/demo_rankings.hpp b/src/modern/ui/demo_rankings.hpp new file mode 100644 index 0000000..4a221b9 --- /dev/null +++ b/src/modern/ui/demo_rankings.hpp @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-3.0-only +#pragma once +#include "modern/ui/catalog.hpp" + +namespace bmh::modern_ui { +// Read-only presentation fixtures. Neither function constructs a game/session, +// touches a random stream, or modifies the catalogue or a saved demo model. +// scope: 0 = selected league, 1 = managed club; kind: goals/assists/yellow/red. +// At most ten distinct actual outfield players form one shared category cohort. +// Positive metrics sort descending with competition ranks (1,2,2,4). +// Rows: player, club, name, club_name, photo, crest, goals, assists, yellow, +// red, value, rank, original. Asset fields are catalogue references, not bytes. +Json demo_scorer_rows(const Catalog &, const std::string &league, + const std::string &managed_club, int scope = 0, + int kind = 0); +// Gold's fixed domestic overview uses every club of the first German league. +// Rows: club, name, crest, yellow, red, points, rank, original; points are +// yellow + 4*red, ascending, with original catalogue order breaking ties. +Json demo_fairplay_rows(const Catalog &); +} // namespace bmh::modern_ui diff --git a/src/modern/ui/rankings_controls.inc b/src/modern/ui/rankings_controls.inc new file mode 100644 index 0000000..9c0193e --- /dev/null +++ b/src/modern/ui/rankings_controls.inc @@ -0,0 +1,69 @@ +// SPDX-License-Identifier: GPL-3.0-only +bool App::rankings_action(const std::string &action, Rml::Element *target) { + if (!action.starts_with("rankings-")) return false; + if (menu_ != "scorers" || !world_ || !target) return true; + rankings_remember_scroll(); + const auto value = target->GetAttribute("data-value", ""); + if (action == "rankings-tab") { + const int kind = target->GetAttribute("data-kind", -1); + if (kind < 0 || kind > 3) return true; + rankings_view_["tab"] = kind; + focus_after_render_ = "player-stat-tab-" + std::to_string(kind); + } else if (action == "rankings-country") { + const auto leagues = world_->leagues(value); + if (leagues.empty()) return true; + rankings_view_["league"] = leagues.front()->at("id"); + } else if (action == "rankings-league") { + const auto *league = world_->find("competitions", value); + if (!league || league->value("type", "") != "league") return true; + rankings_view_["league"] = value; + } else if (action == "rankings-scope") { + if (value != "0" && value != "1") return true; + rankings_view_["scope"] = value == "1" ? 1 : 0; + } else return true; + refresh(); + return true; +} +bool App::rankings_event(Rml::Event &event) { + if (menu_ != "scorers" || !report_detail_kind_.empty() || + !report_picker_.empty() || event.GetType() != "keydown") return false; + auto *target = event.GetTargetElement(); + const auto key = Rml::Input::KeyIdentifier(event.GetParameter("key_identifier", 0)); + if (key == Rml::Input::KI_TAB) { + Rml::ElementList controls; + if (auto *canvas = element("canvas")) + canvas->QuerySelectorAll(controls, ".window button,.window input,.window select"); + std::erase_if(controls, [](auto *node) { + return !node->IsVisible(true) || node->HasAttribute("disabled") || + (node->GetId().starts_with("player-stat-tab-") && + node->template GetAttribute("aria-selected", "false") != "true"); + }); + if (!controls.empty()) { + const auto found = std::find(controls.begin(), controls.end(), context_->GetFocusElement()); + const bool backwards = event.GetParameter("shift_key", 0) != 0; + const int count = int(controls.size()), old = found == controls.end() ? -1 : int(found - controls.begin()); + const int next = old < 0 ? (backwards ? count - 1 : 0) + : (old + (backwards ? -1 : 1) + count) % count; + controls[size_t(next)]->Focus(true); + if (controls[size_t(next)]->GetId().starts_with("rankings-player-") || + controls[size_t(next)]->GetId().starts_with("rankings-club-")) + controls[size_t(next)]->ScrollIntoView(Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest)); + dirty_ = true; + } + event.StopImmediatePropagation(); + return true; + } + if (!target || !target->GetId().starts_with("player-stat-tab-")) return false; + const int current = rankings_view_.value("tab", 0); + int next = current; + if (key == Rml::Input::KI_LEFT) next = (current + 3) % 4; + else if (key == Rml::Input::KI_RIGHT) next = (current + 1) % 4; + else if (key == Rml::Input::KI_HOME) next = 0; + else if (key == Rml::Input::KI_END) next = 3; + else return false; + rankings_remember_scroll(); + rankings_view_["tab"] = next; + focus_after_render_ = "player-stat-tab-" + std::to_string(next); + refresh(); event.StopImmediatePropagation(); + return true; +} diff --git a/src/modern/ui/rankings_screens.inc b/src/modern/ui/rankings_screens.inc new file mode 100644 index 0000000..fe809d2 --- /dev/null +++ b/src/modern/ui/rankings_screens.inc @@ -0,0 +1,126 @@ +// SPDX-License-Identifier: GPL-3.0-only +namespace { +const std::array rankings_categories{ + "Tore", "Vorlagen", "Gelbe Karten", "Rote Karten"}; +std::string rankings_cell_text(const std::string &value) { + return "" + esc(value) + ""; +} +std::string rankings_league(const Catalog &world, const Json &state, + const std::string &club) { + const auto *own = world.find("clubs", club); + const auto requested = state.value("reports", Json::object()).value( + "league", own ? own->value("competition", "") : ""); + const auto *league = world.find("competitions", requested); + if (league && league->value("type", "") == "league") return requested; + const auto leagues = world.leagues(); + return leagues.empty() ? "" : leagues.front()->value("id", ""); +} +std::string rankings_season(const Json &state, const Catalog &world) { + const auto date = state.value("date", world.manifest().value("start_date", "")); + if (date.size() < 7 || date.find_first_not_of("0123456789", 0) < 4) return "—"; + try { + int year = std::stoi(date.substr(0, 4)); + if (std::stoi(date.substr(5, 2)) < 7) --year; + return std::to_string(year) + "/" + std::to_string(year + 1).substr(2); + } catch (...) { return "—"; } +} +std::string rankings_icon(int kind, const std::string &color) { + const std::string shape = kind == 0 + ? "" + : ""; + return "" + shape + ""; +} +} // namespace + +void App::rankings_remember_scroll() { + if (!rankings_view_.is_object()) return; + if (auto *list = element("rankings-list")) { + const auto key = list->GetAttribute("data-scroll-key", ""); + if (!key.empty()) rankings_view_["scrolls"][key] = list->GetScrollTop(); + } +} +void App::rankings_restore_scroll() { + if ((menu_ != "scorers" && menu_ != "fairplay") || + !rankings_view_.value("restore_scroll", false)) return; + rankings_view_["restore_scroll"] = false; + if (auto *list = element("rankings-list")) { + const auto key = list->GetAttribute("data-scroll-key", ""); + const auto values = rankings_view_.value("scrolls", Json::object()); + if (auto it = values.find(key); it != values.end() && it->is_number()) + list->SetScrollTop(it->get()); + } +} +std::string App::render_scorers() { + rankings_remember_scroll(); + const auto snapshot = snap(); + const auto club = manager(snapshot).value("club", ""); + if (!rankings_view_.is_object()) rankings_view_ = Json::object(); + if (!rankings_view_.contains("league")) rankings_view_["league"] = rankings_league(*world_, snapshot.state, club); + const auto league_id = rankings_view_.value("league", std::string()); + const int scope = std::clamp(rankings_view_.value("scope", 0), 0, 1), + kind = std::clamp(rankings_view_.value("tab", 0), 0, 3); + rankings_view_["scope"] = scope; rankings_view_["tab"] = kind; + const auto *league = world_->find("competitions", league_id), + *own = world_->find("clubs", club); + const auto title = scope ? (own ? world_->name(*own) : "—") + : (league ? world_->name(*league) : "—"); + const auto nation = scope ? (own ? own->value("nation", "") : "") + : (league ? league->value("nation", "") : ""); + const auto rows = demo_scorer_rows(*world_, league_id, club, scope, kind); + const auto key = "scorers:" + league_id + ":" + std::to_string(scope) + ":" + std::to_string(kind); + const auto player_button = [&](const Json &r, bool leader) { + const auto id = r.at("player").get(); + const double size = leader ? 126 : 88; + const auto image = "" + img(r.at("photo").get(), size, size, true, true, 256) + ""; + return btn("player-detail", image + "" + esc(r.at("name").get()) + "", + "rankings-player-button", "id=\"rankings-player-" + esc(id) + "\" data-id=\"" + esc(id) + + "\" data-club=\"" + esc(r.at("club").get()) + "\" title=\"" + esc(r.at("name").get()) + "\""); + }; + const auto club_button = [&](const Json &r, bool leader) { + const auto id = r.at("club").get(); + return btn("club-detail", label(world_->find("clubs", id), leader ? 34 : 42), "rankings-club-button " + std::string(id == club ? "current" : ""), + "id=\"rankings-club-" + esc(r.at("player").get()) + "\" data-id=\"" + esc(id) + "\""); + }; + std::string out = "

" + esc(title) + + "

" + esc(world_->nation_name(nation)) + " · Saison " + esc(rankings_season(snapshot.state, *world_)) + + "

Spielwerte fiktiv

"; + for (size_t i = 0; i < std::min(size_t(3), rows.size()); ++i) { + const auto &r = rows[i]; + out += "
" + r.at("rank").dump() + ".
" + player_button(r, true) + club_button(r, true) + "
" + r.at("value").dump() + "" + rankings_categories[size_t(kind)] + "
"; + } + out += "
" + rankings_cell_text("Spieler") + "
" + rankings_cell_text("Verein") + "
" + rankings_cell_text(rankings_categories[size_t(kind)]) + "
"; + for (size_t i = 3; i < rows.size(); ++i) { + const auto &r = rows[i]; + out += "
" + r.at("rank").dump() + "." + player_button(r, false) + "
" + club_button(r, false) + "
" + rankings_cell_text(r.at("value").dump()) + "
"; + } + if (rows.empty()) out += "

" + rankings_cell_text("Keine Spieler mit Einträgen in dieser Kategorie.") + "

"; + out += "
" + render_report_detail(); +} + +std::string App::render_fairplay() { + rankings_remember_scroll(); + const auto rows = demo_fairplay_rows(*world_); + std::string out = "

Strafpunkte · weniger ist besser

Gelb · 1 PunktRot · 4 Punkte
" + rankings_cell_text("Pl. / Verein") + "
" + rankings_cell_text("Gelb") + "
" + rankings_cell_text("Rot") + "
" + rankings_cell_text("Punkte") + "
"; + for (size_t i = 0; i < rows.size(); ++i) { + const auto &r = rows[i]; + out += "
" + r.at("rank").dump() + "." + report_club_button(r.at("club").get()) + "
" + rankings_cell_text(r.at("yellow").dump()) + "
" + rankings_cell_text(r.at("red").dump()) + "
" + rankings_cell_text(r.at("points").dump()) + "
"; + } + if (rows.empty()) out += "

" + rankings_cell_text("Keine Vereine in der deutschen Ligavorschau.") + "

"; + rankings_view_["restore_scroll"] = true; + return out + "
" + render_report_detail(); +} diff --git a/src/modern/ui/report_pickers.inc b/src/modern/ui/report_pickers.inc index 2a51035..be9575c 100644 --- a/src/modern/ui/report_pickers.inc +++ b/src/modern/ui/report_pickers.inc @@ -2,11 +2,11 @@ namespace { bool report_picker_menu(const std::string &menu) { return menu == "tables" || menu == "strengths" || menu == "league" || - menu == "other" || menu == "calendar" || menu == "friendlies" || menu == "almanac"; + menu == "other" || menu == "calendar" || menu == "friendlies" || menu == "almanac" || menu == "scorers"; } bool report_picker_kind(const std::string &kind) { return kind == "country" || kind == "league" || kind == "filter" || - kind == "competition" || kind == "year"; + kind == "competition" || kind == "year" || kind == "scorer-scope"; } } // namespace @@ -15,6 +15,11 @@ App::report_picker_items(const std::string &kind) const { std::vector> items; if (!world_ || !report_picker_kind(kind)) return items; + if (kind == "scorer-scope") { + if (menu_ == "scorers") + items = {{"0", "Gesamte Liga"}, {"1", "Eigener Verein"}}; + return items; + } if (kind == "year") { if (!source_) return items; const auto index = source_->read_almanac({{"kind", "index"}}); @@ -66,6 +71,13 @@ std::string App::report_picker_value(const std::string &kind) const { if (!world_ || !report_picker_kind(kind)) return {}; if (kind == "year") return std::to_string(almanac_year_); + if (menu_ == "scorers") { + if (kind == "scorer-scope") return std::to_string(rankings_view_.value("scope", 0)); + const auto league = rankings_view_.value("league", ""); + if (kind == "league") return league; + const auto *row = world_->find("competitions", league); + return row ? row->value("nation", "") : ""; + } const auto reports = snap().state.at("reports"); if (kind == "filter" || kind == "competition") return std::to_string(reports.at(kind).get()); @@ -92,7 +104,7 @@ std::string App::report_picker(const std::string &kind, double left, const bool open = report_picker_ == kind; const std::string menu_label = kind == "country" ? "Land" : kind == "league" ? "Liga" - : kind == "filter" ? "Spiele" : kind == "year" ? "Kalenderjahr" : "Wettbewerb"; + : kind == "filter" ? "Spiele" : kind == "year" ? "Kalenderjahr" : kind == "scorer-scope" ? "Bereich" : "Wettbewerb"; std::string out = "
" + @@ -191,6 +203,10 @@ bool App::report_picker_action(const std::string &action, Rml::Element *target) almanac_day_.clear(); almanac_match_.clear(); almanac_tab_ = "lineups"; + } else if (menu_ == "scorers") { + const auto ranking_action_name = kind == "country" ? "rankings-country" + : kind == "league" ? "rankings-league" : "rankings-scope"; + rankings_action(ranking_action_name, target); } else if (menu_ == "friendlies") apply("calendar", {{"kind", "friendly-" + kind}, {"value", selection}}); else if (menu_ == "calendar") { diff --git a/src/modern/ui/screens.inc b/src/modern/ui/screens.inc index 5412c4d..cb8a974 100644 --- a/src/modern/ui/screens.inc +++ b/src/modern/ui/screens.inc @@ -887,6 +887,14 @@ std::string App::render_menu(const std::string &key) { body = render_lineup(); else if (key == "transfer") body = render_transfer(); + else if (key == "achievements") + body = render_achievements(); + else if (key == "scorers") + body = render_scorers(); + else if (key == "fairplay") + body = render_fairplay(); + else if (key == "highscore") + body = render_highscore(); else if (key == "environment") body = render_environment(); else if (key == "advertising") diff --git a/src/modern/ui/view.cpp b/src/modern/ui/view.cpp index d415e68..981783a 100644 --- a/src/modern/ui/view.cpp +++ b/src/modern/ui/view.cpp @@ -14,6 +14,8 @@ #include "modern/ui/demo_sports.hpp" #include "modern/ui/demo_lineup.hpp" #include "modern/ui/demo_transfer.hpp" +#include "modern/ui/demo_career_reports.hpp" +#include "modern/ui/demo_rankings.hpp" #include "modern/ui/desktop.hpp" #include "modern/ui/gui_assets.hpp" #include "modern/ui/model.hpp" @@ -99,7 +101,7 @@ const std::array titles = {"Tabellen", "Stadion", "Statistiken", "Umfeld", - "Fairplay", + "Fairplaywertung", "Highscore", "Verträge", "Bilanz", @@ -366,6 +368,7 @@ class App final : public Rml::EventListener { std::string transfer_dialog_, transfer_return_focus_, transfer_notice_, transfer_poach_league_, transfer_poach_club_, transfer_picker_; uint64_t transfer_revision_ = 0; std::shared_ptr transfer_world_; + Json career_view_ = Json::object(), rankings_view_ = Json::object(); float device_ratio_ = 1.f; Json desktop_ = Json::object(), saved_desktop_ = Json::object(), options_ = Json::object(); @@ -584,6 +587,7 @@ class App final : public Rml::EventListener { transfer_view_ = Json::object(); transfer_draft_ = transfer_search_draft_ = Json(); transfer_dialog_.clear(); transfer_picker_.clear(); transfer_notice_.clear(); transfer_return_focus_.clear(); transfer_poach_league_.clear(); transfer_poach_club_.clear(); transfer_world_.reset(); transfer_revision_ = 0; + career_view_ = Json::object(); rankings_view_ = Json::object(); advertising_selected_ = -1; advertising_offer_ = 0; advertising_revision_ = 0; advertising_world_.reset(); toto_column_ = 0; toto_dialog_.clear(); for (auto &focus : toto_focus_) focus = {0, 1}; @@ -744,6 +748,16 @@ class App final : public Rml::EventListener { void close_transfer(bool restore = true); void transfer_remember_scroll(); void transfer_restore_scroll(); + std::string render_achievements(); + std::string render_highscore(); + bool career_report_action(const std::string &, Rml::Element *); + bool career_report_event(Rml::Event &); + std::string render_scorers(); + std::string render_fairplay(); + bool rankings_action(const std::string &, Rml::Element *); + bool rankings_event(Rml::Event &); + void rankings_remember_scroll(); + void rankings_restore_scroll(); std::string render_almanac(); bool almanac_action(const std::string &, Rml::Element *); std::string render_indoor(); @@ -818,6 +832,7 @@ class App final : public Rml::EventListener { // open. Never keep that menu's modal/input gate in the destination view. if (menu_ != last_rendered_menu_) { planning_dialog_.clear(); + career_view_["dialog"] = ""; career_view_["return_focus"] = ""; lineup_drag_ = Json(); lineup_drag_world_.reset(); lineup_ignore_click_ = false; transfer_dialog_.clear(); transfer_draft_ = transfer_search_draft_ = Json(); transfer_picker_.clear(); transfer_world_.reset(); transfer_revision_ = 0; transfer_return_focus_.clear(); @@ -871,10 +886,10 @@ class App final : public Rml::EventListener { setting_menu_markup_ = true; element("canvas")->SetInnerRML(markup); setting_menu_markup_ = false; - if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty()) { + if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty() || !career_view_.value("dialog", "").empty()) { Rml::ElementList behind; doc_->QuerySelectorAll(behind, - "#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay button,#lineup-underlay button,#lineup-underlay select,#lineup-underlay input,#transfer-underlay button,#transfer-underlay select,#transfer-underlay input,.window .titlebar button"); + "#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay button,#lineup-underlay button,#lineup-underlay select,#lineup-underlay input,#transfer-underlay button,#transfer-underlay select,#transfer-underlay input,#career-report-underlay button,#career-report-underlay input,#career-report-underlay select,.rankings-scorers button,.rankings-scorers select,.rankings-fairplay button,.window .titlebar button"); for (auto *node : behind) node->SetProperty("pointer-events", "none"); } @@ -1026,6 +1041,7 @@ class App final : public Rml::EventListener { lineup_roster_scroll_.reset(); } if (menu_ == "transfer") transfer_restore_scroll(); + if (menu_ == "scorers" || menu_ == "fairplay") rankings_restore_scroll(); if (!report_option_to_scroll_.empty()) { if (auto *node = element(report_option_to_scroll_)) node->ScrollIntoView(Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest)); @@ -1296,6 +1312,10 @@ public: #include "modern/ui/lineup_controls.inc" #include "modern/ui/transfer_screens.inc" #include "modern/ui/transfer_controls.inc" +#include "modern/ui/career_report_screens.inc" +#include "modern/ui/career_report_controls.inc" +#include "modern/ui/rankings_screens.inc" +#include "modern/ui/rankings_controls.inc" } // namespace bool is_modern_world(const fs::path &file) { try { diff --git a/tests/modern_career_reports_tests.cpp b/tests/modern_career_reports_tests.cpp new file mode 100644 index 0000000..933e454 --- /dev/null +++ b/tests/modern_career_reports_tests.cpp @@ -0,0 +1,76 @@ +// SPDX-License-Identifier: GPL-3.0-only +#include "modern/ui/demo_career_reports.hpp" +#include +#include +#include +#include +using namespace bmh::modern_ui; +namespace { +void require(bool ok,const char *message){if(!ok)throw std::runtime_error(message);} +std::string id(int i){return "club:career-test-"+std::to_string(i);} +struct Fixture { + fs::path root;std::shared_ptr world; + explicit Fixture(int count) { + root=fs::temp_directory_path()/("openbmh-career-reports-"+std::to_string(std::chrono::steady_clock::now().time_since_epoch().count()));fs::create_directories(root/"world"); + const auto write=[&](const std::string &name,const Json &value){bmh::editor::write_atomic(root/name,value.dump());}; + write("manifest.json",{{"format","openbmh-world"},{"kind","world"},{"format_version","1.1"},{"id","world:synthetic-career-reports"},{"start_date","2026-07-01"},{"requires",{"editor:world-v1"}},{"x-editor",{{"profile","editor-world-v1"}}}}); + write("world/nations.json",{{"items",{{{"id","nation:de"},{"name","Synthetic nation"}}}}}); + write("world/competitions.json",{{"items",{{{"id","competition:career-test"},{"type","league"},{"nation","nation:de"},{"name","Synthetic league"}}}}}); + Json clubs=Json::array();for(int i=0;irows("clubs"); + const auto current=demo_achievements(*f.world,s,0);require(current.at("ok")==true&¤t.at("available")==true&¤t.at("fictional")==true,"Career report unavailable for actual first-manager club"); + require(current.at("club")==id(4)&¤t.at("manager")=="Synthetic first manager","Career projection silently selected another manager or club"); + require(current.at("first_year")==2019&¤t.at("last_year")==2026&¤t.at("range")=="2019/20 – 2026/27","Career window does not end at the last completed season"); + require(current.at("charts").size()==3&¤t.at("history").size()==12,"Expected three charts and twelve historical seasons"); + for(int page=0;page<=4;++page) { + const auto view=demo_achievements(*f.world,s,page);require(view.at("last_year")==2026-page&&view.at("first_year")==2019-page,"Page must shift by one season, not eight"); + require(view.at("history")==current.at("history"),"Club history changed when paging chart window"); + for(const auto &chart:view.at("charts")) { + require(chart.at("seasons").size()==8,"Chart does not contain eight seasons"); + for(size_t i=0;i<8;++i)require(chart.at("seasons")[i].at("year")==2019-page+int(i),"Chart years not chronological"); + require(chart.at("latest")==chart.at("seasons")[7],"Latest summary disagrees with visible last season"); + } + } + const auto older=demo_achievements(*f.world,s,4);std::set tiers; + for(const auto &r:older.at("charts")[0].at("seasons"))tiers.insert(r.at("tier").get()); + require(tiers==std::set({1,2,3,4}),"Four league bands were collapsed"); + const auto &league=current.at("charts")[0].at("latest");require(league.at("value")==1&&league.at("winner")==true&&league.at("label")=="1. Platz"&&league.at("tier")==1,"Gold championship sample or title highlighting changed"); + require(current.at("charts")[1].at("latest").at("label")=="Sieger"&¤t.at("charts")[2].at("latest").at("label")=="Viertelfinale","Cup/Europe result labels changed"); + bool zero=false;for(const auto &r:current.at("history"))for(const auto &value:r.at("results"))if(value.at("value")==0){zero=true;require(value.at("label")=="Nicht teilgenommen"&&value.at("caption")=="–"&&value.at("winner")==false,"Nonparticipation was fabricated into a played result or title");} + require(zero,"Historical demo lost its nonparticipation fixture"); + require(demo_achievements(*f.world,s,-1).value("ok",true)==false&&demo_achievements(*f.world,s,5).value("ok",true)==false,"Out-of-range career page accepted"); + const auto scores=demo_highscores(*f.world,s);require(scores.at("rows").size()==8,"Highscore must show at most eight existing clubs");std::set seen; + for(size_t i=0;i<8;++i) { + const auto &r=scores.at("rows")[i];const auto club=r.at("club").get();require(f.world->find("clubs",club)&&club!="nt:synthetic"&&seen.insert(club).second,"Unknown, national or duplicated club in highscore"); + require(r.at("rank")==i+1&&r.at("points")==18200-int(i)*1575&&r.at("championships")==8-int(i%5)&&r.at("cups")==6-int(i%4)&&r.at("europe")==3-int(i%3)&&r.at("fictional")==true,"Highscore order/totals differ from deterministic Gold preview"); + } + require(scores.at("rows")[0].at("club")==id(4)&&scores.at("rows")[0].at("manager")=="Synthetic first manager"&&scores.at("rows")[1].at("manager")=="Chris Winter","First manager or explicitly fictional manager fixtures changed"); + auto other=s;other["reports"]={{"league","elsewhere"},{"filter",0}};other["cash"]=0; + require(demo_achievements(*f.world,other,0)==current&&demo_highscores(*f.world,other)==scores,"Career projection depends on unrelated filters or wallet"); + other=s;other["managers"][0]["club"]=id(7);other["managers"][0]["name"]="Changed snapshot name"; + require(demo_achievements(*f.world,other).at("club")==id(7)&&demo_highscores(*f.world,other).at("rows")[0].at("manager")=="Changed snapshot name","Manager switch retained a stale identity"); + other=s;other["date"]="2027-06-30";require(demo_achievements(*f.world,other).at("last_year")==2025,"June incorrectly treated the current season as completed"); + other["date"]="2028-02-29";require(demo_achievements(*f.world,other).at("last_year")==2026,"Valid leap date was rejected"); + other["date"]="2027-02-29";require(demo_achievements(*f.world,other).at("last_year")==2025,"Invalid date did not use the deterministic manifest reference"); + require(s==original&&f.world->rows("clubs")==clubs&&demo_achievements(*f.world,s)==current&&demo_highscores(*f.world,s)==scores,"Read-only projections mutated source/catalogue or were nondeterministic"); +} +void test_short(int n) { + Fixture f(n);auto s=state(n?id(n-1):"club:missing");const auto before=s; + const auto a=demo_achievements(*f.world,s),h=demo_highscores(*f.world,s); + require(a.at("available")==bool(n)&&h.at("available")==bool(n)&&h.at("rows").size()==size_t(n),"Short catalogue invented extra clubs"); + if(!n)require(a.at("charts").empty()&&a.at("history").empty()&&a.at("club").is_null(),"Empty catalogue invented an own club or historical identity"); + if(n){s["managers"][0]["name"]="";require(demo_highscores(*f.world,s).at("rows")[0].at("manager")=="—","Missing current manager received a fictional name");s=before;} + for(const auto &bad:std::vector{nullptr,Json::array(),Json::object(),Json{{"managers",Json::array()}},state("club:missing"),state("nt:synthetic")}) { + const auto aa=demo_achievements(*f.world,bad),hh=demo_highscores(*f.world,bad);require(aa.at("ok")==true&&aa.at("available")==false&&aa.at("history").empty()&&hh.at("rows").empty(),"Missing/invalid first-manager identity silently fell back to another club"); + } + require(s==before,"Short catalogue projection changed state"); +} +} // namespace +int main()try{test_full();test_short(0);test_short(1);test_short(3);std::cout<<"Modern career report checks passed\n";return 0;}catch(const std::exception &e){std::cerr< +#include +#include +#include +#include +#include +#include + +using namespace bmh::modern_ui; +namespace { +void require(bool ok, const char *why) { if (!ok) throw std::runtime_error(why); } +struct Fixture { + fs::path root; + std::shared_ptr world; + Fixture(int clubs = 20, int field_players = 12, bool german = true) { + root = fs::temp_directory_path() / ("openbmh-rankings-test-" + + std::to_string(std::chrono::steady_clock::now().time_since_epoch().count())); + fs::create_directories(root / "world"); + const auto write = [&](const std::string &path, const Json &value) { + std::ofstream file(root / path); file << value.dump(); + require(bool(file), "Cannot write synthetic rankings fixture"); + }; + write("manifest.json", {{"format", "openbmh-world"}, {"kind", "world"}, + {"format_version", "1.1"}, {"id", "world:rankings-test"}, + {"requires", {"runtime:modern-v1"}}, {"start_date", "2026-07-01"}}); + Json competitions = Json::array(), nations = Json::array(), teams = Json::array(), players = Json::array(); + for (int group = 0; group < 2; ++group) { + const std::string nation = group == 0 && german ? "nation:de" : "nation:synthetic-" + std::to_string(group); + nations.push_back({{"id", nation}, {"name", "Synthetic nation " + std::to_string(group)}}); + const auto league = "competition:rankings-" + std::to_string(group); + competitions.push_back({{"id", league}, {"type", "league"}, {"nation", nation}, {"name", "Synthetic league " + std::to_string(group)}}); + for (int i = 0; i < (group ? 3 : clubs); ++i) { + const auto club = "club:rankings-" + std::to_string(group) + "-" + std::to_string(i); + teams.push_back({{"id", club}, {"name", "Synthetic team " + std::to_string(group) + " " + std::to_string(i)}, {"competition", league}, {"nation", nation}, {"crest", "asset:synthetic-crest-" + std::to_string(group) + "-" + std::to_string(i)}}); + for (int p = 0; p < field_players + 2; ++p) { + const auto id = "player:rankings-" + std::to_string(group) + "-" + std::to_string(i) + "-" + std::to_string(p); + players.push_back({{"id", id}, {"name", "Synthetic player " + std::to_string(group) + " " + std::to_string(i) + " " + std::to_string(p)}, {"team", club}, {"positions", {p < 2 ? "gk" : std::array{"def", "mid", "fwd"}[size_t(p - 2) % 3]}}, {"squad_order", p}, {"photo", "asset:synthetic-photo-" + id}}); + } + } + } + write("world/nations.json", {{"items", nations}}); + write("world/competitions.json", {{"items", competitions}}); + write("world/clubs.json", {{"items", teams}}); + write("world/players.json", {{"items", players}}); + world = Catalog::open(root); + } + ~Fixture() { std::error_code error; fs::remove_all(root, error); } +}; +void check_rows(const Catalog &world, const Json &rows, int kind, + const std::string &league, const std::string &own, int scope) { + std::set seen; + const std::array metrics{"goals", "assists", "yellow", "red"}; + for (size_t i = 0; i < rows.size(); ++i) { + const auto &row = rows[i]; + const auto player = row.at("player").get(); + const auto *p = world.find("players", player); + const auto *club = world.find("clubs", row.at("club").get()); + require(p && club && p->at("team") == club->at("id"), "Invented or incorrectly bound ranking identity"); + require(seen.insert(player).second, "Duplicate ranking player"); + require(scope ? p->at("team") == own : club->at("competition") == league, "Ranking crossed requested club/league"); + require(p->at("positions")[0] != "gk", "Goalkeeper substituted for an actual outfield player"); + require(row.at("name") == world.name(*p) && row.at("club_name") == world.name(*club) && row.at("photo") == p->at("photo") && row.at("crest") == club->at("crest"), "Historical identity or asset reference invented"); + require(row.at("value").get() > 0 && row.at("value") == row.at(metrics[size_t(kind)]), "Zero value survived or category metric mismatched"); + const int expected_rank = i && row.at("value") == rows[i - 1].at("value") ? rows[i - 1].at("rank").get() : int(i + 1); + require(row.at("rank") == expected_rank, "Competition ranking mishandled a tie"); + if (i) require(rows[i - 1].at("value").get() >= row.at("value").get(), "Ranking not sorted by active metric"); + } +} +void full_world() { + Fixture fixture; const auto &world = *fixture.world; + const auto players_before = world.rows("players"), clubs_before = world.rows("clubs"), manifest_before = world.manifest(); + const std::string league = "competition:rankings-0", own = "club:rankings-0-7"; + for (int scope = 0; scope < 2; ++scope) { + const auto goals = demo_scorer_rows(world, league, own, scope, 0); + require(goals.size() == 10 && goals[0].at("value") == 19 && goals[9].at("value") == 10, "Gold ten-player goals fixture changed"); + for (int kind = 0; kind < 4; ++kind) { + const auto rows = demo_scorer_rows(world, league, own, scope, kind); + check_rows(world, rows, kind, league, own, scope); + for (const auto &r : rows) { + const auto at = r.at("original").get(); + require(r.at("player") == goals[at].at("player"), "Tabs used different player cohorts"); + for (const char *key : {"goals", "assists", "yellow", "red"}) require(r.at(key) == goals[at].at(key), "Statistics changed while selecting category"); + } + if (kind == 1) require(rows[0].at("original") == 1 && rows[0].at("value") == 12, "Assists retained goal order"); + if (kind == 2) require(rows[0].at("original") == 9 && rows[0].at("value") == 10, "Yellow retained goal order"); + if (kind == 3) { + require(rows.size() == 7, "Red zero filter changed"); + const std::array ranks{1, 2, 2, 4, 4, 4, 4}, values{3, 2, 2, 1, 1, 1, 1}; + for (size_t i = 0; i < 7; ++i) require(rows[i].at("rank") == ranks[i] && rows[i].at("value") == values[i], "Red ties not 1/2/2/4/4/4/4"); + } + auto detached = rows; detached[0]["name"] = "Changed returned projection"; + require(demo_scorer_rows(world, league, own, scope, kind) == rows, "Projection aliases shared state"); + } + } + const auto fair = demo_fairplay_rows(world); + require(fair.size() == 20 && fair[0].at("club") == "club:rankings-0-0", "Fairplay cut domestic clubs or selected foreign league"); + std::set fair_clubs; + for (size_t i = 0; i < fair.size(); ++i) { + const auto &r = fair[i]; + require(fair_clubs.insert(r.at("club").get()).second && r.at("rank") == i + 1, "Fairplay duplicated club or changed Gold ordinal ranks"); + require(r.at("points").get() == r.at("yellow").get() + 4 * r.at("red").get(), "Fairplay penalty weight wrong"); + if (i) require(fair[i - 1].at("points").get() <= r.at("points").get(), "Fairplay not ascending"); + } + require(fair[1].at("original") == 1 && fair[2].at("original") == 5 && fair[1].at("points") == fair[2].at("points"), "Fairplay stable tie order changed"); + require(demo_scorer_rows(world, "missing", own).empty() && demo_scorer_rows(world, league, "missing", 1).empty() && demo_scorer_rows(world, league, own, -1).empty() && demo_scorer_rows(world, league, own, 0, 4).empty(), "Invalid selection invented replacement players"); + require(world.rows("players") == players_before && world.rows("clubs") == clubs_before && world.manifest() == manifest_before, "Read-only rankings mutated catalogue"); +} +} // namespace +int main() try { + full_world(); + for (int count : {0, 1, 2, 5}) { + Fixture f(1, count); const std::string league = "competition:rankings-0", club = "club:rankings-0-0"; + for (int scope = 0; scope < 2; ++scope) { + const auto rows = demo_scorer_rows(*f.world, league, club, scope); + require(rows.size() == size_t(count), "Short/empty outfield squad invented phantom rows"); + check_rows(*f.world, rows, 0, league, club, scope); + } + } + Fixture no_clubs(0); require(demo_scorer_rows(*no_clubs.world, "competition:rankings-0", "").empty() && demo_fairplay_rows(*no_clubs.world).empty(), "Empty domestic league unsafe"); + Fixture no_de(4, 4, false); require(demo_fairplay_rows(*no_de.world).empty(), "Fairplay silently substituted non-German league"); + std::cout << "Modern UI rankings checks passed\n"; return 0; +} catch (const std::exception &error) { std::cerr << error.what() << '\n'; return 1; } diff --git a/tools/modern_ui/prepare_gui_assets.py b/tools/modern_ui/prepare_gui_assets.py index 4ef713b..569dfd4 100644 --- a/tools/modern_ui/prepare_gui_assets.py +++ b/tools/modern_ui/prepare_gui_assets.py @@ -16,6 +16,23 @@ import shutil import subprocess +def silver_highscore_svg(source): + """Apply the Gold CSS brightness(.44)/saturate(1.2) to vector colours only.""" + def colour(match): + raw = match[2][1:] + if len(raw) not in (3, 4, 6, 8): + raise ValueError('Unsupported SVG colour length') + if len(raw) in (3, 4): + raw = ''.join(c * 2 for c in raw) + rgb = [int(raw[i:i + 2], 16) * .44 for i in (0, 2, 4)] + luminance = sum(a * b for a, b in zip(rgb, (.213, .715, .072), strict=True)) + result = ''.join(f'{max(0, min(255, round(luminance + 1.2 * (c - luminance)))):02x}' + for c in rgb) + return match[1] + '#' + result + raw[6:] + match[3] + return re.sub(r'''((?:fill|stroke|stop-color|color)\s*=\s*["'])(\#[0-9a-fA-F]{3,8})(["'])''', + colour, source) + + def main(): parser = argparse.ArgumentParser(description=__doc__) parser.add_argument('--mockup', type=Path, required=True) @@ -86,6 +103,22 @@ def main(): for path in sorted((source / folder).rglob('*')): if path.is_file() and path.suffix.lower() in ('.png', '.svg', '.jpg', '.webp'): add('art.' + path.relative_to(source / folder).as_posix(), path.relative_to(source).as_posix()) + # The native compatibility renderer has no CSS image-filter implementation. + # Keep the approved original untouched; supply its exact colour-only variant. + logo_source = source / 'assets/vector/highscore-mark-v1.svg' + logo_relative = 'generated/highscore-mark-silver.svg' + logo_destination = output / logo_relative + if not logo_destination.resolve().is_relative_to(output): + raise ValueError('Derived GUI output escapes resource directory') + logo_destination.parent.mkdir(parents=True, exist_ok=True) + logo_bytes = silver_highscore_svg(logo_source.read_text()).encode() + if not logo_destination.exists() or logo_destination.read_bytes() != logo_bytes: + logo_destination.write_bytes(logo_bytes) + items['art.highscore-mark-silver.svg'] = { + 'file': logo_relative, 'sha256': hashlib.sha256(logo_bytes).hexdigest(), + 'derived_from': 'assets/vector/highscore-mark-v1.svg', + 'transform': 'brightness(0.44) saturate(1.2); alpha unchanged', + } map_source = (source / 'desktop/camp-map-data.js').read_text() maps = json.loads(re.search(r'Object.freeze\((.*)\);', map_source).group(1)) regions = {'germany': 'de', 'europe': 'eu', 'gulf': 'me'}