fix mapping sfioratore (join con decsira_t_istanza_autorizzativa su i…

…d_istanza
regione-piemonte · Dec 6, 2024 · 44c9b08 · 44c9b08
1 parent 3637472
commit 44c9b08
Show file tree

Hide file tree

Showing 10 changed files with 33,585 additions and 33,764 deletions.
diff --git a/frontend/assets/cardTemplateSfioratore.jsxt b/frontend/assets/cardTemplateSfioratore.jsxt
@@ -30,14 +30,15 @@
 			<LabeledField label='Provincia' value={
 				model.getValue("/wfs:FeatureCollection/wfs:member/decsiraogc_scarichi:Sfioratore/decsiraogc_scarichi:desProvincia/text()")
 			}/>
+			<LabeledField label='Codice SIRA Impianto' value={
+				model.getValue("/wfs:FeatureCollection/wfs:member/decsiraogc_scarichi:Sfioratore/decsiraogc_scarichi:codiceSira/text()")
+			}/>
 			<LabeledField label='Tipo autorizzazione' value={
 				model.getValue("/wfs:FeatureCollection/wfs:member/decsiraogc_scarichi:Sfioratore/decsiraogc_scarichi:autorizzAmbientaleSfioratore/decsiraogc_scarichi:AutorizzAmbientaleSfioratore/decsiraogc_scarichi:tipoProvvedimento/text()")
 			}/>
-			<ProfileWrapper condition={() => (model && model.profile) && ( (model.profile.indexOf('PA_GEN_DECSIRA@REG_PMN')) > -1 )}>
-				<LabeledField label='Stato autorizzazione' value={
-					model.getValue("/wfs:FeatureCollection/wfs:member/decsiraogc_scarichi:Sfioratore/decsiraogc_scarichi:autorizzAmbientaleSfioratore/decsiraogc_scarichi:AutorizzAmbientaleSfioratore/decsiraogc_scarichi:desStato/text()")
-				}/>
-			</ProfileWrapper>
+			<LabeledField label='Stato autorizzazione' value={
+				model.getValue("/wfs:FeatureCollection/wfs:member/decsiraogc_scarichi:Sfioratore/decsiraogc_scarichi:autorizzAmbientaleSfioratore/decsiraogc_scarichi:AutorizzAmbientaleSfioratore/decsiraogc_scarichi:desStato/text()")
+			}/>
 			<LabeledField label='Estremi autorizzazione' value={
 				model.getValue("/wfs:FeatureCollection/wfs:member/decsiraogc_scarichi:Sfioratore/decsiraogc_scarichi:autorizzAmbientaleSfioratore/decsiraogc_scarichi:AutorizzAmbientaleSfioratore/decsiraogc_scarichi:estremiProvvedimento/text()")
 			}/>

diff --git a/frontend/assets/sfioratore.json b/frontend/assets/sfioratore.json
@@ -334,8 +334,8 @@
                "sortBy": "provv+A"
              }
            },
-           "valueId":"des_tematica",
-           "valueLabel":"des_tematica"
+           "valueId":"provv",
+           "valueLabel":"provv"
         },
 		{
             "index": 12,

diff --git a/security/app-schema/hale/sfioratore.halex b/security/app-schema/hale/sfioratore.halex
diff --git a/security/app-schema/hale/sfioratore.halex.alignment.xml b/security/app-schema/hale/sfioratore.halex.alignment.xml
@@ -682,43 +682,6 @@
         </target>
         <parameter value="id_istanza_autorizzativa.{id_istanza_autorizzativa}" name="pattern"/>
     </cell>
-    <cell relation="eu.esdihumboldt.hale.align.join" id="C3480fe70-6e95-4fc6-8e6c-d29b15e9a106" priority="normal">
-        <source name="types">
-            <class>
-                <type name="decsira_geo_sfioratore" ns="jdbc:postgresql:DBSIRA:decsira"/>
-            </class>
-        </source>
-        <source name="types">
-            <class>
-                <type name="decsira_t_istanza_autorizzativa" ns="jdbc:postgresql:DBSIRA:decsira"/>
-            </class>
-        </source>
-        <target>
-            <class>
-                <type name="SfioratoreType" ns="http://www.regione.piemonte.it/ambiente/decsiraogc_scarichi/1.0"/>
-            </class>
-        </target>
-        <complexParameter name="join">
-            <jp:join-parameter xmlns:jp="http://www.esdi-humboldt.eu/hale/join">
-                <class>
-                    <type name="decsira_geo_sfioratore" ns="jdbc:postgresql:DBSIRA:decsira"/>
-                </class>
-                <class>
-                    <type name="decsira_t_istanza_autorizzativa" ns="jdbc:postgresql:DBSIRA:decsira"/>
-                </class>
-                <jp:condition>
-                    <property>
-                        <type name="decsira_geo_sfioratore" ns="jdbc:postgresql:DBSIRA:decsira"/>
-                        <child name="codice_sira"/>
-                    </property>
-                    <property>
-                        <type name="decsira_t_istanza_autorizzativa" ns="jdbc:postgresql:DBSIRA:decsira"/>
-                        <child name="codice_sira"/>
-                    </property>
-                </jp:condition>
-            </jp:join-parameter>
-        </complexParameter>
-    </cell>
     <cell relation="eu.esdihumboldt.hale.align.retype" id="C720dac8f-47b2-4a4e-9762-ea4cb8676994" priority="normal">
         <source>
             <class>
@@ -1137,4 +1100,41 @@
             </jp:join-parameter>
         </complexParameter>
     </cell>
+    <cell relation="eu.esdihumboldt.hale.align.join" id="C3480fe70-6e95-4fc6-8e6c-d29b15e9a106" priority="normal">
+        <source name="types">
+            <class>
+                <type name="decsira_geo_sfioratore" ns="jdbc:postgresql:DBSIRA:decsira"/>
+            </class>
+        </source>
+        <source name="types">
+            <class>
+                <type name="decsira_t_istanza_autorizzativa" ns="jdbc:postgresql:DBSIRA:decsira"/>
+            </class>
+        </source>
+        <target>
+            <class>
+                <type name="SfioratoreType" ns="http://www.regione.piemonte.it/ambiente/decsiraogc_scarichi/1.0"/>
+            </class>
+        </target>
+        <complexParameter name="join">
+            <jp:join-parameter xmlns:jp="http://www.esdi-humboldt.eu/hale/join">
+                <class>
+                    <type name="decsira_geo_sfioratore" ns="jdbc:postgresql:DBSIRA:decsira"/>
+                </class>
+                <class>
+                    <type name="decsira_t_istanza_autorizzativa" ns="jdbc:postgresql:DBSIRA:decsira"/>
+                </class>
+                <jp:condition>
+                    <property>
+                        <type name="decsira_geo_sfioratore" ns="jdbc:postgresql:DBSIRA:decsira"/>
+                        <child name="id_istanza"/>
+                    </property>
+                    <property>
+                        <type name="decsira_t_istanza_autorizzativa" ns="jdbc:postgresql:DBSIRA:decsira"/>
+                        <child name="id_istanza"/>
+                    </property>
+                </jp:condition>
+            </jp:join-parameter>
+        </complexParameter>
+    </cell>
 </alignment>
diff --git a/security/app-schema/mappings/decsiraogc_scarichi/puntoScaricoIndustriale/includedTypes.xml b/security/app-schema/mappings/decsiraogc_scarichi/puntoScaricoIndustriale/includedTypes.xml
@@ -32,7 +32,7 @@
                 </Parameter>
                 <Parameter>
                     <name>encode functions</name>
-                    <value>false</value>
+                    <value>true</value>
                 </Parameter>
                 <Parameter>
                     <name>Evictor run periodicity</name>

diff --git a/...ma/mappings/decsiraogc_scarichi/puntoScaricoIndustriale/puntoScaricoIndustriale.appschema b/...ma/mappings/decsiraogc_scarichi/puntoScaricoIndustriale/puntoScaricoIndustriale.appschema
@@ -35,7 +35,7 @@
                 </Parameter>
                 <Parameter>
                     <name>encode functions</name>
-                    <value>false</value>
+                    <value>true</value>
                 </Parameter>
                 <Parameter>
                     <name>Evictor run periodicity</name>

diff --git a/security/app-schema/mappings/decsiraogc_scarichi/puntoScaricoUrbano/includedTypes.xml b/security/app-schema/mappings/decsiraogc_scarichi/puntoScaricoUrbano/includedTypes.xml
@@ -32,7 +32,7 @@
                 </Parameter>
                 <Parameter>
                     <name>encode functions</name>
-                    <value>false</value>
+                    <value>true</value>
                 </Parameter>
                 <Parameter>
                     <name>Evictor run periodicity</name>

diff --git a/...y/app-schema/mappings/decsiraogc_scarichi/puntoScaricoUrbano/puntoScaricoUrbano.appschema b/...y/app-schema/mappings/decsiraogc_scarichi/puntoScaricoUrbano/puntoScaricoUrbano.appschema
@@ -36,7 +36,7 @@
                 </Parameter>
                 <Parameter>
                     <name>encode functions</name>
-                    <value>false</value>
+                    <value>true</value>
                 </Parameter>
                 <Parameter>
                     <name>Evictor run periodicity</name>

diff --git a/security/app-schema/mappings/decsiraogc_scarichi/sfioratore/includedTypes.xml b/security/app-schema/mappings/decsiraogc_scarichi/sfioratore/includedTypes.xml
@@ -21,7 +21,7 @@
                 </Parameter>
                 <Parameter>
                     <name>port</name>
-                    <value>5432</value>
+                    <value>${db.port}</value>
                 </Parameter>
                 <Parameter>
                     <name>passwd</name>
@@ -222,7 +222,7 @@
                 <AttributeMapping>
                     <targetAttribute>FEATURE_LINK[1]</targetAttribute>
                     <sourceExpression>
-                        <OCQL>codice_sira</OCQL>
+                        <OCQL>id_istanza</OCQL>
                     </sourceExpression>
                 </AttributeMapping>
             </attributeMappings>

diff --git a/security/app-schema/mappings/decsiraogc_scarichi/sfioratore/sfioratore.appschema b/security/app-schema/mappings/decsiraogc_scarichi/sfioratore/sfioratore.appschema
@@ -23,7 +23,7 @@
                 </Parameter>
                 <Parameter>
                     <name>port</name>
-                    <value>5432</value>
+                    <value>${db.port}</value>
                 </Parameter>
                 <Parameter>
                     <name>passwd</name>
@@ -288,19 +288,19 @@
                     </sourceExpression>
                 </AttributeMapping>
                 <AttributeMapping>
-                    <targetAttribute>decsiraogc_scarichi:autorizzAmbientaleSfioratore</targetAttribute>
+                    <targetAttribute>decsiraogc_scarichi:oggettoAssociatoSfioratore</targetAttribute>
                     <sourceExpression>
-                        <OCQL>codice_sira</OCQL>
-                        <linkElement>decsiraogc_scarichi:AutorizzAmbientaleSfioratore</linkElement>
+                        <OCQL>id_ogg_tipo</OCQL>
+                        <linkElement>decsiraogc_scarichi:OggettoAssociatoSfioratore</linkElement>
                         <linkField>FEATURE_LINK[1]</linkField>
                     </sourceExpression>
                     <isMultiple>true</isMultiple>
                 </AttributeMapping>
                 <AttributeMapping>
-                    <targetAttribute>decsiraogc_scarichi:oggettoAssociatoSfioratore</targetAttribute>
+                    <targetAttribute>decsiraogc_scarichi:autorizzAmbientaleSfioratore</targetAttribute>
                     <sourceExpression>
-                        <OCQL>id_ogg_tipo</OCQL>
-                        <linkElement>decsiraogc_scarichi:OggettoAssociatoSfioratore</linkElement>
+                        <OCQL>id_istanza</OCQL>
+                        <linkElement>decsiraogc_scarichi:AutorizzAmbientaleSfioratore</linkElement>
                         <linkField>FEATURE_LINK[1]</linkField>
                     </sourceExpression>
                     <isMultiple>true</isMultiple>