Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Ausgabe finalisierung 2024 12 18 #155

Merged
merged 4 commits into from
Dec 19, 2024
Merged

Ausgabe finalisierung 2024 12 18 #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca729fc
Abzug eingeführt, korrekte Warnhinweis-Trigger
arnold-pichler Dec 18, 2024
ff83974
Neuer Wert: N-Saldo für Folgefrucht
arnold-pichler Dec 19, 2024
6d5469a
Umsetzung der Vorgabe Output laut Excel
arnold-pichler Dec 19, 2024
006f42a
Update Test
arnold-pichler Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 73 additions & 65 deletions fixtures/leerfeld.json → fixtures/ohnebilanz.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "LeerFeld",
"name": "OhneBilanz",
"input": {
"jahr": 2025,
"feldstuecksnummer": 1,
"schlagnummer": "",
"feldstuecksname": "LeerFeld",
"feldstuecksname": "OhneBilanz",
"flaechennutzungsart": "A",
"flaeche": 4.7029,
"flaeche": 3.1029,
"flaeche_nitratrisikogebiet": 0,
"nitratrisikogebiet": false,
"flaeche_schwereboeden": 0,
Expand All @@ -21,88 +21,94 @@
"bodenart": "lS - lehmiger Sand",
"vorfrucht": "",
"nsaldo": 0,
"extent": [13.802869208157054, 48.10330969097589, 13.807610012590876, 48.105657836531634],
"extent": [13.705966696143154, 48.08507656941458, 13.70986394584179, 48.08687526756381],
"parts": [
{
"type": "Polygon",
"coordinates": [
[
[13.8073481619358, 48.105657836531634],
[13.8073531910777, 48.105611716475124],
[13.807491324841967, 48.10438101210855],
[13.807610012590876, 48.103323124607954],
[13.806588426232329, 48.1033121538087],
[13.806362785398951, 48.10330969097589],
[13.80617905408143, 48.10331192991478],
[13.804187178611745, 48.10333678213027],
[13.804181143641463, 48.10338559095092],
[13.804111070930949, 48.10365157581961],
[13.80392801016568, 48.10404204269574],
[13.803900517523278, 48.10411435934324],
[13.803900517523278, 48.10411458323364],
[13.802951015532008, 48.10413227057151],
[13.80295068025588, 48.10413227057151],
[13.802904412150374, 48.10431339751642],
[13.802869208157054, 48.10445086550101],
[13.803212866187087, 48.10455542152329],
[13.806488178670397, 48.10449340437944],
[13.80648784339427, 48.10449497160059],
[13.80636479705571, 48.10541716102398],
[13.806374184787263, 48.105421414833415],
[13.806581050157538, 48.105513431362255],
[13.806749358773224, 48.105550372258136],
[13.806930407881728, 48.10558037272378],
[13.806991763412944, 48.10559089527101],
[13.807202316820613, 48.105627388343606],
[13.8073481619358, 48.105657836531634]
[13.708149679005148, 48.08687526756381],
[13.709852881729606, 48.085275233351126],
[13.707006052136425, 48.085275233351126],
[13.705966696143154, 48.08625174391287],
[13.70648838579655, 48.08627033326897],
[13.70655745267868, 48.086274812630876],
[13.706618808209898, 48.086285563097874],
[13.706856518983844, 48.086346258400624],
[13.706980235874656, 48.08638321307015],
[13.707098588347437, 48.08643047021491],
[13.707967624068264, 48.086832490141035],
[13.708149679005148, 48.08687526756381]
]
]
},
{
"type": "Polygon",
"coordinates": [
[
[13.70954778045416, 48.085561917273395],
[13.70986394584179, 48.085264706645404],
[13.7095008417964, 48.0852378299403],
[13.709231950342655, 48.08521946418372],
[13.70900966227055, 48.085211625139294],
[13.708690814673902, 48.08520065047506],
[13.708148002624513, 48.085167950441246],
[13.707748018205168, 48.08513569833272],
[13.707377538084986, 48.08509515919539],
[13.707217611372473, 48.08507656941458],
[13.706700950860979, 48.085561917273395],
[13.70954778045416, 48.085561917273395]
]
]
}
],
"schlaginfo": {
"basic": {
"fnar_code": "A",
"inspire_id": "https://data.inspire.gv.at/0095/bbd8ee1b-76a1-451f-88ef-84e9c7a1faaf/elu.ExistingLandUseObject/113194343/MFA-2024",
"sl_flaeche_brutto_ha": 4.70297043,
"snar_bezeichnung": "WINTERGERSTE",
"inspire_id": "https://data.inspire.gv.at/0095/bbd8ee1b-76a1-451f-88ef-84e9c7a1faaf/elu.ExistingLandUseObject/106159408/MFA-2024",
"sl_flaeche_brutto_ha": 3.1029277,
"snar_bezeichnung": "WINTERROGGEN",
"BL_KZ": "4",
"layer": "invekos_schlaege_polygon",
"loading": false,
"id": 2409717,
"extent": [13.802869208157054, 48.10330969097589, 13.807610012590876, 48.105657836531634],
"id": 1284854,
"extent": [13.705966696143154, 48.08507656941458, 13.70986394584179, 48.08687526756381],
"parts": [
{
"type": "Polygon",
"coordinates": [
[
[13.8073481619358, 48.105657836531634],
[13.8073531910777, 48.105611716475124],
[13.807491324841967, 48.10438101210855],
[13.807610012590876, 48.103323124607954],
[13.806588426232329, 48.1033121538087],
[13.806362785398951, 48.10330969097589],
[13.80617905408143, 48.10331192991478],
[13.804187178611745, 48.10333678213027],
[13.804181143641463, 48.10338559095092],
[13.804111070930949, 48.10365157581961],
[13.80392801016568, 48.10404204269574],
[13.803900517523278, 48.10411435934324],
[13.803900517523278, 48.10411458323364],
[13.802951015532008, 48.10413227057151],
[13.80295068025588, 48.10413227057151],
[13.802904412150374, 48.10431339751642],
[13.802869208157054, 48.10445086550101],
[13.803212866187087, 48.10455542152329],
[13.806488178670397, 48.10449340437944],
[13.80648784339427, 48.10449497160059],
[13.80636479705571, 48.10541716102398],
[13.806374184787263, 48.105421414833415],
[13.806581050157538, 48.105513431362255],
[13.806749358773224, 48.105550372258136],
[13.806930407881728, 48.10558037272378],
[13.806991763412944, 48.10559089527101],
[13.807202316820613, 48.105627388343606],
[13.8073481619358, 48.105657836531634]
[13.708149679005148, 48.08687526756381],
[13.709852881729606, 48.085275233351126],
[13.707006052136425, 48.085275233351126],
[13.705966696143154, 48.08625174391287],
[13.70648838579655, 48.08627033326897],
[13.70655745267868, 48.086274812630876],
[13.706618808209898, 48.086285563097874],
[13.706856518983844, 48.086346258400624],
[13.706980235874656, 48.08638321307015],
[13.707098588347437, 48.08643047021491],
[13.707967624068264, 48.086832490141035],
[13.708149679005148, 48.08687526756381]
]
]
},
{
"type": "Polygon",
"coordinates": [
[
[13.70954778045416, 48.085561917273395],
[13.70986394584179, 48.085264706645404],
[13.7095008417964, 48.0852378299403],
[13.709231950342655, 48.08521946418372],
[13.70900966227055, 48.085211625139294],
[13.708690814673902, 48.08520065047506],
[13.708148002624513, 48.085167950441246],
[13.707748018205168, 48.08513569833272],
[13.707377538084986, 48.08509515919539],
[13.707217611372473, 48.08507656941458],
[13.706700950860979, 48.085561917273395],
[13.70954778045416, 48.085561917273395]
]
]
}
Expand Down Expand Up @@ -176,6 +182,7 @@
"nanrechenbar": 0,
"nentzug": 0,
"nbilanz": 0,
"nsaldoff": 0,
"pbedarf": 0,
"pmengehd": 0,
"pmengesr": 0,
Expand Down Expand Up @@ -209,6 +216,7 @@
"nanrechenbar": 0,
"nentzug": 0,
"nbilanz": 0,
"nsaldoff": 0,
"pbedarf": 0,
"pmengehd": 0,
"pmengesr": 0,
Expand Down
12 changes: 10 additions & 2 deletions src/components/TheEntryForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,11 @@
class="ma-1 w-100"
elevation="0"
color="red-lighten-1"
v-if="currentBilanz[i - 1] && currentBilanz[i - 1].nbilanz > 0"
v-if="
entry.cultures[i - 1].ertragslage != '' &&
currentBilanz[i - 1] &&
currentBilanz[i - 1].duengeobergrenzered < currentBilanz[i - 1].nabzug
"
>
<v-row no-gutters class="error"
><v-col cols="1" class="pa-1"
Expand All @@ -562,7 +566,11 @@
class="ma-1 w-100"
elevation="0"
color="black"
v-if="currentBilanz[i - 1] && currentBilanz[i - 1].pbilanz > 0"
v-if="
entry.cultures[i - 1].ertragslage != '' &&
currentBilanz[i - 1] &&
currentBilanz[i - 1].pbedarf < currentBilanz[i - 1].pduengung
"
>
<v-row no-gutters class="error"
><v-col cols="1" class="pa-1"
Expand Down
Loading
Loading