Update XSDs for branch master - Build 31

vitruvio-form-basic-components.xsd

@@ -158,6 +158,8 @@
 	</xs:sequence>
 	<xs:attributeGroup ref="fieldAttrs" />
 	<xs:attribute name="format" type="xs:string"/>
+	<xs:attribute name="minDaysBeforeToday" type="xs:int"/>
+	<xs:attribute name="maxDaysAfterToday" type="xs:int"/>
 	<xs:attribute name="resolution">
 		<xs:simpleType>
 			<xs:restriction base="xs:string">

vitruvio-form-common-attrs.xsd

@@ -97,6 +97,7 @@
 	<xs:attribute name="mobileAllowed" type="xs:boolean" />
 	<xs:attribute name="readOnly" type="xs:boolean" />
 	<xs:attribute name="processVariable" type="xs:boolean" />
+	<xs:attribute name="bulkRequired" type="xs:boolean" />
 	<xs:attributeGroup ref="elementAlign" />
 </xs:attributeGroup>
 
@@ -152,6 +153,7 @@
 	<xs:attribute name="readOnly" type="xs:boolean" />
 	<xs:attribute name="processVariable" type="xs:boolean" />
 	<xs:attribute name="enabled" type="xs:boolean" />
+	<xs:attribute name="bulkRequired" type="xs:boolean" />
 </xs:attributeGroup>
 
 <xs:attributeGroup name="stringFieldAttrs">

vitruvio-form-db-components.xsd

@@ -19,6 +19,15 @@
 		</xs:simpleContent>
 	</xs:complexType>
 
+	<xs:complexType name="formRefDataSource">
+		<xs:annotation>
+			<xs:documentation>
+				Datasource para consumir datasources definidos no formulário.
+			</xs:documentation>
+		</xs:annotation>
+		<xs:attribute name="ref" type="xs:string" use="required" />
+	</xs:complexType>
+
 	<!-- Datasource para uso de Querys mapeadas pre cadastradas no Vitruvio -->
 	<xs:complexType name="queryDataSource">
 		<xs:attribute name="key" type="xs:string" use="required" />
@@ -58,13 +67,19 @@
 		<xs:attributeGroup ref="datasource-basic-attrs" />
 	</xs:complexType>
 
-<!-- SQLBuilder DataSource -->
-<xs:complexType name="datasource-with-builder">
+	<xs:group name="DatasourceWithBuilderOptions">
 		<xs:choice>
 			<xs:element name="freeQuery" type="freeDataSource" />
 			<xs:element name="query" type="queryDataSource" />
 			<xs:element name="sqlBuilderDataSource" type="sqlBuilderScript" />
 		</xs:choice>
+	</xs:group>
+
+	<!-- SQLBuilder DataSource -->
+	<xs:complexType name="datasource-with-builder">
+		<xs:choice>
+			<xs:group ref="DatasourceWithBuilderOptions"></xs:group>
+		</xs:choice>
 		<xs:attributeGroup ref="datasource-basic-attrs" />
 	</xs:complexType>
 
@@ -266,6 +281,18 @@
 				</xs:restriction>
 			</xs:simpleType>
 		</xs:attribute>
+		<xs:attribute name="type" use="optional">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="STRING" />
+					<xs:enumeration value="DECIMAL" />
+					<xs:enumeration value="NUMBER" />
+					<xs:enumeration value="BOOLEAN" />
+					<xs:enumeration value="DATE" />
+					<xs:enumeration value="TIMESTAMP" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
 	</xs:attributeGroup>
 
 	<xs:attributeGroup name="DBTableValueColumnBase">
@@ -314,7 +341,8 @@
 							</xs:element>
 							<xs:element name="dynamicColumn">
 								<xs:complexType>
-								<xs:attribute name="matchColumnTag" type="xs:string" use="required" />
+									<xs:attribute name="matchColumnTag" type="xs:string"
+										use="required" />
 									<xs:attribute name="removeTagInCaption" type="xs:boolean" />
 									<xs:attribute name="matchColumnBy">
 										<xs:simpleType>
@@ -331,7 +359,8 @@
 							<xs:element name="generated">
 								<xs:complexType>
 									<xs:choice>
-									<xs:element name="scriptColumnGenerator" type="script" minOccurs="1" maxOccurs="1"/>
+										<xs:element name="scriptColumnGenerator" type="script"
+											minOccurs="1" maxOccurs="1" />
 									</xs:choice>
 									<xs:attribute name="name" type="xs:string" use="required" />
 									<xs:attribute name="caption" type="xs:string" />
@@ -350,14 +379,16 @@
 						<xs:element name="prefix" minOccurs="0" maxOccurs="1">
 							<xs:complexType>
 								<xs:sequence>
-								<xs:element name="column" type="DBSortColumn" minOccurs="1" maxOccurs="unbounded"/>
+									<xs:element name="column" type="DBSortColumn" minOccurs="1"
+										maxOccurs="unbounded" />
 								</xs:sequence>
 							</xs:complexType>
 						</xs:element>
 						<xs:element name="suffix" minOccurs="0" maxOccurs="1">
 							<xs:complexType>
 								<xs:sequence>
-								<xs:element name="column" type="DBSortColumn" minOccurs="1" maxOccurs="unbounded"/>
+									<xs:element name="column" type="DBSortColumn" minOccurs="1"
+										maxOccurs="unbounded" />
 								</xs:sequence>
 							</xs:complexType>
 						</xs:element>
@@ -396,16 +427,19 @@
 									<xs:element name="menuItem" minOccurs="1" maxOccurs="unbounded">
 										<xs:complexType>
 											<xs:sequence>
-											<xs:element name="clickScript" type="script" minOccurs="1" maxOccurs="1" />
+												<xs:element name="clickScript" type="script"
+													minOccurs="1" maxOccurs="1" />
 											</xs:sequence>
-										<xs:attribute name="caption" type="xs:string" use="required" />
+											<xs:attribute name="caption" type="xs:string"
+												use="required" />
 											<xs:attribute name="icon" type="xs:string" />
 										</xs:complexType>
 									</xs:element>
 								</xs:sequence>
 							</xs:complexType>
 						</xs:element>
-					<xs:element name="scriptMenuGenerator" type="script" minOccurs="1" maxOccurs="1" />
+						<xs:element name="scriptMenuGenerator" type="script" minOccurs="1"
+							maxOccurs="1" />
 					</xs:choice>
 				</xs:complexType>
 			</xs:element>
@@ -469,7 +503,8 @@
 
 	<xs:complexType name="columnFilter">
 		<xs:attribute name="name" type="xs:string" use="required" />
-	<!-- Possiveis operadores de comparacao. Devem ser separados por ",". Valores: eq, ne, gt, ge, lt, le, lk -->
+		<!-- Possiveis operadores de comparacao. Devem ser separados por ",". Valores: eq, ne, gt,
+		ge, lt, le, lk -->
 		<xs:attribute name="compareWith" type="xs:string" />
 	</xs:complexType>
 
@@ -502,7 +537,8 @@
 			<xs:element name="columns" minOccurs="0" maxOccurs="1">
 				<xs:complexType>
 					<xs:sequence>
-					<xs:element name="column" type="DBFilterColumn" minOccurs="1" maxOccurs="unbounded" />
+						<xs:element name="column" type="DBFilterColumn" minOccurs="1"
+							maxOccurs="unbounded" />
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
@@ -537,7 +573,8 @@
 			<xs:element name="columns" minOccurs="0" maxOccurs="1">
 				<xs:complexType>
 					<xs:sequence>
-					<xs:element name="column" type="DBTableColumn" minOccurs="1" maxOccurs="unbounded" />
+						<xs:element name="column" type="DBTableColumn" minOccurs="1"
+							maxOccurs="unbounded" />
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
@@ -580,9 +617,12 @@
 							<xs:complexType>
 								<xs:sequence minOccurs="1" maxOccurs="1">
 									<xs:any processContents="skip" />
-								<xs:element name="initialValue" type="userInfoInitialValue" minOccurs="0" maxOccurs="1"/>
-								<xs:element name="valuePrefix" type="xs:string" minOccurs="0" maxOccurs="1" />
-								<xs:element name="valueSuffix" type="xs:string" minOccurs="0" maxOccurs="1" />
+									<xs:element name="initialValue" type="userInfoInitialValue"
+										minOccurs="0" maxOccurs="1" />
+									<xs:element name="valuePrefix" type="xs:string" minOccurs="0"
+										maxOccurs="1" />
+									<xs:element name="valueSuffix" type="xs:string" minOccurs="0"
+										maxOccurs="1" />
 									<xs:choice>
 										<xs:element name="column" type="columnFilter" />
 										<xs:element name="parameter" type="bindParameter" />

vitruvio-form-scripting.xsd

@@ -59,4 +59,13 @@
   </xs:simpleContent>
 </xs:complexType>
 
+<!-- Definicao de uma acao de conclusao em grupo -->
+<xs:complexType name="vitruvio-bulk-action">
+	<xs:sequence>
+		<xs:element name="validator" type="script" minOccurs="0" maxOccurs="1" />
+	</xs:sequence>
+	<xs:attribute name="acceptLabel" type="xs:string" use="required" />
+	<xs:attribute name="cancelLabel" type="xs:string" use="required" />
+</xs:complexType>
+
 </xs:schema>

vitruvio-form-widgets.xsd

@@ -30,6 +30,7 @@
 	<xs:attribute name="caption-field" type="xs:string" use="required"/>
 	<xs:attribute name="start-date-field" type="xs:string" use="required"/>
 	<xs:attribute name="end-date-field" type="xs:string" use="required"/>
+    <xs:attribute name="style-name-field" type="xs:string" use="optional"/>
 	<xs:attribute name="description-field" type="xs:string" use="optional"/>
 	<xs:attributeGroup ref="datasource-basic-attrs" />
 </xs:complexType>
@@ -81,12 +82,40 @@
 </xs:complexType>
 
 <!-- Calendar -->
+<xs:complexType name="CalendarMultiBind">
+    <xs:sequence minOccurs="1" maxOccurs="unbounded">
+        <xs:choice>
+            <xs:element name="parameter">
+                <xs:complexType>
+                    <xs:attribute name="field-ref" type="xs:string" use="optional" />
+                    <xs:attribute name="context-value" use="optional" >
+                        <xs:simpleType>
+                            <xs:restriction base="xs:string">
+                                <xs:enumeration value="PROCESS_INSTANCE_ID" />
+                                <xs:enumeration value="PROCESS_BUSINESS_KEY" />
+                                <xs:enumeration value="TASK_ID" />
+                                <xs:enumeration value="USER_LOGIN" />
+                                <xs:enumeration value="USER_COMPANYS" />
+                            </xs:restriction>
+                        </xs:simpleType>
+                    </xs:attribute>
+                    <xs:attribute name="parameterName" type="xs:string" use="required" />
+                    <xs:attribute name="defaultValue" type="xs:string" use="required" />
+                    <xs:attributeGroup ref="value-type-enum" />
+                </xs:complexType>
+            </xs:element>
+        </xs:choice>
+    </xs:sequence>
+    <xs:attribute name="refreshOnChange" type="xs:boolean" />
+</xs:complexType>
+
 <xs:complexType name="CalendarWidget">
 	<xs:sequence>
 		<xs:choice>
 			<xs:element name="sql-datasource" type="calendar-datasource-with-builder" minOccurs="1" maxOccurs="1" />
 		</xs:choice>
 		<xs:element name="events" type="calendarEvents" minOccurs="0" maxOccurs="1" />
+        <xs:element name="bind" type="CalendarMultiBind" minOccurs="0" maxOccurs="1" />
 	</xs:sequence>
 	<xs:attribute name="id" type="xs:string" use="required" />
 	<xs:attributeGroup ref="basicElement" />
@@ -101,6 +130,7 @@
 	</xs:attribute>
 	<xs:attribute name="showViewTypeButtons" type="xs:boolean" use="optional" />
 	<xs:attribute name="showNavigationButtons" type="xs:boolean" use="optional" />
+    <xs:attribute name="showRefreshButton" type="xs:boolean" use="optional" />
 </xs:complexType>
 
 <!-- Definicao de widgets CORE, dentro do Namespace do Vitruvio -->

vitruvio-form.xsd

@@ -46,6 +46,7 @@
 						</xs:sequence>
 					</xs:complexType>
 				</xs:element>
+				<xs:element name="bulkAction" type="vitruvio-bulk-action" minOccurs="0" maxOccurs="1" />
 			</xs:sequence>
 			<xs:attribute name="loadWithPreviousForm" type="xs:boolean" />
 			<xs:attribute name="hideWhenFinished" type="xs:boolean" />
@@ -55,6 +56,7 @@
             <xs:attribute name="preventAttach" type="xs:boolean" />
             <xs:attribute name="minimumVersion" type="xs:string" />
             <xs:attribute name="minimumVersionNotMeetMessage" type="xs:string" />
+            <xs:attribute name="allowsBulkFinish" type="xs:boolean" />
 		</xs:extension>
 	</xs:complexContent>
 </xs:complexType>

vitruvio-mobile-base-form.xsd

@@ -232,6 +232,7 @@
 			<!-- Suporte a definicao de widgets -->
 			<xs:group ref="CoreWidgets" />
 			<xs:element name="GridEditorWidget" type="GridEditorWidget" minOccurs="0" maxOccurs="unbounded" />
+			<xs:element name="Barcode" type="Barcode" minOccurs="0" maxOccurs="unbounded" />
 			<xs:element name="ProgressBarLinear" type="ProgressBarLinear" minOccurs="0" maxOccurs="unbounded" />
 			
 			<xs:element name="CustomWidget" type="CustomWidget" />

vitruvio-mobile-form.xsd

@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<xs:schema xmlns="http://www.davinti.com.br/vitruvio/mobile-form" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.davinti.com.br/vitruvio/mobile-form" elementFormDefault="qualified">
+<xs:schema xmlns="http://www.davinti.com.br/vitruvio/mobile-form"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://www.davinti.com.br/vitruvio/mobile-form" elementFormDefault="qualified">
 
 	<!-- Parametros comuns nos Campos -->
 	<xs:include schemaLocation="vitruvio-form-common-attrs.xsd" />
@@ -8,7 +10,14 @@
 	<xs:include schemaLocation="vitruvio-form-basic-components.xsd" />
 
 	<!-- Componentes para uso com bancos de dados -->
-<xs:include schemaLocation="vitruvio-form-db-components.xsd" />
+	<xs:redefine schemaLocation="vitruvio-form-db-components.xsd">
+		<xs:group name="DatasourceWithBuilderOptions">
+			<xs:choice>
+				<xs:group ref="DatasourceWithBuilderOptions" />
+				<xs:element name="form-datasource" type="formRefDataSource" />
+			</xs:choice>
+		</xs:group>
+	</xs:redefine>
 
 	<!-- Componentes especificos ao contexto da aplicacao -->
 	<xs:include schemaLocation="vitruvio-form-specific-components.xsd" />
@@ -108,7 +117,8 @@
 			<xs:element name="customButtons" minOccurs="0" maxOccurs="1">
 				<xs:complexType>
 					<xs:sequence>
-					<xs:element name="button" type="MobileFormNavButton" minOccurs="1" maxOccurs="unbounded" />
+						<xs:element name="button" type="MobileFormNavButton" minOccurs="1"
+							maxOccurs="unbounded" />
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
@@ -132,15 +142,22 @@
 		<xs:complexContent>
 			<xs:extension base="vitruvio-subform-enabled-form">
 				<xs:sequence>
-				<xs:element name="Autoload" type="MobileAutoloadInfo" minOccurs="0" maxOccurs="1" />
-				<xs:element name="ServerSide" type="MobileServerSide" minOccurs="0" maxOccurs="1" />
-				<xs:element name="TaskPropertiesDisplaySettings" type="MobileFormTaskPropertiesDisplaySettings" minOccurs="0" maxOccurs="1" />
-				<xs:element name="NavButtonSettings" type="MobileFormNavButtonSettings" minOccurs="0" maxOccurs="1" />
+					<xs:element name="Autoload" type="MobileAutoloadInfo" minOccurs="0"
+						maxOccurs="1" />
+					<xs:element name="ServerSide" type="MobileServerSide" minOccurs="0"
+						maxOccurs="1" />
+					<xs:element name="TaskPropertiesDisplaySettings"
+						type="MobileFormTaskPropertiesDisplaySettings" minOccurs="0" maxOccurs="1" />
+					<xs:element name="NavButtonSettings" type="MobileFormNavButtonSettings"
+						minOccurs="0" maxOccurs="1" />
+					<xs:element name="bulkAction" type="vitruvio-bulk-action" minOccurs="0" maxOccurs="1" />
 				</xs:sequence>
 				<xs:attribute name="requiredDurationNotes" type="xs:boolean" />
 				<xs:attribute name="shouldDisplayNextTask" type="xs:boolean" />
 				<xs:attribute name="shouldDisplayNextTaskWithoutConfirmation" type="xs:boolean" />
 				<xs:attribute name="shouldRefreshTasksFromBackendAfterEnd" type="xs:boolean" />
+				<xs:attribute name="preventAttach" type="xs:boolean" />
+				<xs:attribute name="allowsBulkFinish" type="xs:boolean" />
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
@@ -150,11 +167,13 @@
 			<xs:sequence>
 				<xs:element name="library" type="library" minOccurs="0" maxOccurs="1" />
 				<xs:element name="descriptorScript" type="script" minOccurs="0" maxOccurs="1" />
-			<xs:element name="form" type="vitruvio-mobile-form" minOccurs="1" maxOccurs="unbounded" />
+				<xs:element name="form" type="vitruvio-mobile-form" minOccurs="1"
+					maxOccurs="unbounded" />
 			</xs:sequence>
 			<xs:attribute name="processKey" type="xs:string" />
 			<xs:attribute name="allowAttachments" type="xs:boolean" />
-		<!-- Determina se as notas e anexos devem ser exibidas dentro do mesmo form, ou atraves de formularios externos -->
+			<!-- Determina se as notas e anexos devem ser exibidas dentro do mesmo form, ou atraves
+			de formularios externos -->
 			<xs:attribute name="embeddedNotes" type="xs:boolean" />
 			<xs:attribute name="embeddedAttachments" type="xs:boolean" />
 		</xs:complexType>

vitruvio-mobile-widgets.xsd

@@ -71,7 +71,8 @@
 
 	<xs:complexType name="GridEditorWidget">
 		<xs:sequence>
-		<xs:element name="datasource" minOccurs="1" maxOccurs="1" type="GridEditorWidgetDataSource" />
+			<xs:element name="datasource" minOccurs="1" maxOccurs="1"
+				type="GridEditorWidgetDataSource" />
 			<xs:element name="keyField" minOccurs="1" maxOccurs="1" />
 			<xs:element name="parentKeyField" minOccurs="1" maxOccurs="1" />
 			<xs:element name="freezeCount" minOccurs="1" maxOccurs="1" />
@@ -103,4 +104,58 @@
 		<xs:attributeGroup ref="basicElement" />
 	</xs:complexType>
 
+	<xs:complexType name="BarCodeEventType">
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attribute name="key" use="required">
+					<xs:simpleType>
+						<xs:restriction base="xs:string">
+							<xs:enumeration value="valueChange" />
+							<xs:enumeration value="blur" />
+							<xs:enumeration value="focus" />
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:attribute>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
+	<xs:complexType name="Barcode">
+		<xs:sequence>
+			<xs:element name="events" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="event" type="BarCodeEventType" minOccurs="0"
+							maxOccurs="unbounded" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+
+		<xs:attributeGroup ref="basicElement" />
+		<xs:attribute name="id" use="required" type="xs:string" />
+		<xs:attribute name="type" use="required">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="string" />
+					<xs:enumeration value="number" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attribute name="readOnly" type="xs:boolean" default="false" />
+		<xs:attribute name="enabled" type="xs:boolean" default="true" />
+		<xs:attribute name="description" type="xs:string" />
+		<xs:attribute name="prefix" type="xs:string" />
+		<xs:attribute name="suffix" type="xs:string" />
+		<xs:attribute name="titleField" type="xs:string" default="Leitor" />
+		<xs:attribute name="descriptionField" type="xs:string"
+			default="Por favor, aponte sua câmera para o código." />
+		<xs:attribute name="allowPaste" type="xs:boolean" default="true" />
+		<xs:attribute name="focusNextFieldOnValueChange" type="xs:boolean" default="true" />
+		<xs:attribute name="focusNextFieldOnEnter" type="xs:boolean" default="false" />
+		<xs:attribute name="formats" type="xs:string" default="EAN_13,QR_CODE" />
+		<xs:attribute name="prefixAndSuffixValidation" type="xs:string" />
+		<xs:attribute name="allowElevationForGroups" type="xs:string" />
+	</xs:complexType>
+
 </xs:schema>