diff --git a/.github/workflows/modern-ui.yml b/.github/workflows/modern-ui.yml index 8030d81..9d9379a 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 --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 --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_)" --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_)" --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/amount.rcss b/assets/modern/amount.rcss new file mode 100644 index 0000000..9797e70 --- /dev/null +++ b/assets/modern/amount.rcss @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-3.0-only */ +.amount-layer {position:absolute;left:0;right:0;top:0;bottom:0;z-index:150;display:flex;align-items:center;justify-content:center;background-color:#0a131d66;} +.amount-box {position:relative;flex-shrink:0;width:820dp;height:1154dp;padding:26dp;border:2dp var(--border);border-radius:30dp;background-color:var(--strong);color:var(--text);} +.amount-button {display:flex;align-items:center;justify-content:center;padding:0;border:1dp var(--border);border-radius:14dp;background-color:#53616d;font-size:46dp;font-weight:normal;line-height:1.1;color:var(--text);} +.amount-button:hover {filter:brightness(1.16);} +.amount-button:active {filter:brightness(.88);} +.amount-button[disabled] {opacity:.4;} +.amount-button:focus-visible {border-color:var(--accent);} +.amount-header {position:absolute;left:26dp;top:26dp;width:764dp;height:58dp;} +.amount-header h2 {position:absolute;left:62dp;top:10.8dp;width:640dp;height:36.4dp;line-height:36.4dp;margin:0;font-size:28dp;font-weight:normal;text-align:center;} +.amount-header .amount-close {position:absolute;left:0;top:7dp;width:44dp;height:44dp;border-radius:22dp;background-color:#fa6a60;border-color:#ffb0a34d;color:#572c29;font-size:34dp;} +.amount-label {position:absolute;left:26dp;top:104dp;width:764dp;height:28dp;line-height:28dp;text-align:right;font-size:24dp;color:var(--muted);} +#calculator-value {position:absolute;left:26dp;top:132dp;width:764dp;height:112dp;padding:6dp 8dp;border:0dp;border-radius:10dp;background-color:transparent;color:var(--text);font-size:82dp;font-weight:normal;line-height:98.4dp;text-align:right;letter-spacing:-2dp;} +.amount-context {position:absolute;left:26dp;top:256dp;width:764dp;height:58dp;} +.amount-limit {position:absolute;left:0;top:0;width:595.984dp;height:58dp;display:flex;align-items:center;font-size:24dp;color:var(--muted);} +.amount-limit span {display:block;line-height:28dp;} +.amount-context .amount-button {position:absolute;top:5dp;height:48dp;font-size:24dp;border-radius:10dp;background-color:#384957;} +.amount-clear {left:607.984dp;width:66dp;} +.amount-max {left:685.984dp;width:78.016dp;} +.amount-proposal,.amount-key {position:absolute;} +.amount-proposal {font-size:31dp;background-color:#40596b;} +.amount-proposal.selected {background-color:var(--selected);color:var(--accent);} +.amount-feedback {position:absolute;left:26dp;top:964dp;width:764dp;height:70dp;display:flex;align-items:center;justify-content:center;margin:0;font-size:24dp;line-height:32.4dp;text-align:center;color:var(--muted);} +.amount-feedback span {display:block;width:100%;line-height:32.4dp;} +.amount-feedback.invalid {color:#e7c7a7;} +.amount-actions {position:absolute;left:26dp;top:1050dp;width:764dp;height:74dp;display:flex;gap:14dp;} +.amount-actions .amount-button {height:74dp;width:326.078dp;font-size:28dp;background-color:#3b4b59;} +.amount-actions .amount-button.amount-accept {width:423.922dp;background-color:var(--accent);color:var(--on-accent);} +.amount-box.amount-review {height:auto;min-height:620dp;padding:70dp;display:flex;flex-direction:column;align-items:center;justify-content:flex-start;gap:42dp;text-align:center;} +.amount-review h2 {display:block;width:100%;margin:0;line-height:50dp;font-size:44dp;font-weight:bold;} +.amount-review>p {display:block;width:100%;margin:0;line-height:51dp;font-size:34dp;color:var(--text);} +.amount-review>strong {display:block;width:100%;font-size:74dp;line-height:85dp;font-weight:normal;color:var(--accent);} +.amount-review-actions {display:flex;align-items:center;justify-content:center;flex-shrink:0;gap:24dp;width:697.188dp;height:87.188dp;margin-top:28dp;} +.amount-review-actions .amount-button {height:87.188dp;width:234.781dp;padding:24dp 38dp;border:2dp var(--border);border-radius:16dp;background-color:var(--soft);font-size:32dp;line-height:35.2dp;flex-shrink:0;} +.amount-review-actions #calculator-back {width:183.188dp;} +.amount-review-actions #calculator-confirm {width:231.219dp;background-color:var(--selected);border-color:var(--accent);} +.amount-review .amount-review-error {color:var(--danger);font-size:26dp;line-height:35dp;} +body.midnight .amount-box {background-color:#293846fa;border-color:#dce8f13d;color:#eef2f6;} +body.midnight .amount-review>strong {color:#c4e9dd;} +body.midnight .amount-review>p {color:#b5cad9;} +body.silver .amount-button {background-color:#d8e2eb;} +body.matchday .amount-button {background-color:#514b50;} +body.silver .amount-context .amount-button,body.matchday .amount-context .amount-button {background-color:var(--soft);} +body.silver .amount-proposal,body.matchday .amount-proposal {background-color:var(--panel);} +body.midnight .amount-box {background-color:transparent;decorator:linear-gradient(155deg,#364350f5,#1f2b37fa);} +body.silver .amount-box {background-color:#eaf1f7fc;} +body.matchday .amount-box {background-color:#2c2c32fc;} +body.silver .amount-proposal.selected,body.matchday .amount-proposal.selected {background-color:var(--selected);color:var(--accent);} +#calculator-value selection {color:#ffffff;background-color:#144bc1;} +#calculator-value:focus {box-shadow:0dp 0dp 0dp 2dp #b2d7f23b;} +body.midnight .amount-actions .amount-accept {background-color:#719dab;color:#10252d;} +body.midnight .amount-review-actions #calculator-confirm {background-color:#96cdb536;border-color:#a5dfca73;} +body.silver .amount-button {background-color:transparent;decorator:linear-gradient(180deg,#ffffffb0,#bfd0e259);} +body.matchday .amount-button {background-color:transparent;decorator:linear-gradient(180deg,#e8d6dc12,#a1a0aa0d);} +body.silver .amount-button.selected,body.matchday .amount-button.selected, +body.silver .amount-button.amount-accept,body.matchday .amount-button.amount-accept, +body.silver .amount-review #calculator-confirm,body.matchday .amount-review #calculator-confirm {decorator:none;} +body.silver .amount-header .amount-close,body.matchday .amount-header .amount-close {decorator:none;background-color:#fa6a60;border-color:#ffb0a34d;color:#572c29;} +body.silver .amount-context .amount-button,body.matchday .amount-context .amount-button {background-color:transparent;} diff --git a/assets/modern/bank.rcss b/assets/modern/bank.rcss new file mode 100644 index 0000000..eb530fb --- /dev/null +++ b/assets/modern/bank.rcss @@ -0,0 +1,84 @@ +/* SPDX-License-Identifier: GPL-3.0-only */ +.bank-page {position:absolute;left:0;right:0;top:0;bottom:0;color:var(--text);} +.bank-scene {position:absolute;left:0;top:60dp;width:2612dp;height:1470.016746dp;border:2dp var(--border);border-radius:20dp;overflow:hidden;} +.bank-hotspots {position:absolute;left:0;right:0;top:0;bottom:0;} +.bank-hotspot,.bank-hotspot:hover {position:absolute;padding:0;border:0dp;border-radius:10dp;background-color:transparent;decorator:none;} +.bank-hotspot:focus-visible {border:4dp var(--accent);} +#bank-interaction-hint {position:absolute;left:40dp;right:40dp;bottom:25dp;min-height:90dp;display:flex;align-items:center;justify-content:center;text-align:center;font-size:32dp;line-height:46.4dp;} +.bank-overlay {position:absolute;left:0;right:0;top:0;bottom:0;border:2dp var(--border);border-radius:20dp;background-color:#243441f7;color:var(--text);font-size:34dp;} +.bank-overlay>h2 {position:absolute;left:50dp;right:50dp;top:40dp;text-align:center;font-size:40dp;line-height:45dp;font-weight:normal;} +.bank-actions {position:absolute;left:50dp;right:50dp;bottom:35dp;height:84dp;display:flex;gap:30dp;} +.bank-actions .bank-control {flex:1;min-width:0;height:84dp;padding:12dp 24dp;font-size:32dp;border-radius:12dp;background-color:transparent;decorator:linear-gradient(180deg,#c1d1e31c,#869eb312);} +.savings-overlay {background-color:#1c2d3bba;} +.passbook {position:absolute;left:254dp;top:35dp;width:2100dp;height:1301.109375dp;color:#342c27;} +.passbook-left,.passbook-right {position:absolute;top:30dp;bottom:30dp;width:924dp;font-size:34dp;line-height:49.3dp;} +.passbook-left {left:63dp;} +.passbook-right {right:63dp;} +.passbook h2 {position:absolute;left:0;right:0;top:0;text-align:center;font-size:52dp;line-height:60dp;font-weight:normal;color:#8b3c32;} +.passbook h3 {position:absolute;left:0;right:0;top:90dp;font-size:46dp;line-height:54dp;font-weight:bold;text-transform:uppercase;color:#423628;} +.passbook-left p {position:absolute;left:0;right:0;} +.passbook-note-one {top:184dp;} +.passbook-note-two {top:273.296875dp;} +.passbook-note-three {top:411.890625dp;} +.passbook-right h2 {color:#5b4837;} +.passbook-right output {position:absolute;left:0;right:0;top:140dp;text-align:right;font-size:54dp;line-height:62dp;} +.property-row {position:absolute;left:50dp;right:50dp;height:650dp;display:flex;align-items:center;gap:50dp;} +.owned-property {top:115dp;} +.offered-property {top:765dp;} +.property-description {flex:1;min-width:0;font-size:34dp;line-height:47.6dp;} +.property-description h3 {font-size:34dp;font-weight:normal;line-height:44.2dp;margin:10dp 0 30dp;} +.property-description p {margin:20dp 0;} +.property-picture {width:1000dp;height:570dp;flex-shrink:0;padding:0;border:2dp var(--border);border-radius:16dp;background-color:#172431;overflow:hidden;display:flex;align-items:center;justify-content:center;} +.property-empty {display:block;width:100%;height:100%;background-color:#242323;} +.stock-table {position:absolute;left:50dp;top:115dp;width:1718dp;height:1320dp;font-size:32dp;} +.stock-row {display:flex;align-items:center;height:103.333333dp;} +.stock-row.stock-head {height:80dp;} +.stock-row>div {width:399.333333dp;flex-shrink:0;text-align:right;color:#d8c892;} +.stock-row>div:first-child {width:520dp;text-align:left;} +.stock-head>div {color:var(--text);} +.stock-name {font-size:32dp;padding:8dp 15dp;border:0dp;border-radius:8dp;background-color:transparent;color:var(--text);} +.stock-name[aria-pressed=true] {background-color:var(--selected);color:var(--accent);} +.stock-chart {position:absolute;left:1818dp;top:115dp;width:740dp;height:1320dp;background-color:#172938;border-radius:16dp;overflow:hidden;} +.credit-portrait {position:absolute;left:50dp;top:135dp;width:620dp;height:515dp;border-radius:16dp;overflow:hidden;} +.credit-facts {position:absolute;left:740dp;top:195dp;width:1818dp;height:395dp;font-size:34dp;line-height:39dp;} +.credit-fact {position:absolute;left:0;right:0;height:63dp;display:flex;justify-content:space-between;} +.credit-fact>span,.credit-fact>strong {display:block;width:891.5dp;font-weight:normal;} +.credit-fact>strong {text-align:right;white-space:nowrap;color:#b9d8e2;} +#bank-term {width:190dp;height:63dp;padding:12dp 30dp 12dp 12dp;text-align:left;border:2dp var(--border);border-radius:10dp;background-color:#263744;color:var(--text);font-size:30dp;} +.credit-schedule {position:absolute;left:50dp;right:50dp;top:686dp;height:642.78125dp;border:2dp var(--border);border-radius:18dp;background-color:#1a303fe6;} +.credit-schedule-caption {position:absolute;left:36dp;right:36dp;top:28dp;height:106.390625dp;} +.credit-schedule-caption h3 {font-size:32dp;line-height:41.59375dp;font-weight:normal;color:var(--text);} +.credit-schedule-amount {position:absolute;left:0;top:51.59375dp;font-size:42dp;line-height:54.796875dp;color:var(--accent);} +.credit-schedule-amount>span {padding:0 16dp;color:var(--muted);} +.credit-schedule-context {position:absolute;right:0;top:0;text-align:right;} +.credit-schedule-context>span {display:inline-block;padding:10dp 22dp;border:2dp var(--border);border-radius:12dp;background-color:var(--soft);font-size:28dp;line-height:36.4dp;} +.credit-schedule-context>p {margin-top:14dp;font-size:26dp;line-height:33.8dp;color:var(--muted);} +.credit-chart {position:absolute;left:36dp;top:152.390625dp;width:2432dp;height:420dp;} +.credit-schedule-note {position:absolute;left:36dp;right:36dp;top:580.390625dp;font-size:26dp;line-height:36.390625dp;color:var(--muted);} +.bank-note {font-size:28dp;line-height:42dp;color:var(--muted);} +.credit-note {position:absolute;left:50dp;right:50dp;top:1346.78125dp;line-height:39.1875dp;} +.bank-overview {position:absolute;left:110dp;right:110dp;top:175dp;font-size:40dp;line-height:45dp;} +.bank-overview-row {height:113dp;display:flex;justify-content:space-between;gap:45dp;} +.bank-overview-row>span,.bank-overview-row>strong {display:block;width:50%;font-weight:normal;} +.bank-overview-row>strong {text-align:right;color:#b9d8e2;} +.bank-overview-total {height:90dp;border-top:5dp var(--border);padding-top:40dp;} +.overview-note {position:absolute;left:50dp;right:50dp;bottom:50dp;} +body.silver .bank-overlay {background-color:#eaf1f7fc;color:#233443;} +body.silver .savings-overlay {background-color:#f1f6fa80;} +body.silver .property-picture {background-color:#f1f6fa80;} +body.silver .stock-chart {background-color:#f1f6fa80;} +body.silver .stock-row>div {color:#805b18;} +body.silver .stock-head>div,body.silver .stock-name {color:#233443;} +body.silver .credit-fact>strong,body.silver .bank-overview-row>strong {color:#233443;} +body.silver #bank-term {background-color:#ffffffad;color:#233443;} +body.silver .credit-schedule {background-color:#f1f6fa80;} +body.silver .bank-actions .bank-control {decorator:linear-gradient(180deg,#ffffffb0,#bfd0e259);} +body.matchday .bank-overlay {background-color:#2c2c32fc;color:#efeded;} +body.matchday .savings-overlay {background-color:#1d1e2466;} +body.matchday .property-picture,body.matchday .stock-chart {background-color:#1d1e2466;} +body.matchday .stock-row>div {color:#e1c68b;} +body.matchday .stock-head>div,body.matchday .stock-name {color:#efeded;} +body.matchday .credit-fact>strong,body.matchday .bank-overview-row>strong {color:#efeded;} +body.matchday #bank-term {background-color:#191a208a;color:#efeded;} +body.matchday .credit-schedule {background-color:#1d1e2466;} +body.matchday .bank-actions .bank-control {decorator:linear-gradient(180deg,#e8d6dc12,#a1a0aa0d);} diff --git a/assets/modern/contracts.rcss b/assets/modern/contracts.rcss new file mode 100644 index 0000000..048f28f --- /dev/null +++ b/assets/modern/contracts.rcss @@ -0,0 +1,117 @@ +/* SPDX-License-Identifier: GPL-3.0-only */ +/* Contracts retain the HTML roster and modal coordinates in 2612 x 1864 dp. */ +.contracts-overview {position:absolute;left:0;top:0;width:2612dp;height:1864dp;color:var(--text);} +.contracts-heading {position:absolute;left:0;top:0;width:2612dp;height:118dp;} +.contracts-heading-club {position:absolute;left:0;top:7dp;width:1950dp;height:104dp;} +.contracts-club-label {display:flex;align-items:center;gap:14dp;min-width:0;width:100%;height:58dp;font-size:38dp;} +.contracts-club-label .image-frame {flex-shrink:0;} +.contracts-club-label span {display:block;flex:1;min-width:0;width:100%;max-width:100%;line-height:44dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.contracts-heading-club p {display:block;position:absolute;left:0;top:70dp;width:100%;height:30dp;margin:0;font-size:26dp;line-height:30dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:var(--muted);} +.contracts-salary-total {position:absolute;right:0;top:9dp;max-width:620dp;height:100dp;display:flex;flex-direction:column;align-items:flex-end;justify-content:center;gap:12dp;} +.contracts-salary-total span {display:block;font-size:26dp;line-height:30dp;white-space:nowrap;color:var(--muted);} +.contracts-salary-total .contracts-total-value {font-size:42dp;line-height:48dp;color:var(--accent);} +.contracts-roster {position:absolute;left:0;top:148dp;width:2612dp;height:1578dp;border:2dp var(--border);border-radius:18dp;background-color:var(--panel);overflow-y:auto;overflow-x:hidden;} +.contracts-table {width:100%;font-size:30dp;} +.contracts-row {display:flex;align-items:stretch;width:100%;height:76dp;color:var(--text);} +.contracts-row.striped {background-color:var(--soft);} +.contracts-row.selected {background-color:var(--selected);} +.contracts-cell {display:flex;align-items:center;justify-content:flex-end;flex-shrink:0;min-width:0;width:11.333333%;height:76dp;padding:8dp 18dp;font-size:30dp;overflow:hidden;} +.contracts-cell.c0 {width:32%;justify-content:flex-start;} +.contracts-cell.c1,.contracts-cell.c2,.contracts-cell.c3 {justify-content:center;} +.contracts-cell span {display:block;max-width:100%;line-height:34dp;white-space:nowrap;} +.contracts-table-head {height:70dp;border-bottom:2dp var(--border);} +.contracts-table-head .contracts-cell {height:70dp;font-size:27dp;color:var(--muted);} +.contracts-table-head .contracts-cell span {width:100%;line-height:31dp;overflow:hidden;text-overflow:ellipsis;text-align:right;} +.contracts-table-head .contracts-cell.c0 span {text-align:left;} +.contracts-table-head .contracts-cell.c1 span,.contracts-table-head .contracts-cell.c2 span,.contracts-table-head .contracts-cell.c3 span {text-align:center;} +.contract-player-button {display:flex;align-items:center;justify-content:flex-start;gap:18dp;width:100%;max-width:100%;min-width:0;padding:4dp 0;border:0dp;border-radius:0dp;background-color:transparent;color:var(--text);font-size:30dp;text-align:left;} +.contract-player-button:hover {background-color:var(--hover);} +.contract-player-button:focus-visible {border-color:var(--accent);} +.contracts-row.selected .contract-player-button {color:var(--accent);} +.contract-player-button .contract-player-rank {display:block;flex-shrink:0;width:58dp;line-height:34dp;text-align:right;color:var(--muted);} +.contract-player-button .contract-player-name {display:block;flex:1;min-width:0;width:100%;max-width:100%;line-height:34dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.contract-value {display:block;min-width:0;width:100%;max-width:100%;text-align:right;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.contracts-cell.c1 .contract-value,.contracts-cell.c2 .contract-value,.contracts-cell.c3 .contract-value {text-align:center;} +.contracts-empty {margin:90dp 40dp;font-size:32dp;line-height:46dp;text-align:center;color:var(--muted);} +.contracts-actions {position:absolute;left:0;top:1770dp;width:2612dp;height:94dp;display:flex;gap:20dp;} +.contract-control {display:flex;align-items:center;justify-content:center;gap:18dp;padding:12dp 24dp;border:2dp var(--border);border-radius:12dp;background-color:transparent;decorator:linear-gradient(180deg,#c1d1e31c,#869eb312);font-size:30dp;font-weight:normal;color:var(--text);} +.contract-control>span {display:block;min-width:0;width:100%;max-width:100%;line-height:34dp;white-space:nowrap;text-align:center;} +.contract-control>.control-label {min-width:0;width:100%;max-width:100%;white-space:nowrap;text-align:center;} +.contract-control:hover {decorator:none;background-color:var(--hover);} +.contract-control:focus-visible {border-color:var(--accent);} +.contract-control.selected {decorator:none;background-color:var(--selected);border-color:var(--accent);} +.contracts-actions .contract-control {flex:1;min-width:0;height:94dp;} +.contracts-actions .contract-control.bonuses {flex:1.2;} +.contracts-layer {position:absolute;left:0;top:0;width:2612dp;height:1864dp;z-index:30;display:flex;align-items:center;justify-content:center;background-color:#08101980;} +.contracts-dialog {position:relative;flex-shrink:0;width:2050dp;height:350dp;border:2dp var(--border);border-radius:22dp;background-color:var(--strong);font-size:36dp;color:var(--text);} +.contracts-dialog-offer {height:1201.0625dp;} +.contracts-dialog-insurance {height:581dp;} +.contracts-dialog-bonuses {height:1132dp;} +.contracts-dialog h2 {position:absolute;left:52dp;top:40dp;width:1942dp;height:45dp;margin:0;font-size:40dp;line-height:45dp;font-weight:bold;letter-spacing:-0.4dp;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.contract-player-summary {position:absolute;left:52dp;top:103dp;width:1942dp;height:42dp;margin:0;font-size:28dp;line-height:42dp;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:var(--muted);} +.contract-scenes {position:absolute;left:52dp;top:173dp;width:1942dp;height:295.0625dp;display:flex;gap:24dp;} +.contract-scene {display:flex;align-items:center;justify-content:center;flex-shrink:0;width:959dp;height:295.0625dp;border:2dp var(--border);border-radius:14dp;overflow:hidden;} +.contract-scene .image-frame {flex-shrink:0;} +.contract-amounts {position:absolute;left:52dp;top:496.0625dp;width:1942dp;height:147dp;display:flex;gap:24dp;} +.contract-amount-card {flex:1;min-width:0;height:147dp;padding:24dp 28dp;border:2dp var(--border);border-radius:14dp;background-color:var(--panel);} +.contract-amount-label {display:block;width:100%;max-width:100%;height:31dp;line-height:31dp;font-size:27dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:var(--muted);} +.contract-amount-value {display:block;width:100%;max-width:100%;height:48dp;line-height:48dp;margin-top:16dp;font-size:42dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.contract-duration-heading {position:absolute;left:52dp;top:671.0625dp;width:1942dp;height:34dp;display:flex;align-items:center;justify-content:space-between;font-size:30dp;} +.contract-duration-heading span {display:block;line-height:34dp;} +.contract-duration-value {color:var(--accent);} +.contract-duration {position:absolute;left:52dp;top:721.0625dp;width:1942dp;height:78dp;display:flex;gap:18dp;} +.contract-duration .contract-control {flex:1;min-width:0;height:78dp;font-size:30dp;} +.contract-salary {position:absolute;left:52dp;top:827.0625dp;width:1942dp;height:136dp;border-top:2dp var(--border);border-bottom:2dp var(--border);font-size:32dp;} +.contract-salary-label {position:absolute;left:0;top:28.5dp;width:1432dp;height:75dp;display:flex;flex-direction:column;gap:12dp;} +.contract-salary-label span {display:block;font-size:32dp;line-height:36dp;} +.contract-salary-label .contract-salary-hint {font-size:24dp;line-height:27dp;color:var(--muted);} +.contract-salary-input {position:absolute;right:0;top:24dp;display:flex;align-items:center;justify-content:flex-end;width:480dp;height:84dp;padding:14dp 24dp;border:2dp var(--border);border-radius:12dp;background-color:var(--input);font-size:38dp;text-align:right;} +.contract-salary-input span {display:block;width:100%;max-width:100%;text-align:right;line-height:44dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.contract-salary-input:focus-visible {border-color:var(--accent);} +.contract-draft-note {position:absolute;left:52dp;top:987.0625dp;width:1942dp;height:39dp;margin:0;font-size:26dp;line-height:39dp;color:var(--muted);} +.contract-dialog-actions {position:absolute;left:52dp;right:52dp;bottom:40dp;height:86dp;display:flex;gap:20dp;} +.contract-dialog-actions .contract-control {flex:1;min-width:0;height:86dp;font-size:30dp;} +.contract-submit {decorator:none;background-color:var(--selected);border-color:var(--accent);color:var(--accent);} +.contract-insurance-prompt {position:absolute;left:52dp;top:115dp;width:1942dp;height:45dp;margin:0;font-size:30dp;line-height:45dp;text-align:center;} +.contract-insurance-options {position:absolute;left:52dp;top:196dp;width:1942dp;height:210dp;display:flex;gap:24dp;} +.contract-insurance-options .contract-control {flex:1;min-width:0;height:210dp;padding:12dp 20dp;flex-direction:column;gap:22dp;} +.contract-insurance-options .contract-insurance-title {display:block;max-width:100%;font-size:40dp;line-height:45dp;white-space:nowrap;} +.contract-insurance-options .contract-insurance-caption {display:block;max-width:100%;font-size:26dp;line-height:30dp;color:var(--muted);white-space:nowrap;} +.contract-bonuses {position:absolute;left:52dp;top:173dp;width:1942dp;height:784dp;} +.contract-bonus-row {display:flex;align-items:center;justify-content:space-between;width:100%;height:112dp;padding:16dp 22dp;border-bottom:2dp var(--border);font-size:32dp;} +.contract-bonus-row>span {display:block;flex:1;min-width:0;width:100%;max-width:100%;line-height:36dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.contract-bonus-row .contract-control {flex-shrink:0;width:240dp;height:78dp;padding:12dp 20dp;font-size:36dp;} +.contract-bonus-row .contract-control span {line-height:41dp;} +.contract-notice-text {position:absolute;left:52dp;top:121dp;width:1942dp;height:54dp;margin:0;font-size:36dp;line-height:54dp;text-align:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +body.midnight .contracts-overview {color:#d4e0e9;} +body.midnight .contracts-heading-club {color:#e2ebf2;} +body.midnight .contracts-heading-club p {color:#a2b8c9;} +body.midnight .contracts-salary-total span {color:#a0b7c7;} +body.midnight .contracts-salary-total .contracts-total-value {color:#b8dfd0;} +body.midnight .contracts-roster {border-color:#c5d9e726;background-color:#12243140;} +body.midnight .contracts-row {color:#d4e0e9;} +body.midnight .contracts-row.striped {background-color:#e3edf605;} +body.midnight .contracts-row.selected {background-color:#9acbb21a;} +body.midnight .contracts-table-head .contracts-cell {color:#9fb7c8;} +body.midnight .contract-player-button {color:#d4e0e9;} +body.midnight .contracts-row.selected .contract-player-button {color:#c3e8d9;} +body.midnight .contract-player-button .contract-player-rank {color:#91acbf;} +body.midnight .contract-control {color:#e0e6ec;border-color:#d4e0ec29;} +body.midnight .contract-control.selected {decorator:none;background-color:#9cafc240;border-color:#dce9f047;color:#f5f8fc;} +body.midnight .contracts-dialog {background-color:#283542f5;border-color:#e1ecf429;color:#dce3e9;} +body.midnight .contracts-dialog h2 {color:#e3ecf3;} +body.midnight .contract-player-summary,body.midnight .contract-amount-label,body.midnight .contract-draft-note {color:#9fb8ca;} +body.midnight .contract-scene {border-color:#c5d9e724;} +body.midnight .contract-amount-card {border-color:#c5d9e71f;background-color:#10232e40;} +body.midnight .contract-amount-value {color:#d6e7f2;} +body.midnight .contract-duration-heading {color:#bdd1df;} +body.midnight .contract-duration-value {color:#a9dccb;} +body.midnight .contract-salary {border-color:#c5d9e726;color:#d4e5f0;} +body.midnight .contract-salary-hint {color:#91adbf;} +body.midnight .contract-salary-input {border-color:#c5d9e738;background-color:#111f2a80;color:#e3ecf5;} +body.midnight .contract-submit {color:#d6eee5;background-color:#78b9a533;border-color:#a9dccb52;} +body.midnight .contract-insurance-prompt {color:#abc1d1;} +body.midnight .contract-insurance-options .contract-insurance-caption {color:#a4bdcf;} +body.midnight .contract-bonus-row {border-color:#c5d9e71f;color:#cadde9;} +body.silver .contract-control {decorator:linear-gradient(180deg,#ffffffb0,#bfd0e259);} +body.matchday .contract-control {decorator:linear-gradient(180deg,#e8d6dc12,#a1a0aa0d);} diff --git a/assets/modern/finance.rcss b/assets/modern/finance.rcss new file mode 100644 index 0000000..2bfb9bf --- /dev/null +++ b/assets/modern/finance.rcss @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-3.0-only */ +.balance-native {position:absolute;left:0;top:0;right:0;bottom:0;} +.balance-panel {position:absolute;top:0;width:1290dp;height:1404dp;padding:24dp;border:2dp var(--border);border-radius:18dp;background-color:var(--soft);} +.balance-panel h2 {font-size:36dp;line-height:42dp;font-weight:normal;text-align:center;margin:8dp 0;color:var(--text);} +.balance-table {position:absolute;left:24dp;right:24dp;top:104dp;bottom:22dp;overflow-y:auto;overflow-x:hidden;} +.balance-row {display:flex;align-items:stretch;width:100%;height:70dp;font-size:31dp;color:var(--text);} +.balance-row.striped {background-color:var(--soft);} +.balance-row>span {display:block;width:65%;max-width:65%;padding:8dp 10dp;line-height:54dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.balance-row>span:last-child {width:35%;max-width:35%;text-align:right;} +.balance-head {font-size:27dp;color:var(--muted);border-bottom:2dp var(--border);} +.balance-summary-item {position:absolute;margin:0;font-size:33dp;line-height:38dp;color:var(--text);} +.balance-summary-item.balance-net {color:var(--accent);} +.balance-toggle {position:absolute;left:0;bottom:0;width:2612dp;height:94dp;display:flex;align-items:center;justify-content:center;} +.balance-cycle {position:absolute;right:32dp;top:26dp;width:28dp;height:38dp;} +.balance-cycle>span {display:block;position:absolute;} +.cycle-line {left:3dp;width:22dp;height:0;border-bottom:2dp var(--muted);} +.cycle-top {top:13dp;} +.cycle-bottom {top:24dp;} +.cycle-head {width:0;height:0;border-top:5dp transparent;border-bottom:5dp transparent;} +.cycle-right {right:0;top:9dp;border-left:6dp var(--muted);} +.cycle-left {left:0;top:20dp;border-right:6dp var(--muted);} +.balance-plan {position:absolute;left:0;top:0;right:0;bottom:234dp;padding:28dp 36dp;border:2dp var(--border);border-radius:18dp;background-color:var(--soft);overflow-y:auto;overflow-x:hidden;} +.balance-plan h2 {font-size:36dp;line-height:42dp;font-weight:normal;margin:0 0 22dp;color:var(--text);text-align:center;} +.balance-plan-rows {width:100%;} +.balance-plan-row {width:100%;height:112dp;display:flex;align-items:center;justify-content:space-between;padding:12dp 26dp;border-bottom:2dp var(--border);font-size:34dp;} +.balance-plan-row>span {display:block;width:80%;max-width:80%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.balance-plan-value {display:flex;align-items:center;justify-content:flex-end;width:430dp;height:68dp;flex-shrink:0;padding:12dp 20dp;border:2dp var(--border);border-radius:10dp;background-color:var(--input);font-size:34dp;font-weight:normal;line-height:40dp;} +.balance-plan-total {position:absolute;left:26dp;right:26dp;bottom:144dp;display:flex;justify-content:space-between;margin:0;font-size:34dp;line-height:40dp;color:var(--accent);} +body.midnight .balance-panel,body.midnight .balance-plan {background-color:#101d2826;border-color:#c5d9e71f;} +body.midnight .balance-row.striped {background-color:#e3edf605;} +body.midnight .balance-row {color:#d8e0e8;} +body.midnight .balance-head {color:#a0aebc;border-color:#d5e3ed26;} +body.midnight .balance-panel h2,body.midnight .balance-plan h2 {color:#dce5ee;} +body.midnight .balance-summary-item {color:#c4d0da;} +body.midnight .balance-summary-item.balance-net,body.midnight .balance-plan-total {color:#a9dccb;} +body.midnight .balance-plan-value {background-color:#111f2a80;border-color:#c5d9e738;color:#dce5ee;} diff --git a/assets/modern/modern.rml b/assets/modern/modern.rml index 1851246..1d8afb1 100644 --- a/assets/modern/modern.rml +++ b/assets/modern/modern.rml @@ -1,5 +1,6 @@ -OpenBMH +OpenBMH +
diff --git a/docs/new_engine/balance.md b/docs/new_engine/balance.md index a038341..490933a 100644 --- a/docs/new_engine/balance.md +++ b/docs/new_engine/balance.md @@ -1,6 +1,6 @@ # Balance (M7) -Laufende Notizen zur Balance der Modern-Engine: Befunde, Entscheidungen von Michael, Messungen. +Laufende Notizen zur Balance der Modern-Engine: Befunde, bestätigte Entscheidungen, Messungen. ## Spielerwerte des Datensatzes @@ -8,7 +8,7 @@ Laufende Notizen zur Balance der Modern-Engine: Befunde, Entscheidungen von Mich Die Werte des Datensatzes passen zwischen den Vereinen nicht zur Spielstärke: Wolfsburg (2. Liga) 92, stärker als jeder Bundesligist, Elversberg (Bundesliga) 42, Kaiserslautern (2. Liga) 28. Streuung der Vereinsstärke (Mittel der besten 14) in den deutschen Ligen 14–21 Punkte statt rund 6 im Original. 1:1 übernommen ergab das 3,3 Tore pro Spiel und Tabellen mit 100 bzw. 6 Punkten. -**Entscheidung (Michael): Rangfolge übernehmen.** +**Entscheidung: Rangfolge übernehmen.** - Die Vereine einer Liga nehmen die Plätze im Stärkeband der Liga nach der Rangfolge im Datensatz ein (Mittel von Kondition und Technik der besten 14), statt nach dem Tabellenplatz. - Innerhalb des Kaders behalten die Spieler ihren Abstand zum Vereinsniveau, gestaucht auf die Streuung erzeugter Spieler (W(Niveau ± 10 %), Standardabweichung ≈ 5,8 % des Niveaus), wo der Kader breiter ist. Form und Eigenschaften bleiben aus dem Datensatz. - Der Verein des Menschen (Mannschaftsstärke beim Start) und Vereine, die beim Start den Platz tauschen, werden als Ganzes auf ihr Niveau verschoben; die Abstände bleiben. diff --git a/docs/new_ui/NATIVE_STATUS.md b/docs/new_ui/NATIVE_STATUS.md index 7730582..1316517 100644 --- a/docs/new_ui/NATIVE_STATUS.md +++ b/docs/new_ui/NATIVE_STATUS.md @@ -60,6 +60,15 @@ wird ausdrücklich mit `OPENBMH_BUILD_MODERN_UI=ON` gebaut. Die Vorschau verwendet unveränderliche Pseudodatensätze über zwei Saisons; die vorbereitete Leseprojektion ist noch nicht an F10/OBS angeschlossen. +- [Bank](desktop/bank/README.md): anklickbare Bankhalle, Sparbuch, + Immobilien, Aktien, Kredit mit Tilgungsverlauf und Vermögensübersicht. +- [Bilanz](desktop/balance/README.md): aktuelle Einnahmen/Ausgaben und + getrennte Zukunftsplanung, mit gemeinsamem Kontostand und Eintrittspreis. +- [Verträge](desktop/contracts/README.md): tatsächlicher OBW-Kader, + drei Datenseiten, Gehaltsangebot/Laufzeit, Versicherung und Prämien. + Die gemeinsame Zahleneingabe bietet sechs Vorschlagswerte, Tastaturbedienung, + lokale Entwürfe und eine zweite Bestätigung vor Geldänderungen. + **Anstoß führt keine Aktion aus**, weder per Maus noch per Tastatur. Das gilt auch für die direkte Aktionsschnittstelle des Demoanbieters. @@ -97,8 +106,8 @@ python3 tools/modern_ui/prepare_gui_assets.py \ --mockup /path/to/bmh_4k_ui --output /path/to/gui-resources cmake -S . -B build-modern -DOPENBMH_BUILD_MODERN_UI=ON \ -DBMH_MODERN_GUI_ASSETS=/path/to/gui-resources -cmake --build build-modern --target openbmh_play modern_ui_core_tests modern_reports_tests modern_ticket_document_tests -ctest --test-dir build-modern -R '^modern_(ui_core|reports_|ticket_)' --output-on-failure +cmake --build build-modern --target openbmh_play modern_ui_core_tests modern_reports_tests modern_finance_ui_tests modern_ticket_document_tests +ctest --test-dir build-modern -R '^modern_(ui_core|reports_|finance_ui_|ticket_)' --output-on-failure ./build-modern/OpenBMH --modern-ui-demo --mod /path/to/Diamond_Modern.obw ``` diff --git a/docs/new_ui/README.md b/docs/new_ui/README.md index 9029bf3..32e6ede 100644 --- a/docs/new_ui/README.md +++ b/docs/new_ui/README.md @@ -19,6 +19,10 @@ Implementierung in der Spiel-Engine. | Training | [Übungen, Kader, Intensität und Demo-Automatik](desktop/training/README.md) | | Taktik | [Interaktive Diagramme und Einsatzregler](desktop/tactics/README.md) | | Kalender | [Zwölf Monate, transponierte Wochen und Ligavorschau](desktop/calendar/README.md) | +| Zahleneingabe | [Entwurf, Vorschläge und Bestätigung](desktop/number-entry/README.md) | +| Bank | [Sparbuch, Immobilien, Aktien und Kredit](desktop/bank/README.md) | +| Bilanz | [Aktuelle Bilanz und Zukunftsplanung](desktop/balance/README.md) | +| Verträge | [Kaderdaten, Angebote, Versicherung und Prämien](desktop/contracts/README.md) | | Almanach | [Jahreskalender, Tagespartien und historische Spielberichte](desktop/almanac/README.md) | | Paarungsanordnung | [Mittige Ergebnisse und innenliegende Wappen](desktop/fixtures/README.md) | | Berichte | [Tabellen, Stärken, Ligaspiele, übrige Spiele und Profile](desktop/reports/README.md) | diff --git a/docs/new_ui/desktop/balance/README.md b/docs/new_ui/desktop/balance/README.md new file mode 100644 index 0000000..1d1b251 --- /dev/null +++ b/docs/new_ui/desktop/balance/README.md @@ -0,0 +1,27 @@ +# Bilanz + +Stand: 24. Oktober 2026. HTML-Gestaltungsreferenz: `bmh_4k_ui`, Revision +`ea6c8d97`, `report-menus.js`, `table-window.css` und `poc-menus.css`. +Die native RmlUI zeigt aktuelle Vorschau und Zukunftsplanung in derselben +Glasfensterfamilie. Private Referenzbilder bleiben außerhalb des Repositorys. + +Die sieben Einnahmenpositionen, elf Kostenpositionen und angezeigten +Spiel-/Zuschauerkennzahlen sind **fiktive Berichtswerte**. Sie stammen +weder aus gespielten Begegnungen noch aus einem Enginekonto. Die +Währungsdefinition kommt aus der geladenen OBW-Welt; der Kontostand ist +hingegen das gemeinsame `cash` der UI-Demo. Eine Bankaktion wird daher +auch in der Bilanz sichtbar. + +Die Zukunftsplanung bearbeitet elf Beträge unter `balance.plan`. +Der gemeinsame Zahleneditor nimmt ganze Anzeigeeinheiten in den vorgesehenen +Tausenderschritten an. Eingabe und Bestätigung bleiben getrennt; erst die +Bestätigung übernimmt einen gültigen, revisionsgebundenen Wert. Änderungen +der Planung buchen kein Geld vom gemeinsamen Guthaben ab und ändern keine +Kosten, Einnahmen oder Engineereignisse. Summen werden aus dem jeweiligen +Vorschau-/Planungsstand gebildet. + +Speichern/Laden erhält den Plan gemeinsam mit Bank- und Vertragszustand. +Die Migration ergänzt ausschließlich fehlende Felder und erhält vorhandene +Guthaben. Classic und die Spiel-Engine bleiben unverändert; eine spätere +Anbindung echter Finanzberichte ist eine gesonderte Integrationsentscheidung. +Prüfnachweise: [gemeinsame Menü-QA](../../menu-qa.md). diff --git a/docs/new_ui/desktop/bank/README.md b/docs/new_ui/desktop/bank/README.md new file mode 100644 index 0000000..12b9396 --- /dev/null +++ b/docs/new_ui/desktop/bank/README.md @@ -0,0 +1,32 @@ +# Bank + +Stand: 24. Oktober 2026. Gestaltungsreferenz ist der private HTML-Prototyp +`bmh_4k_ui`, Revision `ea6c8d97`, insbesondere `finance-menus.js`, +`bank-window.css` und `finance-menus.css`. Die Immobilienkacheln verwenden +das korrigierte native Seitenverhältnis des 2×3-Atlas; dessen vorherige +HTML-Streckung ist im selben Paket berichtigt. Die native RmlUI übernimmt diese +Ansicht; private Bilder und Weltdaten gehören nicht in diese Dokumentation. + +Die geladenen OBW-Daten liefern Vereinsidentität und Währungsdefinition. +Bankkonditionen, Immobilien-/Aktienpreise und Tilgungsvorschau sind +**fiktive Präsentationsdaten**. Zinsen entstehen nicht durch das Öffnen der +Ansicht; es werden weder Zeit noch Enginezufall fortgeschrieben. Ohne +laufenden Kredit kennzeichnet die Tilgungsvorschau einen Beispielbetrag. + +Einzahlen, Abheben, Kreditaufnahme, Rückzahlung und Vermögenskäufe/-verkäufe +verwenden dieselben Zustandsfelder `cash`, `deposit`, `debt` und `finance`. +Es gibt kein zweites Bankkonto neben dem Desktopguthaben. Betrag beziehungsweise +Stückzahl werden im gemeinsamen Zahleneditor eingegeben und anschließend +bestätigt. Erst diese Bestätigung ruft eine geprüfte Finanzaktion auf; +Abbrechen verwirft die Eingabe. Bestand, Grenzen, Revision und Welt werden +vor der Übernahme erneut geprüft. + +Geld liegt intern in der kleinsten Währungseinheit. Der Editor verwendet +ganze Anzeigeeinheiten; die Umrechnung erfolgt genau einmal an der +Präsentationsgrenze. UI-Checkpoints erhalten Guthaben und Vermögensbestand. +Alte Checkpoints erhalten nur fehlende neue Finanzfelder; beschädigte +vorhandene Werte werden abgewiesen. + +Dies ist die Modern-UI-Demo, keine Anbindung an Enginebuchungen oder Classic. +Prüfnachweise werden gemeinsam im Bank-/Bilanz-/Vertragspaket geführt; +siehe [Menü-QA](../../menu-qa.md). diff --git a/docs/new_ui/desktop/contracts/README.md b/docs/new_ui/desktop/contracts/README.md new file mode 100644 index 0000000..7bb9174 --- /dev/null +++ b/docs/new_ui/desktop/contracts/README.md @@ -0,0 +1,33 @@ +# Verträge + +Stand: 24. Oktober 2026. HTML-Gold: `bmh_4k_ui`, Revision `ea6c8d97`, +`management-menus.js`, `career-menus.css` und `poc-menus.css`. +Die native Ansicht bietet Daten A, Daten B und Gehalt sowie Verhandlung, +Versicherung und sieben Team-Prämien. + +Kader, stabile Spieler-IDs, Namen, Positionen und vorhandene Attribute +stammen unverändert aus der OBW-Welt. Zuständig ist der Verein des ersten +Managers, unabhängig von der Berichtsliga. Der Kader wird vollständig +angezeigt und bei Bedarf gescrollt; fehlende Werte bleiben `—`, ein leerer +Kader wird ausdrücklich benannt. Es werden keine Ersatzspieler erfunden. + +Ein vorhandenes OBW-Saisongehalt liefert eine gerundete monatliche +**Vorschau**. Ausdrücklich zur Initialisierung vorgesehene Demoverträge +bekommen fiktive Startgehälter; ohne diese Grundlage bleibt das Gehalt +unbekannt. Herkunftshinweise stehen am Gehalt. Laufzeit, Versicherung, +Forderung und Prämien gehören zum Präsentationszustand, nicht zu einer +Engineverhandlung. Verhandlungsbilder sind GUI-Ressourcen, keine Weltassets. + +Gehalt und Laufzeit bleiben lokale Vorschläge. Auch die Bestätigung im +Zahleneditor übernimmt zunächst nur diesen Entwurf; erst „Angebot machen“ +schreibt ihn in den Demozustand. Abbrechen und der Wechsel zur Versicherung +verwerfen den Vorschlag. Versicherung mit 0/12/24 Monaten wird direkt +übernommen. Die sieben Prämien akzeptieren 0–255 und nutzen die gemeinsame +Geldbestätigung; dabei wird kein Guthaben abgebucht. + +Revision, Welt, Verein und Spieleridentität werden vor dem endgültigen +Angebot geprüft. Ein Vereinswechsel des ersten Managers initialisiert +passende Verträge neu, ohne Bankguthaben oder Bilanzplan zurückzusetzen. +Checkpoints erhalten Vorschauverträge; nur fehlende Altfelder migrieren. +Classic und Engine bleiben unverändert. Prüfnachweise stehen in der +[gemeinsamen Menü-QA](../../menu-qa.md). diff --git a/docs/new_ui/desktop/number-entry/README.md b/docs/new_ui/desktop/number-entry/README.md new file mode 100644 index 0000000..10cefa9 --- /dev/null +++ b/docs/new_ui/desktop/number-entry/README.md @@ -0,0 +1,30 @@ +# Gemeinsame Zahleneingabe + +Die native Bank, Bilanzplanung und Vertragsansicht verwenden dieselbe +RmlUI-Zahleneingabe nach `number-calculator.js/.css` des HTML-Mockups. +Der Eintrittspreis behält seinen bereits abgenommenen kleinen Schieberegler. + +Der Dialog enthält ausschließlich Ziffern, Rücktaste, C, MAX und sechs +kontextbezogene Vorschläge. Er rechnet nicht. Geldbeträge werden als ganze +Anzeigeeinheiten eingegeben, Bestände als Stückzahlen. Die folgende +Bestätigungsseite nennt den Betrag; bei Immobilien und Aktien zusätzlich +den Gesamtpreis. „Ändern“ kehrt zum Entwurf zurück. Abbrechen beziehungsweise +Escape auf beiden Seiten verwirft ihn vollständig. + +Der Dialog bleibt auf das aufrufende Menü, die Welt und die Revision gebunden. +Ein inzwischen geänderter Stand erfordert eine neue Eingabe. Die +abschließende `finance`-Aktion prüft Bestand und Grenzen erneut und übernimmt +atomar. Bei Gehaltsangeboten bestätigt der Zahleneditor zunächst nur den +lokalen Vertragsentwurf; die eigentliche Übernahme folgt mit „Angebot machen“. + +Tastatur: Tab/Shift-Tab bleiben im Dialog; Enter und Nummernblock-Enter +bestätigen, Escape bricht ab. Die numerischen Felder der Bilanz und Verträge +öffnen den Dialog auch durch Zahlentasten, F4, Pfeil hoch/runter oder Einfügen. +Vorschläge und Tasten führen den Fokus zur Eingabe zurück. Nach dem Schließen +kehrt er zum auslösenden Feld zurück. + +Die UI-Demo erlaubt maximal acht Ziffern. Bilanzpläne sind in 1.000er-Schritten, +Vertragsgehälter bis 200.000, Prämien bis 255 möglich. Diese Grenzen sind +Präsentationsregeln des Prototyps. Sie sind keine Änderung an der Engine oder +am OBW-Format. Später liefert ein Engineadapter die konkreten zulässigen +Angebote und Aktionen. diff --git a/docs/new_ui/menu-qa.md b/docs/new_ui/menu-qa.md index b7e2e9d..309923a 100644 --- a/docs/new_ui/menu-qa.md +++ b/docs/new_ui/menu-qa.md @@ -71,9 +71,23 @@ deshalb nicht ins öffentliche Quellcode-Repository. Öffentliche Zusammenfassun [Freundschaftsspiele](desktop/friendlies/README.md) und [Hallentabellen](desktop/indoor/README.md): ein gemeinsames Paket mit 18 Rendererläufen, 43 Bedienzuständen und gesondertem OS-Beenden-/ - Speichern-Nachtest. Aktueller Gesamtkatalog: 18 native und 18 offene Routen. + Speichern-Nachtest. Damals: 18 native und 18 offene Routen. - [Almanach](desktop/almanac/README.md): Jahreskalender, Tagespartien und Spielbericht als neues readonly Menü; alle Ergebnisphasen, Kader/Bank, Ereignisse, alte Ansichten und unveränderte Revision/Dirty-Zustände geprüft. - Der Katalog umfasst jetzt 19 native und 18 offene Routen. + Nach diesem Paket: 19 native und 18 offene Routen. + +- [Bank](desktop/bank/README.md), [Bilanz](desktop/balance/README.md) und + [Verträge](desktop/contracts/README.md): gemeinsames Finanzpaket mit drei + Themes bei 720p/1080p. Bankhalle und fünf Dienste, alle acht Transaktionen, + Kredit-/Bestandsgrenzen, Entwürfe, doppelte Bestätigung und Abbruch geprüft. + Zwölf Bilanz-/Vertragsläufe liefern 96 erfolgreiche Zustandsprüfungen; + 42 Text-/Layoutzustände zeigen keinen horizontalen Textüberlauf. + Die 20 ausgewählten Regressionstests bestehen nach Übernahme der parallel + eingetroffenen Engineänderungen. Screenshots, UI-Demostände und Eingabeskripte + liegen privat unter `docs/qa/finance-batch-2026-10-24/`. + Aktueller Katalog: **22 native und 15 noch offene Routen**. + +Die Finanzprüfung umfasst echte Linux-/OpenGL-Aufnahmen. Windows-/macOS- +Laufzeitdarstellung wird dadurch nicht als abgenommen ausgegeben. diff --git a/docs/new_ui/qa-findings.md b/docs/new_ui/qa-findings.md index 181f473..2527a69 100644 --- a/docs/new_ui/qa-findings.md +++ b/docs/new_ui/qa-findings.md @@ -32,8 +32,16 @@ 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 19 native Routen und 18 offene Ports. +der aktuelle Runner erfasst 22 native Routen und 15 offene Ports. Spätere Meilensteine erfassen denselben Gesamtkatalog erneut. Siehe [QA-Ablauf](menu-qa.md), [Typografie](typography-qa.md) und [aktuellen nativen Stand](NATIVE_STATUS.md). + +Im Finanzpaket behoben: unsichtbare Bilanzplan-Labels, unnötige Umbrüche in +Vertragsbuttons, fehlendes Bilanz-Umschaltsymbol, Bank-Laufzeittext am Pfeil, +Tastaturhinweise der Bankhalle sowie abweichende Farben des Zahleneditors. +Das immobilienspezifische HTML-Seitenverhältnis war verzerrt und wurde auf +die ursprüngliche 2×3-Atlaskachel korrigiert. Native Bilder bleiben proportional; +der HTML-Randbeschnitt von 1 % ist als kleine verbleibende Bildabweichung +im privaten Nachweis dokumentiert. diff --git a/src/modern/ui/CMakeLists.txt b/src/modern/ui/CMakeLists.txt index 11db434..a82e4ab 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) +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) 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,7 +14,7 @@ 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) +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) configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY) endforeach() file(GLOB modern_icons CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/assets/modern/icons/*.svg") @@ -53,6 +53,12 @@ if(MSVC) target_compile_options(modern_almanac_ui_tests PRIVATE /utf-8) endif() add_test(NAME modern_almanac_ui_tests COMMAND modern_almanac_ui_tests) +add_executable(modern_finance_ui_tests ../../../tests/modern_finance_ui_tests.cpp) +target_link_libraries(modern_finance_ui_tests PRIVATE bmh_modern_ui_core) +if(MSVC) + target_compile_options(modern_finance_ui_tests PRIVATE /utf-8) +endif() +add_test(NAME modern_finance_ui_tests COMMAND modern_finance_ui_tests) add_executable(modern_reports_tests ../../../tests/modern_reports_tests.cpp) target_link_libraries(modern_reports_tests PRIVATE bmh_modern_ui_core) if(MSVC) diff --git a/src/modern/ui/amount_entry.inc b/src/modern/ui/amount_entry.inc new file mode 100644 index 0000000..95db982 --- /dev/null +++ b/src/modern/ui/amount_entry.inc @@ -0,0 +1,277 @@ +// SPDX-License-Identifier: GPL-3.0-only +std::optional App::amount_value() const { + if (!amount_ || amount_->raw.empty() || amount_->raw.size() > 8 || + std::any_of(amount_->raw.begin(), amount_->raw.end(), [](char c) { return c < '0' || c > '9'; })) + return {}; + return std::stoll(amount_->raw); +} +std::string App::amount_error() const { + if (!amount_) return {}; + if (!amount_->error.empty()) return amount_->error; + const auto &r = amount_->request; + if (r.max < r.min) return "Derzeit ist kein Betrag oder Bestand verfügbar."; + const auto value = amount_value(); + if (!value) return "Bitte eine ganze Zahl mit höchstens acht Ziffern eingeben."; + if (*value < r.min || *value > r.max) + return "Erlaubt: " + number(r.min) + " bis " + number(r.max) + (r.unit.empty() ? "" : " " + r.unit) + "."; + if ((*value - r.min) % r.step) + return "Bitte in Schritten von " + number(r.step) + " ab " + number(r.min) + " eingeben."; + return {}; +} +void App::open_amount(AmountRequest request) { + if (!source_) return; + close_report_picker(false); + request.step = std::max(1, request.step); + request.suggestion_step = std::max(1, request.suggestion_step); + if (request.return_focus.empty() && context_->GetFocusElement()) + request.return_focus = context_->GetFocusElement()->GetId(); + amount_ = AmountDraft{std::move(request), {}, {}, menu_, false, snap().revision, world_}; + amount_->raw = std::to_string(amount_->request.value); + amount_select_all_ = true; + amount_caret_end_ = false; + focus_after_render_ = "calculator-value"; + refresh(); +} +void App::close_amount(bool restore) { + if (!amount_) return; + const auto id = amount_->request.return_focus, menu = amount_->menu; + amount_.reset(); + amount_select_all_ = false; + amount_caret_end_ = false; + if (restore && menu == menu_) focus_after_render_ = id; + refresh(); +} +void App::update_amount(bool focus, bool select_all) { + if (!amount_ || amount_->review) return; + const auto error = amount_error(); + if (auto *feedback = element("calculator-feedback")) { + feedback->SetInnerRML("" + esc(error.empty() + ? amount_->request.review ? "Nach „Übernehmen“ wird der Betrag noch einmal bestätigt." : "Erst „Übernehmen“ bestätigt den Wert." + : error) + ""); + feedback->SetClass("invalid", !error.empty()); + } + if (auto *confirm = element("calculator-confirm")) { + if (error.empty()) confirm->RemoveAttribute("disabled"); + else confirm->SetAttribute("disabled", true); + } + if (auto *input = dynamic_cast(element("calculator-value"))) { + if (input->GetValue() != amount_->raw) input->SetValue(amount_->raw); + if (focus) { + input->Focus(keyboard_navigation_); + if (select_all) input->Select(); + else input->SetSelectionRange(int(amount_->raw.size()), int(amount_->raw.size())); + } + } + Rml::ElementList proposals; + if (auto *layer = element("number-calculator")) layer->QuerySelectorAll(proposals, ".amount-proposal"); + const auto current = amount_value(); + for (auto *button : proposals) { + const auto value = button->GetAttribute("data-value", -1); + button->SetClass("selected", current && *current == value); + button->SetAttribute("aria-pressed", current && *current == value ? "true" : "false"); + } + dirty_ = true; +} +std::string App::render_amount() { + if (!amount_) return {}; + const auto &r = amount_->request; + const auto button = [&](const std::string &action, const std::string &label, + const std::string &css, const std::string &attrs = "") { + return btn(action, esc(label), "amount-button " + css, attrs); + }; + std::string out = "
"; + if (amount_->review) { + const auto value = amount_value().value_or(0); + const auto text = r.review_text ? r.review_text(value) : "Diesen Betrag übernehmen?"; + return out + "
" + "

" + esc(r.title + " bestätigen") + "

" + esc(text) + + "

" + esc(number(value) + (r.unit.empty() ? "" : " " + r.unit)) + "" + + (amount_->error.empty() ? "" : "

" + esc(amount_->error) + "

") + + "
" + + button("calc-cancel", "Abbrechen", "", "id=\"calculator-cancel\"") + + button("calc-back", "Ändern", "", "id=\"calculator-back\"") + + button("calc-confirm", "Bestätigen", "amount-accept", "id=\"calculator-confirm\" " + std::string(amount_error().empty() ? "" : "disabled")) + + "
"; + } + out += "
" + "
" + button("calc-cancel", "×", "amount-close", "id=\"calculator-close\" aria-label=\"Zahleneingabe schließen\"") + + "

" + esc(r.title) + "

raw) + + "\" aria-label=\"" + esc(r.title) + "\"/>
" + + esc(number(r.min) + " – " + number(r.max) + (r.unit.empty() ? "" : " " + r.unit)) + "" + + button("calc-clear", "C", "amount-clear", "id=\"calculator-clear\"") + button("calc-max", "MAX", "amount-max", "id=\"calculator-max\"") + "
"; + const int64_t first = std::max(1, (r.min + r.suggestion_step - 1) / r.suggestion_step); + const auto value = amount_value(); + for (int i = 0; i < 6; ++i) { + const int64_t proposal = (first + i) * r.suggestion_step; + const bool enabled = proposal >= r.min && proposal <= r.max && (proposal - r.min) % r.step == 0; + out += button("calc-preset", number(proposal), "amount-proposal" + std::string(value && *value == proposal ? " selected" : ""), + "id=\"calculator-preset-" + std::to_string(i) + "\" data-value=\"" + std::to_string(proposal) + "\" style=\"" + + rect(26 + (i % 2) * 388, 334 + (i / 2) * 74, 376, 64) + "\" " + (enabled ? "" : "disabled")); + } + const std::array keys = {"7","8","9","4","5","6","1","2","3","0","00","←"}; + for (int i = 0; i < 12; ++i) + out += button("calc-digit", keys[size_t(i)], "amount-key", "id=\"calculator-key-" + std::to_string(i) + "\" data-id=\"" + + keys[size_t(i)] + "\" style=\"" + rect(26 + (i % 3) * 258, 566 + (i / 3) * 98, 248, 88) + "\""); + const auto error = amount_error(); + out += "

" + + esc(error.empty() ? r.review ? "Nach „Übernehmen“ wird der Betrag noch einmal bestätigt." : "Erst „Übernehmen“ bestätigt den Wert." : error) + + "

" + button("calc-cancel", "Abbrechen", "", "id=\"calculator-cancel\"") + + button("calc-confirm", "Übernehmen", "amount-accept", "id=\"calculator-confirm\" " + std::string(error.empty() ? "" : "disabled")); + return out + "
"; +} +bool App::amount_action(const std::string &action, Rml::Element *target) { + if (!action.starts_with("calc-")) return false; + if (!amount_) return true; + if (action == "calc-cancel") { close_amount(); return true; } + if (action == "calc-back") { + amount_->review = false; + focus_after_render_ = "calculator-value"; + amount_select_all_ = false; + amount_caret_end_ = true; + refresh(); + return true; + } + if (action == "calc-confirm") { + if (!amount_error().empty()) return true; + if (world_ != amount_->world || !source_ || snap().revision != amount_->revision) { + amount_->error = "Die Daten haben sich geändert. Bitte die Eingabe schließen und neu öffnen."; + if (amount_->review) refresh(); else update_amount(); + return true; + } + if (amount_->request.review && !amount_->review) { + amount_->review = true; + focus_after_render_ = "calculator-confirm"; + refresh(); + return true; + } + const auto value = *amount_value(); + auto accept = amount_->request.accept; + close_amount(); + if (accept && !accept(value) && popup_.empty() && contracts_dialog_ != "notice") + message("Die Eingabe konnte nicht übernommen werden. Bitte den Dialog mit dem aktuellen Stand erneut öffnen."); + return true; + } + if (amount_->review) return true; + if (action == "calc-clear") amount_->raw = "0"; + else if (action == "calc-max") amount_->raw = std::to_string(amount_->request.max); + else if (action == "calc-preset" && target) amount_->raw = target->GetAttribute("data-value", "0"); + else if (action == "calc-digit" && target) { + const auto digit = target->GetAttribute("data-id", ""); + int start = int(amount_->raw.size()), end = start; + if (auto *input = dynamic_cast(element("calculator-value"))) input->GetSelection(&start, &end, nullptr); + start = std::clamp(start, 0, int(amount_->raw.size())); + end = std::clamp(end, start, int(amount_->raw.size())); + if (digit == "←") { + if (start == end && start) --start; + amount_->raw.erase(size_t(start), size_t(end - start)); + if (amount_->raw.empty()) amount_->raw = "0"; + } else if ((digit.size() == 1 || digit == "00") && std::all_of(digit.begin(), digit.end(), [](char c) { return c >= '0' && c <= '9'; })) { + auto next = amount_->raw.substr(0, size_t(start)) + digit + amount_->raw.substr(size_t(end)); + while (next.size() > 1 && next.front() == '0') next.erase(0, 1); + if (next.size() <= 8) amount_->raw = std::move(next); + } + } else return false; + update_amount(true); + return true; +} +bool App::amount_event(Rml::Event &event) { + if (!amount_ || !popup_.empty()) return false; + const auto type = event.GetType(); + if (type == "contextmenu" || ((type == "mousedown" || type == "mouseup") && event.GetParameter("button", 0) == 1)) { + event.StopImmediatePropagation(); return true; + } + bool inside = false; + for (auto *n = event.GetTargetElement(); n && n != doc_; n = n->GetParentNode()) if (n->GetId() == "number-calculator") inside = true; + 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) { close_amount(); event.StopImmediatePropagation(); return true; } + if (keyboard && key == Rml::Input::KI_TAB) { + Rml::ElementList fields; + if (auto *layer = element("number-calculator")) layer->QuerySelectorAll(fields, "input,button"); + std::erase_if(fields, [](auto *n) { return !n->IsVisible(true) || n->HasAttribute("disabled"); }); + if (!fields.empty()) { + const auto at = std::find(fields.begin(), fields.end(), context_->GetFocusElement()); + const int old = at == fields.end() ? -1 : int(at - fields.begin()), count = int(fields.size()); + const bool back = event.GetParameter("shift_key", 0) != 0; + const int next = old < 0 ? back ? count - 1 : 0 : (old + (back ? -1 : 1) + count) % count; + fields[size_t(next)]->Focus(true); + } + event.StopImmediatePropagation(); return true; + } + if (!inside) { if (type != "blur") event.StopImmediatePropagation(); return true; } + auto *target = event.GetTargetElement(); + if ((type == "input" || type == "change") && target->GetId() == "calculator-value") { + if (!amount_->review) { + amount_->raw = dynamic_cast(target)->GetValue(); + update_amount(); + } + event.StopImmediatePropagation(); return true; + } + if (keyboard && !amount_->review && target->GetId() != "calculator-value" && + !event.GetParameter("ctrl_key", 0) && !event.GetParameter("alt_key", 0) && !event.GetParameter("meta_key", 0)) { + const int digit = key >= Rml::Input::KI_0 && key <= Rml::Input::KI_9 ? key - Rml::Input::KI_0 + : key >= Rml::Input::KI_NUMPAD0 && key <= Rml::Input::KI_NUMPAD9 ? key - Rml::Input::KI_NUMPAD0 : -1; + if (digit >= 0 || key == Rml::Input::KI_BACK) { + const int keypad = digit < 0 ? 11 : digit == 0 ? 9 : (2 - (digit - 1) / 3) * 3 + (digit - 1) % 3; + if (auto *button = element("calculator-key-" + std::to_string(keypad))) amount_action("calc-digit", button); + event.StopImmediatePropagation(); return true; + } + } + if (keyboard && target->GetId() == "calculator-value" && (key == Rml::Input::KI_RETURN || key == Rml::Input::KI_NUMPADENTER)) { + amount_action("calc-confirm", target); event.StopImmediatePropagation(); return true; + } + if (type == "click" || (keyboard && (key == Rml::Input::KI_RETURN || key == Rml::Input::KI_NUMPADENTER || key == Rml::Input::KI_SPACE))) { + for (auto *node = target; node && node != doc_; node = node->GetParentNode()) + if (node->HasAttribute("data-action")) { + if (!node->HasAttribute("disabled")) amount_action(node->GetAttribute("data-action", ""), node); + event.StopImmediatePropagation(); return true; + } + } + return true; // Native text input retains its own default action; underlying menus do not see it. +} + +bool App::amount_trigger_event(Rml::Event &event) { + if (amount_ || event.GetType() != "keydown") return false; + Rml::Element *trigger = nullptr; + for (auto *n = event.GetTargetElement(); n && n != doc_; n = n->GetParentNode()) + if (n->IsClassSet("amount-trigger")) { trigger = n; break; } + if (!trigger || trigger->HasAttribute("disabled")) return false; + const auto key = Rml::Input::KeyIdentifier(event.GetParameter("key_identifier", 0)); + const bool modified = event.GetParameter("ctrl_key", 0) || event.GetParameter("meta_key", 0), + paste = modified && key == Rml::Input::KI_V; + const int digit = key >= Rml::Input::KI_0 && key <= Rml::Input::KI_9 ? key - Rml::Input::KI_0 + : key >= Rml::Input::KI_NUMPAD0 && key <= Rml::Input::KI_NUMPAD9 ? key - Rml::Input::KI_NUMPAD0 : -1; + if (event.GetParameter("alt_key", 0) || (modified && !paste) || + (!paste && digit < 0 && key != Rml::Input::KI_RETURN && key != Rml::Input::KI_NUMPADENTER && + key != Rml::Input::KI_SPACE && key != Rml::Input::KI_F4 && key != Rml::Input::KI_UP && + key != Rml::Input::KI_DOWN && key != Rml::Input::KI_BACK && key != Rml::Input::KI_DELETE)) return false; + dispatch(trigger->GetAttribute("data-action", ""), trigger); + if (amount_ && (digit >= 0 || paste)) { + if (paste) { + char *clipboard = SDL_GetClipboardText(); + std::string raw = clipboard ? clipboard : ""; + SDL_free(clipboard); + const auto first = raw.find_first_not_of(" \r\n\t"), last = raw.find_last_not_of(" \r\n\t"); + raw = first == std::string::npos ? "" : raw.substr(first, last - first + 1); + if (raw.ends_with("€")) raw.resize(raw.size() - std::string("€").size()); + while (!raw.empty() && raw.back() == ' ') raw.pop_back(); + bool grouping = raw.find('.') != std::string::npos; + size_t start = 0, group = 0; + while (grouping && start < raw.size()) { + const auto dot = raw.find('.', start), end = dot == std::string::npos ? raw.size() : dot; + const auto length = end - start; + grouping = length > 0 && (group == 0 ? length <= 3 : length == 3) && + std::all_of(raw.begin() + start, raw.begin() + end, [](char c) { return c >= '0' && c <= '9'; }); + start = end + 1; ++group; + } + if (grouping && !raw.ends_with('.')) std::erase(raw, '.'); + amount_->raw = std::move(raw); + } else amount_->raw = std::to_string(digit); + amount_select_all_ = false; + amount_caret_end_ = true; + } + event.StopImmediatePropagation(); + return true; +} diff --git a/src/modern/ui/bank_controls.inc b/src/modern/ui/bank_controls.inc new file mode 100644 index 0000000..5a3769d --- /dev/null +++ b/src/modern/ui/bank_controls.inc @@ -0,0 +1,162 @@ +// SPDX-License-Identifier: GPL-3.0-only +bool App::bank_action(const std::string &action, Rml::Element *target) { + if (menu_ != "bank" || !source_ || !world_) return false; + if (action == "close") { + if (bank_view_ == "entrance") return false; + bank_view_ = "entrance"; + bank_hint_.clear(); + focus_after_render_ = "window-close"; + refresh(); + return true; + } + if (action == "bank-view" && target) { + const auto view = target->GetAttribute("data-view", ""); + if (view != "properties" && view != "stocks" && view != "overview" && view != "savings" && view != "credit") return true; + bank_view_ = view; + bank_hint_.clear(); + focus_after_render_ = "window-close"; + refresh(); + return true; + } + if (action == "property-next") { + if (bank_view_ != "properties") return true; + bank_property_ = (bank_property_ + 1) % 6; + focus_after_render_ = "property-next"; + refresh(); + return true; + } + if (action == "property-owned-next") { + if (bank_view_ != "properties") return true; + const auto state = snap().state; + for (int step = 1; step <= 6; ++step) { + const int next = (bank_owned_ + step) % 6; + if (state.at("finance").at("properties")[size_t(next)] != 0) { bank_owned_ = next; break; } + } + focus_after_render_ = "property-owned-next"; + refresh(); + return true; + } + if (action == "bank-stock" && target) { + const auto index = target->GetAttribute("data-id", -1); + if (bank_view_ != "stocks" || index < 0 || index > 11) return true; + bank_stock_ = index; + focus_after_render_ = "bank-stock-" + std::to_string(index); + refresh(); + return true; + } + if (action != "bank-calc" || !target) return false; + const auto kind = target->GetAttribute("data-kind", ""); + const bool property = kind == "property-buy" || kind == "property-sell"; + const bool stock = kind == "stock-buy" || kind == "stock-sell"; + if ((property && bank_view_ != "properties") || (stock && bank_view_ != "stocks") || + ((kind == "deposit" || kind == "withdraw") && bank_view_ != "savings") || + ((kind == "loan" || kind == "repay") && bank_view_ != "credit")) return true; + const auto snapshot = snap(); + Json quote_request = {{"kind", kind}}; + if (property) quote_request["index"] = kind == "property-buy" ? bank_property_ : bank_owned_; + if (stock) quote_request["index"] = bank_stock_; + const auto quote = demo_bank_quote(snapshot.state, quote_request, *world_); + if (!quote.value("ok", false)) return true; + const auto world = world_; + const auto *source = source_.get(); + const auto view = bank_view_; + const auto revision = snapshot.revision; + const auto unit_price = quote.at("unit_price").get(); + AmountRequest request; + const std::map titles{{"deposit", "Einzahlen"}, {"withdraw", "Abheben"}, + {"loan", "Kredit aufnehmen"}, {"repay", "Kredit tilgen"}, {"property-buy", "Immobilien kaufen"}, + {"property-sell", "Immobilien verkaufen"}, {"stock-buy", "Aktien kaufen"}, {"stock-sell", "Aktien verkaufen"}}; + request.title = titles.at(kind); + request.unit = property || stock ? "Stück" : money_unit(); + request.return_focus = target->GetId(); + request.value = 0; + request.min = quote.at("min"); + request.max = quote.at("max"); + request.step = 1; + request.suggestion_step = quote.at("step"); + request.review = true; + if (property || stock) request.review_text = [world, unit_price](int64_t count) { + return "Gesamtbetrag: " + money(count * unit_price, world->manifest().value("currency", Json::object())); + }; + request.accept = [this, world, source, view, revision, quote_request, kind](int64_t value) { + if (world != world_ || source != source_.get() || menu_ != "bank" || bank_view_ != view) return false; + auto action = quote_request; + action["value"] = value; + const bool accepted = commit_finance(action, revision); + if (accepted && kind == "property-buy") { + bank_owned_ = quote_request.at("index").get(); + refresh(); + } + return accepted; + }; + open_amount(std::move(request)); + return true; +} + +bool App::bank_event(Rml::Event &event) { + if (menu_ != "bank" || !source_ || amount_ || !popup_.empty()) return false; + const auto type = event.GetType(); + auto *target = event.GetTargetElement(); + const bool keyboard = type == "keydown"; + const auto key = keyboard ? Rml::Input::KeyIdentifier(event.GetParameter("key_identifier", 0)) : Rml::Input::KI_UNKNOWN; + if (bank_view_ != "entrance" && ((keyboard && key == Rml::Input::KI_ESCAPE) || + (type == "mouseup" && event.GetParameter("button", 0) == 1))) { + if (keyboard) + if (auto *select = dynamic_cast(element("bank-term")); + select && select->IsSelectBoxVisible()) { + select->CancelSelectBox(); + select->Focus(true); + dirty_ = true; + event.StopImmediatePropagation(); + return true; + } + bank_action("close", nullptr); + event.StopImmediatePropagation(); + return true; + } + if (type == "contextmenu" && bank_view_ != "entrance") { event.StopImmediatePropagation(); return true; } + if (type == "click" && bank_view_ != "entrance") + for (auto *node = target; node && node != doc_; node = node->GetParentNode()) + if (node->GetAttribute("data-action", "") == "close") { + bank_action("close", node); + event.StopImmediatePropagation(); + return true; + } + if (type == "change" && target->GetId() == "bank-term") { + auto *select = dynamic_cast(target); + if (!select || bank_view_ != "credit" || snap().state.at("debt") != 0) return true; + const auto raw = select->GetValue(); + if (raw.empty() || raw.size() > 2 || raw.find_first_not_of("0123456789") != raw.npos) return true; + const int value = std::stoi(raw); + if (value < 6 || value > 60 || value % 6) return true; + // Initializing a native select may emit change; opening a view is read-only. + if (snap().state.at("finance").at("term") == value) { + event.StopImmediatePropagation(); + return true; + } + focus_after_render_ = "bank-term"; + commit_finance({{"kind", "term"}, {"value", value}}, snap().revision); + event.StopImmediatePropagation(); + return true; + } + if (bank_view_ == "entrance" && (type == "mousemove" || type == "focus")) { + const auto hint = [&](Rml::Element *from) { + for (auto *node = from; node && node != doc_; node = node->GetParentNode()) + if (node->HasAttribute("data-bank-hint")) return node->GetAttribute("data-bank-hint", ""); + return Rml::String(); + }; + auto text = hint(target); + // RmlUI dispatches focus to the whole new ancestor chain before updating + // Context's focus pointer. Ancestor notifications must not erase a hint + // just supplied by the actual hotspot. The close button resets it. + if (type == "focus" && text.empty() && target->GetId() != "window-close") return false; + if (type == "mousemove" && text.empty()) text = hint(context_->GetFocusElement()); + if (bank_hint_ != text) { + bank_hint_ = text; + if (auto *label = element("bank-interaction-hint")) + label->SetInnerRML("" + esc(text.empty() ? "Ein Element in der Bankhalle auswählen." : text) + ""); + dirty_ = true; + } + } + return false; +} diff --git a/src/modern/ui/bank_screens.inc b/src/modern/ui/bank_screens.inc new file mode 100644 index 0000000..b11cde2 --- /dev/null +++ b/src/modern/ui/bank_screens.inc @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-3.0-only +std::string App::render_bank() { + const auto snapshot = snap(); + const auto assets = demo_bank_assets(*world_); + const auto summary = demo_bank_summary(snapshot.state, *world_); + if (!summary.value("ok", false)) return {}; + const auto &finance = snapshot.state.at("finance"); + bank_property_ = std::clamp(bank_property_, 0, 5); + bank_stock_ = std::clamp(bank_stock_, 0, 11); + bank_owned_ = std::clamp(bank_owned_, 0, 5); + if (finance.at("properties")[size_t(bank_owned_)] == 0) + for (int i = 0; i < 6; ++i) + if (finance.at("properties")[size_t(i)] != 0) { bank_owned_ = i; break; } + const auto actions = [&](const char *left, const char *lk, const char *right, const char *rk) { + return ""; + }; + std::string out = "
" + + img("art.bank-hall-v1.png", 2608, 1466.016746, false, false, 3000); + if (bank_view_ == "entrance") { + struct Service { const char *id, *label, *hint; double x, y, w, h; }; + const std::array services{{ + {"properties", "Immobilien", "Immobilien – Gebäude ansehen, kaufen oder verkaufen.", .5, 18.5, 17.5, 43.5}, + {"stocks", "Aktien", "Aktien – Kurse und Bestände ansehen, Aktien kaufen oder verkaufen.", 30, 30, 13.5, 19.5}, + {"overview", "Finanzübersicht", "Finanzübersicht – Konto, Sparbuch, Immobilien, Aktien und Kredit im Überblick.", 30.5, 49.5, 13, 14.5}, + {"savings", "Sparbuch", "Sparbuch – Guthaben ansehen, Geld einzahlen oder abheben.", 85, 60, 6.5, 7.5}, + {"credit", "Kredit", "Kredit – Laufzeit wählen, einen Kredit aufnehmen oder tilgen.", 85.3, 31.5, 13.7, 27.5}}}; + out += "
"; + for (const auto &s : services) + out += btn("bank-view", "", "bank-hotspot", "id=\"bank-view-" + std::string(s.id) + + "\" data-view=\"" + s.id + "\" data-bank-hint=\"" + esc(s.hint) + "\" aria-label=\"" + s.label + + "\" style=\"left:" + scalar(s.x) + "%;top:" + scalar(s.y) + "%;width:" + scalar(s.w) + "%;height:" + scalar(s.h) + "%;\""); + out += "
"; + } + out += "
"; + if (bank_view_ == "entrance") + return out + "

" + + esc(bank_hint_.empty() ? "Ein Element in der Bankhalle auswählen." : bank_hint_) + "

"; + out += "
"; + if (bank_view_ == "savings") { + out += "
" + img("art.bank-passbook-v1.png", 2100, 1293.109375, false, false, 2400) + + "

Waldpark Bank

Sparbuch

Bitte beachten Sie:

" + "

Einzahlungen und Abhebungen werden hier als fiktive Vorschau verbucht.

" + "

2,5 % Beispielzins

Guthaben

" + + esc(cash(snapshot.state.at("deposit").get())) + "
" + actions("Einzahlen", "deposit", "Abheben", "withdraw"); + } else if (bank_view_ == "properties") { + out += "

Immobilien

"; + const auto &owned = assets.at("properties")[size_t(bank_owned_)], &offer = assets.at("properties")[size_t(bank_property_)]; + const auto count = finance.at("properties")[size_t(bank_owned_)].get(); + out += "

Ihre Immobilien

" + + (count ? "

" + std::to_string(count) + " × " + esc(owned.at("name").get()) + "

Wert: " + + esc(cash(count * owned.at("price").get())) + "

" : "

Keine Immobilien im Bestand

") + + "
" + btn("property-owned-next", count ? img("bank.property." + std::to_string(bank_owned_), 996, 566, false, false, 1200) + : "", "property-picture", "id=\"property-owned-next\" aria-label=\"Nächste eigene Immobilie\" " + std::string(count ? "" : "disabled")) + "
"; + out += "

Kaufangebot

" + + esc(offer.at("name").get()) + "

Kaufpreis: " + esc(cash(offer.at("price").get())) + + "

" + btn("property-next", img("bank.property." + std::to_string(bank_property_), 996, 566, false, false, 1200), + "property-picture", "id=\"property-next\" aria-label=\"Nächstes Immobilienangebot\"") + "
" + + actions("Kaufen", "property-buy", "Verkaufen", "property-sell"); + } else if (bank_view_ == "stocks") { + out += "

Aktien

"; + for (const auto *label : {"Wert", "Kurs", "Vortag", "Bestand"}) out += "
" + std::string(label) + "
"; + out += "
"; + const auto factor = finance_currency_factor(*world_); + for (int i = 0; i < 12; ++i) { + const auto &s = assets.at("stocks")[size_t(i)]; + out += "
" + btn("bank-stock", esc(s.at("name").get()), "stock-name", + "id=\"bank-stock-" + std::to_string(i) + "\" data-bank-stock=\"" + std::to_string(i) + "\" data-id=\"" + std::to_string(i) + + "\" aria-pressed=\"" + (i == bank_stock_ ? "true" : "false") + "\"") + "
" + + number(s.at("price").get() / factor) + "
" + number(s.at("previous").get() / factor) + + "
" + number(finance.at("stocks")[size_t(i)].get()) + "
"; + } + const double price = assets.at("stocks")[size_t(bank_stock_)].at("price").get() / factor; + std::array history{}; + for (int i = 0; i < 30; ++i) history[size_t(i)] = price * (.85 + .08 * std::sin(i * .6 + bank_stock_) + i * .003); + const double lo = *std::min_element(history.begin(), history.end()) * .95, hi = *std::max_element(history.begin(), history.end()) * 1.05; + std::string points; + for (int i = 0; i < 30; ++i) points += scalar(20 + i * 690. / 29) + "," + scalar(900 - (history[size_t(i)] - lo) / (hi - lo) * 830) + " "; + const auto stroke = theme_ == "silver" ? "#526779" : theme_ == "matchday" ? "#b7b4b9" : "#9ac7d8"; + const auto axis = theme_ == "silver" ? "#526779" : theme_ == "matchday" ? "#b7b4b9" : "#6c8798"; + const auto svg = "" + "" + ""; + out += "
()) + "\">" + + picture(renderer_.diagram("bank-stock", svg, 1600), 740, 1320) + "
" + actions("Kaufen", "stock-buy", "Verkaufen", "stock-sell"); + } else if (bank_view_ == "credit") { + out += "

Kredit

" + img("art.bank-adviser-v1.png", 620, 515, false, false, 1000) + + "
"; + const auto fact = [&](const char *label, const std::string &value, int row) { + constexpr std::array y{0, 83, 166, 273, 356}; + return "
" + label + "" + value + "
"; + }; + out += fact("Restschuld", esc(cash(summary.at("debt").get())), 0) + fact("Beispielzins", "8 % pro Jahr", 1); + std::string select = "", 2) + fact("Monatsrate, Beispiel", esc(cash(summary.at("monthly_rate").get())), 3) + + fact("Maximaler Kredit", esc(cash(5000000 * finance_currency_factor(*world_))), 4) + "
"; + const int term = finance.at("term"); + const auto principal = summary.at("schedule_principal").get(); + const auto color = theme_ == "silver" ? "#233443" : theme_ == "matchday" ? "#efeded" : "#a8c0cf"; + const auto accent = theme_ == "silver" ? "#25617a" : theme_ == "matchday" ? "#efb2aa" : "#a9dfd1"; + const auto grid_color = theme_ == "silver" ? "#58738c38" : "#b7d0de24"; + std::string svg = "" + "" + ""; + for (int i = 0; i < 5; ++i) { + const auto y = 30 + i * 77.5; + svg += "" + "" + + esc(cash((principal * (4 - i) + 2) / 4)) + ""; + } + const int interval = term <= 12 ? 3 : term <= 24 ? 6 : 12; + std::vector labels; + for (int month = 0; month <= term; month += interval) labels.push_back(month); + if (labels.back() != term) labels.push_back(term); + for (const int month : labels) { + svg += "" + (month == 0 ? "Heute" : std::to_string(month) + (month == term ? " Monate" : "")) + ""; + } + std::string points; + for (const auto &point : summary.at("schedule")) points += scalar(220 + point.at("month").get() / term * 1960) + "," + + scalar(340 - point.at("remaining").get() / principal * 310) + " "; + svg += "" + ""; + out += "

Restschuld über die Laufzeit

" + + esc(cash(principal)) + " → " + esc(cash(0)) + "

" + std::to_string(term) + + " Monate

" + (summary.at("schedule_example") == true ? "Beispiel · kein laufender Kredit" : "Aktueller Kredit") + + "

" + picture(renderer_.diagram("bank-credit", svg, 2400), 2432, 420) + + "

Gleichmäßige monatliche Tilgung · Restschuld ohne Zinsen

" + "

Fiktiver Kredit. Im POC erfolgen keine Zins- oder Ratenbuchungen.

" + actions("Aufnehmen", "loan", "Tilgen", "repay"); + } else if (bank_view_ == "overview") { + out += "

Finanzübersicht

"; + const std::array, 6> fields{{ + {"Konto", summary.at("cash")}, {"Sparbuch", summary.at("deposit")}, + {"Immobilien", summary.at("properties")}, {"Aktien", summary.at("stocks")}, + {"Kredit", -summary.at("debt").get()}, {"Saldo", summary.at("net")}}}; + for (size_t i = 0; i < fields.size(); ++i) + out += "
" + + fields[i].first + "" + (i == 4 ? "-" + esc(cash(summary.at("debt").get())) : esc(cash(fields[i].second))) + "
"; + out += "

Erfundene Bestände · Änderungen betreffen ausschließlich die Bankvorschau.

"; + } + return out + "
"; +} diff --git a/src/modern/ui/contracts_controls.inc b/src/modern/ui/contracts_controls.inc new file mode 100644 index 0000000..74ca4d0 --- /dev/null +++ b/src/modern/ui/contracts_controls.inc @@ -0,0 +1,262 @@ +// SPDX-License-Identifier: GPL-3.0-only +void App::close_contracts(bool focus) { + auto restore = contracts_return_focus_; + if (focus && !restore.empty()) { + const auto snapshot = snap(); + const auto club = contracts_text(contracts_field(contract_draft_, "club"), ""); + if ((contracts_world_ && snapshot.world != contracts_world_) || + (!club.empty() && contracts_managed(snapshot) != club) || + (restore.starts_with("contract-player-") && + !contracts_row(contracts_projection(snapshot), contracts_player_).is_object())) + restore = "contracts-tab-" + std::to_string(contracts_tab_); + focus_after_render_ = restore; + } + contract_draft_ = Json(); + contracts_dialog_.clear(); + contracts_notice_.clear(); + contracts_return_focus_.clear(); + contracts_world_.reset(); + contracts_revision_ = 0; + refresh(); +} + +bool App::contracts_action(const std::string &action, Rml::Element *target) { + if (menu_ != "contracts") return false; + constexpr std::array actions = {"contracts-tab", "contract-player", "contract-close", + "contract-term", "contract-salary", "contract-submit", "contract-insurance", + "contract-insure", "contracts-bonuses", "contract-bonus"}; + if (std::find(actions.begin(), actions.end(), action) == actions.end()) return false; + const auto id = target ? target->GetAttribute("data-id", "") : std::string(); + const auto integer_id = [&]() -> std::optional { + if (id.empty() || id.size() > 3 || + std::any_of(id.begin(), id.end(), [](char c) { return c < '0' || c > '9'; })) return {}; + return std::stoi(id); + }; + const auto reject = [&](const std::string &text) { + contract_draft_ = {{"notice_title", "Nicht übernommen"}, + {"club", contracts_text(contracts_field(contract_draft_, "club"), "")}}; + contracts_notice_ = text; + contracts_dialog_ = "notice"; + focus_after_render_ = "contract-close"; + refresh(); + }; + const auto bound = [&](bool player) { + return contracts_bound(snap(), contracts_revision_, contracts_world_, + contracts_text(contracts_field(contract_draft_, "club"), ""), player ? contracts_player_ : ""); + }; + if (action == "contract-close") { + close_contracts(true); + return true; + } + if (action == "contracts-tab") { + const auto tab = integer_id(); + if (!contracts_dialog_.empty() || !tab || *tab > 2) return true; + contracts_tab_ = *tab; + focus_after_render_ = "contracts-tab-" + std::to_string(*tab); + refresh(); + return true; + } + if (action == "contract-player" || action == "contracts-bonuses") { + if (!contracts_dialog_.empty()) return true; + const auto snapshot = snap(); + const auto projection = contracts_projection(snapshot); + if (!snapshot.world || !projection.value("ok", false)) return true; + const auto row = action == "contract-player" ? contracts_row(projection, id) : Json(); + if (action == "contract-player" && !row.is_object()) return true; + contracts_world_ = snapshot.world; + contracts_revision_ = snapshot.revision; + contracts_return_focus_ = target ? target->GetId() : "contracts-bonuses"; + contracts_notice_.clear(); + contract_draft_ = {{"club", projection.at("club")}}; + if (action == "contracts-bonuses") { + contracts_player_.clear(); + contract_draft_["bonuses"] = projection.at("bonuses"); + contracts_dialog_ = "bonuses"; + focus_after_render_ = "contract-bonus-0"; + } else { + contracts_player_ = id; + const auto factor = finance_currency_factor(*snapshot.world); + const auto &salary = contracts_field(row, "salary"); + contract_draft_["row"] = row; + // The editor and the finance action both use whole display units. The + // source alone multiplies the accepted value by its currency factor. + contract_draft_["salary"] = salary.is_number_integer() + ? Json(salary.get() / factor) : Json(); + contract_draft_["months"] = contracts_field(row, "months"); + contracts_dialog_ = "offer"; + focus_after_render_ = "contract-term-12"; + } + refresh(); + return true; + } + if (action == "contract-term") { + const auto term = integer_id(); + if (contracts_dialog_ != "offer" || !term || + !(*term == 12 || *term == 24 || *term == 36 || *term == 48)) return true; + contract_draft_["months"] = *term; + focus_after_render_ = "contract-term-" + std::to_string(*term); + refresh(); + return true; + } + if (action == "contract-salary") { + if (contracts_dialog_ != "offer" || !contracts_world_) return true; + const auto player = contracts_player_; + const auto world = contracts_world_; + const auto revision = contracts_revision_; + const auto &value = contracts_field(contract_draft_, "salary"); + AmountRequest request; + const auto unit = money_unit(); + request.title = "Angebotenes Monatsgehalt in " + (unit == "€" ? std::string("Euro") : unit); + request.unit = unit; + request.return_focus = "contract-salary"; + request.value = value.is_number_integer() ? value.get() : 0; + request.min = 0; + request.max = 200000; + request.step = 1; + request.suggestion_step = 5000; + request.review = true; + request.accept = [this, player, world, revision](int64_t amount) { + if (menu_ != "contracts" || contracts_dialog_ != "offer" || + contracts_player_ != player || contracts_world_ != world || + contracts_revision_ != revision || amount < 0 || amount > 200000) return false; + contract_draft_["salary"] = amount; + refresh(); + return true; + }; + open_amount(std::move(request)); + return true; + } + if (action == "contract-insurance") { + if (contracts_dialog_ != "offer") return true; + if (!bound(true)) { + reject("Der Vertragsstand hat sich geändert. Bitte den Spieler erneut auswählen."); + return true; + } + // Opening insurance discards the proposal. Cancelling it returns to the + // roster, never to the previous salary or term draft. + const auto row = contract_draft_.at("row"), club = contract_draft_.at("club"); + contract_draft_ = {{"row", row}, {"club", club}}; + contracts_dialog_ = "insurance"; + focus_after_render_ = "contract-insure-0"; + refresh(); + return true; + } + if (action == "contract-submit" || action == "contract-insure") { + const bool offer = action == "contract-submit"; + if (contracts_dialog_ != (offer ? "offer" : "insurance")) return true; + if (!bound(true)) { + reject("Der Vertragsstand hat sich geändert. Bitte den Spieler erneut auswählen."); + return true; + } + Json payload; + if (offer) { + const auto &salary = contracts_field(contract_draft_, "salary"); + const auto &months = contracts_field(contract_draft_, "months"); + if (!salary.is_number_integer() || salary < 0 || salary > 200000 || + !months.is_number_integer() || months < 1 || months > 48) return true; + payload = {{"kind", "contract-offer"}, {"player", contracts_player_}, + {"salary", salary}, {"months", months}}; + } else { + const auto duration = integer_id(); + if (!duration || !(*duration == 0 || *duration == 12 || *duration == 24)) return true; + payload = {{"kind", "insurance"}, {"player", contracts_player_}, {"value", *duration}}; + } + const auto result = source_->apply({contracts_revision_, "finance", payload}); + if (!result.ok) { + reject("Die Änderung konnte nicht übernommen werden. Bitte die Vertragsdaten erneut öffnen."); + return true; + } + if (!offer) { + close_contracts(true); + return true; + } + const auto row = contract_draft_.at("row"); + const auto salary = contract_draft_.at("salary").get(); + const auto months = contract_draft_.at("months").get(); + const auto club = contract_draft_.at("club"); + const auto factor = finance_currency_factor(*contracts_world_); + contracts_notice_ = contracts_text(contracts_field(row, "name")) + " · " + + contracts_money(Json(salary * factor), *contracts_world_) + " · " + std::to_string(months) + " Monate"; + contract_draft_ = {{"notice_title", "Vertrag vorgemerkt"}, {"club", club}}; + contracts_revision_ = result.revision; + contracts_dialog_ = "notice"; + focus_after_render_ = "contract-close"; + refresh(); + return true; + } + if (action == "contract-bonus") { + const auto index = integer_id(); + if (contracts_dialog_ != "bonuses" || !index || *index > 6 || !contracts_world_) return true; + const auto &bonuses = contracts_field(contract_draft_, "bonuses"); + if (!bonuses.is_array() || size_t(*index) >= bonuses.size()) return true; + const auto bonus = bonuses[size_t(*index)]; + const auto world = contracts_world_; + const auto revision = contracts_revision_; + const auto club = contracts_text(contracts_field(contract_draft_, "club"), ""); + AmountRequest request; + request.title = contracts_text(contracts_field(bonus, "name")); + request.unit = money_unit(); + request.return_focus = "contract-bonus-" + std::to_string(*index); + request.value = bonus.at("value").get(); + request.min = 0; + request.max = 255; + request.step = 1; + request.suggestion_step = 1; + request.review = true; + request.accept = [this, world, revision, club, index = *index](int64_t amount) { + if (menu_ != "contracts" || contracts_dialog_ != "bonuses" || contracts_world_ != world || + contracts_revision_ != revision || amount < 0 || amount > 255 || + !contracts_bound(snap(), revision, world, club)) return false; + const auto result = source_->apply({revision, "finance", + {{"kind", "bonus"}, {"index", index}, {"value", amount}}}); + if (!result.ok) return false; + contract_draft_["bonuses"][size_t(index)]["value"] = amount; + contracts_revision_ = result.revision; + refresh(); + return true; + }; + open_amount(std::move(request)); + return true; + } + return true; +} + +bool App::contracts_event(Rml::Event &event) { + if (menu_ != "contracts" || contracts_dialog_.empty() || amount_) 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 == "contextmenu" || + (type == "mouseup" && event.GetParameter("button", 0) == 1)) { + close_contracts(true); + event.StopImmediatePropagation(); + return true; + } + if (keyboard && key == Rml::Input::KI_TAB) { + Rml::ElementList buttons; + if (auto *dialog = element("contracts-dialog")) dialog->QuerySelectorAll(buttons, "button"); + buttons.erase(std::remove_if(buttons.begin(), buttons.end(), [](auto *button) { + return button->HasAttribute("disabled"); + }), buttons.end()); + if (!buttons.empty()) { + const auto current = std::find(buttons.begin(), buttons.end(), context_->GetFocusElement()); + const int count = int(buttons.size()); + const int old = current == buttons.end() ? -1 : int(current - buttons.begin()); + const bool backwards = event.GetParameter("shift_key", 0) != 0; + const int next = old < 0 ? backwards ? count - 1 : 0 : (old + (backwards ? -1 : 1) + count) % count; + buttons[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() == "contracts-dialog") 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/contracts_screens.inc b/src/modern/ui/contracts_screens.inc new file mode 100644 index 0000000..6f57cc9 --- /dev/null +++ b/src/modern/ui/contracts_screens.inc @@ -0,0 +1,245 @@ +// SPDX-License-Identifier: GPL-3.0-only +namespace { +const Json &contracts_field(const Json &object, const char *key) { + static const Json absent; + if (object.is_object()) { + const auto found = object.find(key); + if (found != object.end()) return *found; + } + return absent; +} +std::string contracts_text(const Json &value, const std::string &fallback = "—") { + return value.is_string() && !value.get_ref().empty() + ? value.get() : fallback; +} +std::string contracts_managed(const Snapshot &snapshot) { + const auto &managers = contracts_field(snapshot.state, "managers"); + return managers.is_array() && !managers.empty() + ? contracts_text(contracts_field(managers[0], "club"), "") : ""; +} +Json contracts_projection(const Snapshot &snapshot) { + if (!snapshot.world) return {{"ok", false}}; + try { + return demo_contract_rows(snapshot.state, *snapshot.world, contracts_managed(snapshot)); + } catch (const std::exception &) { return {{"ok", false}}; } +} +Json contracts_row(const Json &projection, const std::string &id) { + const auto &rows = contracts_field(projection, "rows"); + if (rows.is_array()) + for (const auto &row : rows) + if (contracts_field(row, "id") == id) return row; + return Json(); +} +std::string contracts_number(const Json &value) { + if (!value.is_number()) return "—"; + if (value.is_number_integer()) return number(value.get()); + const double n = value.get(); + if (!std::isfinite(n)) return "—"; + std::ostringstream out; + out << std::setprecision(6) << n; + auto text = out.str(); + std::replace(text.begin(), text.end(), '.', ','); + return text; +} +std::string contracts_money(const Json &value, const Catalog &world) { + return value.is_number_integer() + ? money(value.get(), world.manifest().value("currency", Json::object())) : "—"; +} +std::string contracts_position_code(const std::string &code) { + return code == "gk" ? "TW" : code == "def" ? "ABW" + : code == "mid" ? "MIT" : code == "fwd" ? "STU" : code; +} +std::string contracts_position(const Json &row) { + const auto &positions = contracts_field(row, "positions"); + std::string text; + if (positions.is_array()) + for (const auto &value : positions) { + if (!value.is_string() || value.get_ref().empty()) continue; + if (!text.empty()) text += " / "; + text += contracts_position_code(value.get()); + } + return text.empty() ? contracts_position_code(contracts_text(contracts_field(row, "position"))) : text; +} +bool contracts_bound(const Snapshot &snapshot, uint64_t revision, + const std::shared_ptr &world, + const std::string &club, const std::string &player = "") { + if (!world || snapshot.world != world || snapshot.revision != revision || + contracts_managed(snapshot) != club) return false; + const auto projection = contracts_projection(snapshot); + if (!projection.value("ok", false) || contracts_field(projection, "club") != club) return false; + return player.empty() || contracts_row(projection, player).is_object(); +} +} // namespace + +std::string App::render_contracts() { + const auto snapshot = snap(); + const auto projection = contracts_projection(snapshot); + const bool ready = projection.value("ok", false) && snapshot.world; + const auto &rows = contracts_field(projection, "rows"); + const size_t count = rows.is_array() ? rows.size() : 0; + if (contracts_tab_ < 0 || contracts_tab_ > 2) contracts_tab_ = 2; + if (contracts_dialog_.empty() && contracts_player_.empty() && count) + contracts_player_ = contracts_text(contracts_field(rows[0], "id"), ""); + const auto managed = contracts_managed(snapshot); + const auto *own = snapshot.world ? snapshot.world->find("clubs", managed) : nullptr; + const auto club_name = own ? snapshot.world->name(*own) : std::string("—"); + std::string output = "
" + "
" + + (own ? img(own->value("crest", ""), 58, 58, true) : "") + + "" + esc(club_name) + "

" + std::to_string(count) + + " Spieler · Spieler anklicken, um einen Vertrag zu verhandeln

" + "
Monatsgehälter" + + (ready ? esc(contracts_money(contracts_field(projection, "salary_total"), *snapshot.world)) : "—") + + "
" + "
"; + const std::array>, 3> headings = {{ + {{"name", "Spieler"}, {"position", "Pos."}, {"condition", "Kond."}, + {"technique", "Technik"}, {"form", "Form"}, {"strength", "Stärke"}, {"age", "Alter"}}, + {{"name", "Spieler"}, {"age", "Alter"}, {"shoot", "Schuss"}, {"pass", "Pass"}, + {"team", "Team"}, {"games", "Spiele"}, {"grade", "Note"}}, + {{"name", "Spieler"}, {"position", "Pos."}, {"strength", "Stärke"}, {"age", "Alter"}, + {"salary", "Gehalt / Monat"}, {"months", "Vertrag"}, {"insurance", "Versicherung"}} + }}; + const auto &columns = headings[size_t(contracts_tab_)]; + for (size_t column = 0; column < columns.size(); ++column) + output += "
" + esc(columns[column].second) + "
"; + output += "
"; + if (rows.is_array()) + for (size_t i = 0; i < rows.size(); ++i) { + const auto &row = rows[i]; + const auto id = contracts_text(contracts_field(row, "id"), ""); + const auto name = contracts_text(contracts_field(row, "name")); + output += "
"; + for (size_t column = 0; column < columns.size(); ++column) { + const auto key = columns[column].first; + const auto source = contracts_text(contracts_field(row, "source_label"), ""); + output += "
"; + if (column == 0) + output += btn("contract-player", "" + + std::to_string(i + 1) + "." + esc(name) + "", "contract-player-button", + "id=\"contract-player-" + esc(id) + "\" data-id=\"" + esc(id) + + "\" aria-haspopup=\"dialog\" aria-pressed=\"" + (contracts_player_ == id ? "true" : "false") + "\""); + else { + std::string value; + if (key == "position") value = contracts_position(row); + else if (key == "salary") value = ready ? contracts_money(contracts_field(row, "salary"), *snapshot.world) : "—"; + else if (key == "months") value = contracts_number(contracts_field(row, "months")) + " Monate"; + else if (key == "insurance") { + const auto &insurance = contracts_field(row, "insurance"); + value = insurance.is_number_integer() ? insurance.get() == 0 ? "Ohne" + : contracts_number(insurance) + " Monate" : "—"; + } else value = contracts_number(contracts_field(row, key.c_str())); + output += "" + esc(value) + ""; + } + output += "
"; + } + output += "
"; + } + output += "
"; + if (!ready || count == 0) + output += "

" + std::string(ready + ? "Für diesen Verein sind keine Spieler im Katalog vorhanden." + : "Die Vertragsvorschau ist derzeit nicht verfügbar.") + "

"; + output += "
"; + if (contracts_dialog_.empty()) return output; + + const auto &draft_row = contracts_field(contract_draft_, "row"); + const auto player_name = contracts_text(contracts_field(draft_row, "name")); + const auto &world = contracts_world_ ? contracts_world_ : snapshot.world; + const bool offer = contracts_dialog_ == "offer", insurance = contracts_dialog_ == "insurance"; + std::string title = offer ? "Vertragsverhandlung · " + player_name + : insurance ? "Spielerversicherung · " + player_name + : contracts_dialog_ == "bonuses" ? "Team-Prämien" + : contracts_text(contracts_field(contract_draft_, "notice_title"), "Vertragsvorschau"); + std::string body, actions; + const auto close = [&](const std::string &caption) { + return btn("contract-close", "" + esc(caption) + "", "contract-control", + "id=\"contract-close\""); + }; + if (offer) { + const auto &salary = contracts_field(draft_row, "salary"); + const auto &proposed = contracts_field(contract_draft_, "salary"); + const auto &months = contracts_field(contract_draft_, "months"); + const auto source = contracts_text(contracts_field(draft_row, "source_label")); + const int64_t factor = world ? finance_currency_factor(*world) : 1; + // Fictional asking price follows the HTML preview, never an engine demand. + const Json demand = salary.is_number_integer() + ? Json(((salary.get() / factor * 11 + 5) / 10) * factor) : Json(); + body = "

" + esc(contracts_position(draft_row)) + + " · Stärke " + esc(contracts_number(contracts_field(draft_row, "strength"))) + + " · " + esc(contracts_number(contracts_field(draft_row, "age"))) + " Jahre

" + "
" + img("contracts.scene.0", 955, 291.0625) + + "
" + img("contracts.scene.1", 955, 291.0625) + "
" + "
Aktuelles Monatsgehalt" + + (world ? esc(contracts_money(salary, *world)) : "—") + + "
Fiktive Forderung" + "" + (world ? esc(contracts_money(demand, *world)) : "—") + + "
Laufzeit" + + esc(contracts_number(months)) + " Monate
Dein Angebot pro Monat" + "Betrag über die gemeinsame Zahleneingabe ändern
" + + btn("contract-salary", "" + (world && proposed.is_number_integer() + ? esc(std::to_string(proposed.get())) : "—") + "", + "contract-salary-input amount-trigger", "id=\"contract-salary\" aria-haspopup=\"dialog\" aria-label=\"Angebotenes Monatsgehalt ändern\"") + + "

Erst „Angebot machen“ übernimmt Gehalt und Laufzeit.

"; + actions = close("Abbrechen") + + btn("contract-insurance", "Versichern", "contract-control", "id=\"contract-insurance\"") + + btn("contract-submit", "Angebot machen", "contract-control contract-submit", + "id=\"contract-submit\" " + std::string(proposed.is_number_integer() ? "" : "disabled")); + } else if (insurance) { + const auto current = contracts_field(draft_row, "insurance"); + body = "

Wähle die Versicherungsdauer für diesen Spieler.

" + ""; + actions = close("Abbrechen"); + } else if (contracts_dialog_ == "bonuses") { + body = "

Prämienvereinbarung für die gesamte Mannschaft

" + "
"; + const auto &bonuses = contracts_field(contract_draft_, "bonuses"); + const std::array names = {"Torprämie", "Punktprämie", "Auflaufprämie", "Meisterprämie", + "Prämie Pl. 2–5", "Prämie Pl. 6–10", "Nichtabstiegsprämie"}; + for (size_t i = 0; i < names.size(); ++i) { + const Json bonus = bonuses.is_array() && i < bonuses.size() ? bonuses[i] : Json(); + body += "
" + esc(contracts_text(contracts_field(bonus, "name"), names[i])) + "" + + btn("contract-bonus", "" + esc(contracts_number(contracts_field(bonus, "value"))) + "", + "contract-control amount-trigger", "id=\"contract-bonus-" + std::to_string(i) + "\" data-id=\"" + + std::to_string(i) + "\" aria-haspopup=\"dialog\"") + "
"; + } + body += "
"; + actions = close("Zurück"); + } else { + body = "

" + esc(contracts_notice_) + "

"; + actions = close("Verstanden"); + } + return output + "
" + "

" + esc(title) + "

" + body + + "
"; +} diff --git a/src/modern/ui/controls.inc b/src/modern/ui/controls.inc index 099ba23..3421997 100644 --- a/src/modern/ui/controls.inc +++ b/src/modern/ui/controls.inc @@ -135,6 +135,7 @@ void App::ProcessEvent(Rml::Event &event) try { keyboard_navigation_ = true; else if (type == "mousedown") keyboard_navigation_ = false; + if (type == "blur" && popup_.empty()) bank_event(event); if (type == "blur") { if (auto *select = dynamic_cast( event.GetTargetElement()); @@ -148,6 +149,10 @@ void App::ProcessEvent(Rml::Event &event) try { n = n->GetParentNode()) if (n->GetId() == "native-ticket-layer") return; + if (amount_event(event)) return; + if (popup_.empty() && amount_trigger_event(event)) return; + if (popup_.empty() && contracts_event(event)) return; + if (popup_.empty() && (bank_event(event) || finance_event(event))) return; if (!planning_dialog_.empty() && popup_.empty()) { const bool key_event = type == "keydown"; const auto key = key_event ? Rml::Input::KeyIdentifier(event.GetParameter("key_identifier", 0)) : Rml::Input::KI_UNKNOWN; @@ -389,7 +394,8 @@ void App::ProcessEvent(Rml::Event &event) try { if (controls[size_t(next)]->GetId().starts_with("report-detail-player-") || controls[size_t(next)]->GetId().starts_with("report-club-") || controls[size_t(next)]->GetId().starts_with("friendly-opponent-") || - controls[size_t(next)]->GetId().starts_with("alm-match-")) + controls[size_t(next)]->GetId().starts_with("alm-match-") || + controls[size_t(next)]->GetId().starts_with("contract-player-")) controls[size_t(next)]->ScrollIntoView( Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest)); event.StopImmediatePropagation(); @@ -429,6 +435,7 @@ void App::ProcessEvent(Rml::Event &event) try { void App::dispatch(const std::string &action, Rml::Element *target) { const auto id = target ? target->GetAttribute("data-id", "") : std::string(); + 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; if (report_detail_action(action, target)) { close_report_picker(false); @@ -1040,11 +1047,12 @@ 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"}; + "save", "load", "training", "tactics", "calendar", "league", "other", "postpone", "friendlies", "indoor", "almanac", "bank", "balance", "contracts"}; if (!available.contains(route)) { message("Diese native Ansicht wird im nächsten Menüpaket übertragen."); return; } + if (route == "bank") { bank_view_ = "entrance"; bank_hint_.clear(); } menu_ = route; report_picker_.clear(); report_detail_kind_.clear(); @@ -1393,12 +1401,16 @@ void App::script() { context_->ProcessTextInput(command.value("value", std::string())); else if (type == "key") { const std::map keys = { - {"ESC", Rml::Input::KI_ESCAPE}, {"ENTER", Rml::Input::KI_RETURN}, + {"ESC", Rml::Input::KI_ESCAPE}, {"ENTER", Rml::Input::KI_RETURN}, {"NUMENTER", Rml::Input::KI_NUMPADENTER}, {"TAB", Rml::Input::KI_TAB}, {"SPACE", Rml::Input::KI_SPACE}, {"HOME", Rml::Input::KI_HOME}, {"END", Rml::Input::KI_END}, {"LEFT", Rml::Input::KI_LEFT}, {"RIGHT", Rml::Input::KI_RIGHT}, {"UP", Rml::Input::KI_UP}, {"DOWN", Rml::Input::KI_DOWN}, - {"A", Rml::Input::KI_A}, {"Z", Rml::Input::KI_Z}}; + {"A", Rml::Input::KI_A}, {"Z", Rml::Input::KI_Z}, {"V", Rml::Input::KI_V}, + {"BACKSPACE", Rml::Input::KI_BACK}, {"DELETE", Rml::Input::KI_DELETE}, {"F4", Rml::Input::KI_F4}, + {"0", Rml::Input::KI_0}, {"1", Rml::Input::KI_1}, {"2", Rml::Input::KI_2}, {"3", Rml::Input::KI_3}, + {"4", Rml::Input::KI_4}, {"5", Rml::Input::KI_5}, {"6", Rml::Input::KI_6}, {"7", Rml::Input::KI_7}, + {"8", Rml::Input::KI_8}, {"9", Rml::Input::KI_9}}; const auto name = command.at("value").get(); if (!keys.contains(name)) throw editor::Error("Unbekannte UI-Skripttaste."); @@ -1420,6 +1432,10 @@ void App::script() { {"menu", menu_}, {"report_picker", report_picker_}, {"planning_dialog", planning_dialog_}, + {"bank_view", bank_view_}, {"bank_property", bank_property_}, {"bank_stock", bank_stock_}, + {"balance_future", balance_future_}, + {"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()}, {"game_dirty", source_ && source_->dirty()}, {"desktop_dirty", desktop_ != saved_desktop_}, diff --git a/src/modern/ui/demo_finance.cpp b/src/modern/ui/demo_finance.cpp new file mode 100644 index 0000000..f6158c1 --- /dev/null +++ b/src/modern/ui/demo_finance.cpp @@ -0,0 +1,391 @@ +// SPDX-License-Identifier: GPL-3.0-only +#include "modern/ui/demo_finance.hpp" +#include +#include +#include +#include +#include +#include +#include + +namespace bmh::modern_ui { +namespace { +constexpr int64_t money_cap = 99999999, debt_cap = 5000000, salary_cap = 200000; +constexpr std::array property_prices{115000, 340000, 470000, 780000, 1350000, 3650000}; +constexpr std::array property_names{"Eigentumswohnung", "Mehrfamilienhaus", + "Einfamilienhaus", "Villa", "Hochhaus", "Bürogebäude"}; +constexpr std::array stock_prices{124, 86, 207, 59, 310, 145, 97, 225, 68, 178, 112, 264}; +constexpr std::array stock_names{"MainTech", "Nordlicht", "Hafenwerk", "Bergstrom", + "Solaris", "Westbahn", "Rheinwerk", "Ballwerk", "Feldpunkt", "Stadtfunk", "Werkbank", "Sportnetz"}; +constexpr std::array incomes{134000, 92000, 86200, 950000, 120000, 50000, 25000}; +constexpr std::array income_names{"Trikotwerbung", "Bandenwerbung", "Fernsehrechte", + "Zuschauer", "Stadionperipherie", "Mieten, Zinsen, Tilgung", "Sonstiges"}; +constexpr std::array costs{650000, 420000, 80000, 120000, 60000, 45000, + 250000, 50000, 35000, 0, 30000}; +constexpr std::array cost_names{"Gehälter und Prämien", "Stadionkosten", "Nachwuchs", + "Co-Trainer", "Arzt", "Physio", "Trainingslager", "Fanbetreuung", "PR-Arbeit", + "Zinsen und Tilgung", "Sonstiges"}; +constexpr std::array bonus_names{"Torprämie", "Punktprämie", "Auflaufprämie", + "Meisterprämie", "Prämie Pl. 2–5", "Prämie Pl. 6–10", "Nichtabstiegsprämie"}; +bool keys(const Json &v, std::initializer_list expected) { + return v.is_object() && v.size() == expected.size() && + std::all_of(expected.begin(), expected.end(), [&](auto *key) { return v.contains(key); }); +} +bool integer(const Json &v, int64_t lo, int64_t hi) { + if (v.is_number_unsigned()) + return hi >= 0 && v.get() <= uint64_t(hi) && + (lo <= 0 || v.get() >= uint64_t(lo)); + return v.is_number_integer() && v.get() >= lo && v.get() <= hi; +} +bool list(const Json &v, size_t size, int64_t lo, int64_t hi) { + return v.is_array() && v.size() == size && std::all_of(v.begin(), v.end(), + [&](const auto &item) { return integer(item, lo, hi); }); +} +Json error(const char *code) { return {{"ok", false}, {"error", code}}; } +std::string own(const Catalog &world, const std::string &managed, const Json *state = nullptr) { + if (!managed.empty()) { + if (!world.manageable(managed)) throw editor::Error("invalid_finance_manager"); + return managed; + } + if (state && state->contains("managers")) { + const auto &managers = state->at("managers"); + if (!managers.is_array() || managers.empty() || !managers[0].is_object() || + !managers[0].contains("club") || !managers[0]["club"].is_string()) + throw editor::Error("invalid_finance_manager"); + if (managers[0]["club"].get().empty()) + throw editor::Error("invalid_finance_manager"); + return own(world, managers[0]["club"].get()); + } + for (const auto *club : world.clubs()) + if (world.manageable(club->value("id", ""))) return club->value("id", ""); + return ""; +} +bool valid_date(const Json &v) { + if (!v.is_string()) return false; + const auto d = v.get(); + if (d.size() != 10 || d[4] != '-' || d[7] != '-') return false; + for (size_t i = 0; i < d.size(); ++i) + if (i != 4 && i != 7 && (d[i] < '0' || d[i] > '9')) return false; + const int y = std::stoi(d.substr(0, 4)), m = std::stoi(d.substr(5, 2)), day = std::stoi(d.substr(8, 2)); + return y > 0 && std::chrono::year_month_day{std::chrono::year{y}, + std::chrono::month{unsigned(m)}, std::chrono::day{unsigned(day)}}.ok(); +} +Json initial_contract(const Catalog &world, const Json &p, size_t index, int64_t factor) { + const auto date = world.manifest().value("start_date", Json("2026-07-01")); + std::vector active; + if (valid_date(date)) for (const auto &c : world.rows("contracts")) { + if (c.value("person", Json()) != p.at("id") || + c.value("team", Json()) != p.value("team", Json())) continue; + bool in_range = true; + for (const auto *bound : {"start", "end"}) + if (c.contains(bound) && (!valid_date(c.at(bound)) || + (std::string(bound) == "start" ? date < c.at(bound) : date > c.at(bound)))) in_range = false; + if (in_range) active.push_back(&c); + } + Json salary = nullptr; + std::string source = "unavailable"; + if (active.size() == 1) { + const auto &c = *active[0]; + if (c.contains("salary") && integer(c.at("salary"), 0, salary_cap * factor * 12)) { + // OBW stores a season salary. The editable preview uses whole monthly + // display units, rounded half up; no Classic initializer is invoked. + const auto raw = c.at("salary").get(); + const auto monthly = (raw + 6 * factor) / (12 * factor); + salary = monthly * factor; + source = "obw_season"; + } else if (!c.contains("salary") && c.contains("initialization") && c.at("initialization").is_object()) { + salary = (4500 + int64_t(index % 40) * 750) * factor; + source = "demo"; + } + } + return {{"salary", salary}, {"months", 24 + int(index % 3) * 12}, + {"insurance", 0}, {"source", source}}; +} +Json default_finance() { + return {{"term", 12}, {"properties", {1, 0, 0, 0, 0, 0}}, + {"stocks", Json::array({0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})}}; +} +Json default_balance(int64_t factor) { + Json plan = Json::array(); + for (const auto value : costs) plan.push_back(value * factor); + return {{"plan", plan}}; +} +Json attribute(const Json &player, const char *key) { + const auto found = player.find("attributes"); + if (found == player.end() || !found->is_object()) return nullptr; + const auto value = found->find(key); + return value != found->end() && value->is_number() && std::isfinite(value->get()) + ? *value : Json(nullptr); +} +std::string position(const Json &p) { + const auto found = p.find("positions"); + if (found == p.end() || !found->is_array()) return ""; + if (std::find(found->begin(), found->end(), "gk") != found->end()) return "gk"; + for (const auto &v : *found) if (v.is_string()) return v.get(); + return ""; +} +Json age(const Json &player, const Json &state) { + if (player.contains("birth_date") && valid_date(player.at("birth_date")) && + state.contains("date") && valid_date(state.at("date"))) { + const auto birth = player.at("birth_date").get(), today = state.at("date").get(); + const int years = std::stoi(today.substr(0, 4)) - std::stoi(birth.substr(0, 4)) - + (today.substr(5) < birth.substr(5) ? 1 : 0); + return years >= 0 && years <= 100 ? Json(years) : Json(nullptr); + } + const auto initial = player.value("age_at_start", Json()); + return integer(initial, 0, 100) ? initial : Json(nullptr); +} +std::string source_label(const std::string &source) { + return source == "obw_season" ? "Monatsvorschau aus OBW-Saisongehalt · Laufzeit fiktiv" + : source == "demo" ? "Fiktives Demogehalt · Laufzeit fiktiv" + : source == "offer" ? "Lokales Demoangebot" : "Kein Gehalt überliefert · Laufzeit fiktiv"; +} +} // namespace + +int64_t finance_currency_factor(const Catalog &world) { + const auto currency = world.manifest().value("currency", Json::object()); + if (!currency.is_object()) throw editor::Error("unsupported_currency_precision"); + const auto precision = currency.value("minor_units", Json(0)); + if (!integer(precision, 0, 2) || precision == 1) + throw editor::Error("unsupported_currency_precision"); + return precision == 2 ? 100 : 1; +} +Json demo_contracts(const Catalog &world, const std::string &managed) { + const auto club = own(world, managed); + const auto factor = finance_currency_factor(world); + Json players = Json::object(); + size_t index = 0; + if (!club.empty()) for (const auto *p : world.squad(club)) + players[p->at("id").get()] = initial_contract(world, *p, index++, factor); + return {{"club", club}, {"players", players}, {"bonuses", {0, 0, 0, 0, 0, 0, 0}}}; +} +bool valid_demo_finance(const Json &state, const Catalog &world, const std::string &managed) { + try { + if (!state.is_object()) return false; + const auto factor = finance_currency_factor(world), cap = money_cap * factor; + for (const auto *key : {"cash", "deposit", "debt"}) + if (!state.contains(key) || !integer(state.at(key), 0, std::string(key) == "debt" ? debt_cap * factor : cap)) return false; + if (state.contains("ticket") && !integer(state.at("ticket"), 0, 25)) return false; + const auto &f = state.at("finance"), &b = state.at("balance"), &c = state.at("contracts"); + if (!keys(f, {"term", "properties", "stocks"}) || !integer(f.at("term"), 6, 60) || + f.at("term").get() % 6 || !list(f.at("properties"), 6, 0, 9999) || + !list(f.at("stocks"), 12, 0, 9999) || !keys(b, {"plan"}) || + !list(b.at("plan"), 11, 0, cap) || !keys(c, {"club", "players", "bonuses"}) || + !c.at("club").is_string() || !c.at("players").is_object() || + !list(c.at("bonuses"), 7, 0, 255)) return false; + const auto club = own(world, managed, &state); + const auto squad = club.empty() ? std::vector{} : world.squad(club); + if (c.at("club") != club || c.at("players").size() != squad.size()) return false; + for (const auto *p : squad) { + const auto &v = c.at("players").at(p->at("id").get()); + if (!keys(v, {"salary", "months", "insurance", "source"}) || + !integer(v.at("months"), 1, 48) || !integer(v.at("insurance"), 0, 24) || + !(v.at("insurance") == 0 || v.at("insurance") == 12 || v.at("insurance") == 24) || + !v.at("source").is_string()) return false; + const auto source = v.at("source").get(); + if (source == "unavailable") { if (!v.at("salary").is_null()) return false; } + else if ((source != "demo" && source != "obw_season" && source != "offer") || + !integer(v.at("salary"), 0, salary_cap * factor)) return false; + } + return true; + } catch (const std::exception &) { return false; } +} +bool migrate_demo_finance(Json &state, const Catalog &world, const std::string &managed) { + try { + if (!state.is_object()) return false; + auto next = state; + const auto factor = finance_currency_factor(world); + if (!next.contains("finance")) next["finance"] = default_finance(); + if (!next.contains("balance")) next["balance"] = default_balance(factor); + if (!next.contains("contracts")) next["contracts"] = demo_contracts(world, own(world, managed, &state)); + if (!valid_demo_finance(next, world, managed)) return false; + state = std::move(next); + return true; + } catch (const std::exception &) { return false; } +} +Json demo_bank_terms() { return Json::array({6, 12, 18, 24, 30, 36, 42, 48, 54, 60}); } +Json demo_bank_assets(const Catalog &world) { + const auto factor = finance_currency_factor(world); + Json properties = Json::array(), stocks = Json::array(); + for (size_t i = 0; i < property_prices.size(); ++i) + properties.push_back({{"index", i}, {"name", property_names[i]}, {"price", property_prices[i] * factor}}); + for (size_t i = 0; i < stock_prices.size(); ++i) + stocks.push_back({{"index", i}, {"name", stock_names[i]}, {"price", stock_prices[i] * factor}, + {"previous", (stock_prices[i] - (int(i % 3) - 1) * 3) * factor}}); + return {{"properties", properties}, {"stocks", stocks}}; +} +Json demo_bank_quote(const Json &state, const Json &request, const Catalog &world) { + if (!valid_demo_finance(state, world)) return error("invalid_finance_state"); + try { + if (!request.is_object() || !request.contains("kind") || !request.at("kind").is_string()) + return error("invalid_finance_action"); + const auto kind = request.at("kind").get(); + const bool property = kind == "property-buy" || kind == "property-sell"; + const bool stock = kind == "stock-buy" || kind == "stock-sell"; + const bool quantity = property || stock; + if (!(quantity ? keys(request, {"kind", "index"}) : keys(request, {"kind"}))) + return error("invalid_finance_action"); + const auto factor = finance_currency_factor(world), cap = money_cap * factor; + const auto cash = state.at("cash").get(), deposit = state.at("deposit").get(), debt = state.at("debt").get(); + int64_t max = 0, price = factor; + Json index = nullptr; + if (quantity) { + if (!integer(request.at("index"), 0, property ? 5 : 11)) return error("invalid_finance_action"); + const auto i = request.at("index").get(); + index = i; + price = (property ? property_prices[i] : stock_prices[i]) * factor; + const auto owned = state.at("finance").at(property ? "properties" : "stocks")[i].get(); + max = kind.ends_with("buy") ? std::min(9999 - owned, cash / price) + : std::min(owned, (cap - cash) / price); + } else if (kind == "deposit") max = std::min(cash, cap - deposit) / factor; + else if (kind == "withdraw") max = std::min(deposit, cap - cash) / factor; + else if (kind == "loan") max = debt ? 0 : std::min(debt_cap * factor, cap - cash) / factor; + else if (kind == "repay") max = std::min(cash, debt) / factor; + else return error("unknown_finance_action"); + return {{"ok", true}, {"kind", kind}, {"min", 1}, {"max", max}, {"quantity", quantity}, + {"index", index}, {"unit_price", price}, {"step", quantity ? 1 : 100000}}; + } catch (const std::exception &) { return error("invalid_finance_action"); } +} +std::string edit_demo_finance(Json &state, const Json &action, const Catalog &world, + const std::string &managed) { + if (!valid_demo_finance(state, world, managed)) return "invalid_finance_state"; + try { + if (!action.is_object() || !action.contains("kind") || !action.at("kind").is_string()) + return "invalid_finance_action"; + const auto kind = action.at("kind").get(); + auto next = state; + if (kind == "term") { + if (!keys(action, {"kind", "value"}) || !integer(action.at("value"), 6, 60) || + action.at("value").get() % 6 || state.at("debt") != 0) return "invalid_finance_value"; + next["finance"]["term"] = action.at("value"); + } else if (kind == "plan" || kind == "bonus") { + if (!keys(action, {"kind", "index", "value"}) || !integer(action.at("index"), 0, kind == "plan" ? 10 : 6) || + !integer(action.at("value"), 0, kind == "plan" ? money_cap : 255)) return "invalid_finance_value"; + const auto i = action.at("index").get(); + const auto value = action.at("value").get(); + if (kind == "plan") { + if (value % 1000) return "invalid_finance_value"; + next["balance"]["plan"][i] = value * finance_currency_factor(world); + } else next["contracts"]["bonuses"][i] = value; + } else if (kind == "contract-offer" || kind == "insurance") { + if (!(kind == "contract-offer" ? keys(action, {"kind", "player", "salary", "months"}) + : keys(action, {"kind", "player", "value"})) || + !action.at("player").is_string()) return "invalid_finance_action"; + const auto id = action.at("player").get(); + if (!state.at("contracts").at("players").contains(id)) return "invalid_finance_player"; + auto &contract = next["contracts"]["players"][id]; + if (kind == "contract-offer") { + if (!integer(action.at("salary"), 0, salary_cap) || !integer(action.at("months"), 1, 48)) + return "invalid_finance_value"; + contract["salary"] = action.at("salary").get() * finance_currency_factor(world); + contract["months"] = action.at("months"); + contract["source"] = "offer"; + } else { + if (!integer(action.at("value"), 0, 24) || + !(action.at("value") == 0 || action.at("value") == 12 || action.at("value") == 24)) + return "invalid_finance_value"; + contract["insurance"] = action.at("value"); + } + } else { + const bool quantity = kind == "property-buy" || kind == "property-sell" || kind == "stock-buy" || kind == "stock-sell"; + if (!(quantity ? keys(action, {"kind", "index", "value"}) : keys(action, {"kind", "value"}))) + return "invalid_finance_action"; + auto request = action; + request.erase("value"); + const auto quote = demo_bank_quote(state, request, world); + if (!quote.value("ok", false)) return quote.at("error").get(); + if (!integer(action.at("value"), 1, quote.at("max").get())) return "invalid_finance_value"; + const auto value = action.at("value").get(), total = value * quote.at("unit_price").get(); + const auto cash = state.at("cash").get(), deposit = state.at("deposit").get(), debt = state.at("debt").get(); + if (kind == "deposit") { next["cash"] = cash - total; next["deposit"] = deposit + total; } + else if (kind == "withdraw") { next["cash"] = cash + total; next["deposit"] = deposit - total; } + else if (kind == "loan") { next["cash"] = cash + total; next["debt"] = total; } + else if (kind == "repay") { next["cash"] = cash - total; next["debt"] = debt - total; } + else { + const bool buying = kind.ends_with("buy"), property = kind.starts_with("property-"); + const auto i = action.at("index").get(); + next["cash"] = cash + (buying ? -total : total); + next["finance"][property ? "properties" : "stocks"][i] = + state.at("finance").at(property ? "properties" : "stocks")[i].get() + (buying ? value : -value); + } + } + if (!valid_demo_finance(next, world, managed)) return "invalid_finance_state"; + state = std::move(next); + return {}; + } catch (const std::exception &) { return "invalid_finance_action"; } +} +Json demo_bank_summary(const Json &state, const Catalog &world) { + if (!valid_demo_finance(state, world)) return error("invalid_finance_state"); + const auto factor = finance_currency_factor(world); + const auto cash = state.at("cash").get(), deposit = state.at("deposit").get(), debt = state.at("debt").get(); + int64_t properties = 0, stocks = 0; + for (size_t i = 0; i < property_prices.size(); ++i) + properties += property_prices[i] * factor * state.at("finance").at("properties")[i].get(); + for (size_t i = 0; i < stock_prices.size(); ++i) + stocks += stock_prices[i] * factor * state.at("finance").at("stocks")[i].get(); + const int64_t term = state.at("finance").at("term"), principal = debt ? debt : 1000000 * factor; + const int64_t denominator = 150 * term * factor; + const int64_t monthly = ((debt * (150 + term) + denominator - 1) / denominator) * factor; + Json schedule = Json::array(); + for (int month = 0; month <= term; ++month) + schedule.push_back({{"month", month}, {"remaining", (principal * (term - month) + term / 2) / term}}); + return {{"ok", true}, {"cash", cash}, {"deposit", deposit}, {"debt", debt}, + {"properties", properties}, {"stocks", stocks}, {"net", cash + deposit + properties + stocks - debt}, + {"term", term}, {"savings_rate", 2.5}, {"credit_rate", 8}, + {"savings_interest", (deposit * 25 + 500) / 1000}, {"credit_interest", (debt * 8 + 50) / 100}, + {"monthly_rate", monthly}, {"schedule_principal", principal}, {"schedule_example", debt == 0}, + {"schedule", schedule}}; +} +Json demo_balance_rows(const Json &state, const Catalog &world) { + if (!valid_demo_finance(state, world)) return error("invalid_finance_state"); + const auto factor = finance_currency_factor(world); + Json in = Json::array(), out = Json::array(), plan = Json::array(); + int64_t sum_in = 0, sum_out = 0, sum_plan = 0; + for (size_t i = 0; i < incomes.size(); ++i) { + const auto value = incomes[i] * factor; + in.push_back({{"name", income_names[i]}, {"amount", value}}); sum_in += value; + } + for (size_t i = 0; i < costs.size(); ++i) { + const auto actual = costs[i] * factor, planned = state.at("balance").at("plan")[i].get(); + out.push_back({{"name", cost_names[i]}, {"amount", actual}}); + plan.push_back({{"name", cost_names[i]}, {"amount", planned}}); sum_out += actual; sum_plan += planned; + } + return {{"ok", true}, {"income", in}, {"costs", out}, {"plan", plan}, + {"income_total", sum_in}, {"cost_total", sum_out}, {"plan_total", sum_plan}, {"balance", sum_in - sum_out}, + {"cash", state.at("cash")}, {"ticket", state.value("ticket", 0) * factor}, + {"league_home_games", 14}, {"other_home_games", 4}, {"attendance_average", 28450}}; +} +Json demo_contract_rows(const Json &state, const Catalog &world, const std::string &managed) { + if (!valid_demo_finance(state, world, managed)) return error("invalid_finance_state"); + const auto club = own(world, managed, &state); + Json rows = Json::array(); + int64_t total = 0, known = 0, unknown = 0; + if (!club.empty()) for (const auto *p : world.squad(club)) { + const auto &c = state.at("contracts").at("players").at(p->at("id").get()); + if (c.at("salary").is_null()) ++unknown; + else { + const auto salary = c.at("salary").get(); + if (total > std::numeric_limits::max() - salary) return error("finance_sum_overflow"); + total += salary; ++known; + } + rows.push_back({{"id", p->at("id")}, {"name", world.name(*p)}, + {"position", position(*p).empty() ? Json(nullptr) : Json(position(*p))}, + {"age", age(*p, state)}, + {"strength", attribute(*p, "strength")}, {"condition", attribute(*p, "condition")}, + {"technique", attribute(*p, "technique")}, {"form", attribute(*p, "form")}, + {"shoot", attribute(*p, "shooting")}, {"pass", attribute(*p, "passing")}, + {"team", attribute(*p, "teamplay")}, {"games", attribute(*p, "games")}, + {"grade", attribute(*p, "grade")}, + {"positions", p->value("positions", Json::array())}, + {"attributes", p->value("attributes", Json::object())}, + {"birth_date", p->value("birth_date", Json())}, + {"salary", c.at("salary")}, {"months", c.at("months")}, {"insurance", c.at("insurance")}, + {"source", c.at("source")}, {"source_label", source_label(c.at("source").get())}}); + } + Json bonuses = Json::array(); + for (size_t i = 0; i < bonus_names.size(); ++i) + bonuses.push_back({{"name", bonus_names[i]}, {"value", state.at("contracts").at("bonuses")[i]}}); + return {{"ok", true}, {"club", club}, {"rows", rows}, {"salary_total", known ? Json(total) : Json(nullptr)}, + {"salary_known", known}, {"salary_unknown", unknown}, {"bonuses", bonuses}}; +} +} // namespace bmh::modern_ui diff --git a/src/modern/ui/demo_finance.hpp b/src/modern/ui/demo_finance.hpp new file mode 100644 index 0000000..bf96aac --- /dev/null +++ b/src/modern/ui/demo_finance.hpp @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-3.0-only +#pragma once +#include "modern/ui/catalog.hpp" + +namespace bmh::modern_ui { +// Full presentation state: cash/deposit/debt remain the sole shared balances. +// Money in the model/projections uses currency minor units. Action editor values +// use whole displayed currency units, or quantities for asset transactions. +int64_t finance_currency_factor(const Catalog &); +Json demo_contracts(const Catalog &, const std::string &managed_club = ""); +bool migrate_demo_finance(Json &state, const Catalog &, + const std::string &managed_club = ""); +bool valid_demo_finance(const Json &state, const Catalog &, + const std::string &managed_club = ""); +std::string edit_demo_finance(Json &state, const Json &action, const Catalog &, + const std::string &managed_club = ""); +// Helpers only project synthetic prices/rates. They never accrue money or time. +Json demo_bank_assets(const Catalog &); +Json demo_bank_terms(); +// {kind:deposit|withdraw|loan|repay} or +// {kind:property-buy|property-sell|stock-buy|stock-sell,index:int}. +// Returns ok,kind,min,max,quantity,index,unit_price (raw),step. A max of zero +// disables confirmation. Every commit recomputes this quote from current state. +Json demo_bank_quote(const Json &state, const Json &request, const Catalog &); +Json demo_bank_summary(const Json &state, const Catalog &); +Json demo_balance_rows(const Json &state, const Catalog &); +// Returns {ok,club,rows:[catalogue values + stored contract],salary_total, +// salary_known,salary_unknown,bonuses}; total covers known salaries only. +Json demo_contract_rows(const Json &state, const Catalog &, + const std::string &managed_club = ""); +} // namespace bmh::modern_ui diff --git a/src/modern/ui/finance_controls.inc b/src/modern/ui/finance_controls.inc new file mode 100644 index 0000000..b567da9 --- /dev/null +++ b/src/modern/ui/finance_controls.inc @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-3.0-only +bool App::commit_finance(const Json &change, uint64_t revision) { + if (!source_) return false; + const auto result = source_->apply({revision, "finance", change}); + if (!result.ok) { + message("Die Eingabe konnte nicht übernommen werden. Bitte den aktuellen Stand prüfen und erneut eingeben. (" + result.error + ")"); + return false; + } + refresh(); + return true; +} +bool App::finance_action(const std::string &action, Rml::Element *target) { + if (menu_ != "balance") return false; + if (action == "balance-toggle") { + balance_future_ = !balance_future_; + focus_after_render_ = "balance-toggle"; + refresh(); + return true; + } + if (action == "balance-plan" && target) { + const int index = target->GetAttribute("data-id", -1); + const auto rows = demo_balance_rows(snap().state, *world_); + if (!balance_future_ || !rows.value("ok", false) || index < 0 || size_t(index) >= rows.at("plan").size()) return true; + const auto &row = rows.at("plan")[size_t(index)]; + const auto revision = snap().revision; + const auto world = world_; + AmountRequest request; + request.title = row.at("name").get() + " in " + (money_unit() == "€" ? "Euro" : money_unit()); + request.unit = money_unit(); + request.value = row.at("amount").get() / finance_currency_factor(*world_); + request.min = 0; + request.max = 99999999; + request.step = 1000; + request.suggestion_step = 50000; + request.return_focus = target->GetId(); + request.accept = [this, index, revision, world](int64_t value) { + if (world != world_ || menu_ != "balance") return false; + return commit_finance({{"kind", "plan"}, {"index", index}, {"value", value}}, revision); + }; + open_amount(std::move(request)); + return true; + } + return false; +} +bool App::finance_event(Rml::Event &event) { + if (menu_ != "balance" || !balance_future_ || amount_) return false; + const auto type = event.GetType(); + if ((type == "keydown" && event.GetParameter("key_identifier", 0) == Rml::Input::KI_ESCAPE) || + (type == "mouseup" && event.GetParameter("button", 0) == 1)) { + balance_future_ = false; + focus_after_render_ = "balance-toggle"; + refresh(); + event.StopImmediatePropagation(); + return true; + } + return false; +} diff --git a/src/modern/ui/finance_screens.inc b/src/modern/ui/finance_screens.inc new file mode 100644 index 0000000..9335777 --- /dev/null +++ b/src/modern/ui/finance_screens.inc @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-3.0-only +std::string App::render_balance() { + const auto rows = demo_balance_rows(snap().state, *world_); + if (!rows.value("ok", false)) throw editor::Error("Die Bilanzdaten sind ungültig."); + std::string out = "
"; + if (balance_future_) { + out += "

Ausgabenplanung

"; + int i = 0; + for (const auto &row : rows.at("plan")) { + const auto name = row.at("name").get(); + out += "
" + esc(name) + "" + + btn("balance-plan", esc(number(row.at("amount").get() / finance_currency_factor(*world_))), + "balance-plan-value amount-trigger", "id=\"balance-plan-" + std::to_string(i) + + "\" data-id=\"" + std::to_string(i) + "\" aria-label=\"" + esc(name + " in " + (money_unit() == "€" ? "Euro" : money_unit())) + "\"") + "
"; + ++i; + } + out += "

Geplante Ausgaben" + + esc(cash(rows.at("plan_total").get())) + "

"; + } else { + int index = 0; + for (const auto &kind : {std::string("income"), std::string("costs")}) { + out += "

" + (kind == "income" ? "Einnahmen" : "Ausgaben") + "

" + "
PositionBetrag
"; + int n = 0; + for (const auto &row : rows.at(kind)) { + out += "
" + + esc(row.at("name").get()) + "" + esc(cash(row.at("amount").get())) + "
"; + } + out += "
"; + } + const std::array values = { + number(rows.at("league_home_games").get()) + " Liga-Heimspiele", + number(rows.at("other_home_games").get()) + " sonstige Heimspiele", + "Zuschauerschnitt: " + number(rows.at("attendance_average").get()), + "Eintrittspreis: " + cash(rows.at("ticket").get()), + "Kontostand: " + cash(rows.at("cash").get()), + "Saldo: " + cash(rows.at("balance").get())}; + for (int i = 0; i < 6; ++i) + out += "

" + esc(values[size_t(i)]) + "

"; + } + out += btn("balance-toggle", "" + std::string(balance_future_ ? "Zukunft" : "Aktuell") + + "", "balance-toggle report-reset", + "id=\"balance-toggle\" aria-label=\"Zwischen aktueller Bilanz und Zukunftsplanung wechseln\""); + return out + "
"; +} diff --git a/src/modern/ui/model.cpp b/src/modern/ui/model.cpp index 17018a8..f6c7e4d 100644 --- a/src/modern/ui/model.cpp +++ b/src/modern/ui/model.cpp @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-only #include "modern/ui/model.hpp" #include "modern/ui/demo_almanac.hpp" +#include "modern/ui/demo_finance.hpp" #include "modern/ui/demo_calendar.hpp" #include "modern/ui/demo_reports.hpp" #include "modern/ui/demo_sports.hpp" @@ -84,6 +85,8 @@ DemoSource::DemoSource(std::shared_ptr catalog) throw editor::Error("invalid_demo_date"); state_["calendar"] = demo_calendar(*catalog_, state_.at("date"), club); state_["reports"] = demo_reports(*catalog_); + if (!migrate_demo_finance(state_, *catalog_, club)) + throw editor::Error("invalid_demo_finance"); saved_ = state_; } Snapshot DemoSource::snapshot() const { return {revision_, catalog_, state_}; } @@ -122,11 +125,15 @@ ActionResult DemoSource::apply(const Action &action) { if (next.at("training").at("club") != first) { next["training"] = demo_training(*catalog_, first); next["tactics"] = demo_tactics(); + next["contracts"] = demo_contracts(*catalog_, first); next["calendar"] = demo_calendar(*catalog_, next.at("date"), first); const auto error = edit_demo_reports(next["reports"], {{"kind", "league"}, {"value", next["calendar"]["league"]}}, *catalog_); if (!error.empty()) return {false, revision_, error}; } + } else if (action.kind == "finance") { + const auto error = edit_demo_finance(next, action.value, *catalog_, next["managers"][0]["club"]); + if (!error.empty()) return {false, revision_, error}; } else if (action.kind == "training") { const auto error = edit_demo_training(next["training"], action.value); if (!error.empty()) @@ -246,6 +253,8 @@ Json DemoSource::load(const fs::path &file) { for (const auto &v : focus) if (!v.is_number_integer() || v < 0 || v > 15) throw editor::Error("invalid_focus"); + if (!migrate_demo_finance(data, *catalog_, club)) + throw editor::Error("invalid_demo_finance"); auto next = data; auto desktop = next.value("desktop", Json::object()); if (!migrate_desktop(desktop)) diff --git a/src/modern/ui/screens.inc b/src/modern/ui/screens.inc index 4c84aaf..b4a659f 100644 --- a/src/modern/ui/screens.inc +++ b/src/modern/ui/screens.inc @@ -883,6 +883,12 @@ std::string App::render_menu(const std::string &key) { body = render_friendlies(); else if (key == "indoor") body = render_indoor(); + else if (key == "bank") + body = render_bank(); + else if (key == "balance") + body = render_balance(); + else if (key == "contracts") + body = render_contracts(); else if (key == "training") body = render_training(); else if (key == "tactics") @@ -900,6 +906,12 @@ std::string App::render_menu(const std::string &key) { body = render_desktop_tools(key); else throw editor::Error("Diese native Ansicht ist noch nicht verfügbar."); + std::string heading = key == "postpone" ? "Spiel verlegen" : title(key); + if (key == "bank" && bank_view_ != "entrance") { + const std::map labels = {{"savings", "Sparbuch"}, {"properties", "Immobilien"}, + {"stocks", "Aktien"}, {"credit", "Kredit"}, {"overview", "Finanzübersicht"}}; + if (labels.contains(bank_view_)) heading += " · " + labels.at(bank_view_); + } return "
" + - window(key == "postpone" ? "Spiel verlegen" : title(key), body) + "
"; + window(heading, body) + ""; } diff --git a/src/modern/ui/view.cpp b/src/modern/ui/view.cpp index 5fe938c..9a90607 100644 --- a/src/modern/ui/view.cpp +++ b/src/modern/ui/view.cpp @@ -6,6 +6,7 @@ #include "launch/rml_video.hpp" #include "modern/ui/controls.hpp" #include "modern/ui/demo_calendar.hpp" +#include "modern/ui/demo_finance.hpp" #include "modern/ui/demo_reports.hpp" #include "modern/ui/demo_sports.hpp" #include "modern/ui/desktop.hpp" @@ -16,6 +17,7 @@ #include "version.hpp" #include #include +#include #include #include #include @@ -280,6 +282,20 @@ struct Mod { fs::path file; Json manifest; }; +struct AmountRequest { + std::string title, unit, return_focus; + int64_t value = 0, min = 0, max = 99999999, step = 1, suggestion_step = 100000; + bool review = true; + std::function review_text; + std::function accept; +}; +struct AmountDraft { + AmountRequest request; + std::string raw, error, menu; + bool review = false; + uint64_t revision = 0; + std::shared_ptr world; +}; class App final : public Rml::EventListener { fs::path executable_, root_, assets_, gui_root_; launch::SaveMigrator migrate_; @@ -317,6 +333,16 @@ class App final : public Rml::EventListener { std::string planning_dialog_, planning_notice_, planning_return_focus_; int almanac_year_ = 0; std::string almanac_day_, almanac_match_, almanac_tab_ = "lineups"; + std::optional amount_; + bool amount_select_all_ = false, amount_caret_end_ = false; + std::string bank_view_ = "entrance", bank_hint_; + int bank_property_ = 0, bank_owned_ = 0, bank_stock_ = 11; + bool balance_future_ = false; + Json contract_draft_; + std::string contracts_player_, contracts_dialog_, contracts_return_focus_, contracts_notice_; + int contracts_tab_ = 2; + uint64_t contracts_revision_ = 0; + std::shared_ptr contracts_world_; float device_ratio_ = 1.f; Json desktop_ = Json::object(), saved_desktop_ = Json::object(), options_ = Json::object(); @@ -369,6 +395,10 @@ class App final : public Rml::EventListener { world_ ? world_->manifest().value("currency", Json::object()) : Json::object()); } + std::string money_unit() const { + const auto code = world_ ? world_->manifest().value("currency", Json::object()).value("code", std::string("EUR")) : "EUR"; + return code == "EUR" ? "€" : code; + } fs::path user_dir() const { const auto id = world_ ? world_->manifest().value("id", std::string("none")) : std::string("none"); @@ -422,10 +452,10 @@ class App final : public Rml::EventListener { std::string window(const std::string &heading, const std::string &content, bool close = true) { return "
" + - (close ? btn("close", "×", "close") + (close ? btn("close", "×", "close", "id=\"window-close\" aria-label=\"" + std::string(menu_ == "bank" && bank_view_ != "entrance" ? "Zurück zur Bankhalle" : "Fenster schließen") + "\"") : "") + "

" + esc(heading) + "

" + - content + "
"; + content + "" + (amount_ ? render_amount() : "") + ""; } std::string select(const std::string &id, @@ -526,6 +556,15 @@ class App final : public Rml::EventListener { renderer_.world(next); world_ = std::move(next); source_ = std::move(demo); + amount_.reset(); + amount_select_all_ = amount_caret_end_ = false; + contracts_dialog_.clear(); + contracts_player_.clear(); + contract_draft_ = Json(); + contracts_world_.reset(); + bank_view_ = "entrance"; + bank_hint_.clear(); + balance_future_ = false; almanac_year_ = 0; almanac_day_.clear(); almanac_match_.clear(); @@ -635,6 +674,26 @@ class App final : public Rml::EventListener { std::string render_planning_dialog(); std::string planning_progress(bool, bool); bool planning_action(const std::string &, Rml::Element *); + std::string render_amount(); + void open_amount(AmountRequest); + void close_amount(bool restore = true); + void update_amount(bool focus = false, bool select_all = false); + bool amount_action(const std::string &, Rml::Element *); + bool amount_event(Rml::Event &); + bool amount_trigger_event(Rml::Event &); + std::optional amount_value() const; + std::string amount_error() const; + bool commit_finance(const Json &, uint64_t); + std::string render_bank(); + bool bank_action(const std::string &, Rml::Element *); + bool bank_event(Rml::Event &); + std::string render_balance(); + bool finance_action(const std::string &, Rml::Element *); + bool finance_event(Rml::Event &); + std::string render_contracts(); + bool contracts_action(const std::string &, Rml::Element *); + bool contracts_event(Rml::Event &); + void close_contracts(bool restore = true); std::string render_almanac(); bool almanac_action(const std::string &, Rml::Element *); std::string render_indoor(); @@ -704,6 +763,9 @@ 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(); + amount_.reset(); + contracts_dialog_.clear(); + contract_draft_ = Json(); report_detail_kind_.clear(); report_picker_.clear(); } @@ -737,13 +799,21 @@ class App final : public Rml::EventListener { if (!menu_.empty()) markup += render_menu(menu_); element("canvas")->SetInnerRML(markup); - if (!report_detail_kind_.empty() || !planning_dialog_.empty()) { + if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty()) { Rml::ElementList behind; doc_->QuerySelectorAll(behind, - "#report-underlay button,#report-underlay input,#report-underlay select,.window .titlebar button"); + "#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,.window .titlebar button"); for (auto *node : behind) node->SetProperty("pointer-events", "none"); } + if (amount_) { + Rml::ElementList underlay; + doc_->QuerySelectorAll(underlay, ".window>.content,.window>.titlebar"); + for (auto *node : underlay) { + node->SetProperty("pointer-events", "none"); + node->SetProperty("filter", "blur(10dp)"); + } + } const auto size = context_->GetDimensions(); const auto background = img("background", size.x / scale_, size.y / scale_, false, true, 2048); @@ -770,7 +840,8 @@ class App final : public Rml::EventListener { node->Focus(keyboard_navigation_); if (focus_after_render_.starts_with("report-option-") || focus_after_render_.starts_with("friendly-opponent-") || - focus_after_render_.starts_with("alm-match-")) + focus_after_render_.starts_with("alm-match-") || + focus_after_render_.starts_with("contract-player-")) report_option_to_scroll_ = focus_after_render_; focus_after_render_.clear(); } @@ -855,6 +926,15 @@ class App final : public Rml::EventListener { context_->Update(); if (center_selects(*doc_)) context_->Update(); + if (amount_select_all_) { + if (auto *input = dynamic_cast(element("calculator-value"))) input->Select(); + amount_select_all_ = false; + } + if (amount_caret_end_) { + if (auto *input = dynamic_cast(element("calculator-value"))) + input->SetSelectionRange(int(input->GetValue().size()), int(input->GetValue().size())); + amount_caret_end_ = false; + } if (center_fixture_columns()) context_->Update(); if (training_scroll_) { @@ -986,9 +1066,9 @@ public: throw std::runtime_error("Modern UI layout missing"); for (const char *event : {"click", "dblclick", "change", "input", "keydown", "blur", "mousedown", - "mouseup", "mousemove", "contextmenu"}) + "mouseup", "mousemove", "contextmenu", "focus"}) doc_->AddEventListener(event, this, Rml::String(event) == "keydown" || - Rml::String(event) == "blur"); + Rml::String(event) == "blur" || Rml::String(event) == "focus"); if (!config_.theme.empty()) theme_ = config_.theme; if (theme_ != "midnight" && theme_ != "silver" && theme_ != "matchday") @@ -1119,6 +1199,13 @@ public: #include "modern/ui/planning_controls.inc" #include "modern/ui/almanac_screens.inc" #include "modern/ui/almanac_controls.inc" +#include "modern/ui/amount_entry.inc" +#include "modern/ui/bank_screens.inc" +#include "modern/ui/bank_controls.inc" +#include "modern/ui/finance_screens.inc" +#include "modern/ui/finance_controls.inc" +#include "modern/ui/contracts_screens.inc" +#include "modern/ui/contracts_controls.inc" } // namespace bool is_modern_world(const fs::path &file) { try { diff --git a/tests/modern_control_layout_tests.cpp b/tests/modern_control_layout_tests.cpp index b050380..e2b11a8 100644 --- a/tests/modern_control_layout_tests.cpp +++ b/tests/modern_control_layout_tests.cpp @@ -100,7 +100,7 @@ int main(int argc, char **argv) try { std::ostringstream css; for (const auto *name : {"theme.rcss", "ticket.rcss", "sports.rcss", "calendar.rcss", "reports.rcss", "report_details.rcss", - "report_pickers.rcss", "indoor.rcss", "planning.rcss", "almanac.rcss"}) { + "report_pickers.rcss", "indoor.rcss", "planning.rcss", "almanac.rcss", "finance.rcss", "bank.rcss", "contracts.rcss", "amount.rcss"}) { std::ifstream input(root / name); require(bool(input), "Production stylesheet missing"); css << input.rdbuf() << '\n'; diff --git a/tests/modern_finance_ui_tests.cpp b/tests/modern_finance_ui_tests.cpp new file mode 100644 index 0000000..8e88a3a --- /dev/null +++ b/tests/modern_finance_ui_tests.cpp @@ -0,0 +1,322 @@ +// SPDX-License-Identifier: GPL-3.0-only +#include "modern/ui/demo_finance.hpp" +#include +#include +#include +#include +#include + +using namespace bmh::modern_ui; +namespace { +void require(bool value, const char *message) { + if (!value) throw std::runtime_error(message); +} +std::string player(int i) { return "player:finance-test-" + std::to_string(i); } +struct Fixture { + fs::path root; + std::shared_ptr world; + explicit Fixture(Json precision = 0, bool populated = true) { + root = fs::temp_directory_path() / ("openbmh-finance-ui-" + + std::to_string(std::chrono::steady_clock::now().time_since_epoch().count())); + fs::create_directories(root / "world"); + const auto write = [&](const std::string &file, const Json &value) { + std::ofstream out(root / file); out << value.dump(); + require(bool(out), "Cannot write synthetic catalogue"); + }; + write("manifest.json", {{"format", "openbmh-world"}, {"kind", "world"}, + {"format_version", "1.1"}, {"id", "world:synthetic-finance-ui"}, + {"start_date", "2026-07-01"}, {"currency", {{"code", "EUR"}, {"minor_units", precision}}}, + {"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:finance-test"}, + {"name", "Synthetic league"}, {"nation", "nation:de"}, {"type", "league"}}}}}); + Json players = Json::array(), clubs = Json::array(), contracts = Json::array(); + if (populated) { + clubs = {{{"id", "club:finance-home"}, {"name", "Synthetic home"}, {"nation", "nation:de"}, + {"competition", "competition:finance-test"}}, + {{"id", "club:finance-other"}, {"name", "Synthetic other"}, {"nation", "nation:de"}, + {"competition", "competition:finance-test"}}}; + for (int i = 0; i < 13; ++i) { + Json p = {{"id", player(i)}, {"name", "Synthetic player " + std::to_string(i)}, + {"team", "club:finance-home"}, {"squad_order", i}, {"positions", {i ? "mid" : "gk"}}}; + if (i == 0) { + p["birth_date"] = "2000-07-02"; + p["attributes"] = {{"strength", 82}, {"condition", 80}, {"technique", 75}, {"form", 77}, + {"shooting", 61}, {"passing", 72}, {"teamplay", 68}}; + } + if (i == 1) p["age_at_start"] = 31; + players.push_back(p); + } + players.push_back({{"id", "player:finance-other"}, {"team", "club:finance-other"}, + {"name", "Synthetic other player"}, {"positions", {"def"}}}); + const int64_t factor = precision == 2 ? 100 : 1; + const auto add = [&](int i, Json salary, Json extra = Json::object()) { + Json c = {{"id", "contract:synthetic-" + std::to_string(contracts.size())}, + {"person", player(i)}, {"team", "club:finance-home"}}; + if (!salary.is_null()) c["salary"] = salary; + for (const auto &item : extra.items()) c[item.key()] = item.value(); + contracts.push_back(c); + }; + add(0, 120000 * factor); + add(1, nullptr, {{"initialization", {{"policy", "classic-player-contract@1"}, + {"source_identity_word", 65535}, {"source_skill_word", 65535}}}}); + add(3, 0); + add(4, 120000 * factor); add(4, 240000 * factor); + add(5, 120000 * factor, {{"end", "2026-06-30"}}); + add(6, 120000 * factor, {{"start", "2026-07-02"}}); + add(7, 120000 * factor, {{"team", "club:finance-other"}}); + add(8, 120006 * factor, {{"start", "2026-07-01"}, {"end", "2026-07-01"}}); + add(9, -1, {{"initialization", Json::object()}}); + add(10, nullptr, {{"initialization", Json::object()}, {"start", "2026-02-30"}}); + add(11, uint64_t(-1)); + add(12, "not-a-salary"); + contracts.push_back({{"id", "contract:synthetic-other"}, {"person", "player:finance-other"}, + {"team", "club:finance-other"}, {"initialization", Json::object()}}); + } + write("world/clubs.json", {{"items", clubs}}); + write("world/players.json", {{"items", players}}); + write("world/contracts.json", {{"items", contracts}}); + world = Catalog::open(root); + } + ~Fixture() { std::error_code ec; fs::remove_all(root, ec); } +}; +Json legacy(int64_t factor) { + return {{"cash", 12450000 * factor}, {"deposit", 600000 * factor}, {"debt", 0}, + {"ticket", 13}, {"date", "2026-07-01"}, + {"managers", {{{"club", "club:finance-home"}, {"name", "Synthetic manager"}}}}, + {"unrelated", {{"revision_marker", 97}, {"other_plan", {4, 5, 6}}}}}; +} +void edit(Json &state, const Catalog &world, const Json &action) { + const auto error = edit_demo_finance(state, action, world); + if (!error.empty()) throw std::runtime_error("Unexpected rejection: " + error + " " + action.dump()); + require(valid_demo_finance(state, world), "Accepted action left invalid state"); +} +void reject(Json &state, const Catalog &world, const Json &action) { + const auto before = state; + require(!edit_demo_finance(state, action, world).empty() && state == before, + "Rejected action mutated state or was accepted"); +} +int64_t quote(const Json &state, const Catalog &world, const char *kind, int index = -1) { + Json request = {{"kind", kind}}; + if (index >= 0) request["index"] = index; + const auto result = demo_bank_quote(state, request, world); + require(result.value("ok", false) && result.at("min") == 1, + "Bank quote failed or used zero minimum"); + return result.at("max").get(); +} +int64_t net(const Json &state, const Catalog &world) { + return demo_bank_summary(state, world).at("net").get(); +} +void check_currency(int precision) { + Fixture fixture(precision); + const auto &world = *fixture.world; + const auto factor = precision ? 100 : 1; + const auto original_players = world.rows("players"), original_contracts = world.rows("contracts"); + auto state = legacy(factor); + const auto original_legacy = state; + require(!valid_demo_finance(state, world) && migrate_demo_finance(state, world) && + valid_demo_finance(state, world), "Finance legacy migration failed"); + require(finance_currency_factor(world) == factor && state.at("cash") == original_legacy.at("cash") && + state.at("deposit") == original_legacy.at("deposit") && state.at("debt") == original_legacy.at("debt") && + state.at("unrelated") == original_legacy.at("unrelated") && !state["finance"].contains("cash"), + "Migration replaced sole shared balances or unrelated state"); + const auto &contracts = state.at("contracts").at("players"); + require(contracts.at(player(0)).at("salary") == 10000 * factor && + contracts.at(player(0)).at("source") == "obw_season" && + contracts.at(player(1)).at("salary") == 5250 * factor && + contracts.at(player(1)).at("source") == "demo" && + contracts.at(player(1)).at("months") == 36 && + contracts.at(player(3)).at("salary") == 0 && + contracts.at(player(3)).at("source") == "obw_season" && + contracts.at(player(8)).at("salary") == 10001 * factor, + "Salary season/month conversion, rounding, source or explicit zero incorrect"); + for (int i : {2, 4, 5, 6, 7, 9, 10, 11, 12}) + require(contracts.at(player(i)).at("salary").is_null() && + contracts.at(player(i)).at("source") == "unavailable", "Unavailable or ambiguous salary was invented"); + const auto rows = demo_contract_rows(state, world); + require(rows.at("salary_total") == 25251 * factor && rows.at("salary_known") == 4 && + rows.at("salary_unknown") == 9 && rows.at("rows")[0].at("age") == 25 && + rows.at("rows")[1].at("age") == 31 && rows.at("rows")[0].at("position") == "gk" && + rows.at("rows")[0].at("shoot") == 61 && rows.at("rows")[0].at("pass") == 72 && + rows.at("rows")[0].at("team") == 68 && rows.at("rows")[0].at("games").is_null() && + rows.at("rows")[0].at("grade").is_null(), "Contract rows lost real values or invented game statistics"); + const auto assets = demo_bank_assets(world); + require(assets.at("properties").size() == 6 && assets.at("stocks").size() == 12 && + assets.at("properties")[5].at("price") == 3650000 * factor && + assets.at("stocks")[0].at("price") == 124 * factor && + assets.at("stocks")[0].at("previous") == 127 * factor && demo_bank_terms() == Json::array({6,12,18,24,30,36,42,48,54,60}), + "Gold asset catalogue, terms or currency scaling changed"); + const auto initial = state; + const auto total = net(state, world); + require(quote(state, world, "deposit") == 12450000 && quote(state, world, "withdraw") == 600000 && + quote(state, world, "loan") == 5000000 && quote(state, world, "repay") == 0, + "Bank maximum is in raw minor units or ignores balance limits"); + edit(state, world, {{"kind", "deposit"}, {"value", 100000}}); + require(state.at("cash") == 12350000 * factor && state.at("deposit") == 700000 * factor && + net(state, world) == total, "Deposit failed value conservation or unit conversion"); + edit(state, world, {{"kind", "withdraw"}, {"value", 100000}}); + require(state.at("cash") == initial.at("cash") && state.at("deposit") == initial.at("deposit"), + "Withdrawal did not reverse deposit"); + edit(state, world, {{"kind", "term"}, {"value", 24}}); + edit(state, world, {{"kind", "loan"}, {"value", 1000000}}); + require(state.at("debt") == 1000000 * factor && net(state, world) == total && + quote(state, world, "loan") == 0, "Loan changed net assets or permits duplicate loans"); + reject(state, world, {{"kind", "term"}, {"value", 12}}); + reject(state, world, {{"kind", "loan"}, {"value", 1}}); + const auto before_projection = state; + const auto summary = demo_bank_summary(state, world); + require(summary.at("monthly_rate") == 48334 * factor && summary.at("credit_interest") == 80000 * factor && + summary.at("schedule").size() == 25 && summary.at("schedule")[0].at("remaining") == 1000000 * factor && + summary.at("schedule").back().at("remaining") == 0 && summary.at("schedule_example") == false && state == before_projection, + "Interest/rate/schedule projection is incorrect or booked effects"); + edit(state, world, {{"kind", "repay"}, {"value", 500000}}); + edit(state, world, {{"kind", "repay"}, {"value", 500000}}); + require(state.at("cash") == initial.at("cash") && state.at("debt") == 0 && net(state, world) == total, + "Loan repayment did not conserve balances"); + edit(state, world, {{"kind", "term"}, {"value", 60}}); + require(demo_bank_summary(state, world).at("schedule_example") == true && + demo_bank_summary(state, world).at("schedule_principal") == 1000000 * factor, + "No-loan schedule is not marked as a currency-correct example"); + edit(state, world, {{"kind", "property-buy"}, {"index", 2}, {"value", 2}}); + require(state["finance"]["properties"][2] == 2 && state["finance"]["properties"][0] == 1 && + net(state, world) == total, "Property acquisition changed total value"); + edit(state, world, {{"kind", "property-sell"}, {"index", 0}, {"value", 1}}); + require(state["finance"]["properties"][0] == 0 && state["finance"]["properties"][2] == 2 && + net(state, world) == total, "Sale ignored chosen owned property type"); + reject(state, world, {{"kind", "property-sell"}, {"index", 0}, {"value", 1}}); + edit(state, world, {{"kind", "stock-buy"}, {"index", 11}, {"value", 1000}}); + require(state["finance"]["stocks"][11] == 1000 && net(state, world) == total, + "Stock purchase did not conserve synthetic asset value"); + reject(state, world, {{"kind", "stock-sell"}, {"index", 1}, {"value", 1}}); + edit(state, world, {{"kind", "stock-sell"}, {"index", 11}, {"value", 1000}}); + require(state["finance"]["stocks"][11] == 0 && net(state, world) == total, "Stock sale changed total value"); + const auto current_balance = demo_balance_rows(state, world); + require(current_balance.at("income").size() == 7 && current_balance.at("costs").size() == 11 && + current_balance.at("cash") == state.at("cash") && current_balance.at("ticket") == 13 * factor, + "Balance projection duplicated cash/ticket or lost Gold categories"); + const auto cash = state.at("cash"); + edit(state, world, {{"kind", "plan"}, {"index", 0}, {"value", 1000}}); + require(state.at("cash") == cash && demo_balance_rows(state, world).at("costs") == current_balance.at("costs") && + demo_balance_rows(state, world).at("plan")[0].at("amount") == 1000 * factor, + "Expense plan booked cash or changed fictional actual expenses"); + reject(state, world, {{"kind", "plan"}, {"index", 0}, {"value", 1234}}); + reject(state, world, {{"kind", "plan"}, {"index", 0}, {"value", 99999999}}); + edit(state, world, {{"kind", "plan"}, {"index", 10}, {"value", 99999000}}); + state["balance"]["plan"][1] = 123 * factor + (precision ? 45 : 0); + const auto legacy_plan = state; + require(valid_demo_finance(state, world) && migrate_demo_finance(state, world) && state == legacy_plan, + "Migration repaired or rejected a valid older non-step plan value"); + edit(state, world, {{"kind", "insurance"}, {"player", player(0)}, {"value", 24}}); + edit(state, world, {{"kind", "bonus"}, {"index", 6}, {"value", 255}}); + edit(state, world, {{"kind", "contract-offer"}, {"player", player(0)}, {"salary", 12345}, {"months", 18}}); + require(state["contracts"]["players"][player(0)]["salary"] == 12345 * factor && + state["contracts"]["players"][player(0)]["months"] == 18 && + state["contracts"]["players"][player(0)]["insurance"] == 24 && + state["contracts"]["players"][player(0)]["source"] == "offer" && state.at("cash") == cash, + "Contract offer converted units twice, reset insurance or charged cash"); + edit(state, world, {{"kind", "contract-offer"}, {"player", player(2)}, {"salary", 0}, {"months", 1}}); + edit(state, world, {{"kind", "contract-offer"}, {"player", player(3)}, {"salary", 200000}, {"months", 48}}); + auto near_cap = initial; near_cap["cash"] = 99999999LL * factor - 2 * factor; + require(quote(near_cap, world, "loan") == 2 && quote(near_cap, world, "withdraw") == 2 && + quote(near_cap, world, "property-sell", 0) == 0, "Cash cap is ignored by loan, withdrawal or sale"); + reject(near_cap, world, {{"kind", "loan"}, {"value", 3}}); + edit(near_cap, world, {{"kind", "loan"}, {"value", 2}}); + require(near_cap["cash"] == 99999999LL * factor && quote(near_cap, world, "withdraw") == 0, + "Cash cap exact boundary failed"); + auto full_asset = initial; full_asset["finance"]["stocks"][0] = 9998; + require(quote(full_asset, world, "stock-buy", 0) == 1, "Asset quantity cap missing"); + reject(full_asset, world, {{"kind", "stock-buy"}, {"index", 0}, {"value", 2}}); + auto stale = initial; + const auto stale_max = quote(stale, world, "stock-buy", 11); + edit(stale, world, {{"kind", "deposit"}, {"value", quote(stale, world, "deposit")}}); + reject(stale, world, {{"kind", "stock-buy"}, {"index", 11}, {"value", stale_max}}); + auto empty_cash = initial; empty_cash["cash"] = 0; + require(quote(empty_cash, world, "deposit") == 0 && quote(empty_cash, world, "stock-buy", 0) == 0, + "Zero cash quote did not disable confirmation"); + reject(empty_cash, world, {{"kind", "deposit"}, {"value", 0}}); + for (const auto &action : std::vector{nullptr, Json::array(), "bad", Json::object(), + {{"kind", 1}}, {{"kind", "unknown"}, {"value", 1}}, {{"kind", "deposit"}}, + {{"kind", "deposit"}, {"value", -1}}, {{"kind", "deposit"}, {"value", true}}, + {{"kind", "deposit"}, {"value", 1.0}}, {{"kind", "deposit"}, {"value", uint64_t(-1)}}, + {{"kind", "deposit"}, {"value", 99999999999999LL}}, + {{"kind", "deposit"}, {"value", 1}, {"cash", 0}}, + {{"kind", "property-buy"}, {"index", 6}, {"value", 1}}, + {{"kind", "stock-buy"}, {"index", uint64_t(-1)}, {"value", 1}}, + {{"kind", "stock-buy"}, {"index", 0.0}, {"value", 1}}, + {{"kind", "term"}, {"value", 7}}, {{"kind", "term"}, {"value", 66}}, + {{"kind", "plan"}, {"index", 11}, {"value", 1000}}, + {{"kind", "bonus"}, {"index", 7}, {"value", 1}}, + {{"kind", "bonus"}, {"index", 0}, {"value", 256}}, + {{"kind", "insurance"}, {"player", player(0)}, {"value", 6}}, + {{"kind", "insurance"}, {"player", "player:finance-other"}, {"value", 12}}, + {{"kind", "contract-offer"}, {"player", player(0)}, {"salary", 200001}, {"months", 12}}, + {{"kind", "contract-offer"}, {"player", player(0)}, {"salary", 1000}, {"months", 0}}, + {{"kind", "contract-offer"}, {"player", player(0)}, {"salary", 1000}, {"months", 49}}, + {{"kind", "contract-offer"}, {"player", player(0)}, {"salary", "1000"}, {"months", 12}}}) + reject(state, world, action); + std::vector bad_states; + for (const auto &value : std::vector{-1, true, 1.5, uint64_t(-1), 99999999999999LL}) { + auto bad = state; bad["cash"] = value; bad_states.push_back(bad); + } + auto bad = state; bad["debt"] = 5000001LL * factor; bad_states.push_back(bad); + bad = state; bad["finance"]["cash"] = 0; bad_states.push_back(bad); + bad = state; bad["finance"].erase("term"); bad_states.push_back(bad); + bad = state; bad["finance"]["properties"][0] = 10000; bad_states.push_back(bad); + bad = state; bad["finance"]["stocks"].push_back(0); bad_states.push_back(bad); + bad = state; bad["balance"]["plan"][0] = -1; bad_states.push_back(bad); + bad = state; bad["balance"]["plan"].erase(bad["balance"]["plan"].end() - 1); bad_states.push_back(bad); + bad = state; bad["contracts"]["players"].erase(player(0)); bad_states.push_back(bad); + bad = state; bad["contracts"]["players"]["player:finance-other"] = bad["contracts"]["players"][player(0)]; bad_states.push_back(bad); + bad = state; bad["contracts"]["club"] = "club:finance-other"; bad_states.push_back(bad); + bad = state; bad["contracts"]["players"][player(0)]["salary"] = -1; bad_states.push_back(bad); + bad = state; bad["contracts"]["players"][player(0)]["source"] = "unavailable"; bad_states.push_back(bad); + bad = state; bad["contracts"]["players"][player(0)]["insurance"] = 1; bad_states.push_back(bad); + bad = state; bad["contracts"]["bonuses"][0] = 256; bad_states.push_back(bad); + bad = state; bad["managers"][0]["club"] = ""; bad_states.push_back(bad); + for (auto &invalid : bad_states) { + require(!valid_demo_finance(invalid, world), "Corrupt finance state accepted"); + reject(invalid, world, {{"kind", "term"}, {"value", 12}}); + const auto before = invalid; + require(!migrate_demo_finance(invalid, world) && invalid == before, + "Migration repaired present invalid finance data"); + } + auto reset = state; + reset["managers"][0]["club"] = "club:finance-other"; + require(!valid_demo_finance(reset, world), "Manager change inherited another roster's contracts"); + reset["contracts"] = demo_contracts(world, "club:finance-other"); + require(valid_demo_finance(reset, world) && reset["contracts"]["players"].size() == 1 && + reset["finance"] == state["finance"] && reset["cash"] == state["cash"], + "Manager contract reset altered shared bank holdings"); + auto migrated = state; migrated.erase("balance"); migrated.erase("finance"); + const auto existing_contracts = migrated["contracts"]; + require(migrate_demo_finance(migrated, world) && migrated["contracts"] == existing_contracts, + "Migration reset an existing valid contract draft"); + require(valid_demo_finance(Json::parse(state.dump()), world), "Finance save roundtrip invalid"); + if (precision == 2) { + auto fractional = initial; fractional["cash"] = 12345; fractional["deposit"] = 876; + require(quote(fractional, world, "deposit") == 123 && quote(fractional, world, "stock-buy", 0) == 0, + "Quote did not convert raw cents into whole-unit limits"); + edit(fractional, world, {{"kind", "deposit"}, {"value", 123}}); + require(fractional["cash"] == 45 && fractional["deposit"] == 13176, + "Whole-unit deposit lost pre-existing fractional balances"); + } + require(state["unrelated"] == original_legacy["unrelated"] && world.rows("players") == original_players && + world.rows("contracts") == original_contracts, "Presentation finance modified world or unrelated state"); +} +} // namespace +int main() try { + check_currency(0); check_currency(2); + for (const auto &precision : std::vector{1, 3, -1, true, "2", uint64_t(-1)}) { + Fixture malformed(precision); + auto state = legacy(1); const auto before = state; + require(!migrate_demo_finance(state, *malformed.world) && state == before, + "Unsupported currency precision was silently substituted"); + } + Fixture empty(0, false); auto state = Json{{"cash", 0}, {"deposit", 0}, {"debt", 0}}; + require(migrate_demo_finance(state, *empty.world) && valid_demo_finance(state, *empty.world) && + demo_contract_rows(state, *empty.world).at("rows").empty(), "Empty catalogue unsafe"); + std::cout << "Modern UI finance checks passed\n"; + return 0; +} catch (const std::exception &error) { + std::cerr << error.what() << '\n'; return 1; +} diff --git a/tests/modern_ui_core_tests.cpp b/tests/modern_ui_core_tests.cpp index 7babb87..a5e7fa2 100644 --- a/tests/modern_ui_core_tests.cpp +++ b/tests/modern_ui_core_tests.cpp @@ -2,6 +2,7 @@ #include "modern/ui/demo_sports.hpp" #include "modern/ui/demo_calendar.hpp" #include "modern/ui/demo_reports.hpp" +#include "modern/ui/demo_finance.hpp" #include "modern/ui/desktop.hpp" #include "modern/ui/gui_assets.hpp" #include "modern/ui/model.hpp" @@ -24,6 +25,134 @@ void table(const fs::path &root, const std::string &name, const Json &rows) { name == "assets" ? "assets/index.json" : "world/" + name + ".json", {{"schema", name + "@1.0"}, {"items", rows}}); } +void check_finance_source(const fs::path &root, + const std::shared_ptr &base) { + const auto folder = root / "finance-source"; + auto manifest = base->manifest(); + manifest["id"] = "world:synthetic-finance-source"; + manifest["currency"] = {{"code", "EUR"}, {"minor_units", 2}}; + write(folder, "manifest.json", manifest); + table(folder, "nations", base->rows("nations")); + table(folder, "competitions", base->rows("competitions")); + auto clubs = base->rows("clubs"), players = base->rows("players"); + clubs.push_back({{"id", "club:finance-next"}, {"name", "Synthetic next club"}, + {"nation", "nation:de"}, {"competition", "comp:home"}}); + players.push_back({{"id", "player:finance-next"}, {"name", "Synthetic next player"}, + {"team", "club:finance-next"}, {"positions", {"gk"}}, {"squad_order", 0}}); + table(folder, "clubs", clubs); + table(folder, "players", players); + table(folder, "contracts", Json::array({ + {{"id", "contract:finance-real"}, {"person", "player:a"}, {"team", "club:a"}, + {"salary", 12000000}}, + {{"id", "contract:finance-initialization"}, {"person", "player:b"}, {"team", "club:a"}, + {"initialization", {{"kind", "synthetic-demo"}}}}, + {{"id", "contract:finance-next"}, {"person", "player:finance-next"}, {"team", "club:finance-next"}, + {"salary", 24000000}}})); + const auto immutable_players = bmh::editor::read_file(folder / "world/players.json"); + const auto immutable_contracts = bmh::editor::read_file(folder / "world/contracts.json"); + auto world = Catalog::open(folder); + DemoSource source(world); + const auto start = source.snapshot(); + const auto factor = finance_currency_factor(*world); + require(factor == 100 && start.state["contracts"]["club"] == "club:a", + "Synthetic cent-currency source did not select its first manager"); + const auto act = [&](const Json &value) { + return source.apply({source.snapshot().revision, "finance", value}); + }; + const auto deposit = act({{"kind", "deposit"}, {"value", 400}}); + const auto deposited = source.snapshot(); + require(deposit.ok && deposit.revision == start.revision + 1 && + deposited.revision == deposit.revision && source.dirty() && + deposited.state["cash"] == start.state["cash"].get() - 400 * factor && + deposited.state["deposit"] == start.state["deposit"].get() + 400 * factor, + "Finance source action lost whole-to-minor conversion or revision/dirty state"); + const auto bank = demo_bank_summary(deposited.state, *world); + const auto balance = demo_balance_rows(deposited.state, *world); + require(bank.value("ok", false) && balance.value("ok", false) && + bank["cash"] == deposited.state["cash"] && balance["cash"] == bank["cash"] && + bank["deposit"] == deposited.state["deposit"] && + source.snapshot().state == deposited.state && source.snapshot().revision == deposited.revision, + "Bank/balance projections diverged from the shared wallet or mutated their source"); + const auto stale = source.apply({start.revision, "finance", {{"kind", "withdraw"}, {"value", 1}}}); + require(!stale.ok && stale.error == "stale_revision" && + source.snapshot().state == deposited.state && source.snapshot().revision == deposited.revision, + "Stale finance source action mutated the wallet or advanced its revision"); + require(act({{"kind", "contract-offer"}, {"player", "player:a"}, {"salary", 1234}, {"months", 36}}).ok && + act({{"kind", "insurance"}, {"player", "player:a"}, {"value", 24}}).ok && + act({{"kind", "bonus"}, {"index", 6}, {"value", 255}}).ok && + act({{"kind", "plan"}, {"index", 0}, {"value", 1000}}).ok, + "Contracts, insurance, bonuses or balance planning failed through the shared source"); + const auto edited = source.snapshot(); + require(edited.state["contracts"]["players"]["player:a"]["salary"] == 1234 * factor && + edited.state["contracts"]["players"]["player:a"]["months"] == 36 && + edited.state["contracts"]["players"]["player:a"]["insurance"] == 24 && + edited.state["contracts"]["bonuses"][6] == 255 && + edited.state["balance"]["plan"][0] == 1000 * factor && + edited.state["cash"] == deposited.state["cash"] && + edited.state["deposit"] == deposited.state["deposit"] && edited.state["debt"] == deposited.state["debt"], + "Contract/plan edits double-converted money or booked unrelated wallet movements"); + const auto file = folder / "finance.ui.json"; + const auto layout = default_desktop(); + source.save(file, layout); + require(!source.dirty(), "Saved finance source remained dirty"); + require(act({{"kind", "withdraw"}, {"value", 1}}).ok, "Post-save finance edit failed"); + const auto before_restore = source.snapshot().revision; + require(source.load(file) == layout && source.snapshot().state == edited.state && + source.snapshot().revision == before_restore + 1 && !source.dirty(), + "Finance checkpoint lost wallet/contracts/plans or failed revision and clean-state restoration"); + auto legacy = Json::parse(bmh::editor::read_file(file)); + for (const auto *key : {"finance", "balance", "contracts"}) legacy.erase(key); + write(folder, "legacy-finance.ui.json", legacy); + DemoSource migrated(world); + migrated.load(folder / "legacy-finance.ui.json"); + const auto upgraded = migrated.snapshot(); + require(valid_demo_finance(upgraded.state, *world, "club:a") && !migrated.dirty() && + upgraded.state["contracts"] == demo_contracts(*world, "club:a") && + upgraded.state["managers"] == edited.state["managers"], + "Legacy finance checkpoint did not initialize a complete manager-scoped preview"); + for (const auto *key : {"cash", "deposit", "debt", "ticket"}) + require(upgraded.state.at(key) == edited.state.at(key), + "Legacy finance migration overwrote an existing wallet/ticket value"); + auto corrupt = Json::parse(bmh::editor::read_file(file)); + corrupt["contracts"]["players"]["player:a"]["salary"] = -1; + write(folder, "invalid-finance.ui.json", corrupt); + const auto accepted = source.snapshot(); + bool rejected = false; + try { source.load(folder / "invalid-finance.ui.json"); } + catch (const std::exception &) { rejected = true; } + require(rejected && source.snapshot().state == accepted.state && + source.snapshot().revision == accepted.revision && !source.dirty(), + "Malformed existing finance fields were repaired or partially loaded"); + const auto change = source.apply({accepted.revision, "managers", Json::array({ + {{"name", "Synthetic next manager"}, {"club", "club:finance-next"}, {"portrait", 1}}})}); + const auto changed = source.snapshot(); + require(change.ok && changed.revision == accepted.revision + 1 && + changed.state["contracts"] == demo_contracts(*world, "club:finance-next") && + changed.state["contracts"]["players"].contains("player:finance-next") && + !changed.state["contracts"]["players"].contains("player:a") && + changed.state["cash"] == accepted.state["cash"] && + changed.state["deposit"] == accepted.state["deposit"] && + changed.state["debt"] == accepted.state["debt"] && + changed.state["finance"] == accepted.state["finance"] && + changed.state["balance"] == accepted.state["balance"], + "First-manager club change retained another club's contracts or reset the shared finances"); + require(!source.apply({accepted.revision, "finance", {{"kind", "insurance"}, + {"player", "player:a"}, {"value", 12}}}).ok && + !source.apply({changed.revision, "finance", {{"kind", "contract-offer"}, + {"player", "player:a"}, {"salary", 2000}, {"months", 24}}}).ok && + source.snapshot().state == changed.state && source.snapshot().revision == changed.revision, + "Old-club contract targets were silently retargeted after a manager switch"); + require(act({{"kind", "bonus"}, {"index", 0}, {"value", 17}}).ok, + "New club bonus edit failed"); + const auto before_rename = source.snapshot(); + require(source.apply({before_rename.revision, "managers", Json::array({ + {{"name", "Renamed manager"}, {"club", "club:finance-next"}, {"portrait", 1}}})}).ok && + source.snapshot().state["contracts"] == before_rename.state["contracts"], + "Renaming a manager in the same club reset its contracts/bonuses"); + require(bmh::editor::read_file(folder / "world/players.json") == immutable_players && + bmh::editor::read_file(folder / "world/contracts.json") == immutable_contracts, + "Finance source edits modified immutable catalogue players or contracts"); +} } // namespace int main(int argc, char **argv) try { if (argc == 2) { @@ -449,6 +578,7 @@ int main(int argc, char **argv) try { restored_planning.snapshot().state["calendar"]["friendly_league"] == "comp:home" && restored_planning.snapshot().state["reports"]["sorts"]["indoor"]["key"] == "points", "Old checkpoint lost league preview or failed planning/indoor migration"); + check_finance_source(root, world); GuiAssets absent(root / "missing-gui"); require(!absent.available(), "World resources were mistaken for GUI resources"); diff --git a/tools/modern_ui/prepare_gui_assets.py b/tools/modern_ui/prepare_gui_assets.py index c182e40..fbde78c 100644 --- a/tools/modern_ui/prepare_gui_assets.py +++ b/tools/modern_ui/prepare_gui_assets.py @@ -56,6 +56,12 @@ def main(): add('button.' + route, button['src'].removeprefix('../')) add('button.news', 'assets/vector/desktop-news.svg') add('button.almanac', 'assets/vector/desktop-almanac.svg') + for i in range(6): + add('bank.property.' + str(i), 'assets/studies/submenus/bank-properties-v1.png', + [(i % 2) / 2, (i // 2) / 3, .5, 1 / 3]) + for i in range(2): + add('contracts.scene.' + str(i), 'assets/studies/submenus/management-negotiations-v1.png', + [0, i / 2, 1, .5]) for i in range(9): add('training.skill.' + str(i), 'assets/studies/submenus/training-icons-v2.png', [(i % 3) / 3, (i // 3) / 3, 1 / 3, 1 / 3])