Skip to content

Commit

Permalink
Merge pull request #1323 from open-zaak/feature/serializer-fields-des…
Browse files Browse the repository at this point in the history
…criptions

move changing serializer fields descriptions
  • Loading branch information
sergei-maertens committed Jan 31, 2023
2 parents 539a079 + a6e7f1b commit 8162869
Show file tree
Hide file tree
Showing 12 changed files with 110 additions and 74 deletions.
8 changes: 5 additions & 3 deletions src/openzaak/components/besluiten/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@ class Meta:
}
validators = [UniekeIdentificatieValidator(), BesluittypeZaaktypeValidator()]

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(VervalRedenen)
self.fields["vervalreden"].help_text += f"\n\n{value_display_mapping}"
fields["vervalreden"].help_text += f"\n\n{value_display_mapping}"

return fields

def create_zaakbesluit(self, besluit):
zaak_url = self.initial_data["zaak"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ class Meta:
model = EigenschapSpecificatie
fields = ("groep", "formaat", "lengte", "kardinaliteit", "waardenverzameling")

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(FormaatChoices)
self.fields["formaat"].help_text += f"\n\n{value_display_mapping}"
fields["formaat"].help_text += f"\n\n{value_display_mapping}"

return fields

def validate(self, attrs):
instance = EigenschapSpecificatie(**attrs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,14 @@ class Meta:
M2MConceptUpdateValidator(["besluittypen", "zaaktypen"]),
]

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(
VertrouwelijkheidsAanduiding
)
self.fields[
fields[
"vertrouwelijkheidaanduiding"
].help_text += f"\n\n{value_display_mapping}"

return fields
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ class Meta:
),
]

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(RichtingChoices)
self.fields["richting"].help_text += f"\n\n{value_display_mapping}"
fields["richting"].help_text += f"\n\n{value_display_mapping}"

return fields

def validate(self, attrs):
super().validate(attrs)
Expand Down
22 changes: 11 additions & 11 deletions src/openzaak/components/catalogi/api/serializers/resultaattype.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ class Meta:

extra_kwargs = {"procestermijn": {"allow_null": True}}

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(Afleidingswijze)
self.fields["afleidingswijze"].help_text += "\n\n{}".format(
value_display_mapping
)
fields["afleidingswijze"].help_text += "\n\n{}".format(value_display_mapping)

value_display_mapping = add_choice_values_help_text(ZaakobjectTypes)
self.fields["objecttype"].help_text += "\n\n{}".format(value_display_mapping)
fields["objecttype"].help_text += "\n\n{}".format(value_display_mapping)

return fields


class ResultaatTypeSerializer(
Expand Down Expand Up @@ -107,10 +107,10 @@ class Meta:
ZaakTypeConceptValidator(),
]

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(Archiefnominatie)
self.fields["archiefnominatie"].help_text += "\n\n{}".format(
value_display_mapping
)
fields["archiefnominatie"].help_text += "\n\n{}".format(value_display_mapping)

return fields
8 changes: 5 additions & 3 deletions src/openzaak/components/catalogi/api/serializers/roltype.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ class Meta:
}
validators = [ZaakTypeConceptValidator()]

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(RolOmschrijving)
self.fields["omschrijving_generiek"].help_text += f"\n\n{value_display_mapping}"
fields["omschrijving_generiek"].help_text += f"\n\n{value_display_mapping}"

return fields
20 changes: 11 additions & 9 deletions src/openzaak/components/catalogi/api/serializers/zaaktype.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ class Meta:
fields = ("zaaktype", "aard_relatie", "toelichting")
extra_kwargs = {"zaaktype": {"source": "gerelateerd_zaaktype"}}

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(AardRelatieChoices)
self.fields["aard_relatie"].help_text += f"\n\n{value_display_mapping}"
fields["aard_relatie"].help_text += f"\n\n{value_display_mapping}"

return fields


class ZaakTypeSerializer(
Expand Down Expand Up @@ -200,17 +202,17 @@ class Meta:
VerlengingsValidator(),
]

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(
VertrouwelijkheidsAanduiding
)
self.fields[
fields[
"vertrouwelijkheidaanduiding"
].help_text += f"\n\n{value_display_mapping}"

value_display_mapping = add_choice_values_help_text(RichtingChoices)
self.fields[
"indicatie_intern_of_extern"
].help_text += f"\n\n{value_display_mapping}"
fields["indicatie_intern_of_extern"].help_text += f"\n\n{value_display_mapping}"

return fields
34 changes: 21 additions & 13 deletions src/openzaak/components/documenten/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,23 +143,27 @@ class Meta:
model = EnkelvoudigInformatieObject
gegevensgroep = "integriteit"

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(ChecksumAlgoritmes)
self.fields["algoritme"].help_text += f"\n\n{value_display_mapping}"
fields["algoritme"].help_text += f"\n\n{value_display_mapping}"

return fields


class OndertekeningSerializer(GegevensGroepSerializer):
class Meta:
model = EnkelvoudigInformatieObject
gegevensgroep = "ondertekening"

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(OndertekeningSoorten)
self.fields["soort"].help_text += f"\n\n{value_display_mapping}"
fields["soort"].help_text += f"\n\n{value_display_mapping}"

return fields


class EnkelvoudigInformatieObjectHyperlinkedRelatedField(LengthHyperlinkedRelatedField):
Expand Down Expand Up @@ -368,18 +372,20 @@ class Meta:
UniekeIdentificatieValidator(),
]

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(
VertrouwelijkheidsAanduiding
)
self.fields[
fields[
"vertrouwelijkheidaanduiding"
].help_text += f"\n\n{value_display_mapping}"

value_display_mapping = add_choice_values_help_text(Statussen)
self.fields["status"].help_text += f"\n\n{value_display_mapping}"
fields["status"].help_text += f"\n\n{value_display_mapping}"

return fields

def validate_indicatie_gebruiksrecht(self, indicatie):
if self.instance and not indicatie and self.instance.has_gebruiksrechten():
Expand Down Expand Up @@ -883,11 +889,13 @@ class Meta:
}
validators = [InformatieObjectUniqueValidator()]

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(ObjectInformatieObjectTypes)
self.fields["object_type"].help_text += f"\n\n{value_display_mapping}"
fields["object_type"].help_text += f"\n\n{value_display_mapping}"

return fields

def set_object_properties(self, object_type: str) -> None:
object_field = self.fields["object"]
Expand Down
8 changes: 5 additions & 3 deletions src/openzaak/components/zaken/api/serializers/betrokkenen.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@ class RolNatuurlijkPersoonSerializer(serializers.ModelSerializer):
required=False, allow_null=True
)

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(GeslachtsAanduiding)
self.fields["geslachtsaanduiding"].help_text += f"\n\n{value_display_mapping}"
fields["geslachtsaanduiding"].help_text += f"\n\n{value_display_mapping}"

return fields

class Meta:
model = NatuurlijkPersoon
Expand Down
32 changes: 20 additions & 12 deletions src/openzaak/components/zaken/api/serializers/objecten.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,27 @@ class Meta:
model = Inrichtingselement
fields = ("type", "identificatie", "naam")

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(TyperingInrichtingselement)
self.fields["type"].help_text += f"\n\n{value_display_mapping}"
fields["type"].help_text += f"\n\n{value_display_mapping}"

return fields


class ObjectKunstwerkdeelSerializer(serializers.ModelSerializer):
class Meta:
model = Kunstwerkdeel
fields = ("type", "identificatie", "naam")

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(TyperingKunstwerk)
self.fields["type"].help_text += f"\n\n{value_display_mapping}"
fields["type"].help_text += f"\n\n{value_display_mapping}"

return fields


class ObjectMaatschappelijkeActiviteitSerializer(serializers.ModelSerializer):
Expand All @@ -107,11 +111,13 @@ class Meta:
model = Spoorbaandeel
fields = ("type", "identificatie", "naam")

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(TypeSpoorbaan)
self.fields["type"].help_text += f"\n\n{value_display_mapping}"
fields["type"].help_text += f"\n\n{value_display_mapping}"

return fields


class ObjectTerreindeelSerializer(serializers.ModelSerializer):
Expand All @@ -125,11 +131,13 @@ class Meta:
model = Waterdeel
fields = ("type_waterdeel", "identificatie", "naam")

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(TyperingWater)
self.fields["type_waterdeel"].help_text += f"\n\n{value_display_mapping}"
fields["type_waterdeel"].help_text += f"\n\n{value_display_mapping}"

return fields


class ObjectWegdeelSerializer(serializers.ModelSerializer):
Expand Down
8 changes: 5 additions & 3 deletions src/openzaak/components/zaken/api/serializers/zaakobjecten.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,13 @@ class Meta:
ObjectTypeOverigeDefinitieValidator(),
]

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(ZaakobjectTypes)
self.fields["object_type"].help_text += f"\n\n{value_display_mapping}"
fields["object_type"].help_text += f"\n\n{value_display_mapping}"

return fields

def validate(self, attrs):
validated_attrs = super().validate(attrs)
Expand Down
20 changes: 12 additions & 8 deletions src/openzaak/components/zaken/api/serializers/zaken.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,13 @@ class Meta:
},
}

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(AardZaakRelatie)
self.fields["aard_relatie"].help_text += f"\n\n{value_display_mapping}"
fields["aard_relatie"].help_text += f"\n\n{value_display_mapping}"

return fields


class GenerateZaakIdentificatieSerializer(serializers.ModelSerializer):
Expand Down Expand Up @@ -798,17 +800,19 @@ class Meta:
},
}

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get_fields(self):
fields = super().get_fields()

value_display_mapping = add_choice_values_help_text(IndicatieMachtiging)
self.fields["indicatie_machtiging"].help_text += f"\n\n{value_display_mapping}"
fields["indicatie_machtiging"].help_text += f"\n\n{value_display_mapping}"

value_display_mapping = add_choice_values_help_text(RolTypes)
self.fields["betrokkene_type"].help_text += f"\n\n{value_display_mapping}"
fields["betrokkene_type"].help_text += f"\n\n{value_display_mapping}"

value_display_mapping = add_choice_values_help_text(RolOmschrijving)
self.fields["omschrijving_generiek"].help_text += f"\n\n{value_display_mapping}"
fields["omschrijving_generiek"].help_text += f"\n\n{value_display_mapping}"

return fields

def validate(self, attrs):
validated_attrs = super().validate(attrs)
Expand Down

0 comments on commit 8162869

Please sign in to comment.