Skip to content

Commit

Permalink
Merge pull request #203 from digipost/master
Browse files Browse the repository at this point in the history
Støtte for lenke utenfor brev
  • Loading branch information
kjorlaug committed Oct 4, 2017
2 parents efbdf7f + 9c69c9d commit 4878d2a
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 0 deletions.
7 changes: 7 additions & 0 deletions eksempler/sdpManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,11 @@
<tittel lang="no">journal</tittel>
</vedlegg>

<lenke>
<url>https://www.avsender.no/svar</url>
<beskrivelse lang="no">Vennligst svar på denne viktige meldingen for videre saksbehandling.</beskrivelse>
<knappTekst lang="no">Svar på den viktige meldingen</knappTekst>
<frist>2017-10-01T12:00:00+02:00</frist>
</lenke>

</manifest>
44 changes: 44 additions & 0 deletions xsd/sdp-manifest.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<xsd:element name="avsender" type="Avsender" minOccurs="1" maxOccurs="1"/>
<xsd:element name="hoveddokument" type="Dokument" minOccurs="1" maxOccurs="1"/>
<xsd:element name="vedlegg" type="Dokument" minOccurs="0" maxOccurs="200"/>
<xsd:element name="lenke" type="Lenke" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>

Expand Down Expand Up @@ -60,4 +61,47 @@
</xsd:attribute>
</xsd:complexType>

<xsd:complexType name="Lenke">
<xsd:sequence>
<xsd:element name="url" type="HttpLenke" minOccurs="1" maxOccurs="1"/>
<xsd:element name="beskrivelse" type="LenkeBeskrivelseTekst" minOccurs="0" maxOccurs="1"/>
<xsd:element name="knappTekst" type="LenkeKnappTekst" minOccurs="0" maxOccurs="1"/>
<xsd:element name="frist" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>

<xsd:simpleType name="HttpLenke">
<xsd:restriction base="xsd:anyURI">
<xsd:pattern value="https?://.+" />
</xsd:restriction>
</xsd:simpleType>

<xsd:complexType name="LenkeBeskrivelseTekst">
<xsd:simpleContent>
<xsd:extension base="LenkeBeskrivelseTekstString">
<xsd:attribute name="lang" type="Spraakkode" use="required"/>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
<xsd:simpleType name="LenkeBeskrivelseTekstString">
<xsd:restriction base="xsd:string">
<xsd:minLength value="1"/>
<xsd:maxLength value="70"/>
</xsd:restriction>
</xsd:simpleType>

<xsd:complexType name="LenkeKnappTekst">
<xsd:simpleContent>
<xsd:extension base="LenkeKnappTekstString">
<xsd:attribute name="lang" type="Spraakkode" use="required"/>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
<xsd:simpleType name="LenkeKnappTekstString">
<xsd:restriction base="xsd:string">
<xsd:minLength value="1"/>
<xsd:maxLength value="30"/>
</xsd:restriction>
</xsd:simpleType>

</xsd:schema>

0 comments on commit 4878d2a

Please sign in to comment.