Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 80df16999f | |||
| d317ccc1e0 | |||
| 6195363335 | |||
| 6a92eb76a0 | |||
| f9d6da7bc8 | |||
| 9478f2a1ab | |||
| 157d0b75a2 | |||
| 255bcbe3ad | |||
| bce2eea3ac | |||
| 91c60018f1 | |||
| 5037818997 | |||
| 5c76b8ec52 | |||
| 9d9bb099e1 | |||
| f4172235be | |||
| 299c65ab1a | |||
| ba8034ad75 | |||
| 7c63373a02 | |||
| 750ae53428 | |||
| 1121c18dc5 | |||
| 96a3168d49 | |||
| e627f13264 | |||
| 7ce8c3cabf | |||
| 763f0197ca | |||
| 43dddf2c07 |
@ -41,6 +41,7 @@ jobs:
|
||||
uses: akkuman/gitea-release-action@v1
|
||||
with:
|
||||
name: Elwig ${{ env.APP_VERSION }}
|
||||
body: "**[Changelog](src/branch/main/CHANGELOG.md#v${{ env.APP_VERSION }})**"
|
||||
files: |-
|
||||
Setup/bin/x64/Release/Elwig-${{ env.APP_VERSION }}.exe
|
||||
- name: Upload to website
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
name: Test
|
||||
on:
|
||||
push:
|
||||
branches: ["**"]
|
||||
paths: ["Elwig/**", "Tests/**", "Installer/Files/*.exe"]
|
||||
jobs:
|
||||
test:
|
||||
name: Run tests
|
||||
|
||||
368
CHANGELOG.md
Normal file
368
CHANGELOG.md
Normal file
@ -0,0 +1,368 @@
|
||||
|
||||
Changelog
|
||||
=========
|
||||
|
||||
|
||||
[v0.8.6][v0.8.6] (2024-07-01) {#v0.8.6}
|
||||
---------------------------------------
|
||||
|
||||
### Neue Funktionen {#v0.8.6-features}
|
||||
|
||||
* Es ist nun möglich benutzerdefinierte Zu-/Abschläge pro Mitglied anzugeben. ([#48][i48], 255bcbe3ad, 6a92eb76a0)
|
||||
* Im Mitglieder-Fenster (`MemberAdminWindow`) Menü-Eintrag zum Ansehen von Traubengutschriften (`CreditNote`) hinzugefügt. (bce2eea3ac)
|
||||
|
||||
### Sonstiges {#v0.8.6-misc}
|
||||
|
||||
* Im Rundschreiben-Fenster (`MailWindow`) kann das Datum geändert werden. (7ce8c3cabf)
|
||||
* Im Auszahlung-Anpassen-Fenster (`PaymentAdjustmentWindow`):
|
||||
* kann nur noch die aktuellste Saison angepasst werden. (43dddf2c07)
|
||||
* gibt es jetzt eine Statusleiste. (5c76b8ec52)
|
||||
* Auf Traubengutschriften (`CreditNote`) wird die Berechnungszeit nicht mehr angeführt, dafür jedoch das Datum der Auszahlungsvariante. (763f0197ca)
|
||||
* Im Stammdaten-Fenster (`BaseDataWindow`) sind Strafen bei Unterlieferung lt. GA besser gruppiert. ([#52][i52])
|
||||
* Statistiken zu Zu-/Abschlägen im Übersichtsdokument für Auszahlungsvarianten (`PaymentVariantSummary`). ([#49][i49])
|
||||
* Knöpfe (und Pfeile) im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) anders angeordnet. (6195363335)
|
||||
* Im Auszahlungsvariante-Fenster (`ChartWindow`) sind 73 °Oe standardmäßig ausgewählt. ([#51][i51])
|
||||
|
||||
[v0.8.6]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.6
|
||||
[i48]: https://git.necronda.net/winzer/elwig/issues/48
|
||||
[i49]: https://git.necronda.net/winzer/elwig/issues/49
|
||||
[i51]: https://git.necronda.net/winzer/elwig/issues/51
|
||||
[i52]: https://git.necronda.net/winzer/elwig/issues/52
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.8.5][v0.8.5] (2024-06-17) {#v0.8.5}
|
||||
---------------------------------------
|
||||
|
||||
### Neue Funktionen {#v0.8.5-features}
|
||||
|
||||
* Fenster zum Anpassen der Auszahlung einer Saison (`PaymentAdjustmentWindow`) hinzugefügt. ([#46][i46])
|
||||
|
||||
### Behobene Fehler {#v0.8.5-bugfixes}
|
||||
|
||||
* Inaktive Mitglieder, die in der letzten Saison geliefert haben, bisher in _Über-/Unterlieferungen_ nicht aufgeschienen. (abf465f821)
|
||||
* Inaktive Mitglieder, die in der letzten Saison geliefert haben, haben keine entsprechenden Rundschreiben bekommen. (792c18365e)
|
||||
* Falls unter `Stammdaten > Mandant` kein IBAN gesetzt war führte das zu einem Fehler beim Exportieren der Überweisungsdaten. (da9df5cbeb)
|
||||
* Falls sich Daten in der Datenbank im Hintergrund geändert haben wurden Daten für Eingebefelder vom Typ _Mehrfachauswahl mit Dropdown_ (`CheckComboBox`) falsch neu geladen. (050e4f5b6f)
|
||||
|
||||
### Sonstiges {#v0.8.5-misc}
|
||||
|
||||
* Kleine Änderungen im EBICS-/XML-Export. (5cb7d2cbb0, cc0aa6046f, 87467bbe75)
|
||||
|
||||
[v0.8.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.5
|
||||
[i46]: https://git.necronda.net/winzer/elwig/issues/46
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.8.4][v0.8.4] (2024-06-13) {#v0.8.4}
|
||||
---------------------------------------
|
||||
|
||||
### Neue Funktionen {#v0.8.4-features}
|
||||
|
||||
* EBICS-Überweisung-Version für EBICS-/XML-Exporte der Überweisungsdaten nun unter `Stammdaten > Parameter > Daten-Export` konfigurierbar. (ab926421b0)
|
||||
|
||||
### Behobene Fehler {#v0.8.4-bugfixes}
|
||||
|
||||
* Falls beim Schließen des Hauptmenüs ein anderes Fenster im Bearbeiten-/Erstellen-Modus war führte das zu einem Absturz. (70f8276808)
|
||||
|
||||
### Sonstiges {#v0.8.4-misc}
|
||||
|
||||
* Eingabetyp _Mehrfachauswahl mit Dropdown_ (`CheckComboBox`) überarbeitet. ([#37][i37], 4483eb6a69)
|
||||
* Abhängigkeit `Extended.Wpf.Toolkit` endgültig entfernt. ([#37][i37], 4483eb6a69)
|
||||
* Automatisierte Tests für österreich-spezifischen EBICS-Standard hinzugefügt. (46551fb142)
|
||||
|
||||
[v0.8.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.4
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.8.3][v0.8.3] (2024-06-11) {#v0.8.3}
|
||||
---------------------------------------
|
||||
|
||||
### Neue Funktionen {#v0.8.3-features}
|
||||
|
||||
* Strafe für Unterlieferung lt. GA kann abhängig von GAs angegeben werden. ([#47][i47])
|
||||
* Es ist nun möglich Mitglieder zu löschen. (c12d111c57, 5a4ff26f31)
|
||||
* Beim Übertragen der Flächenbindungen an einen Nachfolger (bzw. beim Inaktiv-Setzen) kann nun die gewünschte Saison angegeben werden. ([#45][i45])
|
||||
* Es ist nun möglich Saisons anzulegen und zu löschen. ([#44][i44])
|
||||
|
||||
### Behobene Fehler {#v0.8.3-bugfixes}
|
||||
|
||||
* Beim Auswählen einer Saison mit einer anderen Währung unter `Stammdaten > Saisons` kam es zu einem Absturz. (f756220d75)
|
||||
* Abstürze im Rundschreiben-Fenster (`MailWindow`) beim Auswählen von einzelnen Mitgliedern oder nach Flächenbindung. (6e4f3b799d, 5039c1252a)
|
||||
* Es nun wieder möglich Zu-/Abschläge bei Lieferungen hinzuzufügen oder zu entfernen. (324a63cf9a, 012352c562)
|
||||
|
||||
### Sonstiges {#v0.8.3-misc}
|
||||
|
||||
* Eingabetyp _Ganzzahl_ (`IntegerUpDown`) überarbeitet. ([#37](i37), cc4ec6c5db, a531e948c1)
|
||||
* Beim Erstellen der Installationsdatei wird der Rückgabewert überprüft (`curl --fail`). (ff375e3caf)
|
||||
* URL in vordefinierter `config.ini`-Datei auf `https://elwig.at/` ausgebessert. (293c8967be)
|
||||
* Abhängigkeiten aktualisiert. (4e477c38e0, 601ac548fe)
|
||||
* Absender bei Anlieferungsbestätigung (`DeliveryConfirmation`) wird nicht mehr immer abgedruckt. (4c9a151f77)
|
||||
* In der Zusammenfassung der Auszahlungsvariantendaten (`PaymentVariantSummary`) werden Rebel Zu-/Abschläge angeführt. (08f551a394)
|
||||
|
||||
[v0.8.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.3
|
||||
[i37]: https://git.necronda.net/winzer/elwig/issues/37
|
||||
[i44]: https://git.necronda.net/winzer/elwig/issues/44
|
||||
[i45]: https://git.necronda.net/winzer/elwig/issues/45
|
||||
[i47]: https://git.necronda.net/winzer/elwig/issues/47
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.8.2][v0.8.2] (2024-05-14) {#v0.8.2}
|
||||
---------------------------------------
|
||||
|
||||
### Neue Funktionen {#v0.8.2-features}
|
||||
|
||||
* In der Konfigurationsdatei (`config.ini`) gibt es die Möglichkeit bei Waagen `required = false` hinzuzufügen.
|
||||
So werden Fehlermeldungen der Waagen beim Starten dem Benutzer nicht angezeigt (außer `debug = true` ist in `[general]` gesetzt). (81e18ac553, e3fd705f52)
|
||||
|
||||
### Behobene Fehler {#v0.8.2-bugfixes}
|
||||
|
||||
* Falls die Saison für das aktuelle Jahr nicht angelegt war führte das zu einem Absturz im Stammdaten-Fenster (`BaseDataWindow`). (f95f0f0ef3)
|
||||
* Das Drucken von Dokumenten ist wieder möglich. (2b10e52ab0)
|
||||
|
||||
### Sonstiges {#v0.8.2-misc}
|
||||
|
||||
* Umstieg von `https://www.necronda.net/elwig/` auf `https://elwig.at/`. (be246d6f06, 5b952c4eb1)
|
||||
|
||||
[v0.8.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.2
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.8.1][v0.8.1] (2024-05-12) {#v0.8.1}
|
||||
---------------------------------------
|
||||
|
||||
> [!WARNING]
|
||||
> Aufgrund eines Fehlers beim Erstellen der Installationsdatei ist in dieser Version das Drucken von Dokumenten nicht möglich!
|
||||
>
|
||||
> Es wird empfohlen die nächste Version zu verwenden.
|
||||
|
||||
### Neue Funktionen {#v0.8.1-features}
|
||||
|
||||
* Übersichtsdokument für Auszahlungsvarianten (`PaymentVariantSummary`). ([#32][i32], 69aa75a50a)
|
||||
|
||||
### Behobene Fehle {#v0.8.1-bugfixes}
|
||||
|
||||
* Falls in einer neuen Version die Datenbank aktualisiert werden musste, konnte es vorkommen, dass es beim Start zu einem Absturz kam. (6906584ef0)
|
||||
* Beim Exportieren der Überweisungsdaten kam es zu einem Absturz. (f123bb44c5)
|
||||
|
||||
### Sonstiges {#v0.8.1-misc}
|
||||
|
||||
* Das Installationsprogramm ist nun auf deutsch verfügbar. (d102a1cb7a)
|
||||
* Menüleiste und Statusleiste im Fenster für Auszahlungsvarianten (`PaymentVaiantWindow`) hinzugefügt. (b03f81d4f2)
|
||||
|
||||
[v0.8.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.1
|
||||
[i32]: https://git.necronda.net/winzer/elwig/issues/32
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.8.0][v0.8.0] (2024-05-01) {#v0.8.0}
|
||||
---------------------------------------
|
||||
|
||||
### Neue Funktionen {#v0.8.0-features}
|
||||
|
||||
* Die Qualitätsstatistik (`WineQualityStatistic`) kann in °KMW angezeigt werden. (869f652afc, 27b5d653e6)
|
||||
* Waagen-Schnittstelle vom Typ `Gassner` implementiert. (443e111594)
|
||||
* Teile zum Synchronisierung der Datenbank zwischen Zweigstellen implementiert. ([#3][i3])
|
||||
* Sorten-/Qualitätsaufschlüsselung im Hauptfenster. (2a4e8d69d0)
|
||||
|
||||
### Behobene Fehler {#v0.8.0-bugfixes}
|
||||
|
||||
* Beim Anzeigen von Zu-/Abschlägen einer Saison im Stammdaten-Fenster (`BaseDataWindow`) kam es zu einem Absturz. (1419c834ac)
|
||||
* Das Laden von einigen Daten im Stammdaten-Fenster (`BaseDataWindow`) war nicht immer konsistent. (1047bc6e8f)
|
||||
* Die Einstellungen in `Stammdaten -> Parameter` haben nicht konsistent funktioniert. (9062d55b20)
|
||||
|
||||
### Sonstiges {#v0.8.0-misc}
|
||||
|
||||
* Rahmenstärke in Dokumenten wider auf 0.5pt gesetzt. (eddea88e77)
|
||||
* Mehr automatisierte Tests für Dokumente hinzugefügt. (66898714bb, b8851fb241, 5c3cf41d3d, 657910ff48, 12eb53cb44, 80e91ad776)
|
||||
* `SeasonFinishWindow` und `TestWindow` entfernt. (a9f38a3ccb)
|
||||
* Abhängigkeiten aktualisiert. (c6905bbb42, 21fe5bc094, fd17d294b9, 35e5a1dfff)
|
||||
* Beim Überprüfen auf Updates bekommt der Nutzer nun auch eine Rückmeldung, wenn es keine Updates gibt. (c360e6b6a7)
|
||||
|
||||
[v0.8.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.0
|
||||
[i3]: https://git.necronda.net/winzer/elwig/issues/3
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.7.2][v0.7.2] (2024-03-28) {#v0.7.2}
|
||||
---------------------------------------
|
||||
|
||||
### Neue Funktionen {#v0.7.2-features}
|
||||
|
||||
* Flächenbindungen können vom Vorgänger übernommen bzw. beim Inaktiv-Setzen storniert werden. ([#41][i41])
|
||||
* Für diverse Funktionen wurden Tastenkürzel hinzugefügt (in den Menüleisten oder beim Drüberfahren mit der Maus genauer ersichtlich; z.B. Speichern/Neu/Löschen/Zurücksetzen/Abbrechen/Bearbeiten). ([#31][i31])
|
||||
* Die Mitgliederliste ist nun auch als PDF/Ausdruck und Excel-Liste verfügbar. ([#36][i36])
|
||||
* Im Lieferungen-Fenster (`DeliveryAdminWindow`):
|
||||
* kann nach mehr Dingen gefiltert werden (Handwiegung, Handlese, gebunden/ungebunden, brutto/netto). ([#12][i12], cf2ec3bdc4)
|
||||
* werden verwendete Zu-/Abschläge zusätzlich in der Tabelle angezeigt. (b31b5f6164)
|
||||
* können gefilterte Lieferungen nun auch als Excel-Liste exportiert werden. ([#13][i13])
|
||||
* gibt es ab jetzt ein Übersichtsdokument/Qualitätsstatistik für gefilterte Lieferungen (`WineQualityStatistic`). ([#30][i30], d011c69812, d501cfaf72)
|
||||
* Einige Optionen zum PDF-Speichern/-Ausdrucken überarbeitet. (b2f52072f8)
|
||||
|
||||
### Behobene Fehler {#v0.7.2-bugfixes}
|
||||
|
||||
* Falls beim Starten des Programms die Datenbank-Version "zu neu" war, wurde nur ein Fehler angezeigt und kein Auto-Update versucht. (87da56b7a9)
|
||||
* Falls ein Element einer Liste ausgewählt wurde, das nicht in der Liste existierte führte dies zu einem Absturz. (afc143e1e4)
|
||||
|
||||
### Sonstiges {#v0.7.2-misc}
|
||||
|
||||
* Das Gesamte Programm ist nun schneller und wird nach längerer Benutzung nicht mehr langsamer (`AppDbContext` Lifecycle). ([#43][i43])
|
||||
* Excel-Exports überarbeitet (Datumswerte, Wahr-/Falsch-Werte). (9d80c5913f, c6e83ffff4, 5795c5e8ba)
|
||||
* Rahmenstärke in Dokumenten wider auf 0.05pt gesetzt. (9aa6cba1ff)
|
||||
|
||||
[v0.7.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.7.2
|
||||
[i12]: https://git.necronda.net/winzer/elwig/issues/12
|
||||
[i13]: https://git.necronda.net/winzer/elwig/issues/13
|
||||
[i30]: https://git.necronda.net/winzer/elwig/issues/30
|
||||
[i31]: https://git.necronda.net/winzer/elwig/issues/31
|
||||
[i36]: https://git.necronda.net/winzer/elwig/issues/36
|
||||
[i41]: https://git.necronda.net/winzer/elwig/issues/41
|
||||
[i43]: https://git.necronda.net/winzer/elwig/issues/43
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.7.1][v0.7.1] (2024-03-11) {#v0.7.1}
|
||||
---------------------------------------
|
||||
|
||||
### Neue Funktionen {#v0.7.1-features}
|
||||
|
||||
* Für Auszahlungsvarianten kann ein Rebel-Zu-/Abschlag festgelegt werden. ([#40][i40])
|
||||
* Im Rundschreiben-Fenster (`MailWindow`) gibt es ab jetzt die Möglichkeit den Ort anzupassen. (34ebc8fa34, a5df03aa2c)
|
||||
|
||||
### Behobene Fehler {#v0.7.1-bugfixes}
|
||||
|
||||
* Falls im Rundschreiben-Fenster (`MailWindow`) der Ausdruck nach PLZ und Ort sortiert werden sollte, wurden Rechnungsadressen nicht beachtet. (746d0f10de)
|
||||
|
||||
### Sonstiges {#v0.7.1-misc}
|
||||
|
||||
* Im Mitglieder-Fenster (`MemberAdminWindow`) wurde die Möglichkeit zum Verfassen von Rundschreiben entfernt. (61c8d1ee97)
|
||||
* Das Erzeugen von PDF-Dokumenten wurde verbessert. (c70772b47d, 6a5507060a, c0f4a484ab)
|
||||
|
||||
[v0.7.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.7.1
|
||||
[i40]: https://git.necronda.net/winzer/elwig/issues/40
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.7.0][v0.7.0] (2024-03-06) {#v0.7.0}
|
||||
---------------------------------------
|
||||
|
||||
> [!NOTE]
|
||||
> Das Attribut "Bio" wird ab dieser Version automatisch entfernt und als Bewirtschaftungsart "Bio" verwendet.
|
||||
> Sämtliche Lieferungen und Auszahlungsvarianten werden automatisch aktualisiert.
|
||||
|
||||
### Neue Funktionen {#v0.7.0-features}
|
||||
|
||||
* Das Attribut "Bio" wird nun als Bewirtschaftungsart "Bio" verwendet. ([#34][i34], 25a0722f96, 8031654e86, 7181d744fc, cc72a8365e)
|
||||
* Im Übernahme-Fenster (`DeliveryAdminWindow`) wurde eine Abklingzeit von 1 Sekunde zum Wiegen-Knopf hinzugefügt. (efe91192bc)
|
||||
* Im Übernahme-/Lieferungen-Fenster (`DeliveryAdminWindow`) und im Mitglieder-Fenster (`MemberAdminWindow`) wurde ein Knopf hinzugefügt,
|
||||
mit dem man zum entsprechenden Mitglied (bzw. Vorgänger) springen kann. (665e16d78f)
|
||||
* Ein Rundschreiben-Fenster (`MailWindow`) wurde hinzugefügt. ([#15][i15], cc5396711d, 060acc56c3, a275385b5c, 37e10136f4, 376af72700)
|
||||
* Eine automatische Update Funktion wurde hinzugefügt. Diese überprüft regelmäßig, ob eine neuere Version von Elwig verfügbar ist. ([#8][i8], a5a6915db1, 271e085fdf)
|
||||
|
||||
### Behobene Fehler {#v0.7.0-bugfixes}
|
||||
|
||||
* Falls in einer Auszahlungsvariante ein unbekanntes Attribut verwendet wurde, kam es zu einem Absturz. ([#39][i39])
|
||||
* Falls für ein Mitglied kein IBAN hinterlegt war, kam es beim Exportieren der Traubengutschriften zu einem Absturz. (958fbaae50)
|
||||
* Waagen-Schnittstelle für Badner Waage war Fehlerhaft. (092c5788a4)
|
||||
* Falls Flächenbindungen von Mitgliedern keine Bewirtschaftungsart gesetzt haben sollten, kam es beim Erstellen des Stammdatenblattes (`MemberDataSheet`) zum Absturz. (3324a9a238)
|
||||
* Telefonnummern und E-Mail-Adressen können wieder beliebig hinzugefügt und gelöscht werden. (e9f6f22bc8, 3a0f2e9556)
|
||||
|
||||
### Sonstiges {#v0.7.0-misc}
|
||||
|
||||
* Beim Schließen des Hauptfensters wird der Nutzer gefragt, ob er alle anderen Fenster auch schließen möchte. (96c9890b90)
|
||||
* Im Lieferungen-Fenster (`DeliveryAdminWindow`) und auf Lieferscheinen (`DeliveryNote`) wird neben _(nicht) gerebelt_ nun auch _brutto/netto_ angegeben. (049927f90c)
|
||||
* Falls man die Lieferungen eines einzelnen Mitglieds ansieht, werden nun standardmäßig nur die Lieferungen der aktuellen Saison angezeigt. (5a6317fcdb)
|
||||
* Im Stammdaten-Fenster (`BaseDataWindow`) unter Attributen findet sich nun ein kurzer Erklärtext. (e6cab7993f)
|
||||
* Die Installationsdatei erkennt nun die Elwig-Version wieder richtig. ([#35][i35])
|
||||
* Am Mitglieds-Stammdatenblatt (`MemberDataSheet`) werden die Flächenbindungen ab jetzt immer frühestens auf der zweiten Seite abgedruckt. (4673877d36)
|
||||
* Beim automatischen Aktualisieren der Datenbank werden Fremdschlüssel validiert. (d897e44f3b, 3b94875a7f, 614e0010fd, 92c3ed991b)
|
||||
* Nachnamen von Mitgliedern in Großschreibung werden ab jetzt mit `ẞ` statt mit `ß` geschrieben. (ccb83911b1)
|
||||
* Dokumente können nun parallel erstellt werden. ([#19][i19], 9139557cc4, ac4026571e, e9d0eec3bd, 77cf47e154, 5a488369be)
|
||||
* Die Popup-Fenster sind modernisiert worden. ([#16][i16])
|
||||
* Grunstücksnummern bei Flächenbindungen werden bei der Eingabe nicht mehr validiert. (ea6621ee57)
|
||||
* Abhängigkeiten aktualisiert. (d944aabc06)
|
||||
|
||||
[v0.7.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.7.0
|
||||
[i8]: https://git.necronda.net/winzer/elwig/issues/8
|
||||
[i15]: https://git.necronda.net/winzer/elwig/issues/15
|
||||
[i16]: https://git.necronda.net/winzer/elwig/issues/16
|
||||
[i19]: https://git.necronda.net/winzer/elwig/issues/19
|
||||
[i34]: https://git.necronda.net/winzer/elwig/issues/34
|
||||
[i35]: https://git.necronda.net/winzer/elwig/issues/35
|
||||
[i39]: https://git.necronda.net/winzer/elwig/issues/39
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.6.8][v0.6.8] (2024-02-22) {#v0.6.8}
|
||||
---------------------------------------
|
||||
|
||||
### Neue Funktionen {#v0.6.8-features}
|
||||
|
||||
* Waagen-Schnittstelle vom Typ `Schember-Async` implementiert. (10b78dfb72, c0ff852f5e, ae7fdef2ea)
|
||||
|
||||
[v0.6.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.6.8
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.6.7][v0.6.7] (2024-02-21) {#v0.6.7}
|
||||
---------------------------------------
|
||||
|
||||
### Sonstiges {#v0.6.7-misc}
|
||||
|
||||
* WG Weinland und WG Baden nun registierte Mandanten. (583d5b4e3e)
|
||||
* Im Mitglieds-Stammdatenblatt (`MemberDataSheet`) werden Flächenbindungen nun immer für das momentane Jahr angezeigt (nicht die neueste angelegte Saison). (8732141e6b)
|
||||
* Umstrukturierung der internen Waagen-Schnittstellen-Implementation. (3f2b5b684c, 7ff069d068, 99ca12b276)
|
||||
|
||||
[v0.6.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.6.7
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.6.6][v0.6.6] (2024-02-18) {#v0.6.6}
|
||||
---------------------------------------
|
||||
|
||||
### Sonstiges {#v0.6.6-misc}
|
||||
|
||||
* Automatisierte Tests für Waagen-Schnittstellen hinzugefügt. (f13fb3aaf0, f4eb6456be, 7f4cfdc1b5)
|
||||
* Im Übernahme-Fenster (`DeliveryAdminWindow`) wird die Saison ab jetzt ausschließlich über die Jahreszahl bestimmt. (3c0fea30f5)
|
||||
|
||||
[v0.6.6]: https://git.necronda.net/winzer/elwig/releases/tag/v0.6.6
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.6.5][v0.6.5] (2024-02-15) {#v0.6.5}
|
||||
---------------------------------------
|
||||
|
||||
### Neue Funktionen {#v0.6.5-features}
|
||||
|
||||
* Die Installationsdatei kann ab jetzt automatisch erstellt werden. ([#6][i6], 6d53e35399)
|
||||
|
||||
### Behobene Fehler {#v0.6.5-bugfixes}
|
||||
|
||||
* Im Mitglieds-Stammdatenblatt (`MemberDataSheet`) fehlte bei Rechnungsadressen der Abstand zwischen PLZ und Ort. (68f1a2c091)
|
||||
|
||||
### Sonstiges {#v0.6.5-misc}
|
||||
|
||||
* Berechnung der Aufteilung für Bio-Attribute aktualisiert. (0591d91f49, 42eb68d431)
|
||||
* Kleine Änderungen im EBICS-/XML-Export. (befe6a753b, 825bd6f304)
|
||||
* Automatisierte Tests für EBICS-/XML-Export hinzugefügt. (6fdd72e28b, c07a6b450c, 4daa6deb26)
|
||||
* Automatisierte Tests für Dokumente hinzugefügt. (912206f52d, 805f782c83, 1b9064a97c)
|
||||
* Anpassungen für PLZ und KG-Nr. in der Datenbank. (11be424c38)
|
||||
* Im Mitglieder-Fenster (`MemberAdminWindow`) dürfen Freitextsuchen nun 2 (statt 3) Zeichen lang sein. (59cd69ddaf)
|
||||
|
||||
[v0.6.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.6.5
|
||||
[i6]: https://git.necronda.net/winzer/elwig/issues/6
|
||||
|
||||
41
Elwig/Controls/UnitConverter.cs
Normal file
41
Elwig/Controls/UnitConverter.cs
Normal file
@ -0,0 +1,41 @@
|
||||
using System;
|
||||
using System.Globalization;
|
||||
using System.Windows;
|
||||
using System.Windows.Data;
|
||||
|
||||
namespace Elwig.Controls {
|
||||
public class UnitConverter : DependencyObject, IValueConverter {
|
||||
|
||||
public static readonly DependencyProperty UnitProperty = DependencyProperty.Register("Unit", typeof(string), typeof(UnitConverter), new FrameworkPropertyMetadata(null));
|
||||
public string Unit {
|
||||
get => (string)GetValue(UnitProperty);
|
||||
set => SetValue(UnitProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register("Precision", typeof(byte), typeof(UnitConverter), new FrameworkPropertyMetadata((byte)0));
|
||||
public byte Precision {
|
||||
get => (byte)GetValue(PrecisionProperty);
|
||||
set => SetValue(PrecisionProperty, value);
|
||||
}
|
||||
|
||||
public object? Convert(object? value, Type targetType, object parameter, CultureInfo culture) {
|
||||
if (value == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
var fmt = $"{{0:N{Precision}}}";
|
||||
var unit = $"{(Unit != null ? " " : "")}{Unit}";
|
||||
if (value is int i) {
|
||||
return $"{string.Format(fmt, i)}{unit}";
|
||||
} else if (value is decimal d) {
|
||||
return $"{string.Format(fmt, d)}{unit}";
|
||||
}
|
||||
|
||||
return Binding.DoNothing;
|
||||
}
|
||||
|
||||
public object? ConvertBack(object? value, Type targetType, object parameter, CultureInfo culture) {
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
using Elwig.Helpers;
|
||||
using Elwig.Models.Dtos;
|
||||
using Elwig.Models.Entities;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
@ -20,6 +21,7 @@ namespace Elwig.Documents {
|
||||
public decimal MemberTotalUnderDelivery;
|
||||
public int MemberAutoBusinessShares;
|
||||
public decimal MemberAutoBusinessSharesAmount;
|
||||
public PaymentCustom? CustomPayment;
|
||||
|
||||
public CreditNote(
|
||||
AppDbContext ctx,
|
||||
@ -28,6 +30,7 @@ namespace Elwig.Documents {
|
||||
bool considerContractPenalties,
|
||||
bool considerTotalPenalty,
|
||||
bool considerAutoBusinessShares,
|
||||
bool considerCustomModifiers,
|
||||
Dictionary<string, UnderDelivery>? underDeliveries = null
|
||||
) :
|
||||
base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.Name)} – {p.Variant.Name}", p.Member) {
|
||||
@ -46,8 +49,8 @@ namespace Elwig.Documents {
|
||||
Aside = Aside.Replace("</table>", "") +
|
||||
$"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
|
||||
$"<tr><th>TG-Nr.</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" +
|
||||
$"<tr><th>Datum</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" +
|
||||
$"<tr><th>Überw. am</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
|
||||
$"<tr><th>Datum/Zeit</th><td>{p.Credit?.ModifiedTimestamp:dd.MM.yyyy} / {p.Credit?.ModifiedTimestamp:HH:mm}</td></tr>" +
|
||||
$"</tbody></table>";
|
||||
Text = App.Client.TextCreditNote;
|
||||
DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr);
|
||||
@ -57,9 +60,9 @@ namespace Elwig.Documents {
|
||||
if (considerTotalPenalty) {
|
||||
var total = data.Rows.SelectMany(r => r.Buckets).Sum(b => b.Value);
|
||||
var totalUnderDelivery = total - p.Member.BusinessShares * season.MinKgPerBusinessShare;
|
||||
MemberTotalUnderDelivery = totalUnderDelivery < 0 ? totalUnderDelivery * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) : 0;
|
||||
MemberTotalUnderDelivery = totalUnderDelivery < 0 ? totalUnderDelivery * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) - (season.PenaltyPerBsAmount * Math.Floor(-(decimal)totalUnderDelivery / season.MinKgPerBusinessShare) ?? 0) : 0;
|
||||
if (total == 0)
|
||||
MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0);
|
||||
MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0) + (season.PenaltyPerBsNone * p.Member.BusinessShares ?? 0);
|
||||
}
|
||||
if (considerAutoBusinessShares) {
|
||||
var fromDate = $"{season.Year}-01-01";
|
||||
@ -85,5 +88,8 @@ namespace Elwig.Documents {
|
||||
.Where(u => u.Item3 != 0)
|
||||
.ToList();
|
||||
}
|
||||
if (considerCustomModifiers) {
|
||||
CustomPayment = ctx.CustomPayments.Find(p.Year, p.MgNr);
|
||||
}
|
||||
}
|
||||
}}
|
||||
|
||||
@ -157,13 +157,17 @@
|
||||
@Raw(FormatRow($"Autom. Nachz. von GA ({Model.MemberAutoBusinessShares})", Model.MemberAutoBusinessSharesAmount, add: true));
|
||||
penalty += Model.MemberAutoBusinessSharesAmount;
|
||||
}
|
||||
@if (Model.CustomPayment != null) {
|
||||
@Raw(FormatRow(Model.CustomPayment.Comment ?? (Model.CustomPayment.Amount < 0 ? "Weitere Abzüge" : "Weitere Zuschläge"), Model.CustomPayment.Amount, add: true));
|
||||
penalty += Model.CustomPayment.Amount;
|
||||
}
|
||||
|
||||
@if (Model.Credit == null) {
|
||||
@Raw(FormatRow("Auszahlungsbetrag", (Model.Payment?.Amount + penalty) ?? (sum + penalty), bold: true))
|
||||
} else {
|
||||
var diff = Model.Credit.Modifiers - penalty;
|
||||
if (diff != 0) {
|
||||
@Raw(FormatRow(diff < 0 ? "Weitere Abzüge" : "Weitere Zuschläge", diff, add: true))
|
||||
@Raw(FormatRow(diff < 0 ? "Sonstige Abzüge" : "Sonstige Zuschläge", diff, add: true))
|
||||
}
|
||||
if (Model.Credit.PrevModifiers != null && Model.Credit.PrevModifiers != 0) {
|
||||
@Raw(FormatRow("Bereits berücksichtigte Abzüge", -Model.Credit.PrevModifiers, add: true))
|
||||
|
||||
@ -30,7 +30,7 @@ namespace Elwig.Documents {
|
||||
public string Author;
|
||||
public string Header;
|
||||
public string Footer;
|
||||
public DateTime Date;
|
||||
public DateOnly Date;
|
||||
|
||||
public Document(string title) {
|
||||
var c = App.Client;
|
||||
@ -47,7 +47,7 @@ namespace Elwig.Documents {
|
||||
.Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
|
||||
.Item("BIC", c.Bic).Item("IBAN", c.Iban)
|
||||
.ToString();
|
||||
Date = DateTime.Today;
|
||||
Date = DateOnly.FromDateTime(Utils.Today);
|
||||
}
|
||||
|
||||
~Document() {
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
using Elwig.Helpers.Billing;
|
||||
using Elwig.Helpers;
|
||||
using Elwig.Helpers.Billing;
|
||||
using Elwig.Models.Dtos;
|
||||
using Elwig.Models.Entities;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace Elwig.Documents {
|
||||
@ -15,6 +17,8 @@ namespace Elwig.Documents {
|
||||
public int MemberNum;
|
||||
public int DeliveryNum;
|
||||
public int DeliveryPartNum;
|
||||
public List<ModifierStat> ModifierStat;
|
||||
public Dictionary<string, Modifier> Modifiers;
|
||||
|
||||
public PaymentVariantSummary(PaymentVar v, PaymentVariantSummaryData data) :
|
||||
base($"{Name} {v.Year} - {v.Name}") {
|
||||
@ -25,6 +29,8 @@ namespace Elwig.Documents {
|
||||
MemberNum = v.Credits.Count;
|
||||
DeliveryNum = v.DeliveryPartPayments.DistinctBy(p => p.DeliveryPart.Delivery).Count();
|
||||
DeliveryPartNum = v.DeliveryPartPayments.Count;
|
||||
ModifierStat = AppDbContext.GetModifierStats(v.Year, v.AvNr).GetAwaiter().GetResult();
|
||||
Modifiers = v.Season.Modifiers.ToDictionary(m => m.ModId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -167,6 +167,48 @@
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<table class="payment-variant border">
|
||||
<colgroup>
|
||||
<col style="width: 35mm;"/>
|
||||
<col style="width: 30mm;"/>
|
||||
<col style="width: 25mm;"/>
|
||||
<col style="width: 25mm;"/>
|
||||
<col style="width: 25mm;"/>
|
||||
<col style="width: 25mm;"/>
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr class="sectionheading">
|
||||
<th colspan="6">Statistik Zu-/Abschläge</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th rowspan="2">Name</th>
|
||||
<th rowspan="2">Zu-/Abschlag</th>
|
||||
<th>Lieferungen</th>
|
||||
<th>Minimum</th>
|
||||
<th>Maximum</th>
|
||||
<th>Betrag</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>[#]</th>
|
||||
<th>[@Model.CurrencySymbol]</th>
|
||||
<th>[@Model.CurrencySymbol]</th>
|
||||
<th>[@Model.CurrencySymbol]</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach (var m in Model.ModifierStat) {
|
||||
var mod = Model.Modifiers[m.ModId];
|
||||
<tr>
|
||||
<th>@mod.Name</th>
|
||||
<td class="number">@mod.ValueStr</td>
|
||||
<td class="number">@($"{m.Count:N0}")</td>
|
||||
<td class="number">@($"{m.Min:N2}")</td>
|
||||
<td class="number">@($"{m.Max:N2}")</td>
|
||||
<td class="number">@($"{m.Sum:N2}")</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
<table class="payment-variant-data">
|
||||
<colgroup>
|
||||
<col style="width: 30mm;"/>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<UseWPF>true</UseWPF>
|
||||
<PreserveCompilationContext>true</PreserveCompilationContext>
|
||||
<ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
|
||||
<Version>0.8.5</Version>
|
||||
<Version>0.8.6</Version>
|
||||
<SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
|
||||
@ -19,6 +19,7 @@ namespace Elwig.Helpers {
|
||||
public record struct UnderDelivery(int Weight, int Diff);
|
||||
public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int Payment);
|
||||
public record struct MemberStat(string Variety, string Discr, int Weight);
|
||||
public record struct ModifierStat(string ModId, string Name, int Count, decimal? Min, decimal? Max, decimal Sum);
|
||||
|
||||
public class AppDbContext : DbContext {
|
||||
|
||||
@ -57,6 +58,7 @@ namespace Elwig.Helpers {
|
||||
public DbSet<PaymentVar> PaymentVariants { get; private set; }
|
||||
public DbSet<PaymentMember> MemberPayments { get; private set; }
|
||||
public DbSet<PaymentDeliveryPart> PaymentDeliveryParts { get; private set; }
|
||||
public DbSet<PaymentCustom> CustomPayments { get; private set; }
|
||||
public DbSet<Credit> Credits { get; private set; }
|
||||
|
||||
public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
|
||||
@ -354,27 +356,6 @@ namespace Elwig.Helpers {
|
||||
_memberUnderDelivery[year] = buckets;
|
||||
}
|
||||
|
||||
public async Task<Dictionary<int, long>> GetBusinessSharePenalties(int year) {
|
||||
using var cnx = await ConnectAsync();
|
||||
var dict = new Dictionary<int, long>();
|
||||
using var cmd = cnx.CreateCommand();
|
||||
cmd.CommandText = $"""
|
||||
SELECT mgnr, ROUND((
|
||||
COALESCE(-s.penalty_amount, 0) +
|
||||
COALESCE(-s.penalty_per_bs_amount * CEIL(CAST(-u.diff AS REAL) / s.min_kg_per_bs), 0) +
|
||||
COALESCE(u.diff * s.penalty_per_kg, 0)
|
||||
) / POW(10, s.precision - 2))
|
||||
FROM v_total_under_delivery u
|
||||
JOIN season s ON s.year = u.year
|
||||
WHERE s.year = {year} AND u.diff < 0
|
||||
""";
|
||||
using var reader = await cmd.ExecuteReaderAsync();
|
||||
while (await reader.ReadAsync()) {
|
||||
dict[reader.GetInt32(0)] = reader.GetInt64(1);
|
||||
}
|
||||
return dict;
|
||||
}
|
||||
|
||||
public async Task<Dictionary<string, AreaComBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
|
||||
if (!_memberAreaCommitmentBuckets.ContainsKey(year))
|
||||
await FetchMemberAreaCommitmentBuckets(year, cnx);
|
||||
@ -457,5 +438,34 @@ namespace Elwig.Helpers {
|
||||
if (ownCnx) await cnx.DisposeAsync();
|
||||
return list;
|
||||
}
|
||||
|
||||
public static async Task<List<ModifierStat>> GetModifierStats(int year, int avnr, SqliteConnection? cnx = null) {
|
||||
var ownCnx = cnx == null;
|
||||
cnx ??= await ConnectAsync();
|
||||
var list = new List<ModifierStat>();
|
||||
using (var cmd = cnx.CreateCommand()) {
|
||||
cmd.CommandText = $"""
|
||||
SELECT m.modid, m.name, m.count, m.min, m.max, m.sum, s.precision
|
||||
FROM v_stat_modifier m
|
||||
JOIN season s ON s.year = m.year
|
||||
WHERE m.year = {year} AND m.avnr = {avnr}
|
||||
""";
|
||||
using var reader = await cmd.ExecuteReaderAsync();
|
||||
while (await reader.ReadAsync()) {
|
||||
var prec = (byte)reader.GetInt16(6);
|
||||
long? min = reader.IsDBNull(3) ? null : reader.GetInt64(3);
|
||||
long? max = reader.IsDBNull(4) ? null : reader.GetInt64(4);
|
||||
var sum = reader.GetInt64(5);
|
||||
if (min != null && max != null && Math.Abs((long)min) > Math.Abs((long)max))
|
||||
(min, max) = (max, min);
|
||||
list.Add(new(reader.GetString(0), reader.GetString(1), reader.GetInt32(2),
|
||||
min == null ? null : Utils.DecFromDb((long)min, prec),
|
||||
max == null ? null : Utils.DecFromDb((long)max, prec),
|
||||
Utils.DecFromDb(sum, prec)));
|
||||
}
|
||||
}
|
||||
if (ownCnx) await cnx.DisposeAsync();
|
||||
return list;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ namespace Elwig.Helpers {
|
||||
public static class AppDbUpdater {
|
||||
|
||||
// Don't forget to update value in Tests/fetch-resources.bat!
|
||||
public static readonly int RequiredSchemaVersion = 21;
|
||||
public static readonly int RequiredSchemaVersion = 23;
|
||||
|
||||
private static int VersionOffset = 0;
|
||||
|
||||
|
||||
@ -46,8 +46,10 @@ namespace Elwig.Helpers.Billing {
|
||||
ROUND(p.amount / POW(10, s.precision - 2)) AS net_amount,
|
||||
ROUND(lp.amount / POW(10, s.precision - 2)) AS prev_amount,
|
||||
IIF(m.buchführend, s.vat_normal, s.vat_flatrate) AS vat,
|
||||
ROUND(IIF({Data.ConsiderTotalPenalty}, COALESCE(b.total_penalty, 0), 0) / POW(10, s.precision - 2)) +
|
||||
ROUND(IIF({Data.ConsiderContractPenalties}, COALESCE(u.total_penalty, 0), 0) / POW(10, 4 - 2)) +
|
||||
ROUND(IIF({Data.ConsiderAutoBusinessShares}, -COALESCE(a.total_amount, 0), 0) / POW(10, s.precision - 2))
|
||||
ROUND(IIF({Data.ConsiderAutoBusinessShares}, -COALESCE(a.total_amount, 0), 0) / POW(10, s.precision - 2)) +
|
||||
IIF({Data.ConsiderCustomModifiers}, COALESCE(x.amount, 0), 0)
|
||||
AS modifiers,
|
||||
lc.modifiers AS prev_modifiers
|
||||
FROM season s
|
||||
@ -64,28 +66,12 @@ namespace Elwig.Helpers.Billing {
|
||||
LEFT JOIN payment_member lp ON (lp.year, lp.avnr, lp.mgnr) = (l.year, l.avnr, m.mgnr)
|
||||
LEFT JOIN payment_member p ON (p.year, p.avnr, p.mgnr) = (v.year, v.avnr, m.mgnr)
|
||||
LEFT JOIN credit lc ON (lc.year, lc.avnr, lc.mgnr) = (l.year, l.avnr, m.mgnr)
|
||||
LEFT JOIN v_penalty_business_shares b ON (b.year, b.mgnr) = (s.year, m.mgnr)
|
||||
LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr)
|
||||
LEFT JOIN v_auto_business_shares a ON (a.year, a.mgnr) = (s.year, m.mgnr)
|
||||
LEFT JOIN payment_custom x ON (x.year, x.mgnr) = (s.year, m.mgnr)
|
||||
WHERE s.year = {Year} AND v.avnr = {AvNr};
|
||||
""");
|
||||
if (Data.ConsiderTotalPenalty) {
|
||||
if (App.Client.IsWinzerkeller) {
|
||||
// TODO
|
||||
} else {
|
||||
await AppDbContext.ExecuteBatch(cnx, $"""
|
||||
UPDATE credit AS c
|
||||
SET modifiers = modifiers + ROUND((
|
||||
COALESCE(-s.penalty_amount, 0) +
|
||||
COALESCE(-s.penalty_per_bs_amount * CEIL(CAST(-u.diff AS REAL) / s.min_kg_per_bs), 0) +
|
||||
COALESCE(u.diff * s.penalty_per_kg, 0)
|
||||
) / POW(10, s.precision - 2))
|
||||
FROM v_total_under_delivery u
|
||||
JOIN season s ON s.year = u.year
|
||||
WHERE c.year = {Year} AND c.avnr = {AvNr} AND (u.year, u.mgnr) = (c.year, c.mgnr) AND
|
||||
u.diff < 0
|
||||
""");
|
||||
}
|
||||
}
|
||||
await AppDbContext.ExecuteBatch(cnx, $"""
|
||||
UPDATE payment_variant SET test_variant = FALSE WHERE (year, avnr) = ({Year}, {AvNr});
|
||||
""");
|
||||
|
||||
@ -30,6 +30,7 @@ namespace Elwig.Models.Dtos {
|
||||
("Penalties", "Pönalen FB", "€", 20),
|
||||
("Penalty", "Unterl. GA", "€", 20),
|
||||
("AutoBs", "GA Nachz.", "€", 20),
|
||||
("Custom", "Weitere", "€", 20),
|
||||
("Others", "Sonstige", "€", 20),
|
||||
("Considered", "Berückstgt.", "€", 20),
|
||||
("Amount", "Betrag", "€", 20),
|
||||
@ -42,9 +43,8 @@ namespace Elwig.Models.Dtos {
|
||||
public static async Task<CreditNoteData> ForPaymentVariant(AppDbContext ctx, int year, int avnr) {
|
||||
var variant = await ctx.PaymentVariants.FindAsync(year, avnr);
|
||||
var name = variant!.Name;
|
||||
var bsPenalty = await ctx.GetBusinessSharePenalties(year);
|
||||
var data = BillingData.FromJson(variant!.Data);
|
||||
var rows = (await FromDbSet(ctx.CreditNoteRows, year, avnr)).Select(r => new CreditNoteRow(r, data, bsPenalty)).ToList();
|
||||
var rows = (await FromDbSet(ctx.CreditNoteRows, year, avnr)).Select(r => new CreditNoteRow(r, data)).ToList();
|
||||
return new CreditNoteData(rows, year, name);
|
||||
}
|
||||
|
||||
@ -56,16 +56,20 @@ namespace Elwig.Models.Dtos {
|
||||
p.plz, o.name AS ort, m.address, m.iban, c.tgnr, s.year, s.precision,
|
||||
p.amount - p.net_amount AS surcharge,
|
||||
c.net_amount, c.prev_net_amount, c.vat, c.vat_amount, c.gross_amount, c.modifiers, c.prev_modifiers, c.amount,
|
||||
ROUND(COALESCE(u.total_penalty, 0) / POW(10, 4 - 2)) AS fb_penalty,
|
||||
ROUND(COALESCE(a.total_amount, 0) / POW(10, s.precision - 2)) AS auto_bs
|
||||
ROUND(b.total_penalty / POW(10, s.precision - 2)) AS bs_penalty,
|
||||
ROUND(u.total_penalty / POW(10, 4 - 2)) AS fb_penalty,
|
||||
ROUND(-a.total_amount / POW(10, s.precision - 2)) AS auto_bs,
|
||||
x.amount AS custom_mod
|
||||
FROM credit c
|
||||
LEFT JOIN member m ON m.mgnr = c.mgnr
|
||||
LEFT JOIN payment_member p ON (p.year, p.avnr, p.mgnr) = (c.year, c.avnr, c.mgnr)
|
||||
LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
|
||||
LEFT JOIN AT_ort o ON o.okz = p.okz
|
||||
LEFT JOIN season s ON s.year = c.year
|
||||
LEFT JOIN v_penalty_business_shares b ON (b.year, b.mgnr) = (s.year, m.mgnr)
|
||||
LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr)
|
||||
LEFT JOIN v_auto_business_shares a ON (a.year, a.mgnr) = (s.year, m.mgnr)
|
||||
LEFT JOIN payment_custom x ON (x.year, x.mgnr) = (s.year, m.mgnr)
|
||||
WHERE c.year = {year} AND c.avnr = {avnr}
|
||||
ORDER BY m.mgnr
|
||||
""").ToListAsync();
|
||||
@ -91,11 +95,12 @@ namespace Elwig.Models.Dtos {
|
||||
public decimal? Penalties;
|
||||
public decimal? Penalty;
|
||||
public decimal? AutoBs;
|
||||
public decimal? Custom;
|
||||
public decimal? Others;
|
||||
public decimal? Considered;
|
||||
public decimal Amount;
|
||||
|
||||
public CreditNoteRow(CreditNoteRowSingle row, BillingData data, Dictionary<int, long> bsPenalty) {
|
||||
public CreditNoteRow(CreditNoteRowSingle row, BillingData data) {
|
||||
byte prec1 = 2, prec2 = row.Precision;
|
||||
MgNr = row.MgNr;
|
||||
Name1 = row.Name1;
|
||||
@ -117,12 +122,14 @@ namespace Elwig.Models.Dtos {
|
||||
}
|
||||
decimal mod = (row.Modifiers == null) ? 0 : Utils.DecFromDb((long)row.Modifiers, prec1);
|
||||
if (data.ConsiderContractPenalties)
|
||||
Penalties = (row.FbPenalty == null || row.FbPenalty == 0) ? null : Utils.DecFromDb((long)row.FbPenalty, prec1);
|
||||
Penalties = (row.FbPenalty == null) ? null : Utils.DecFromDb((long)row.FbPenalty, prec1);
|
||||
if (data.ConsiderTotalPenalty)
|
||||
Penalty = (!bsPenalty.TryGetValue(row.MgNr, out var val) || val == 0) ? null : Utils.DecFromDb(val, prec1);
|
||||
Penalty = (row.BsPenalty == null) ? null : Utils.DecFromDb((long)row.BsPenalty, prec1);
|
||||
if (data.ConsiderAutoBusinessShares)
|
||||
AutoBs = (row.AutoBs == null || row.AutoBs == 0) ? null : -Utils.DecFromDb((long)row.AutoBs, prec1);
|
||||
mod -= (Penalties ?? 0) + (Penalty ?? 0) + (AutoBs ?? 0);
|
||||
AutoBs = (row.AutoBs == null) ? null : Utils.DecFromDb((long)row.AutoBs, prec1);
|
||||
if (data.ConsiderCustomModifiers)
|
||||
Custom = (row.CustomMod == null) ? null : Utils.DecFromDb((long)row.CustomMod, prec1);
|
||||
mod -= (Penalties ?? 0) + (Penalty ?? 0) + (AutoBs ?? 0) + (Custom ?? 0);
|
||||
Others = (mod == 0) ? null : mod;
|
||||
Gross = Utils.DecFromDb(row.GrossAmount, prec1);
|
||||
Considered = (row.PrevModifiers == null || row.PrevModifiers == 0) ? null : -Utils.DecFromDb((long)row.PrevModifiers, prec1);
|
||||
@ -172,9 +179,13 @@ namespace Elwig.Models.Dtos {
|
||||
public long? PrevModifiers { get; set; }
|
||||
[Column("amount")]
|
||||
public long Amount { get; set; }
|
||||
[Column("bs_penalty")]
|
||||
public long? BsPenalty { get; set; }
|
||||
[Column("fb_penalty")]
|
||||
public long? FbPenalty { get; set; }
|
||||
[Column("auto_bs")]
|
||||
public long? AutoBs { get; set; }
|
||||
[Column("custom_mod")]
|
||||
public long? CustomMod { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
31
Elwig/Models/Entities/PaymentCustom.cs
Normal file
31
Elwig/Models/Entities/PaymentCustom.cs
Normal file
@ -0,0 +1,31 @@
|
||||
using Elwig.Helpers;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace Elwig.Models.Entities {
|
||||
[Table("payment_custom"), PrimaryKey("Year", "MgNr")]
|
||||
public class PaymentCustom {
|
||||
[Column("year")]
|
||||
public int Year { get; set; }
|
||||
|
||||
[Column("mgnr")]
|
||||
public int MgNr { get; set; }
|
||||
|
||||
[Column("amount")]
|
||||
public long AmountValue { get; set; }
|
||||
[NotMapped]
|
||||
public decimal Amount {
|
||||
get => Utils.DecFromDb(AmountValue, 2);
|
||||
set => AmountValue = Utils.DecToDb(value, 2);
|
||||
}
|
||||
|
||||
[Column("comment")]
|
||||
public string? Comment { get; set; }
|
||||
|
||||
[ForeignKey("Year")]
|
||||
public virtual Season Season { get; private set; } = null!;
|
||||
|
||||
[ForeignKey("MgNr")]
|
||||
public virtual Member Member { get; private set; } = null!;
|
||||
}
|
||||
}
|
||||
45
Elwig/Resources/Sql/21-22.sql
Normal file
45
Elwig/Resources/Sql/21-22.sql
Normal file
@ -0,0 +1,45 @@
|
||||
-- schema version 20 to 21
|
||||
|
||||
CREATE VIEW v_penalty_business_shares AS
|
||||
SELECT u.year, u.mgnr,
|
||||
SUM(IIF(u.weight = 0, COALESCE(-s.penalty_none, 0) + COALESCE(-u.business_shares * s.penalty_per_bs_none, 0), 0) +
|
||||
IIF(u.diff < 0, COALESCE(-s.penalty_amount, 0), 0) +
|
||||
COALESCE(u.diff * s.penalty_per_kg, 0) + COALESCE(CEIL(CAST(u.diff AS REAL) / s.min_kg_per_bs) * s.penalty_per_bs_amount, 0)
|
||||
) AS total_penalty
|
||||
FROM v_total_under_delivery u
|
||||
JOIN season s ON u.year = s.year
|
||||
JOIN member m ON m.mgnr = u.mgnr
|
||||
WHERE m.active
|
||||
GROUP BY u.year, u.mgnr
|
||||
HAVING total_penalty < 0
|
||||
ORDER BY u.year, u.mgnr;
|
||||
|
||||
DROP VIEW v_penalty_area_commitments;
|
||||
CREATE VIEW v_penalty_area_commitments AS
|
||||
SELECT u.year, u.mgnr,
|
||||
SUM(COALESCE(IIF(u.weight = 0, -t.penalty_none, 0), 0) +
|
||||
COALESCE(IIF(u.diff < 0, -t.penalty_amount, 0), 0) +
|
||||
COALESCE(u.diff * t.penalty_per_kg, 0)
|
||||
) AS total_penalty
|
||||
FROM v_under_delivery u
|
||||
JOIN area_commitment_type t ON t.vtrgid = u.bucket
|
||||
GROUP BY year, mgnr
|
||||
HAVING total_penalty < 0
|
||||
ORDER BY year, mgnr;
|
||||
|
||||
-- all values in the table are stored with precision 2!
|
||||
CREATE TABLE payment_custom (
|
||||
year INTEGER NOT NULL,
|
||||
mgnr INTEGER NOT NULL,
|
||||
|
||||
amount INTEGER NOT NULL,
|
||||
comment TEXT,
|
||||
|
||||
CONSTRAINT pk_payment_custom PRIMARY KEY (year, mgnr),
|
||||
CONSTRAINT fk_payment_custom_season FOREIGN KEY (year) REFERENCES season (year)
|
||||
ON UPDATE CASCADE
|
||||
ON DELETE CASCADE,
|
||||
CONSTRAINT fk_payment_custom_member FOREIGN KEY (mgnr) REFERENCES member (mgnr)
|
||||
ON UPDATE CASCADE
|
||||
ON DELETE CASCADE
|
||||
) STRICT;
|
||||
15
Elwig/Resources/Sql/22-23.sql
Normal file
15
Elwig/Resources/Sql/22-23.sql
Normal file
@ -0,0 +1,15 @@
|
||||
-- schema version 20 to 21
|
||||
|
||||
CREATE VIEW v_stat_modifier AS
|
||||
SELECT v.year, v.avnr, m.modid, m.name, m.abs, m.rel,
|
||||
COUNT(*) AS count,
|
||||
MIN(IIF(p.net_amount = 0 AND m.abs IS NULL, NULL, ROUND(COALESCE(d.weight * m.abs, 0) + COALESCE(p.net_amount * m.rel, 0)))) AS min,
|
||||
MAX(IIF(p.net_amount = 0 AND m.abs IS NULL, NULL, ROUND(COALESCE(d.weight * m.abs, 0) + COALESCE(p.net_amount * m.rel, 0)))) AS max,
|
||||
SUM(ROUND(COALESCE(d.weight * m.abs, 0) + COALESCE(p.net_amount * m.rel, 0))) AS sum
|
||||
FROM payment_variant v
|
||||
JOIN modifier m ON m.year = v.year
|
||||
JOIN delivery_part d ON d.year = v.year
|
||||
JOIN delivery_part_modifier x ON (x.year, x.did, x.dpnr, x.modid) = (d.year, d.did, d.dpnr, m.modid)
|
||||
LEFT JOIN payment_delivery_part p ON (p.year, p.did, p.dpnr, p.avnr) = (d.year, d.did, d.dpnr, v.avnr)
|
||||
GROUP BY v.year, v.avnr, m.modid
|
||||
ORDER BY v.year, v.avnr, m.ordering;
|
||||
@ -452,26 +452,26 @@
|
||||
<ctrl:UnitTextBox x:Name="SeasonMaxKgPerBsInput" Unit="kg/GA" TextChanged="SeasonMinMaxKgInput_TextChanged"
|
||||
Grid.Column="3" Width="80" Margin="85,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
|
||||
<Label Content="Strafe (pro unterl. kg):" Margin="10,40,0,10" Grid.Column="2"/>
|
||||
<ctrl:UnitTextBox x:Name="SeasonPenaltyPerKgInput" Unit="€/kg" TextChanged="SeasonPenaltyPerKgInput_TextChanged"
|
||||
Grid.Column="3" Width="80" Margin="0,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
|
||||
<Label Content="Strafe (Unterlieferung):" Margin="10,70,0,10" Grid.Column="2"/>
|
||||
<ctrl:UnitTextBox x:Name="SeasonPenaltyInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
|
||||
Grid.Column="3" Width="68" Margin="0,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
<ctrl:UnitTextBox x:Name="SeasonPenaltyPerBsInput" Unit="€/GA" TextChanged="SeasonPenaltyPerBsInput_TextChanged"
|
||||
Grid.Column="3" Width="100" Margin="72,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
|
||||
<Label Content="Strafe (Nicht-Lieferung):" Margin="10,100,0,10" Grid.Column="2"/>
|
||||
<ctrl:UnitTextBox x:Name="SeasonPenaltyNoneInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged" IsEnabled="False"
|
||||
Grid.Column="3" Width="68" Margin="0,100,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
<ctrl:UnitTextBox x:Name="SeasonPenaltyPerBsNoneInput" Unit="€/GA" TextChanged="SeasonPenaltyPerBsInput_TextChanged" IsEnabled="False"
|
||||
Grid.Column="3" Width="100" Margin="72,100,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
|
||||
|
||||
<Label Content="GA-Wert (Nachz.):" Margin="10,130,0,10" Grid.Column="2"/>
|
||||
<Label Content="GA-Wert (Nachz.):" Margin="10,40,0,10" Grid.Column="2"/>
|
||||
<ctrl:UnitTextBox x:Name="SeasonBsValueInput" Unit="€/GA" TextChanged="SeasonPenaltyInput_TextChanged"
|
||||
Grid.Column="3" Width="85" Margin="0,130,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
Grid.Column="3" Width="85" Margin="0,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
|
||||
<GroupBox Header="Strafen bei Unterlieferung lt. GA" Grid.Column="2" Grid.ColumnSpan="2" Margin="0,70,10,0">
|
||||
<Grid>
|
||||
<ctrl:UnitTextBox x:Name="SeasonPenaltyPerKgInput" Unit="€/kg" TextChanged="SeasonPenaltyPerKgInput_TextChanged"
|
||||
Width="80" Margin="65,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
<ctrl:UnitTextBox x:Name="SeasonPenaltyInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
|
||||
Width="68" Margin="150,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
<ctrl:UnitTextBox x:Name="SeasonPenaltyPerBsInput" Unit="€/GA" TextChanged="SeasonPenaltyPerBsInput_TextChanged"
|
||||
Width="100" Margin="222,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
|
||||
<Label Content="Zzgl. bei Nicht-Lieferung:" Margin="10,40,0,10"/>
|
||||
<ctrl:UnitTextBox x:Name="SeasonPenaltyNoneInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
|
||||
Width="68" Margin="150,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
<ctrl:UnitTextBox x:Name="SeasonPenaltyPerBsNoneInput" Unit="€/GA" TextChanged="SeasonPenaltyPerBsInput_TextChanged"
|
||||
Width="100" Margin="222,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</Grid>
|
||||
|
||||
<GroupBox Grid.Column="1" Grid.Row="1" Header="Zu-/Abschläge" Margin="0,0,10,10" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
|
||||
|
||||
@ -192,6 +192,8 @@ namespace Elwig.Windows {
|
||||
ControlUtils.SelectItems(VaributeInput, SelectedGraphEntry?.Vaributes ?? []);
|
||||
|
||||
InitPlot();
|
||||
ChangeActiveGraph(SelectedGraphEntry?.DataGraph);
|
||||
OechsleInput.Text = "73";
|
||||
OechslePricePlot.IsEnabled = true;
|
||||
FillingInputs = false;
|
||||
}
|
||||
@ -215,10 +217,6 @@ namespace Elwig.Windows {
|
||||
DataPlot.Color = ColorUngebunden;
|
||||
DataPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorUngebunden);
|
||||
|
||||
if (SelectedGraphEntry?.GebundenGraph == null) {
|
||||
ChangeActiveGraph(SelectedGraphEntry?.DataGraph);
|
||||
}
|
||||
|
||||
OechslePricePlot.Interaction.Enable(new PlotActions() {
|
||||
ZoomIn = StandardActions.ZoomIn,
|
||||
ZoomOut = StandardActions.ZoomOut,
|
||||
|
||||
@ -94,9 +94,10 @@
|
||||
|
||||
<TextBox x:Name="PostalLocation" Grid.Column="1"
|
||||
Margin="10,30,10,10" Width="120" HorizontalAlignment="Left"/>
|
||||
<Label Margin="130,30,10,10" FontSize="14" Grid.Column="1">
|
||||
<TextBlock>, am <Run x:Name="PostalDate">01.01.2020</Run></TextBlock>
|
||||
</Label>
|
||||
<Label Content=", am" Margin="130,30,10,10" FontSize="14" Grid.Column="1"/>
|
||||
<TextBox x:Name="PostalDate" Grid.Column="1" Text="01.01.2020"
|
||||
Margin="162,30,10,10" Width="78" HorizontalAlignment="Left"
|
||||
TextChanged="Date_TextChanged" LostFocus="Date_LostFocus"/>
|
||||
|
||||
<GroupBox Header="Adressaten" Margin="10,70,10,47" Grid.Column="1">
|
||||
<Grid>
|
||||
|
||||
@ -303,6 +303,15 @@ namespace Elwig.Windows {
|
||||
await UpdateRecipients(ctx);
|
||||
}
|
||||
|
||||
private void Date_TextChanged(object sender, RoutedEventArgs evt) {
|
||||
Validator.CheckDate((TextBox)sender, true);
|
||||
}
|
||||
|
||||
private void Date_LostFocus(object sender, RoutedEventArgs evt) {
|
||||
var res = Validator.CheckDate((TextBox)sender, true);
|
||||
if (!res.IsValid) ((TextBox)sender).Text = $"{Utils.Today:dd.MM.yyyy}";
|
||||
}
|
||||
|
||||
private async Task UpdateRecipients(AppDbContext ctx) {
|
||||
if (RecipientsCustomInput.IsChecked == true) {
|
||||
Recipients = MemberCustomInput.SelectedItems.Cast<Member>().ToList();
|
||||
@ -493,6 +502,7 @@ namespace Elwig.Windows {
|
||||
}
|
||||
}
|
||||
|
||||
var postalDate = DateOnly.ParseExact(PostalDate.Text, "dd.MM.yyyy");
|
||||
var memberDocs = recipients.Select(m => new {
|
||||
Member = m,
|
||||
Docs = docs.SelectMany<SelectedDoc, GeneratedDoc>(doc => {
|
||||
@ -500,7 +510,7 @@ namespace Elwig.Windows {
|
||||
if (doc.Type == DocType.Custom) {
|
||||
return [new GeneratedDoc((string)doc.Details!)];
|
||||
} else if (doc.Type == DocType.MemberDataSheet) {
|
||||
return [new GeneratedDoc(new MemberDataSheet(m, ctx))];
|
||||
return [new GeneratedDoc(new MemberDataSheet(m, ctx) { Date = postalDate })];
|
||||
} else if (doc.Type == DocType.DeliveryConfirmation) {
|
||||
var details = ((int, bool))doc.Details!;
|
||||
var year = details.Item1;
|
||||
@ -513,7 +523,7 @@ namespace Elwig.Windows {
|
||||
} else {
|
||||
return [];
|
||||
}
|
||||
return [new GeneratedDoc(new DeliveryConfirmation(ctx, year, m, data))];
|
||||
return [new GeneratedDoc(new DeliveryConfirmation(ctx, year, m, data) { Date = postalDate })];
|
||||
} else if (doc.Type == DocType.CreditNote) {
|
||||
var details = ((int, int))doc.Details!;
|
||||
var year = details.Item1;
|
||||
@ -521,12 +531,13 @@ namespace Elwig.Windows {
|
||||
var data = cnData[(year, avnr)];
|
||||
try {
|
||||
return [new GeneratedDoc(new CreditNote(
|
||||
ctx, data.Item2[m.MgNr], data.Item1[m.MgNr],
|
||||
data.Item3.ConsiderContractPenalties,
|
||||
data.Item3.ConsiderTotalPenalty,
|
||||
data.Item3.ConsiderAutoBusinessShares,
|
||||
ctx.GetMemberUnderDelivery(year, m.MgNr).GetAwaiter().GetResult()
|
||||
))];
|
||||
ctx, data.Item2[m.MgNr], data.Item1[m.MgNr],
|
||||
data.Item3.ConsiderContractPenalties,
|
||||
data.Item3.ConsiderTotalPenalty,
|
||||
data.Item3.ConsiderAutoBusinessShares,
|
||||
data.Item3.ConsiderCustomModifiers,
|
||||
ctx.GetMemberUnderDelivery(year, m.MgNr).GetAwaiter().GetResult()
|
||||
) { Date = postalDate })];
|
||||
} catch (Exception) {
|
||||
return [];
|
||||
}
|
||||
|
||||
@ -71,6 +71,16 @@
|
||||
<MenuItem x:Name="Menu_DeliveryConfirmation_Email" Header="...per E-Mail schicken" IsEnabled="False"
|
||||
Click="Menu_DeliveryConfirmation_Email_Click"/>
|
||||
</MenuItem>
|
||||
<MenuItem Header="Traubengutschrift" x:Name="Menu_CreditNote">
|
||||
<MenuItem x:Name="Menu_CreditNote_Show" Header="...anzeigen (PDF)" IsEnabled="False"
|
||||
Click="Menu_CreditNote_Show_Click"/>
|
||||
<MenuItem x:Name="Menu_CreditNote_SavePdf" Header="...speichern... (PDF)" IsEnabled="False"
|
||||
Click="Menu_CreditNote_SavePdf_Click"/>
|
||||
<MenuItem x:Name="Menu_CreditNote_Print" Header="...drucken" IsEnabled="False"
|
||||
Click="Menu_CreditNote_Print_Click"/>
|
||||
<MenuItem x:Name="Menu_CreditNote_Email" Header="...per E-Mail schicken" IsEnabled="False"
|
||||
Click="Menu_CreditNote_Email_Click"/>
|
||||
</MenuItem>
|
||||
<MenuItem Header="Mitgliederliste" x:Name="Menu_List">
|
||||
<MenuItem x:Name="Menu_List_SaveActive" Header="...mit Aktiven speichern (Excel)"
|
||||
Click="Menu_List_SaveActive_Click" InputGestureText="Strg+L"/>
|
||||
|
||||
@ -319,9 +319,10 @@ namespace Elwig.Windows {
|
||||
ControlUtils.RenewItemsSource(BranchInput, await ctx.Branches.OrderBy(b => b.Name).ToListAsync());
|
||||
ControlUtils.RenewItemsSource(DefaultKgInput, await ctx.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync());
|
||||
|
||||
var seasons = await ctx.Seasons.OrderByDescending(s => s.Year).ToListAsync();
|
||||
Menu_DeliveryConfirmation.Items.Clear();
|
||||
foreach (var s in await ctx.Seasons.OrderByDescending(s => s.Year).ToListAsync()) {
|
||||
var i = new MenuItem { Header = $"Saison {s.Year}...", IsEnabled = MemberList.SelectedItem != null };
|
||||
foreach (var s in seasons) {
|
||||
var i = new MenuItem { Header = $"Saison {s.Year}...", Tag = s.Year, IsEnabled = MemberList.SelectedItem != null };
|
||||
var show = new MenuItem { Header = "...anzeigen (PDF)" };
|
||||
show.Click += Menu_DeliveryConfirmation_Show_Click;
|
||||
i.Items.Add(show);
|
||||
@ -331,10 +332,31 @@ namespace Elwig.Windows {
|
||||
var print = new MenuItem { Header = "...drucken" };
|
||||
print.Click += Menu_DeliveryConfirmation_Print_Click;
|
||||
i.Items.Add(print);
|
||||
Menu_DeliveryConfirmation.Items.Add(i);
|
||||
var email = new MenuItem { Header = "...per E-Mail schicken" };
|
||||
email.Click += Menu_DeliveryConfirmation_Email_Click;
|
||||
i.Items.Add(email);
|
||||
Menu_DeliveryConfirmation.Items.Add(i);
|
||||
}
|
||||
Menu_CreditNote.Items.Clear();
|
||||
foreach (var s in seasons) {
|
||||
var i1 = new MenuItem { Header = $"Saison {s.Year}...", Tag = s.Year, IsEnabled = MemberList.SelectedItem != null };
|
||||
foreach (var v in s.PaymentVariants.OrderByDescending(v => v.AvNr)) {
|
||||
var i2 = new MenuItem { Header = $"...{v.Name}...", Tag = v.AvNr };
|
||||
var show = new MenuItem { Header = "...anzeigen (PDF)" };
|
||||
show.Click += Menu_CreditNote_Show_Click;
|
||||
i2.Items.Add(show);
|
||||
var pdf = new MenuItem { Header = "...speichern... (PDF)" };
|
||||
pdf.Click += Menu_CreditNote_Email_Click;
|
||||
i2.Items.Add(pdf);
|
||||
var print = new MenuItem { Header = "...drucken" };
|
||||
print.Click += Menu_CreditNote_Print_Click;
|
||||
i2.Items.Add(print);
|
||||
var email = new MenuItem { Header = "...per E-Mail schicken" };
|
||||
email.Click += Menu_CreditNote_Email_Click;
|
||||
i2.Items.Add(email);
|
||||
i1.Items.Add(i2);
|
||||
}
|
||||
Menu_CreditNote.Items.Add(i1);
|
||||
}
|
||||
|
||||
await RefreshMemberList();
|
||||
@ -627,31 +649,31 @@ namespace Elwig.Windows {
|
||||
}
|
||||
|
||||
private async void Menu_DeliveryConfirmation_Show_Click(object sender, RoutedEventArgs evt) {
|
||||
var season = ((sender as MenuItem)?.Parent as MenuItem)?.Header?.ToString()?.Split(' ')[^1].Split('.')[0];
|
||||
if (MemberList.SelectedItem is not Member m || season == null || !int.TryParse(season, out var s))
|
||||
var year = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
|
||||
if (MemberList.SelectedItem is not Member m || year == null)
|
||||
return;
|
||||
await GenerateDeliveryConfirmation(m, s, ExportMode.Show);
|
||||
await GenerateDeliveryConfirmation(m, (int)year, ExportMode.Show);
|
||||
}
|
||||
|
||||
private async void Menu_DeliveryConfirmation_SavePdf_Click(object sender, RoutedEventArgs evt) {
|
||||
var season = ((sender as MenuItem)?.Parent as MenuItem)?.Header?.ToString()?.Split(' ')[^1].Split('.')[0];
|
||||
if (MemberList.SelectedItem is not Member m || season == null || !int.TryParse(season, out var s))
|
||||
var year = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
|
||||
if (MemberList.SelectedItem is not Member m || year == null)
|
||||
return;
|
||||
await GenerateDeliveryConfirmation(m, s, ExportMode.SavePdf);
|
||||
await GenerateDeliveryConfirmation(m, (int)year, ExportMode.SavePdf);
|
||||
}
|
||||
|
||||
private async void Menu_DeliveryConfirmation_Print_Click(object sender, RoutedEventArgs evt) {
|
||||
var season = ((sender as MenuItem)?.Parent as MenuItem)?.Header?.ToString()?.Split(' ')[^1].Split('.')[0];
|
||||
if (MemberList.SelectedItem is not Member m || season == null || !int.TryParse(season, out var s))
|
||||
var year = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
|
||||
if (MemberList.SelectedItem is not Member m || year == null)
|
||||
return;
|
||||
await GenerateDeliveryConfirmation(m, s, ExportMode.Print);
|
||||
await GenerateDeliveryConfirmation(m, (int)year, ExportMode.Print);
|
||||
}
|
||||
|
||||
private async void Menu_DeliveryConfirmation_Email_Click(object sender, RoutedEventArgs evt) {
|
||||
var season = ((sender as MenuItem)?.Parent as MenuItem)?.Header?.ToString()?.Split(' ')[^1].Split('.')[0];
|
||||
if (MemberList.SelectedItem is not Member m || season == null || !int.TryParse(season, out var s))
|
||||
var year = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
|
||||
if (MemberList.SelectedItem is not Member m || year == null)
|
||||
return;
|
||||
await GenerateDeliveryConfirmation(m, s, ExportMode.Email);
|
||||
await GenerateDeliveryConfirmation(m, (int)year, ExportMode.Email);
|
||||
}
|
||||
|
||||
private static async Task GenerateDeliveryConfirmation(Member m, int year, ExportMode mode) {
|
||||
@ -672,6 +694,57 @@ namespace Elwig.Windows {
|
||||
Mouse.OverrideCursor = null;
|
||||
}
|
||||
|
||||
private async void Menu_CreditNote_Show_Click(object sender, RoutedEventArgs evt) {
|
||||
var year = (int?)(((sender as MenuItem)?.Parent as MenuItem)?.Parent as MenuItem)?.Tag;
|
||||
var avnr = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
|
||||
if (MemberList.SelectedItem is not Member m || year == null || avnr == null)
|
||||
return;
|
||||
await GenerateCreditNote(m, (int)year, (int)avnr, ExportMode.Show);
|
||||
}
|
||||
|
||||
private async void Menu_CreditNote_SavePdf_Click(object sender, RoutedEventArgs evt) {
|
||||
var year = (int?)(((sender as MenuItem)?.Parent as MenuItem)?.Parent as MenuItem)?.Tag;
|
||||
var avnr = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
|
||||
if (MemberList.SelectedItem is not Member m || year == null || avnr == null)
|
||||
return;
|
||||
await GenerateCreditNote(m, (int)year, (int)avnr, ExportMode.SavePdf);
|
||||
}
|
||||
|
||||
private async void Menu_CreditNote_Print_Click(object sender, RoutedEventArgs evt) {
|
||||
var year = (int?)(((sender as MenuItem)?.Parent as MenuItem)?.Parent as MenuItem)?.Tag;
|
||||
var avnr = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
|
||||
if (MemberList.SelectedItem is not Member m || year == null || avnr == null)
|
||||
return;
|
||||
await GenerateCreditNote(m, (int)year, (int)avnr, ExportMode.Print);
|
||||
}
|
||||
|
||||
private async void Menu_CreditNote_Email_Click(object sender, RoutedEventArgs evt) {
|
||||
var year = (int?)(((sender as MenuItem)?.Parent as MenuItem)?.Parent as MenuItem)?.Tag;
|
||||
var avnr = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
|
||||
if (MemberList.SelectedItem is not Member m || year == null || avnr == null)
|
||||
return;
|
||||
await GenerateCreditNote(m, (int)year, (int)avnr, ExportMode.Email);
|
||||
}
|
||||
|
||||
private static async Task GenerateCreditNote(Member m, int year, int avnr, ExportMode mode) {
|
||||
Mouse.OverrideCursor = Cursors.AppStarting;
|
||||
try {
|
||||
using var ctx = new AppDbContext();
|
||||
var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
|
||||
var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, year, avnr);
|
||||
var p = (await ctx.MemberPayments.FindAsync(year, avnr, m.MgNr))!;
|
||||
var b = BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data);
|
||||
|
||||
using var doc = new CreditNote(ctx, p, data[m.MgNr],
|
||||
b.ConsiderContractPenalties, b.ConsiderTotalPenalty, b.ConsiderAutoBusinessShares, b.ConsiderCustomModifiers,
|
||||
await ctx.GetMemberUnderDelivery(year, m.MgNr));
|
||||
await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {v.Name}", $"Im Anhang finden Sie die Traubengutschrift {v.Name}"));
|
||||
} catch (Exception exc) {
|
||||
MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||
}
|
||||
Mouse.OverrideCursor = null;
|
||||
}
|
||||
|
||||
private async void Menu_List_SaveActive_Click(object sender, RoutedEventArgs evt) { await GenerateMemberList(0, ExportMode.SaveList); }
|
||||
private async void Menu_List_ShowActive_Click(object sender, RoutedEventArgs evt) { await GenerateMemberList(0, ExportMode.Show); }
|
||||
private async void Menu_List_SavePdfActive_Click(object sender, RoutedEventArgs evt) { await GenerateMemberList(0, ExportMode.SavePdf); }
|
||||
@ -1063,12 +1136,18 @@ namespace Elwig.Windows {
|
||||
ContactPostalInput.IsChecked = m.ContactViaPost;
|
||||
ContactEmailInput.IsChecked = m.ContactViaEmail;
|
||||
|
||||
Dictionary<int, int> delivieries;
|
||||
using (var ctx = new AppDbContext()) {
|
||||
var d1 = ctx.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason && d.MgNr == m.MgNr);
|
||||
var d2 = ctx.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason - 1 && d.MgNr == m.MgNr);
|
||||
StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): {d2.Count():N0} ({d2.Sum(d => d.Parts.Count):N0}), {d2.SelectMany(d => d.Parts).Sum(p => p.Weight):N0} kg";
|
||||
StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): {d1.Count():N0} ({d1.Sum(d => d.Parts.Count):N0}), {d1.SelectMany(d => d.Parts).Sum(p => p.Weight):N0} kg";
|
||||
StatusAreaCommitment.Text = $"Gebundene Fläche: {m.ActiveAreaCommitments(ctx).Select(c => c.Area).Sum():N0} m²";
|
||||
delivieries = ctx.Deliveries
|
||||
.Where(d => d.MgNr == m.MgNr)
|
||||
.SelectMany(d => d.Parts)
|
||||
.GroupBy(d => d.Year)
|
||||
.ToDictionary(g => g.Key, g => g.Sum(d => d.Weight));
|
||||
}
|
||||
|
||||
Menu_Contact_Email.IsEnabled = m.EmailAddresses.Count > 0;
|
||||
@ -1081,6 +1160,13 @@ namespace Elwig.Windows {
|
||||
i.IsEnabled = true;
|
||||
(i.Items[^1] as MenuItem)!.IsEnabled = App.Config.Smtp != null && m.EmailAddresses.Count > 0;
|
||||
}
|
||||
foreach (var i in Menu_CreditNote.Items.Cast<MenuItem>()) {
|
||||
var year = (int)i.Tag;
|
||||
i.IsEnabled = delivieries.GetValueOrDefault(year, 0) > 0;
|
||||
foreach (var v in i.Items.Cast<MenuItem>()) {
|
||||
(v.Items[^1] as MenuItem)!.IsEnabled = App.Config.Smtp != null && m.EmailAddresses.Count > 0;
|
||||
}
|
||||
}
|
||||
|
||||
FinishInputFilling();
|
||||
}
|
||||
@ -1095,6 +1181,9 @@ namespace Elwig.Windows {
|
||||
foreach (var i in Menu_DeliveryConfirmation.Items.Cast<MenuItem>()) {
|
||||
i.IsEnabled = false;
|
||||
}
|
||||
foreach (var i in Menu_CreditNote.Items.Cast<MenuItem>()) {
|
||||
i.IsEnabled = false;
|
||||
}
|
||||
MemberReferenceButton.IsEnabled = false;
|
||||
StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): -";
|
||||
StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): -";
|
||||
|
||||
@ -6,8 +6,10 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:Elwig.Windows"
|
||||
xmlns:ctrl="clr-namespace:Elwig.Controls"
|
||||
Title="Auszahlung anpassen - Elwig" Height="500" Width="850" MinHeight="400" MinWidth="850">
|
||||
Title="Auszahlung anpassen - Elwig" Height="600" Width="1000" MinHeight="400" MinWidth="850">
|
||||
<Window.Resources>
|
||||
<ctrl:UnitConverter x:Key="CurrencyConverter" Precision="2" Unit="€"/>
|
||||
<ctrl:UnitConverter x:Key="WeightConverter" Precision="0" Unit="kg"/>
|
||||
<Style TargetType="Label">
|
||||
<Setter Property="HorizontalAlignment" Value="Left"/>
|
||||
<Setter Property="VerticalAlignment" Value="Top"/>
|
||||
@ -44,16 +46,26 @@
|
||||
<RowDefinition Height="24"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="450"/>
|
||||
<ColumnDefinition Width="2.5*"/>
|
||||
<ColumnDefinition Width="2*" MinWidth="300"/>
|
||||
<ColumnDefinition Width="5"/>
|
||||
<ColumnDefinition Width="1*" MinWidth="380"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Menu Grid.ColumnSpan="2" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
|
||||
<Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
|
||||
</Menu>
|
||||
|
||||
<Grid Grid.Row="1">
|
||||
<DataGrid x:Name="MemberList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
|
||||
CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" Margin="10,10,10,10">
|
||||
CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" Margin="10,10,5,10"
|
||||
SelectionChanged="MemberList_SelectionChanged">
|
||||
<DataGrid.Resources>
|
||||
<Style TargetType="{x:Type DataGridRow}">
|
||||
<Style.Setters>
|
||||
<Setter Property="Background" Value="{Binding Path=Background}"></Setter>
|
||||
<Setter Property="Foreground" Value="{Binding Path=Foreground}"></Setter>
|
||||
</Style.Setters>
|
||||
</Style>
|
||||
</DataGrid.Resources>
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="45">
|
||||
<DataGridTextColumn.CellStyle>
|
||||
@ -63,22 +75,57 @@
|
||||
</DataGridTextColumn.CellStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Header="Nachname" Binding="{Binding FamilyName}" Width="100"/>
|
||||
<DataGridTextColumn Header="Vorname" Binding="{Binding GivenName}" Width="100"/>
|
||||
<DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0} '}" Width="35">
|
||||
<DataGridTextColumn Header="Vorname" Binding="{Binding GivenName}" Width="90"/>
|
||||
<DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0:N0} '}" Width="35">
|
||||
<DataGridTextColumn.CellStyle>
|
||||
<Style>
|
||||
<Setter Property="TextBlock.TextAlignment" Value="Right"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.CellStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Header="Ü.-/U.-Lfrg." Binding="{Binding OverUnder, StringFormat='{}{0} kg '}" Width="70">
|
||||
<DataGridTextColumn Header="Ü.-/U.-Lfrg." Binding="{Binding OverUnder, Converter={StaticResource WeightConverter},StringFormat='{}{0} '}" Width="70">
|
||||
<DataGridTextColumn.CellStyle>
|
||||
<Style>
|
||||
<Setter Property="TextBlock.TextAlignment" Value="Right"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.CellStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Header="Nachz." Binding="{Binding Adjust, StringFormat='{}{0} '}" Width="45">
|
||||
<DataGridTextColumn Header="Strafe GA" Binding="{Binding PenaltyBs, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
|
||||
<DataGridTextColumn.CellStyle>
|
||||
<Style>
|
||||
<Setter Property="TextBlock.TextAlignment" Value="Right"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.CellStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Header="Pönale FB" Binding="{Binding PenaltyAc, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
|
||||
<DataGridTextColumn.CellStyle>
|
||||
<Style>
|
||||
<Setter Property="TextBlock.TextAlignment" Value="Right"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.CellStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Header="Nachz." Binding="{Binding Adjust, StringFormat='{}{0:N0} '}" Width="45">
|
||||
<DataGridTextColumn.CellStyle>
|
||||
<Style>
|
||||
<Setter Property="TextBlock.TextAlignment" Value="Right"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.CellStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Header="Nachz.Betr." Binding="{Binding AdjustAmount, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="70">
|
||||
<DataGridTextColumn.CellStyle>
|
||||
<Style>
|
||||
<Setter Property="TextBlock.TextAlignment" Value="Right"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.CellStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Header="Weitere" Binding="{Binding Custom, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
|
||||
<DataGridTextColumn.CellStyle>
|
||||
<Style>
|
||||
<Setter Property="TextBlock.TextAlignment" Value="Right"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.CellStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Header="Gesamt" Binding="{Binding Total, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
|
||||
<DataGridTextColumn.CellStyle>
|
||||
<Style>
|
||||
<Setter Property="TextBlock.TextAlignment" Value="Right"/>
|
||||
@ -89,40 +136,136 @@
|
||||
</DataGrid>
|
||||
</Grid>
|
||||
|
||||
<Grid Grid.Column="1" Grid.Row="1">
|
||||
<GroupBox Header="Automatische Nachzeichnung der Geschäftsanteile" Margin="10,10,10,10" Height="180" Width="360"
|
||||
<GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
|
||||
|
||||
<Grid Grid.Column="2" Grid.Row="1">
|
||||
<GroupBox Header="Benutzerdefinierte Zu-/Abschläge" Margin="5,10,10,10" Height="180" Width="365"
|
||||
VerticalAlignment="Top" HorizontalAlignment="Left">
|
||||
<Grid>
|
||||
<Label Content="Absoluter Freibetrag:" Margin="10,10,10,10"/>
|
||||
<ctrl:UnitTextBox x:Name="AllowanceKgInput" Unit="kg" Margin="140,10,10,10" Width="70"
|
||||
TextChanged="KgInput_TextChanged"/>
|
||||
<ctrl:UnitTextBox x:Name="AllowanceBsInput" Unit="GA" Margin="215,10,10,10" Width="60"
|
||||
TextChanged="PercentInput_TextChanged"/>
|
||||
<Label Content="Mitglied:" Margin="10,10,10,10"/>
|
||||
<TextBox x:Name="MgNrInput" Width="48" Margin="70,10,10,10" HorizontalAlignment="Left" TextAlignment="Right"
|
||||
TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
|
||||
<ComboBox x:Name="MemberInput" Margin="123,10,40,10" IsEditable="True"
|
||||
ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
|
||||
SelectionChanged="MemberInput_SelectionChanged"
|
||||
VerticalAlignment="Top" Height="25" FontSize="14"/>
|
||||
<Button x:Name="MemberReferenceButton" Grid.Column="1" Height="25" Width="25" FontFamily="Segoe MDL2 Assets" Content="" Padding="0,0,0,0"
|
||||
Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Right" ToolTip="Zu Mitglied springen"
|
||||
Click="MemberReferenceButton_Click"/>
|
||||
|
||||
<Label Content="Relativer Freibetrag:" Margin="10,40,10,10"/>
|
||||
<ctrl:UnitTextBox x:Name="AllowanceKgPerBsInput" Unit="kg/GA" Margin="140,40,10,10" Width="87"
|
||||
TextChanged="KgInput_TextChanged"/>
|
||||
<ctrl:UnitTextBox x:Name="AllowancePercentInput" Unit="%" Margin="232,40,10,10" Width="60"
|
||||
TextChanged="PercentInput_TextChanged"/>
|
||||
<Label Content="Betrag:" Margin="10,40,10,10"/>
|
||||
<ctrl:UnitTextBox x:Name="CustomAmountInput" Width="80" Margin="70,40,10,10" Unit="€"
|
||||
TextChanged="CustomAmountInput_TextChanged"/>
|
||||
|
||||
<Label Content="Nur mind. nachz.:" Margin="10,70,10,10"/>
|
||||
<ctrl:UnitTextBox x:Name="MinBsInput" Unit="GA" Margin="140,70,10,10" Width="50"
|
||||
TextChanged="BsInput_TextChanged"/>
|
||||
<Label Content="Freitext:" Margin="10,70,10,10"/>
|
||||
<TextBox x:Name="CustomCommentInput" Margin="70,70,10,10"/>
|
||||
|
||||
<Button x:Name="SeasonButton" Content="GA-Wert" Margin="10,10,10,42" Width="120"
|
||||
HorizontalAlignment="Right" VerticalAlignment="Bottom"
|
||||
Click="SeasonButton_Click"/>
|
||||
<Button x:Name="AutoAdjustBsButton" Content="Nachzeichnen" Margin="10,10,135,10" Width="120"
|
||||
<Button x:Name="SaveCustomButton" Content="Speichern" Margin="0,0,125,10" Width="120"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Bottom"
|
||||
Click="CustomButton_Click"/>
|
||||
<Button x:Name="RemoveCustomButton" Content="Entfernen" Margin="125,0,0,10" Width="120"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Bottom"
|
||||
Click="CustomButton_Click"/>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
||||
<GroupBox Header="Automatische Nachzeichnung der Geschäftsanteile" Margin="5,10,10,10" Height="180" Width="365"
|
||||
VerticalAlignment="Bottom" HorizontalAlignment="Left">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition/>
|
||||
<ColumnDefinition Width="28*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Label Content="Absoluter Freibetrag:" Margin="10,10,0,0" Grid.ColumnSpan="2"/>
|
||||
<ctrl:UnitTextBox x:Name="AllowanceKgInput" Unit="kg" Margin="128,10,0,0" Width="70"
|
||||
TextChanged="KgInput_TextChanged" Grid.Column="1"/>
|
||||
<ctrl:UnitTextBox x:Name="AllowanceBsInput" Unit="GA" Margin="203,10,0,0" Width="60"
|
||||
TextChanged="PercentInput_TextChanged" Grid.Column="1"/>
|
||||
|
||||
<Label Content="Relativer Freibetrag:" Margin="10,40,0,0" Grid.ColumnSpan="2"/>
|
||||
<ctrl:UnitTextBox x:Name="AllowanceKgPerBsInput" Unit="kg/GA" Margin="128,40,0,0" Width="87"
|
||||
TextChanged="KgInput_TextChanged" Grid.Column="1"/>
|
||||
<ctrl:UnitTextBox x:Name="AllowancePercentInput" Unit="%" Margin="220,40,0,0" Width="60"
|
||||
TextChanged="PercentInput_TextChanged" Grid.Column="1"/>
|
||||
|
||||
<Label Content="Nur mind. nachz.:" Margin="10,70,0,0" Grid.ColumnSpan="2"/>
|
||||
<ctrl:UnitTextBox x:Name="MinBsInput" Unit="GA" Margin="128,70,0,0" Width="50"
|
||||
TextChanged="BsInput_TextChanged" Grid.Column="1"/>
|
||||
|
||||
<Button x:Name="SeasonButton" Content="GA-Wert" Margin="0,0,10,42" Width="120"
|
||||
HorizontalAlignment="Right" VerticalAlignment="Bottom"
|
||||
Click="AutoAdjustBsButton_Click"/>
|
||||
<Button x:Name="UnAdjustBsButton" Content="Rückgängig" Margin="10,10,10,10" Width="120"
|
||||
Click="SeasonButton_Click" Grid.Column="1"/>
|
||||
<Button x:Name="AutoAdjustBsButton" Content="Nachzeichnen" Margin="0,0,135,10" Width="120"
|
||||
HorizontalAlignment="Right" VerticalAlignment="Bottom"
|
||||
Click="UnAdjustBsButton_Click"/>
|
||||
Click="AutoAdjustBsButton_Click" Grid.Column="1"/>
|
||||
<Button x:Name="UnAdjustBsButton" Content="Rückgängig" Margin="0,0,10,10" Width="120"
|
||||
HorizontalAlignment="Right" VerticalAlignment="Bottom"
|
||||
Click="UnAdjustBsButton_Click" Grid.Column="1"/>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</Grid>
|
||||
|
||||
<StatusBar Grid.Row="2" Grid.ColumnSpan="2" BorderThickness="0,1,0,0" BorderBrush="Gray">
|
||||
<StatusBar Grid.Row="2" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
|
||||
<StatusBar.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1.25*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="130"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
</Grid>
|
||||
</ItemsPanelTemplate>
|
||||
</StatusBar.ItemsPanel>
|
||||
<StatusBarItem Grid.Column="0" HorizontalContentAlignment="Stretch">
|
||||
<DockPanel>
|
||||
<TextBlock Text="Strafe GA: "/>
|
||||
<TextBlock x:Name="PenaltyBusinessShares" Text="-"/>
|
||||
</DockPanel>
|
||||
</StatusBarItem>
|
||||
<Separator Grid.Column="1"/>
|
||||
<StatusBarItem Grid.Column="2" HorizontalContentAlignment="Stretch">
|
||||
<DockPanel>
|
||||
<TextBlock Text="Pönale FB: "/>
|
||||
<TextBlock x:Name="PenaltyAreaCommitments" Text="-"/>
|
||||
</DockPanel>
|
||||
</StatusBarItem>
|
||||
<Separator Grid.Column="3"/>
|
||||
<StatusBarItem Grid.Column="4" HorizontalContentAlignment="Stretch">
|
||||
<DockPanel>
|
||||
<TextBlock Text="Nachz.: "/>
|
||||
<TextBlock x:Name="AutoBusinessShareAdjustment" Text="-"/>
|
||||
</DockPanel>
|
||||
</StatusBarItem>
|
||||
<Separator Grid.Column="5"/>
|
||||
<StatusBarItem Grid.Column="6" HorizontalContentAlignment="Stretch">
|
||||
<DockPanel>
|
||||
<TextBlock Text="Weitere: "/>
|
||||
<TextBlock x:Name="CustomModifiers" Text="-"/>
|
||||
</DockPanel>
|
||||
</StatusBarItem>
|
||||
<Separator Grid.Column="7"/>
|
||||
<StatusBarItem Grid.Column="8" HorizontalContentAlignment="Stretch">
|
||||
<DockPanel>
|
||||
<TextBlock Text="Gesamt: "/>
|
||||
<TextBlock x:Name="TotalModifiers" Text="-"/>
|
||||
</DockPanel>
|
||||
</StatusBarItem>
|
||||
<Separator Grid.Column="9"/>
|
||||
<StatusBarItem Grid.Column="10" HorizontalContentAlignment="Stretch">
|
||||
<DockPanel>
|
||||
<TextBlock Text="Nicht-Lieferanten: "/>
|
||||
<TextBlock x:Name="NonDeliveries" Text="-"/>
|
||||
</DockPanel>
|
||||
</StatusBarItem>
|
||||
</StatusBar>
|
||||
</Grid>
|
||||
</local:ContextWindow>
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
using Elwig.Helpers;
|
||||
using Elwig.Helpers.Billing;
|
||||
using Elwig.Models.Dtos;
|
||||
using Elwig.Models.Entities;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@ -9,6 +10,7 @@ using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
|
||||
namespace Elwig.Windows {
|
||||
public partial class PaymentAdjustmentWindow : ContextWindow {
|
||||
@ -16,6 +18,8 @@ namespace Elwig.Windows {
|
||||
public readonly int Year;
|
||||
public readonly bool SeasonLocked;
|
||||
|
||||
public Dictionary<int, PaymentCustom>? CustomPayments;
|
||||
|
||||
public PaymentAdjustmentWindow(int year) {
|
||||
InitializeComponent();
|
||||
Year = year;
|
||||
@ -23,6 +27,12 @@ namespace Elwig.Windows {
|
||||
SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
|
||||
}
|
||||
Title = $"Auszahlung anpassen - Lese {Year} - Elwig";
|
||||
AutoAdjustBsButton.IsEnabled = !SeasonLocked;
|
||||
UnAdjustBsButton.IsEnabled = !SeasonLocked;
|
||||
SaveCustomButton.IsEnabled = !SeasonLocked;
|
||||
RemoveCustomButton.IsEnabled = !SeasonLocked;
|
||||
CustomAmountInput.IsEnabled = !SeasonLocked;
|
||||
CustomCommentInput.IsEnabled = !SeasonLocked;
|
||||
|
||||
AllowanceKgInput.Text = $"{App.Client.AutoAdjustBs.AllowanceKg}";
|
||||
AllowanceBsInput.Text = $"{App.Client.AutoAdjustBs.AllowanceBs}";
|
||||
@ -38,15 +48,20 @@ namespace Elwig.Windows {
|
||||
m.FamilyName,
|
||||
m.GivenName,
|
||||
m.BusinessShares,
|
||||
m.IsActive,
|
||||
})
|
||||
.OrderBy(m => m.FamilyName)
|
||||
.ThenBy(m => m.GivenName)
|
||||
.ThenBy(m => m.MgNr)
|
||||
.ToListAsync();
|
||||
var season = (await ctx.Seasons.FindAsync(Year))!;
|
||||
var contracts = await ctx.AreaCommitmentTypes.ToDictionaryAsync(t => t.VtrgId, t => t);
|
||||
|
||||
var tbl = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, Year);
|
||||
var weight = tbl.Rows.ToDictionary(r => r.MgNr, r => r.Weight);
|
||||
var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, Year);
|
||||
var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, Year);
|
||||
var weight = tbl1.Rows.ToDictionary(r => r.MgNr, r => r.Weight);
|
||||
var areaComs = tbl2.Rows.ToDictionary(r => r.MgNr, r => r.VtrgIds.Zip(r.UnderDeliveries).ToDictionary(r => r.First, r => r.Second));
|
||||
CustomPayments = await ctx.CustomPayments.Where(p => p.Year == Year).ToDictionaryAsync(p => p.MgNr, p => p);
|
||||
|
||||
var history = await ctx.MemberHistory
|
||||
.Where(h => h.DateString.CompareTo($"{Year}-01-01") >= 0 && h.DateString.CompareTo($"{Year}-12-31") <= 0 && h.Type == "auto" && h.BusinessShares > 0)
|
||||
@ -55,32 +70,87 @@ namespace Elwig.Windows {
|
||||
|
||||
var list = members
|
||||
.Select(m => new {
|
||||
m.MgNr,
|
||||
m.FamilyName,
|
||||
m.GivenName,
|
||||
m.MgNr, m.FamilyName, m.GivenName,
|
||||
m.IsActive,
|
||||
BusinessShares = m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0),
|
||||
DeliveryObligation = (m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0)) * season.MinKgPerBusinessShare,
|
||||
DeliveryRight = (m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0)) * season.MaxKgPerBusinessShare,
|
||||
Adjust = history.TryGetValue(m.MgNr, out int v2) ? (int?)v2 : null,
|
||||
})
|
||||
.Select(m => new {
|
||||
m.MgNr,
|
||||
m.FamilyName,
|
||||
m.GivenName,
|
||||
m.MgNr, m.FamilyName, m.GivenName,
|
||||
m.BusinessShares,
|
||||
Weight = weight.GetValueOrDefault(m.MgNr, 0),
|
||||
OverUnder = weight.TryGetValue(m.MgNr, out int v1) ?
|
||||
(v1 < m.DeliveryObligation ? (int?)v1 - m.DeliveryObligation :
|
||||
v1 > m.DeliveryRight ? (int?)v1 - m.DeliveryRight : null)
|
||||
: null,
|
||||
Adjust = history.TryGetValue(m.MgNr, out int v2) ? (int?)v2 : null
|
||||
: (m.IsActive ? -m.DeliveryObligation : null),
|
||||
m.Adjust,
|
||||
AdjustAmount = m.Adjust * -season.BusinessShareValue,
|
||||
})
|
||||
.Where(m => m.OverUnder != null || m.Adjust != null)
|
||||
.OrderByDescending(m => m.OverUnder)
|
||||
.Select(m => new {
|
||||
m.MgNr, m.FamilyName, m.GivenName,
|
||||
m.BusinessShares, m.Weight, m.OverUnder,
|
||||
PenaltyBs = m.OverUnder != null && m.OverUnder < 0 ?
|
||||
(season.PenaltyPerKg * m.OverUnder ?? 0) +
|
||||
(-season.PenaltyAmount ?? 0) +
|
||||
(season.PenaltyPerBsAmount * Math.Floor(m.OverUnder / season.MinKgPerBusinessShare ?? 0m) ?? 0) +
|
||||
(m.Weight == 0 ? (-season.PenaltyNone ?? 0) + (-season.PenaltyPerBsNone * m.BusinessShares ?? 0) : 0)
|
||||
: (decimal?)null,
|
||||
PenaltyAc = areaComs.TryGetValue(m.MgNr, out var c) ? c.Select(r => {
|
||||
var con = contracts[r.Key];
|
||||
return (r.Value.Kg * con.PenaltyPerKg ?? 0) + (r.Value.Kg < 0 ? con.PenaltyAmount ?? 0 : 0) + (r.Value.Percent == -100 ? con.PenaltyNone ?? 0 : 0);
|
||||
}).Sum() : (decimal?)null,
|
||||
m.Adjust,
|
||||
m.AdjustAmount,
|
||||
Custom = CustomPayments!.GetValueOrDefault(m.MgNr, null)?.Amount,
|
||||
})
|
||||
.Select(m => new {
|
||||
m.MgNr, m.FamilyName, m.GivenName,
|
||||
m.BusinessShares, m.Weight, m.OverUnder,
|
||||
PenaltyBs = m.PenaltyBs == null || m.PenaltyBs == 0 ? (decimal?)null : Math.Round((decimal)m.PenaltyBs, 2),
|
||||
PenaltyAc = m.PenaltyAc == null ? (decimal?)null : Math.Round((decimal)m.PenaltyAc, 2),
|
||||
m.Adjust,
|
||||
AdjustAmount = m.AdjustAmount == null ? (decimal?)null : Math.Round((decimal)m.AdjustAmount, 2),
|
||||
m.Custom
|
||||
})
|
||||
.Select(m => new {
|
||||
m.MgNr, m.FamilyName, m.GivenName,
|
||||
m.BusinessShares, m.Weight, m.OverUnder,
|
||||
m.PenaltyBs, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.Custom,
|
||||
Total = (m.PenaltyBs ?? 0) + (m.PenaltyAc ?? 0) + (m.AdjustAmount ?? 0) + (m.Custom ?? 0),
|
||||
})
|
||||
.Select(m => new {
|
||||
m.MgNr, m.FamilyName, m.GivenName,
|
||||
m.BusinessShares, m.Weight, m.OverUnder,
|
||||
m.PenaltyBs, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.Custom,
|
||||
m.Total,
|
||||
Background = m.Weight == 0 ? Brushes.Orange : m.Weight / 2 < -m.Total ? Brushes.Red : Brushes.White,
|
||||
Foreground = m.Total == 0 ? Brushes.Gray : Brushes.Black,
|
||||
})
|
||||
.Where(m => m.OverUnder != null || m.Adjust != null || m.PenaltyBs != null || m.PenaltyAc != null || m.Custom != null)
|
||||
.OrderByDescending(m => m.OverUnder ?? 0)
|
||||
.ThenBy(m => m.FamilyName)
|
||||
.ThenBy(m => m.GivenName)
|
||||
.ThenBy(m => m.MgNr)
|
||||
.ToList();
|
||||
|
||||
MemberList.ItemsSource = list;
|
||||
|
||||
var sym = season.Currency.Symbol ?? season.Currency.Code;
|
||||
PenaltyBusinessShares.Text = $"{list.Count(r => r.PenaltyBs != null && r.PenaltyBs != 0)} Mg. / {list.Sum(r => r.PenaltyBs):N2} {sym}";
|
||||
PenaltyAreaCommitments.Text = $"{list.Count(r => r.PenaltyAc != null && r.PenaltyAc != 0)} Mg. / {list.Sum(r => r.PenaltyAc):N2} {sym}";
|
||||
AutoBusinessShareAdjustment.Text = $"{list.Count(r => r.Adjust > 0)} Mg. / {list.Sum(r => r.Adjust)} GA / {list.Sum(r => r.AdjustAmount):N2} {sym}";
|
||||
CustomModifiers.Text = $"{list.Count(r => r.Custom != null)} Mg. / {list.Sum(r => r.Custom):N2} {sym}";
|
||||
TotalModifiers.Text = $"{list.Count(r => r.Total != 0)} Mg. / {list.Sum(r => r.Total):N2} {sym}";
|
||||
NonDeliveries.Text = $"{list.Count(r => r.Weight == 0):N0}";
|
||||
|
||||
ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
|
||||
.OrderBy(m => m.FamilyName)
|
||||
.ThenBy(m => m.GivenName)
|
||||
.ThenBy(m => m.MgNr)
|
||||
.ToListAsync());
|
||||
CustomAmountInput.Unit = sym;
|
||||
}
|
||||
|
||||
private async void AutoAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
|
||||
@ -139,5 +209,82 @@ namespace Elwig.Windows {
|
||||
private void PercentInput_TextChanged(object sender, TextChangedEventArgs evt) {
|
||||
Validator.CheckDecimal((TextBox)sender, false, 3, 2);
|
||||
}
|
||||
|
||||
private void MemberList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
|
||||
if (MemberList.SelectedItem != null) {
|
||||
var i = MemberList.SelectedItem;
|
||||
var t = i.GetType();
|
||||
MgNrInput.Text = t.GetProperty("MgNr")?.GetValue(i)?.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
private void MgNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
|
||||
var res = Validator.CheckMgNr((TextBox)sender, true);
|
||||
ControlUtils.SelectItemWithPk(MemberInput, res.IsValid ? int.Parse(MgNrInput.Text) : null);
|
||||
}
|
||||
|
||||
private void MgNrInput_LostFocus(object sender, RoutedEventArgs evt) {
|
||||
var res = Validator.CheckMgNr((TextBox)sender, true);
|
||||
ControlUtils.SelectItemWithPk(MemberInput, res.IsValid ? int.Parse(MgNrInput.Text) : null);
|
||||
}
|
||||
|
||||
private void MemberInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
|
||||
if (MemberInput.SelectedItem is Member m) {
|
||||
MgNrInput.Text = m.MgNr.ToString();
|
||||
MemberList.SelectedItem = MemberList.ItemsSource.Cast<object>().FirstOrDefault(i => {
|
||||
var t = i.GetType();
|
||||
return (int?)t.GetProperty("MgNr")?.GetValue(i) == m.MgNr;
|
||||
});
|
||||
if (MemberList.SelectedItem != null)
|
||||
MemberList.ScrollIntoView(MemberList.SelectedItem);
|
||||
|
||||
if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
|
||||
CustomAmountInput.Text = $"{p.Amount:N2}";
|
||||
CustomCommentInput.Text = p.Comment ?? "";
|
||||
} else {
|
||||
CustomAmountInput.Text = "";
|
||||
CustomCommentInput.Text = "";
|
||||
}
|
||||
} else {
|
||||
CustomAmountInput.Text = "";
|
||||
CustomCommentInput.Text = "";
|
||||
}
|
||||
}
|
||||
|
||||
private void MemberReferenceButton_Click(object sender, RoutedEventArgs evt) {
|
||||
if (MemberInput.SelectedItem is not Member m) return;
|
||||
App.FocusMember(m.MgNr);
|
||||
}
|
||||
|
||||
private void CustomAmountInput_TextChanged(object sender, TextChangedEventArgs evt) {
|
||||
Validator.CheckDecimal((TextBox)sender, false, 4, 2, true);
|
||||
}
|
||||
|
||||
private async void CustomButton_Click(object sender, RoutedEventArgs evt) {
|
||||
if (MemberInput.SelectedItem is not Member m) return;
|
||||
Mouse.OverrideCursor = Cursors.AppStarting;
|
||||
try {
|
||||
using var ctx = new AppDbContext();
|
||||
if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
|
||||
ctx.Remove(p);
|
||||
}
|
||||
if (sender == SaveCustomButton && decimal.TryParse(CustomAmountInput.Text, out var num)) {
|
||||
var text = CustomCommentInput.Text.Trim();
|
||||
ctx.Add(new PaymentCustom {
|
||||
MgNr = m.MgNr,
|
||||
Year = Year,
|
||||
Amount = num,
|
||||
Comment = text == "" ? null : text,
|
||||
});
|
||||
}
|
||||
await ctx.SaveChangesAsync();
|
||||
} catch (Exception exc) {
|
||||
var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
|
||||
if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
|
||||
MessageBox.Show(str, "Benutzerdefinierten Zu-/Abschlag speichern", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||
}
|
||||
await App.HintContextChange();
|
||||
Mouse.OverrideCursor = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -175,21 +175,11 @@
|
||||
</Style>
|
||||
</Grid.Resources>
|
||||
|
||||
<Button x:Name="ModifierButton" Content="Zu-/Abschläge" Grid.Column="0" Grid.Row="0"
|
||||
Click="ModifierButton_Click"/>
|
||||
<Label Content="" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="1" RenderTransformOrigin="0.5,0.5" >
|
||||
<Label.RenderTransform>
|
||||
<TransformGroup>
|
||||
<RotateTransform Angle="45"/>
|
||||
<TranslateTransform Y="5"/>
|
||||
</TransformGroup>
|
||||
</Label.RenderTransform>
|
||||
</Label>
|
||||
<Button x:Name="EditButton" Content="Bearbeiten" Grid.Column="0" Grid.Row="2"
|
||||
Click="EditButton_Click"/>
|
||||
<Label Content="" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="1"/>
|
||||
<Button x:Name="PaymentAdjustmentButton" Content="Anpassen" Grid.Column="0" Grid.Row="4"
|
||||
Click="PaymentAdjustmentButton_Click"/>
|
||||
<Button x:Name="ModifierButton" Content="Zu-/Abschläge" Grid.Column="0" Grid.Row="4"
|
||||
Click="ModifierButton_Click"/>
|
||||
<Label Content="" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="1" RenderTransformOrigin="0.5,0.5" >
|
||||
<Label.RenderTransform>
|
||||
<TransformGroup>
|
||||
@ -201,6 +191,16 @@
|
||||
<Button x:Name="CalculateButton" Content="Berechnen" Grid.Column="2" Grid.Row="2"
|
||||
Click="CalculateButton_Click"/>
|
||||
<Label Content="" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3" x:Name="Arrow3"/>
|
||||
<Button x:Name="PaymentAdjustmentButton" Content="Anpassen" Grid.Column="2" Grid.Row="4"
|
||||
Click="PaymentAdjustmentButton_Click"/>
|
||||
<Label Content="" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="3" x:Name="Arrow4" RenderTransformOrigin="0.5,0.5" >
|
||||
<Label.RenderTransform>
|
||||
<TransformGroup>
|
||||
<RotateTransform Angle="-45"/>
|
||||
<TranslateTransform Y="-5"/>
|
||||
</TransformGroup>
|
||||
</Label.RenderTransform>
|
||||
</Label>
|
||||
<Button x:Name="CommitButton" Content="Festsetzen" Grid.Column="4" Grid.Row="2"
|
||||
Click="CommitButton_Click"/>
|
||||
<Button x:Name="RevertButton" Content="Freigeben" Grid.Column="4" Grid.Row="2"
|
||||
|
||||
@ -65,6 +65,7 @@ namespace Elwig.Windows {
|
||||
RevertButton.IsEnabled = locked && !SeasonLocked;
|
||||
RevertButton.Visibility = locked ? Visibility.Visible : Visibility.Hidden;
|
||||
Arrow3.Content = locked ? "\xF0B0" : "\xF0AF";
|
||||
Arrow4.Content = locked ? "\xF0B0" : "\xF0AF";
|
||||
CopyButton.IsEnabled = true;
|
||||
EditButton.Content = locked ? "Ansehen" : "Bearbeiten";
|
||||
EditButton.IsEnabled = true;
|
||||
@ -128,6 +129,7 @@ namespace Elwig.Windows {
|
||||
RevertButton.IsEnabled = false;
|
||||
RevertButton.Visibility = Visibility.Hidden;
|
||||
Arrow3.Content = "\xF0AF";
|
||||
Arrow4.Content = "\xF0AF";
|
||||
DeleteButton.IsEnabled = false;
|
||||
MailButton.IsEnabled = false;
|
||||
Menu_ExportSave.IsEnabled = false;
|
||||
|
||||
@ -13,7 +13,7 @@ namespace Tests.DocumentTests {
|
||||
var m = await ctx.Members.FindAsync(101);
|
||||
var p = await ctx.MemberPayments.Where(p => p.Year == 2020 && p.AvNr == 1).SingleAsync();
|
||||
var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, 2020, 1);
|
||||
using var doc = new CreditNote(ctx, p, data[m!.MgNr], false, false, false,
|
||||
using var doc = new CreditNote(ctx, p, data[m!.MgNr], false, false, false, false,
|
||||
ctx.GetMemberUnderDelivery(2020, m!.MgNr).GetAwaiter().GetResult());
|
||||
var text = await Utils.GeneratePdfText(doc);
|
||||
Assert.Multiple(() => {
|
||||
|
||||
@ -12,35 +12,36 @@ namespace Tests.DocumentTests {
|
||||
var data = await DeliveryJournalData.FromQuery(ctx.Deliveries.Where(d => d.Year == 2020).SelectMany(d => d.Parts), ["Saison 2020"]);
|
||||
using var doc = new DeliveryJournal("Saison 2020", data);
|
||||
var text = await Utils.GeneratePdfText(doc, true);
|
||||
var table = Utils.ExtractTable(text);
|
||||
Assert.Multiple(() => {
|
||||
Assert.That(text, Contains.Substring("Lieferjournal"));
|
||||
Assert.That(text, Contains.Substring("Saison 2020"));
|
||||
Assert.That(text, Contains.Substring("""
|
||||
20201001X001 1 01.10.2020 09:03 101 MUSTERMANN Max Grüner Veltliner 73 15,0 3 219
|
||||
20201001X002 1 01.10.2020 09:35 102 WEINBAUER Wernhardt Grüner Veltliner 86 17,5 2 987
|
||||
20201001X002 2 01.10.2020 09:35 102 WEINBAUER Wernhardt Grüner Veltliner 87 17,7 1 873
|
||||
20201001X003 1 01.10.2020 10:24 101 MUSTERMANN Max Grüner Veltliner 75 15,4 2 561
|
||||
20201001X003 2 01.10.2020 10:24 101 MUSTERMANN Max Grüner Veltliner 87 17,6 3 129
|
||||
20201001X003 3 01.10.2020 10:24 101 MUSTERMANN Max Grüner Veltliner 79 16,1 1 280
|
||||
20201001X004 1 01.10.2020 11:13 102 WEINBAUER Wernhardt Grüner Veltliner 82 16,7 4 002
|
||||
20201001X004 2 01.10.2020 11:13 102 WEINBAUER Wernhardt Grüner Veltliner 75 15,3 481
|
||||
20201001X005 1 01.10.2020 12:45 101 MUSTERMANN Max Welschriesling 84 17,0 3 192
|
||||
20201001X005 2 01.10.2020 12:45 101 MUSTERMANN Max Welschriesling 84 17,1 2 190
|
||||
20201001X006 1 01.10.2020 13:18 102 WEINBAUER Wernhardt Grüner Veltliner 74 15,2 1 732
|
||||
20201002X001 1 02.10.2020 09:13 103 MUSTERBAUER Matthäus Grüner Veltliner 80 16,3 3 198
|
||||
20201002X001 2 02.10.2020 09:13 103 MUSTERBAUER Matthäus Grüner Veltliner 75 15,4 2 134
|
||||
20201002X002 1 02.10.2020 09:28 103 MUSTERBAUER Matthäus Grüner Veltliner 78 16,0 2 901
|
||||
20201002X002 2 02.10.2020 09:28 103 MUSTERBAUER Matthäus Grüner Veltliner 85 17,3 3 321
|
||||
20201002X003 1 02.10.2020 10:11 103 MUSTERBAUER Matthäus Welschriesling 85 17,2 3 998
|
||||
20201003X001 1 03.10.2020 14:13 104 WINZER Waltraud Zweigelt 73 15,0 1 212
|
||||
20201003X001 2 03.10.2020 14:13 104 WINZER Waltraud Zweigelt 74 15,2 2 471
|
||||
20201003X001 3 03.10.2020 14:13 104 WINZER Waltraud Zweigelt 77 15,7 842
|
||||
20201003X002 1 03.10.2020 14:39 104 WINZER Waltraud Zweigelt 84 17,0 3 578
|
||||
20201003X002 2 03.10.2020 14:39 104 WINZER Waltraud Zweigelt 85 17,2 3 862
|
||||
20201003X003 1 03.10.2020 15:15 104 WINZER Waltraud Blauer Portugieser 89 18,0 2 410
|
||||
20201003X003 2 03.10.2020 15:15 104 WINZER Waltraud Blauer Portugieser 89 18,1 2 313
|
||||
Gesamt: (Teil-)Lieferungen: 12 (23) 82 16,6 58 886
|
||||
"""));
|
||||
Assert.That(table, Is.EqualTo(new string[][] {
|
||||
["20201001X001", "1", "01.10.2020 09:03", "101 MUSTERMANN Max", "Grüner Veltliner", "73", "15,0", "3 219"],
|
||||
["20201001X002", "1", "01.10.2020 09:35", "102 WEINBAUER Wernhardt", "Grüner Veltliner", "86", "17,5", "2 987"],
|
||||
["20201001X002", "2", "01.10.2020 09:35", "102 WEINBAUER Wernhardt", "Grüner Veltliner", "87", "17,7", "1 873"],
|
||||
["20201001X003", "1", "01.10.2020 10:24", "101 MUSTERMANN Max", "Grüner Veltliner", "75", "15,4", "2 561"],
|
||||
["20201001X003", "2", "01.10.2020 10:24", "101 MUSTERMANN Max", "Grüner Veltliner", "87", "17,6", "3 129"],
|
||||
["20201001X003", "3", "01.10.2020 10:24", "101 MUSTERMANN Max", "Grüner Veltliner", "79", "16,1", "1 280"],
|
||||
["20201001X004", "1", "01.10.2020 11:13", "102 WEINBAUER Wernhardt", "Grüner Veltliner", "82", "16,7", "4 002"],
|
||||
["20201001X004", "2", "01.10.2020 11:13", "102 WEINBAUER Wernhardt", "Grüner Veltliner", "75", "15,3", "481"],
|
||||
["20201001X005", "1", "01.10.2020 12:45", "101 MUSTERMANN Max", "Welschriesling", "84", "17,0", "3 192"],
|
||||
["20201001X005", "2", "01.10.2020 12:45", "101 MUSTERMANN Max", "Welschriesling", "84", "17,1", "2 190"],
|
||||
["20201001X006", "1", "01.10.2020 13:18", "102 WEINBAUER Wernhardt", "Grüner Veltliner", "74", "15,2", "1 732"],
|
||||
["20201002X001", "1", "02.10.2020 09:13", "103 MUSTERBAUER Matthäus", "Grüner Veltliner", "80", "16,3", "3 198"],
|
||||
["20201002X001", "2", "02.10.2020 09:13", "103 MUSTERBAUER Matthäus", "Grüner Veltliner", "75", "15,4", "2 134"],
|
||||
["20201002X002", "1", "02.10.2020 09:28", "103 MUSTERBAUER Matthäus", "Grüner Veltliner", "78", "16,0", "2 901"],
|
||||
["20201002X002", "2", "02.10.2020 09:28", "103 MUSTERBAUER Matthäus", "Grüner Veltliner", "85", "17,3", "3 321"],
|
||||
["20201002X003", "1", "02.10.2020 10:11", "103 MUSTERBAUER Matthäus", "Welschriesling", "85", "17,2", "3 998"],
|
||||
["20201003X001", "1", "03.10.2020 14:13", "104 WINZER Waltraud", "Zweigelt", "73", "15,0", "1 212"],
|
||||
["20201003X001", "2", "03.10.2020 14:13", "104 WINZER Waltraud", "Zweigelt", "74", "15,2", "2 471"],
|
||||
["20201003X001", "3", "03.10.2020 14:13", "104 WINZER Waltraud", "Zweigelt", "77", "15,7", "842"],
|
||||
["20201003X002", "1", "03.10.2020 14:39", "104 WINZER Waltraud", "Zweigelt", "84", "17,0", "3 578"],
|
||||
["20201003X002", "2", "03.10.2020 14:39", "104 WINZER Waltraud", "Zweigelt", "85", "17,2", "3 862"],
|
||||
["20201003X003", "1", "03.10.2020 15:15", "104 WINZER Waltraud", "Blauer Portugieser", "89", "18,0", "2 410"],
|
||||
["20201003X003", "2", "03.10.2020 15:15", "104 WINZER Waltraud", "Blauer Portugieser", "89", "18,1", "2 313"],
|
||||
["Gesamt:", "(Teil-)Lieferungen: 12 (23)", "82", "16,6", "58 886"],
|
||||
}));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -13,10 +13,10 @@ namespace Tests.DocumentTests {
|
||||
var text = await Utils.GeneratePdfText(doc);
|
||||
Assert.Multiple(() => {
|
||||
Assert.That(text, Contains.Substring("""
|
||||
MUSTERMANN Max
|
||||
Winzerstraße 1
|
||||
2223 Hohenruppersdorf
|
||||
"""));
|
||||
MUSTERMANN Max
|
||||
Winzerstraße 1
|
||||
2223 Hohenruppersdorf
|
||||
"""));
|
||||
Assert.That(text, Contains.Substring("1472583")); // Betriebsnummer
|
||||
Assert.That(text, Contains.Substring("pauschaliert"));
|
||||
Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
|
||||
@ -73,10 +73,10 @@ namespace Tests.DocumentTests {
|
||||
var text = await Utils.GeneratePdfText(doc);
|
||||
Assert.Multiple(() => {
|
||||
Assert.That(text, Contains.Substring("""
|
||||
MUSTERMANN Max
|
||||
Winzerstraße 1
|
||||
2223 Hohenruppersdorf
|
||||
"""));
|
||||
MUSTERMANN Max
|
||||
Winzerstraße 1
|
||||
2223 Hohenruppersdorf
|
||||
"""));
|
||||
Assert.That(text, Contains.Substring("1472583")); // Betriebsnummer
|
||||
Assert.That(text, Contains.Substring("pauschaliert"));
|
||||
Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
|
||||
@ -112,10 +112,10 @@ namespace Tests.DocumentTests {
|
||||
var text = await Utils.GeneratePdfText(doc);
|
||||
Assert.Multiple(() => {
|
||||
Assert.That(text, Contains.Substring("""
|
||||
MUSTERBAUER Matthäus
|
||||
Brünner Straße 10
|
||||
2120 Wolkersdorf im Weinviertel
|
||||
"""));
|
||||
MUSTERBAUER Matthäus
|
||||
Brünner Straße 10
|
||||
2120 Wolkersdorf im Weinviertel
|
||||
"""));
|
||||
Assert.That(text, Contains.Substring("7258369")); // Betriebsnummer
|
||||
Assert.That(text, Contains.Substring("pauschaliert"));
|
||||
Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
|
||||
|
||||
@ -12,14 +12,15 @@ namespace Tests.DocumentTests {
|
||||
var data = await MemberListData.FromQuery(ctx.Members, []);
|
||||
using var doc = new MemberList("Alle Mitglieder", data);
|
||||
var text = await Utils.GeneratePdfText(doc, true);
|
||||
var table = Utils.ExtractTable(text);
|
||||
Assert.Multiple(() => {
|
||||
Assert.That(text, Contains.Substring("Mitgliederliste"));
|
||||
Assert.That(text, Contains.Substring("Alle Mitglieder"));
|
||||
Assert.That(text, Contains.Substring("""
|
||||
101 MUSTERMANN Max Winzerstraße 1 2223 Hohenruppersdorf 1472583 0 Hohenruppersdorf
|
||||
102 WEINBAUER Wernhardt Winzerstraße 2 2223 Hohenruppersdorf 4725836 0 Hohenruppersdorf
|
||||
W&B Weinbauer GesbR Winzerstraße 2 2223 Hohenruppersdorf
|
||||
"""));
|
||||
Assert.That(table.Take(3), Is.EqualTo(new string[][] {
|
||||
["101 MUSTERMANN Max", "Winzerstraße 1", "2223", "Hohenruppersdorf", "1472583", "0", "Hohenruppersdorf"],
|
||||
["102 WEINBAUER Wernhardt", "Winzerstraße 2", "2223", "Hohenruppersdorf", "4725836", "0", "Hohenruppersdorf"],
|
||||
["", "W&B Weinbauer GesbR", "Winzerstraße 2", "2223", "Hohenruppersdorf"],
|
||||
}));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
using Elwig.Documents;
|
||||
using NReco.PdfRenderer;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace Tests.DocumentTests {
|
||||
public static class Utils {
|
||||
@ -16,5 +17,13 @@ namespace Tests.DocumentTests {
|
||||
File.Delete(FileName);
|
||||
}
|
||||
}
|
||||
|
||||
public static string[][] ExtractTable(string text) {
|
||||
return text.Split('\n')
|
||||
.Select(row => Regex.Split(row, @"\s{2,}").Select(c => c.Trim()).ToArray())
|
||||
.Where(row => row.Length > 3)
|
||||
.Skip(1)
|
||||
.ToArray();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
curl --fail -s -L "https://elwig.at/files/create.sql?v=21" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
|
||||
curl --fail -s -L "https://elwig.at/files/create.sql?v=23" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
|
||||
|
||||
Reference in New Issue
Block a user