Skip to content

Commit

Permalink
Merge branch 'main' into Zaehler_Geraet_Rework
Browse files Browse the repository at this point in the history
  • Loading branch information
@hf-aschloegl
hf-aschloegl authored Oct 9, 2023
2 parents 453268d + 3156411 commit b92b964
Show file tree
Hide file tree
Showing 59 changed files with 546 additions and 545 deletions.
2 changes: 1 addition & 1 deletion dev_requirements/requirements-linting.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mccabe==0.7.0
# via pylint
platformdirs==3.10.0
# via pylint
pylint==3.0.0
pylint==3.0.1
# via -r dev_requirements/requirements-linting.in
tomlkit==0.12.1
# via pylint
40 changes: 20 additions & 20 deletions json_schemas/bo/Angebot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -875,19 +875,19 @@
"default": null,
"title": "Geschaeftspartnerrolle"
},
"gewerbekennzeichnung": {
"glaeubigerId": {
"anyOf": [
{
"type": "boolean"
"type": "string"
},
{
"type": "null"
}
],
"default": null,
"title": "Gewerbekennzeichnung"
"title": "Glaeubigerid"
},
"glaeubigerId": {
"hrnummer": {
"anyOf": [
{
"type": "string"
Expand All @@ -897,19 +897,19 @@
}
],
"default": null,
"title": "Glaeubigerid"
"title": "Hrnummer"
},
"hrnummer": {
"istGewerbe": {
"anyOf": [
{
"type": "string"
"type": "boolean"
},
{
"type": "null"
}
],
"default": null,
"title": "Hrnummer"
"title": "Istgewerbe"
},
"kontaktweg": {
"anyOf": [
Expand Down Expand Up @@ -1484,6 +1484,18 @@
"default": null,
"title": "Grundversorgercodenr"
},
"istUnterbrechbar": {
"anyOf": [
{
"type": "boolean"
},
{
"type": "null"
}
],
"default": null,
"title": "Istunterbrechbar"
},
"katasterinformation": {
"anyOf": [
{
Expand Down Expand Up @@ -1579,18 +1591,6 @@
],
"default": null
},
"unterbrechbar": {
"anyOf": [
{
"type": "boolean"
},
{
"type": "null"
}
],
"default": null,
"title": "Unterbrechbar"
},
"verbrauchsart": {
"anyOf": [
{
Expand Down
16 changes: 8 additions & 8 deletions json_schemas/bo/Ansprechpartner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,19 +275,19 @@
"default": null,
"title": "Geschaeftspartnerrolle"
},
"gewerbekennzeichnung": {
"glaeubigerId": {
"anyOf": [
{
"type": "boolean"
"type": "string"
},
{
"type": "null"
}
],
"default": null,
"title": "Gewerbekennzeichnung"
"title": "Glaeubigerid"
},
"glaeubigerId": {
"hrnummer": {
"anyOf": [
{
"type": "string"
Expand All @@ -297,19 +297,19 @@
}
],
"default": null,
"title": "Glaeubigerid"
"title": "Hrnummer"
},
"hrnummer": {
"istGewerbe": {
"anyOf": [
{
"type": "string"
"type": "boolean"
},
{
"type": "null"
}
],
"default": null,
"title": "Hrnummer"
"title": "Istgewerbe"
},
"kontaktweg": {
"anyOf": [
Expand Down
32 changes: 16 additions & 16 deletions json_schemas/bo/Ausschreibung.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,29 +155,29 @@
"default": null,
"title": " Id"
},
"kunde": {
"istLastgangVorhanden": {
"anyOf": [
{
"type": "string"
"type": "boolean"
},
{
"type": "null"
}
],
"default": null,
"title": "Kunde"
"title": "Istlastgangvorhanden"
},
"lastgangVorhanden": {
"kunde": {
"anyOf": [
{
"type": "boolean"
"type": "string"
},
{
"type": "null"
}
],
"default": null,
"title": "Lastgangvorhanden"
"title": "Kunde"
},
"lieferzeitraum": {
"anyOf": [
Expand Down Expand Up @@ -722,19 +722,19 @@
"default": null,
"title": "Geschaeftspartnerrolle"
},
"gewerbekennzeichnung": {
"glaeubigerId": {
"anyOf": [
{
"type": "boolean"
"type": "string"
},
{
"type": "null"
}
],
"default": null,
"title": "Gewerbekennzeichnung"
"title": "Glaeubigerid"
},
"glaeubigerId": {
"hrnummer": {
"anyOf": [
{
"type": "string"
Expand All @@ -744,19 +744,19 @@
}
],
"default": null,
"title": "Glaeubigerid"
"title": "Hrnummer"
},
"hrnummer": {
"istGewerbe": {
"anyOf": [
{
"type": "string"
"type": "boolean"
},
{
"type": "null"
}
],
"default": null,
"title": "Hrnummer"
"title": "Istgewerbe"
},
"kontaktweg": {
"anyOf": [
Expand Down Expand Up @@ -1539,7 +1539,7 @@
"default": null,
"title": "Externereferenzen"
},
"kostenpflichtig": {
"istKostenpflichtig": {
"anyOf": [
{
"type": "boolean"
Expand All @@ -1549,7 +1549,7 @@
}
],
"default": null,
"title": "Kostenpflichtig"
"title": "Istkostenpflichtig"
},
"lose": {
"anyOf": [
Expand Down
16 changes: 8 additions & 8 deletions json_schemas/bo/Buendelvertrag.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,19 +275,19 @@
"default": null,
"title": "Geschaeftspartnerrolle"
},
"gewerbekennzeichnung": {
"glaeubigerId": {
"anyOf": [
{
"type": "boolean"
"type": "string"
},
{
"type": "null"
}
],
"default": null,
"title": "Gewerbekennzeichnung"
"title": "Glaeubigerid"
},
"glaeubigerId": {
"hrnummer": {
"anyOf": [
{
"type": "string"
Expand All @@ -297,19 +297,19 @@
}
],
"default": null,
"title": "Glaeubigerid"
"title": "Hrnummer"
},
"hrnummer": {
"istGewerbe": {
"anyOf": [
{
"type": "string"
"type": "boolean"
},
{
"type": "null"
}
],
"default": null,
"title": "Hrnummer"
"title": "Istgewerbe"
},
"kontaktweg": {
"anyOf": [
Expand Down
16 changes: 8 additions & 8 deletions json_schemas/bo/Geschaeftspartner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,19 +596,19 @@
"default": null,
"title": "Geschaeftspartnerrolle"
},
"gewerbekennzeichnung": {
"glaeubigerId": {
"anyOf": [
{
"type": "boolean"
"type": "string"
},
{
"type": "null"
}
],
"default": null,
"title": "Gewerbekennzeichnung"
"title": "Glaeubigerid"
},
"glaeubigerId": {
"hrnummer": {
"anyOf": [
{
"type": "string"
Expand All @@ -618,19 +618,19 @@
}
],
"default": null,
"title": "Glaeubigerid"
"title": "Hrnummer"
},
"hrnummer": {
"istGewerbe": {
"anyOf": [
{
"type": "string"
"type": "boolean"
},
{
"type": "null"
}
],
"default": null,
"title": "Hrnummer"
"title": "Istgewerbe"
},
"kontaktweg": {
"anyOf": [
Expand Down
Loading

0 comments on commit b92b964

Please sign in to comment.