Merge pull request 'Feature: Versionsnummer in Einstellungs-Kopfzeile' (#46) from fds2610-bot/Steuerkram:main into main

Reviewed-on: https://codeberg.org/fds2610/Steuerkram/pulls/46
This commit is contained in:
fds2610 2026-04-21 19:29:51 +02:00
commit 950fb957e6
6 changed files with 13 additions and 4 deletions

View file

@ -7,7 +7,6 @@ namespace Steuerkram\Controllers;
use Steuerkram\Models\Account;
use Steuerkram\Models\Booking;
use Steuerkram\Models\Beleg;
use Steuerkram\Models\FiscalYear;
use Steuerkram\View;
class AccountController

View file

@ -9,7 +9,6 @@ use Steuerkram\Models\Booking;
use Steuerkram\Models\Account;
use Steuerkram\Models\Asset;
use Steuerkram\Models\Supplier;
use Steuerkram\Config;
use Steuerkram\View;
use Steuerkram\Services\ImageCropService;
use Steuerkram\Services\KontierungsvorschlagService;

View file

@ -12,10 +12,12 @@ class SettingsController
public function show(array $params): void
{
$settings = Setting::get();
$version = trim(@file_get_contents(dirname(__DIR__) . '/version.txt') ?: '');
$view = new View();
$view->render('layout/base.php', [
'pageTitle' => 'Einstellungen',
'version' => $version,
'topbarActions' => '<button type="submit" form="settings-form" class="btn btn-primary">Einstellungen speichern</button>',
'content' => $this->renderView('settings/form', [
'settings' => $settings,
@ -35,9 +37,11 @@ class SettingsController
if (empty($data['ort'])) $errors['ort'] = 'Pflichtfeld';
if ($errors) {
$version = trim(@file_get_contents(dirname(__DIR__) . '/version.txt') ?: '');
$view = new View();
$view->render('layout/base.php', [
'pageTitle' => 'Einstellungen',
'version' => $version,
'content' => $this->renderView('settings/form', [
'settings' => $data,
'errors' => $errors,

View file

@ -19,7 +19,12 @@
<div class="main-content">
<div class="topbar">
<div class="topbar-title"><?= \Steuerkram\View::h($pageTitle ?? '') ?></div>
<div class="topbar-title">
<?= \Steuerkram\View::h($pageTitle ?? '') ?>
<?php if (!empty($version)): ?>
<span style="font-size:0.9rem;font-weight:normal;opacity:0.65;margin-left:.4rem"><?= \Steuerkram\View::h($version) ?></span>
<?php endif; ?>
</div>
<div style="display:flex;gap:.5rem;align-items:center;">
<?php if (!empty($topbarActions)) echo $topbarActions; ?>
</div>

1
src/version.txt Normal file
View file

@ -0,0 +1 @@
1-260421

View file

@ -12,7 +12,8 @@ class KontierungsvorschlagTest extends TestCase
public function run(): void
{
// 1. Einstellung ist standardmäßig deaktiviert
// 1. Einstellung deaktiviert → isEnabled() muss false zurückgeben
Database::execute('UPDATE company_settings SET ki_vorschlag_aktiv = 0');
$svc = new KontierungsvorschlagService();
$this->assert(!$svc->isEnabled(), 'ki_vorschlag_aktiv sollte per Default 0 sein');