From 70872957ff9f8150550141a4010c5843cbc87b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eivind=20Bergst=C3=B8l?= Date: Thu, 23 May 2019 12:56:00 +0200 Subject: [PATCH] =?UTF-8?q?Utvider=20Event=20med=20en=20overskrift=20for?= =?UTF-8?q?=20Strekkode=20Justerer=20max-lengde=20p=C3=A5=20overskrifter?= =?UTF-8?q?=20slik=20at=20de=20er=20ihht=20til=20xsd=20for=20arrangement?= =?UTF-8?q?=20hos=20Difi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 2 ++ .../java/no/digipost/api/datatypes/types/Event.java | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/readme.md b/readme.md index 7e9d9066..82297b96 100644 --- a/readme.md +++ b/readme.md @@ -191,6 +191,7 @@ Event represents an event that occurs over a time period or several days. Eg. a |placeLabel|String|no|Optional label for place. null yield default in gui, eg. 'Venue location'| |address|[Address](#eventaddress)|no|| |info|List|no|Additional sections of information (max 10) with a title and text.| +|barcodeLabel|String|no|Optional label for barcode. null yield default in gui, eg. ''| |barcode|[Barcode](#eventbarcode)|no|Barcode| |links|List|no|Links for releated information to the appointment| @@ -237,6 +238,7 @@ Event represents an event that occurs over a time period or several days. Eg. a Forhåndsstemming Du kan forhåndsstemme fra 10. august + Barcode for use on election day: 1234567890 code-128 diff --git a/src/main/java/no/digipost/api/datatypes/types/Event.java b/src/main/java/no/digipost/api/datatypes/types/Event.java index 31027a6e..f8a37050 100644 --- a/src/main/java/no/digipost/api/datatypes/types/Event.java +++ b/src/main/java/no/digipost/api/datatypes/types/Event.java @@ -26,7 +26,7 @@ public class Event implements DataType { @XmlElement(name = "sub-title") - @Size(max = 150) + @Size(max = 100) @Description("Example: 'Kommunestyre- og fylkestingvalg'") String subTitle; @@ -37,7 +37,7 @@ public class Event implements DataType { @XmlElement @Description("Optional label for time. null yield default in gui, eg. 'Opening hours'") - @Size(max = 150) + @Size(max = 100) String timeLabel; @XmlElement(name = "description") @@ -47,12 +47,11 @@ public class Event implements DataType { @XmlElement @Description("The name of the place. Example: 'Sagene skole'") - @Size(max = 150) String place; @XmlElement @Description("Optional label for place. null yield default in gui, eg. 'Venue location'") - @Size(max = 150) + @Size(max = 100) String placeLabel; @XmlElement @@ -65,6 +64,11 @@ public class Event implements DataType { @Description("Additional sections of information (max 10) with a title and text.") List info; + @XmlElement + @Description("Optional label for barcode. null yield default in gui, eg. ''") + @Size(max = 100) + String barcodeLabel; + @XmlElement(name = "barcode") @Description("Barcode") Barcode barcode; @@ -82,6 +86,7 @@ public class Event implements DataType { , "Election venue" , Address.EXAMPLE , singletonList(new Info("Forhåndsstemming", "Du kan forhåndsstemme fra 10. august")) + , "Barcode for use on election day:" , Barcode.EXAMPLE , singletonList(Link.EXAMPLE) );