Update XSDs for branch feature/pdr-failure - Build 1

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:group name="DatasourceWithBuilderOptions">
-<xs:complexType name="datasource-with-builder">
 		<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="initialValue" type="userInfoInitialValue"
-								<xs:element name="valuePrefix" type="xs:string" minOccurs="0" maxOccurs="1" />
+										minOccurs="0" maxOccurs="1" />
-								<xs:element name="valueSuffix" type="xs:string" 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-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,20 @@
 		<xs:complexContent>
 			<xs:extension base="vitruvio-subform-enabled-form">
 				<xs:sequence>
-				<xs:element name="Autoload" type="MobileAutoloadInfo" minOccurs="0" maxOccurs="1" />
+					<xs:element name="Autoload" type="MobileAutoloadInfo" minOccurs="0"
-				<xs:element name="ServerSide" type="MobileServerSide" minOccurs="0" maxOccurs="1" />
+						maxOccurs="1" />
-				<xs:element name="TaskPropertiesDisplaySettings" type="MobileFormTaskPropertiesDisplaySettings" minOccurs="0" maxOccurs="1" />
+					<xs:element name="ServerSide" type="MobileServerSide" minOccurs="0"
-				<xs:element name="NavButtonSettings" type="MobileFormNavButtonSettings" minOccurs="0" maxOccurs="1" />
+						maxOccurs="1" />
+					<xs:element name="TaskPropertiesDisplaySettings"
+						type="MobileFormTaskPropertiesDisplaySettings" minOccurs="0" maxOccurs="1" />
+					<xs:element name="NavButtonSettings" type="MobileFormNavButtonSettings"
+						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:extension>
 		</xs:complexContent>
 	</xs:complexType>
@@ -150,11 +165,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>