Merge branch 'iss' of git.si.cnr.it:dev/sigla-main into iss

consiglionazionaledellericerche · Oct 30, 2017 · a129d03 · a129d03
2 parents bce285b + 4f52508
commit a129d03
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 117 deletions.
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     	<sonar.skip>true</sonar.skip>
 		<java.version>1.8</java.version>
 		<spring.version>4.3.3.RELEASE</spring.version>
-		<jada.version>5.0.26</jada.version>
+		<jada.version>5.0.30</jada.version>
 		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
 		<sigla.build.number>${maven.build.timestamp}</sigla.build.number>
 		<slf4j.version>1.7.21</slf4j.version>

diff --git a/sigla-ejb/src/main/java/it/cnr/contab/docamm00/actions/ContabilizzaOrdineAction.java b/sigla-ejb/src/main/java/it/cnr/contab/docamm00/actions/ContabilizzaOrdineAction.java
@@ -57,31 +57,4 @@ public Forward doRicercaLibera(ActionContext context) {
         }
     }
 
-    public Forward doRigheSelezionate(ActionContext context) {
-        try {
-            ContabilizzaOrdineBP bp = (ContabilizzaOrdineBP)context.getBusinessProcess();
-            HookForward hook = (HookForward)context.getCaller();
-            Optional.ofNullable(hook.getParameter("remoteIterator"))
-                    .filter(RemoteIterator.class::isInstance)
-                    .map(RemoteIterator.class::cast)
-                    .ifPresent(ri -> {
-                        try {
-                            bp.setIterator(context,ri);
-                        } catch (RemoteException|BusinessProcessException e) {
-                            throw new DetailedRuntimeException(e);
-                        }
-                    });
-            Optional.ofNullable(hook.getParameter("condizioneRadice"))
-                    .filter(CondizioneComplessaBulk.class::isInstance)
-                    .map(CondizioneComplessaBulk.class::cast)
-                    .ifPresent(condizioneRicercaBulk -> {
-                            bp.setCondizioneCorrente(condizioneRicercaBulk);
-                    });
-            bp.setDirty(true);
-            return context.findDefaultForward();
-        } catch(Throwable e) {
-            return handleException(context,e);
-        }
-    }
-
 }
diff --git a/sigla-ejb/src/main/java/it/cnr/contab/docamm00/bp/ContabilizzaOrdineBP.java b/sigla-ejb/src/main/java/it/cnr/contab/docamm00/bp/ContabilizzaOrdineBP.java
@@ -22,44 +22,17 @@
 public class ContabilizzaOrdineBP extends SelezionatoreListaBP implements SearchProvider {
 
     private Fattura_passiva_rigaBulk fattura_passiva_rigaBulk;
-    private CondizioneComplessaBulk condizioneCorrente;
 
     public ContabilizzaOrdineBP(String s) {
         super(s);
         setBulkInfo(BulkInfo.getBulkInfo(EvasioneOrdineRigaBulk.class));
         setColumns(getBulkInfo().getColumnFieldPropertyDictionary("fattura_passiva"));
     }
 
-    @Override
-    public Button[] createToolbar() {
-        List<Button> buttons = new ArrayList<Button>(Arrays.asList(super.createToolbar()));
-        Button button = new Button(Config.getHandler().getProperties(getClass()), "Toolbar.freeSearchFilter");
-        button.setSeparator(true);
-        buttons.add(button);
-        buttons.add(new Button(Config.getHandler().getProperties(getClass()), "Toolbar.freeSearchRemoveFilter"));
-        return buttons.toArray(new Button[buttons.size()]);
-    }
-
     public void setFattura_passiva_rigaBulk(Fattura_passiva_rigaBulk fattura_passiva_rigaBulk) {
         this.fattura_passiva_rigaBulk = fattura_passiva_rigaBulk;
     }
 
-    public boolean isFilterButtonHidden() {
-        return false;
-    }
-
-    public boolean isRemoveFilterButtonHidden() {
-        return condizioneCorrente == null;
-    }
-
-    public CondizioneComplessaBulk getCondizioneCorrente() {
-        return condizioneCorrente;
-    }
-
-    public void setCondizioneCorrente(CondizioneComplessaBulk condizioneCorrente) {
-        this.condizioneCorrente = condizioneCorrente;
-    }
-
     @Override
     public RemoteIterator search(ActionContext actioncontext, CompoundFindClause compoundfindclause, OggettoBulk oggettobulk) throws BusinessProcessException {
         try {
@@ -75,6 +48,4 @@ public RemoteIterator search(ActionContext actioncontext, CompoundFindClause com
             throw new BusinessProcessException(exception);
         }
     }
-
-
 }
diff --git a/...b/src/main/resources/it/cnr/contab/doccont00/core/bulk/Accertamento_scad_voceBulkInfo.xml b/...b/src/main/resources/it/cnr/contab/doccont00/core/bulk/Accertamento_scad_voceBulkInfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<bulkInfo
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns="https://contab.cnr.it/schema/SIGLA" 
+<bulkInfo
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns="https://contab.cnr.it/schema/SIGLA" 
 		xsi:schemaLocation="https://contab.cnr.it/schema/SIGLA https://contab.cnr.it/schema/SIGLA/BulkInfo_1_5.xsd">
 	<fieldProperty
 		name="cd_cds"
@@ -119,7 +119,7 @@
 	<columnFieldProperty
 		name="prc"
 		headerStyle="text-align: center"
-		columnStyle="width:50px; text-align: right"
+		columnStyle="text-align: right"
 		enabledOnEdit="false"		
 		/>
 	<columnFieldProperty

diff --git a/sigla-ejb/src/main/resources/it/cnr/contab/doccont00/core/bulk/Linea_attivitaBulkInfo.xml b/sigla-ejb/src/main/resources/it/cnr/contab/doccont00/core/bulk/Linea_attivitaBulkInfo.xml
@@ -1,6 +1,6 @@
-<bulkInfo
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns="https://contab.cnr.it/schema/SIGLA" 
+<bulkInfo
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns="https://contab.cnr.it/schema/SIGLA" 
 		xsi:schemaLocation="https://contab.cnr.it/schema/SIGLA https://contab.cnr.it/schema/SIGLA/BulkInfo_1_5.xsd">
 
 	<fieldProperty
@@ -140,7 +140,7 @@
 		<columnFieldProperty
 			name="prcImputazioneFin"
 			headerStyle="text-align: center"
-			columnStyle="width:50px; text-align: right"
+			columnStyle="text-align: right"
 			enabledOnEdit="true"
 			enabledOnInsert="true"			
 			/>		

diff --git a/...b/src/main/resources/it/cnr/contab/doccont00/core/bulk/Obbligazione_scad_voceBulkInfo.xml b/...b/src/main/resources/it/cnr/contab/doccont00/core/bulk/Obbligazione_scad_voceBulkInfo.xml
@@ -1,6 +1,6 @@
-<bulkInfo
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns="https://contab.cnr.it/schema/SIGLA" 
+<bulkInfo
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns="https://contab.cnr.it/schema/SIGLA" 
 		xsi:schemaLocation="https://contab.cnr.it/schema/SIGLA https://contab.cnr.it/schema/SIGLA/BulkInfo_1_5.xsd">
 
 	<fieldProperty
@@ -107,35 +107,35 @@
 	<columnFieldProperty
 		name="cd_centro_responsabilita"
 		columnStyle="width:15%; text-align:left"
-		enabledOnEdit="false"
+		enabledOnEdit="false"
 		/>
 	<columnFieldProperty
 		name="cd_linea_attivita"
-		enabledOnEdit="false"	
+		enabledOnEdit="false"	
 		columnStyle="width:15%;"					
 		/>
 	<columnFieldProperty
 		name="cd_funzione"
 		enabledOnEdit="false"		
-		columnStyle="width:10%;"
+		columnStyle="width:10%;"
 		/>
 	<columnFieldProperty
 		name="cd_natura"
-		enabledOnEdit="false"
+		enabledOnEdit="false"
 		columnStyle="width:10%;"		
 		/>
 	<columnFieldProperty
 		name="prc"
 		headerStyle="text-align: center"
-		columnStyle="width:20%; text-align: right"
-		enabledOnEdit="false"
+		columnStyle="text-align: right"
+		enabledOnEdit="false"
 		inputCssClass="form-control column"		
 		/>
 	<columnFieldProperty
 		name="im_voce"
-		columnStyle="width:30%; text-align: right"
+		columnStyle="width:30%; text-align: right"
 		enabledOnEdit="true"
-		enabledOnInsert="true"
+		enabledOnInsert="true"
 		inputCssClass="form-control column"
 		/>
 

diff --git a/sigla-ejb/src/main/resources/it/cnr/contab/prevent00/bulk/V_assestatoBulkInfo.xml b/sigla-ejb/src/main/resources/it/cnr/contab/prevent00/bulk/V_assestatoBulkInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <bulkInfo
 	shortDescription="Situazione assestato"
 	longDescription="Situazione assestato" >
@@ -43,14 +43,14 @@
 		rows="5"
 		enabledOnEdit="false"
 		label="Descrizione" />
-	<fieldProperty
-		name="cd_natura"
-		property="cd_natura"
-		inputType="TEXT"
-		inputSize="1"
-		maxLength="1"
-		enabledOnEdit="false"
-		label="Natura" />
+	<fieldProperty
+		name="cd_natura"
+		property="cd_natura"
+		inputType="TEXT"
+		inputSize="1"
+		maxLength="1"
+		enabledOnEdit="false"
+		label="Natura" />
 	<fieldProperty
 		name="ti_appartenenza"
 		property="ti_appartenenza"
@@ -169,23 +169,23 @@
 		name="prc_da_assegnare"
 		property="prc_da_assegnare"
 		inputType="TEXT"
-		inputSize="5"
-		maxLength="5"
+		inputSize="5"
+		maxLength="5"
 		formatName="it.cnr.contab.util.PercentFormat"
 		label="Percentuale da assegnare" />
-	<fieldProperty
-		name="importo_disponibile_netto"
-		property="importo_disponibile_netto"
-		inputType="TEXT"
-		formatName="it.cnr.contab.util.EuroFormat"
-		enabledOnEdit="false"
-		label="Disponibilità" />
-
+	<fieldProperty
+		name="importo_disponibile_netto"
+		property="importo_disponibile_netto"
+		inputType="TEXT"
+		formatName="it.cnr.contab.util.EuroFormat"
+		enabledOnEdit="false"
+		label="Disponibilità" />
+
 	<formFieldProperty
 		name="imp_da_assegnare" />
 	<formFieldProperty
 		name="prc_da_assegnare" />
-
+
 	<columnFieldProperty
 		name="cd_centro_responsabilita"
 		enabledOnInsert="false" />
@@ -220,11 +220,11 @@
 	<columnFieldProperty
 		name="imp_da_assegnare"
 		columnStyle="text-align: right;" />
-	<columnFieldProperty
-		name="importo_disponibile_netto"
-		enabledOnInsert="false"
-		columnStyle="text-align: right" />
-
+	<columnFieldProperty
+		name="importo_disponibile_netto"
+		enabledOnInsert="false"
+		columnStyle="text-align: right" />
+
 	<findFieldProperty
 		name="cd_centro_responsabilita" />
 	<findFieldProperty
@@ -239,7 +239,7 @@
 		label="Variazioni definitive" />
 	<findFieldProperty
 		name="assestato_finale" />
-
+
 	<columnSet
 		name="modalitaInserimentoPercentuali" >
 		<columnFieldProperty
@@ -251,21 +251,21 @@
 		<columnFieldProperty
 			name="ds_linea_attivita"
 			enabledOnInsert="false" />
-		<columnFieldProperty
-			name="cd_natura"
-			enabledOnInsert="false" />
+		<columnFieldProperty
+			name="cd_natura"
+			enabledOnInsert="false" />
 		<columnFieldProperty
 			name="importo_disponibile_netto"
 			inputType="DESCTOOL"
-			descProperty="dett_imp_voce"
+			descProperty="dett_imp_voce"
 			enabledOnInsert="false"
 			columnStyle="text-align: right" />
 		<columnFieldProperty
 			name="prc_da_assegnare"
 			label="%"
 			headerLabel="Assegna"
 			headerStyle="text-align: center"
-			columnStyle="width:50px; text-align: right" 
+			columnStyle="text-align: right"
 			command="doAssegnaPercentuale"/>
 		<columnFieldProperty
 			name="imp_da_assegnare"
@@ -286,13 +286,13 @@
 		<columnFieldProperty
 			name="ds_linea_attivita"
 			enabledOnInsert="false" />
-		<columnFieldProperty
-			name="cd_natura"
-			enabledOnInsert="false" />
+		<columnFieldProperty
+			name="cd_natura"
+			enabledOnInsert="false" />
 		<columnFieldProperty
 			name="importo_disponibile_netto"
 			inputType="DESCTOOL"
-		    descProperty="dett_imp_voce"
+		    descProperty="dett_imp_voce"
 			enabledOnInsert="false"
 			columnStyle="text-align: right" />
 		<columnFieldProperty
@@ -302,12 +302,12 @@
 			label="%"
 			headerLabel="Assegna"
 			headerStyle="text-align: center"
-			columnStyle="width:50px; text-align: right" />
+			columnStyle="text-align: right" />
 		<columnFieldProperty
 			name="imp_da_assegnare"
 			label="Importo"
 			headerLabel="Assegna"
-			columnStyle="text-align: right;"
+			columnStyle="text-align: right;"
 			command="doAssegnaImporto"/>
 	</columnSet>
 	<columnSet
@@ -321,17 +321,17 @@
 		<columnFieldProperty
 			name="ds_linea_attivita"
 			enabledOnInsert="false" />
-		<columnFieldProperty
-			name="cd_natura"
-			enabledOnInsert="false" />
+		<columnFieldProperty
+			name="cd_natura"
+			enabledOnInsert="false" />
 		<columnFieldProperty
 			name="cd_modulo"
 			enabledOnInsert="false"
 			enabledOnEdit="false" />
 		<columnFieldProperty
 			name="importo_disponibile_netto"
 			inputType="DESCTOOL"
-			descProperty="dett_imp_voce"
+			descProperty="dett_imp_voce"
 			enabledOnInsert="false"
 			columnStyle="text-align: right" />
 	</columnSet>