Skip to content

Commit

Permalink
Utvider Event med en overskrift for Strekkode
Browse files Browse the repository at this point in the history
Justerer max-lengde på overskrifter slik at de er ihht til xsd for arrangement hos Difi
  • Loading branch information
eivinhb committed May 23, 2019
1 parent 62d52b3 commit 7087295
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 2 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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|

Expand Down Expand Up @@ -237,6 +238,7 @@ Event represents an event that occurs over a time period or several days. Eg. a
<title>Forhåndsstemming</title>
<text>Du kan forhåndsstemme fra 10. august</text>
</info>
<barcodeLabel>Barcode for use on election day:</barcodeLabel>
<barcode>
<barcode-value>1234567890</barcode-value>
<barcode-type>code-128</barcode-type>
Expand Down
13 changes: 9 additions & 4 deletions src/main/java/no/digipost/api/datatypes/types/Event.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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")
Expand All @@ -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
Expand All @@ -65,6 +64,11 @@ public class Event implements DataType {
@Description("Additional sections of information (max 10) with a title and text.")
List<Info> 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;
Expand All @@ -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)
);
Expand Down

0 comments on commit 7087295

Please sign in to comment.