Skip to content

Commit a8fae0f

Browse files
ebruchezebruchez
committed
Demo forms: DMV-14: add signature and date
- also update field widths defaults - also enable simple data migration
1 parent 18d942d commit a8fae0f

File tree

5 files changed

+240
-70
lines changed

5 files changed

+240
-70
lines changed

‎data/orbeon/fr/orbeon/builder/data/e3f204051ab5d205f6c6a1948153289cf1c9fca2/bcb79e84010df5a6cf8eb7315b2067d193818164.bin

78.9 KB
Binary file not shown.

‎data/orbeon/fr/orbeon/builder/data/e3f204051ab5d205f6c6a1948153289cf1c9fca2/data.xml

+117-20
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,14 @@
9292

9393

9494
</old-address>
95+
<signature-section>
96+
<grid-10>
97+
<signature-date/>
98+
<signature/>
99+
100+
101+
</grid-10>
102+
</signature-section>
95103
<trailer-coach-vessel>
96104
<grid-6>
97105
<has-trailer-coach-vessel>false</has-trailer-coach-vessel>
@@ -312,8 +320,16 @@
312320

313321

314322

323+
</xf:bind>
324+
<xf:bind id="signature-section-bind" ref="signature-section" name="signature-section">
325+
<xf:bind id="grid-10-bind" ref="grid-10" name="grid-10">
326+
<xf:bind id="signature-date-bind" ref="signature-date" name="signature-date"
327+
type="xf:date"/>
328+
<xf:bind id="signature-bind" ref="signature" name="signature" type="xf:anyURI"/>
329+
315330
</xf:bind>
316331
</xf:bind>
332+
</xf:bind>
317333
<xf:instance xxf:readonly="true" id="fr-form-metadata">
318334
<metadata>
319335
<application-name>orbeon</application-name>
@@ -326,35 +342,76 @@
326342

327343
<library-versions>
328344
<_>1</_>
345+
<orbeon>1</orbeon>
329346
</library-versions>
330-
<email>
331-
<templates>
332-
<template name="default">
333-
<headers/>
334-
<exclude-from-all-control-values/>
335-
</template>
336-
</templates>
337-
<parameters/>
338-
</email>
339-
<thumbnail filename="dmv-14.png" mediatype="image/png" size="86742">/fr/service/persistence/crud/orbeon/builder/data/e3f204051ab5d205f6c6a1948153289cf1c9fca2/b1e787f94b9e91fd7b959ed5dad0c94abb856bf7.bin</thumbnail>
340-
<allow-template-use>true</allow-template-use>
341-
<wizard>true</wizard>
342-
<wizard-subsections-nav>false</wizard-subsections-nav>
343-
<wizard-separate-toc>false</wizard-separate-toc>
344-
<wizard-section-status>false</wizard-section-status>
345-
<wizard-mode>free</wizard-mode>
346-
<density>comfortable</density>
347-
</metadata>
347+
348+
349+
350+
351+
352+
353+
354+
355+
356+
357+
358+
359+
360+
361+
362+
363+
364+
365+
366+
367+
<email>
368+
<templates>
369+
<template name="default">
370+
<headers/>
371+
<exclude-from-all-control-values/>
372+
</template>
373+
</templates>
374+
<parameters/>
375+
</email>
376+
<thumbnail filename="dmv-14.png" mediatype="image/png" size="162016">/fr/service/persistence/crud/orbeon/builder/data/e3f204051ab5d205f6c6a1948153289cf1c9fca2/b1e787f94b9e91fd7b959ed5dad0c94abb856bf7.bin</thumbnail>
377+
<allow-template-use>true</allow-template-use>
378+
<wizard>true</wizard>
379+
<wizard-subsections-nav>false</wizard-subsections-nav>
380+
<wizard-separate-toc>false</wizard-separate-toc>
381+
<wizard-section-status>false</wizard-section-status>
382+
<wizard-mode>free</wizard-mode>
383+
<data-migration>enabled</data-migration>
384+
<density>comfortable</density>
385+
<xbl>
386+
<fr:number field-width="full"/>
387+
<fr:us-phone field-width="full"/>
388+
<fr:date field-width="full"/>
389+
<fr:time field-width="full"/>
390+
<fr:datetime field-width="full"/>
391+
</xbl>
392+
</metadata>
348393
</xf:instance>
349394
<xf:instance id="fr-form-attachments">
350395
<attachments>
351396
<css mediatype="text/css" filename="" size=""/>
352-
<pdf mediatype="application/pdf" filename="dmv14.pdf" size="81260">/fr/service/persistence/crud/orbeon/dmv-14/form/99450e3daef3872b58a965d90333ec2f62f77e40.bin</pdf>
397+
<pdf name="" lang="en"
398+
filename="bcb79e84010df5a6cf8eb7315b2067d193818164 copy.bin.pdf"
399+
mediatype="application/pdf"
400+
size="145551">/fr/service/persistence/crud/orbeon/builder/data/e3f204051ab5d205f6c6a1948153289cf1c9fca2/bcb79e84010df5a6cf8eb7315b2067d193818164.bin</pdf>
401+
353402
</attachments>
354403
</xf:instance>
355404
<xf:instance xxf:readonly="true" id="fr-form-resources">
356405
<resources>
357406
<resource xml:lang="en">
407+
<signature-date>
408+
<label>Date</label>
409+
<hint/>
410+
</signature-date>
411+
<signature>
412+
<label>Signature</label>
413+
<hint/>
414+
</signature>
358415
<old-street-number-name>
359416
<label>Street Number/Name</label>
360417
<hint/>
@@ -518,6 +575,9 @@
518575
<label>Old Address</label>
519576
<hint/>
520577
</old-address>
578+
<signature-section>
579+
<label>Date and signature</label>
580+
</signature-section>
521581
<trailer-coach-vessel>
522582
<label>Location of Trailer Coach or Vessel</label>
523583
<hint/>
@@ -717,7 +777,8 @@
717777
</xf:input>
718778
</fr:c>
719779
<fr:c y="2" x="5" w="4">
720-
<fr:date id="birth-date-control" bind="birth-date-bind" field-width="natural">
780+
<fr:date id="birth-date-control" bind="birth-date-bind" field-width="natural"
781+
output-format="[M01]-[D01]-[Y]">
721782
<xf:label ref="$form-resources/birth-date/label"/>
722783
<xf:hint ref="$form-resources/birth-date/hint"/>
723784
<xf:alert ref="$form-resources/birth-date/alert" validation="validation-6-validation"/>
@@ -1000,6 +1061,42 @@
10001061
<fr:c x="12" y="1" w="1" h="1"/>
10011062
</fr:grid>
10021063
</fr:section>
1064+
<fr:section id="signature-section-section" bind="signature-section-bind">
1065+
<xf:label ref="$form-resources/signature-section/label"/>
1066+
<fr:grid id="grid-10-grid" bind="grid-10-bind">
1067+
<fr:c x="1" y="1" w="6">
1068+
<fr:date xmlns:xxbl="http://orbeon.org/oxf/xml/xbl"
1069+
xmlns:DateSupport="java:org.orbeon.xbl.DateSupportJava"
1070+
id="signature-date-control"
1071+
bind="signature-date-bind"
1072+
output-format="[M01]-[D01]-[Y]">
1073+
<fr:index>
1074+
<fr:summary-show/>
1075+
</fr:index>
1076+
<xf:label ref="$form-resources/signature-date/label"/>
1077+
<xf:hint ref="$form-resources/signature-date/hint"/>
1078+
<xf:alert ref="$fr-resources/detail/labels/alert"/>
1079+
1080+
1081+
</fr:date>
1082+
</fr:c>
1083+
1084+
<fr:c x="7" y="1" w="6">
1085+
<fr:handwritten-signature xmlns="http://orbeon.org/oxf/xml/form-builder"
1086+
xmlns:xxbl="http://orbeon.org/oxf/xml/xbl"
1087+
id="signature-control"
1088+
bind="signature-bind">
1089+
<xf:label ref="$form-resources/signature/label"/>
1090+
<xf:hint ref="$form-resources/signature/hint"/>
1091+
<xf:alert ref="$fr-resources/detail/labels/alert"/>
1092+
1093+
1094+
</fr:handwritten-signature>
1095+
1096+
</fr:c>
1097+
1098+
</fr:grid>
1099+
</fr:section>
10031100
</fr:body>
10041101
</fr:view>
10051102
</xh:body>

‎data/orbeon/fr/orbeon/dmv-14/data/6b01fa4cd1605b8f736fac09be6cf9b2/data.xml

+47-45
Large diffs are not rendered by default.

‎data/orbeon/fr/orbeon/dmv-14/form/99450e3daef3872b58a965d90333ec2f62f77e40.bin renamed to ‎data/orbeon/fr/orbeon/dmv-14/form/bcb79e84010df5a6cf8eb7315b2067d193818164.bin

79.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)