Dev v1.1.1 (#112)

Close refactoring round
italia · Jul 3, 2018 · 9a03f78 · 9a03f78
1 parent 747956a
commit 9a03f78
Show file tree

Hide file tree

Showing 36 changed files with 3,316 additions and 3,133 deletions.
diff --git a/AgID_Vocabularies/AgID_aggregate_components.xsd b/AgID_Vocabularies/AgID_aggregate_components.xsd
@@ -8,7 +8,7 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema" 
 
     targetNamespace="http://www.agid.gov.it/AgID_aggregate_components"  
-    elementFormDefault="qualified"
+    elementFormDefault="qualified" attributeFormDefault="qualified"
     version="1.1.0" xml:lang="it">
 
     <xs:import namespace="http://www.w3.org/ns/corevocabulary/BasicComponents" schemaLocation="ISA_Core_Vocabularies/CoreVocabularies-BasicComponents-1.1.xsd"/>
@@ -61,7 +61,7 @@
 
     <xs:complexType name="ToponimoType">
         <xs:sequence>
-            <xs:element name="specie" type="isacvbc:AddressLocatorNameType"/>
+            <xs:element name="specie" type="enum:DUGEnum"/>
             <xs:element name="indirizzo" type="isacvbc:AddressLocatorNameType"/>
         </xs:sequence>
     </xs:complexType>
@@ -80,7 +80,6 @@
             <xs:documentation>Tipo astratto. Tutti gli elementi CoordinateCatastaliBase sono ereditati da questo tipo utile per specificare le coordinate catastali</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-            <xs:element name="tipo" type="enum:TipoCoordinateCatastaliEnum" />
             <xs:element name="foglio" type="xs:string"/>
             <xs:element name="particella" type="xs:string"/>
             <xs:element name="particellaDenominatore" type="xs:string" minOccurs="0"/>

diff --git a/AgID_Vocabularies/AgID_basic_components.xsd b/AgID_Vocabularies/AgID_basic_components.xsd
@@ -8,7 +8,7 @@
 
     targetNamespace="http://www.agid.gov.it/AgID_basic_components"  
 
-    elementFormDefault="qualified"
+    elementFormDefault="qualified" attributeFormDefault="qualified"
 
     version="1.1.0" xml:lang="it">
 
@@ -123,4 +123,14 @@
         </xs:sequence>
     </xs:complexType>
 
+
+    <xs:simpleType name="SHA256Type">
+        <xs:annotation>
+            <xs:documentation>Un hash SHA-256 viene rappresentato con 32 byte, ovvero con una stringa in esadecimale di 64 caratteri</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:hexBinary">
+            <xs:length value="32" />
+        </xs:restriction>
+    </xs:simpleType>
+
 </xs:schema>
diff --git a/AgID_Vocabularies/AgID_enumeration.xsd b/AgID_Vocabularies/AgID_enumeration.xsd
diff --git a/Moduli_PA/MODULI_common_components.xsd b/Moduli_PA/MODULI_common_components.xsd
@@ -7,10 +7,7 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema" 
 
     targetNamespace="http://www.agid.gov.it/MODULI_PA/moduli_common_components"  
-
-    elementFormDefault="qualified"
-
-    version="1.1.0" xml:lang="it">
+    elementFormDefault="qualified" attributeFormDefault="qualified" version="1.1.0" xml:lang="it">
 
     <xs:import namespace="http://www.agid.gov.it/AgID_basic_components" schemaLocation="../AgID_Vocabularies/AgID_basic_components.xsd"/>
     <xs:import namespace="http://www.agid.gov.it/AgID_aggregate_components" schemaLocation="../AgID_Vocabularies/AgID_aggregate_components.xsd"/>
@@ -28,4 +25,54 @@
         </xs:complexContent>
     </xs:complexType>
 
+
+    <xs:complexType name="AllegatoBaseType" abstract="true"/>
+
+    <xs:complexType name="AllegatoType">
+        <xs:complexContent>
+            <xs:extension base="moduli:AllegatoBaseType">
+                <xs:choice>
+                    <xs:element name="binario" type="moduli:AllegatoBinarioType"/>
+                    <xs:element name="riferimento" type="moduli:AllegatoRiferimentoType"/>
+                </xs:choice>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="AllegatoBinarioType">
+        <xs:complexContent>
+            <xs:extension base="moduli:RiferimentoGenericoAllegatoType">
+                <xs:sequence>
+                    <xs:element name="contenuto" type="xs:base64Binary"/>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="AllegatoRiferimentoType">
+        <xs:complexContent>
+            <xs:extension base="moduli:RiferimentoGenericoAllegatoType">
+                <xs:sequence>
+                    <xs:element name="hash" type="basic:SHA256Type" minOccurs="0"/>
+                </xs:sequence>
+                <xs:attribute name="href" type="xs:anyURI" use="optional"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="RiferimentoGenericoAllegatoType" >
+        <xs:annotation>
+            <xs:documentation>Descrive un riferimento generico ad un file allegato.</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="nomeFile" type="xs:string" />
+            <xs:element name="descrizione" type="xs:string" minOccurs="0"/>
+            <xs:element name="nomeFileAlt" type="xs:string" minOccurs="0"/>  
+            <xs:element name="mime" type="enumeration:MimeTypeEnum" />  
+            <xs:element name="dimensione" type="xs:positiveInteger" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+
+
+
 </xs:schema>