Merge pull request #25 from consiglionazionaledellericerche/master

Allineamento CNR

docs/CHANGELOG.md

@@ -1,3 +1,38 @@
+## Release 6.3.45  -- _July 28, 2021_ 
+**Changes**
+
+>**Refactor generator class**
+>
+>[72afaa1907fe76d](https://github.com/consiglionazionaledellericerche/sigla-main/commit/72afaa1907fe76d) marco.spasiano *July 27, 2021*
+
+>**Upgrade version of storage cloud**
+>
+>[bb20be882ac07ec](https://github.com/consiglionazionaledellericerche/sigla-main/commit/bb20be882ac07ec) marco.spasiano *July 22, 2021*
+
+>**Add main for StringEncrypter**
+>
+>[f9c98c1dc6a07f0](https://github.com/consiglionazionaledellericerche/sigla-main/commit/f9c98c1dc6a07f0) marco.spasiano *July 20, 2021*
+
+>**Update StringEncrypter.java**
+>
+>[6c8bd08263ca0b5](https://github.com/consiglionazionaledellericerche/sigla-main/commit/6c8bd08263ca0b5) Marco Spasiano *July 19, 2021*
+
+>**Rimosso valore N6.2**
+>
+>[fa6fc1f6a43e05a](https://github.com/consiglionazionaledellericerche/sigla-main/commit/fa6fc1f6a43e05a) marco.spasiano *July 19, 2021*
+
+>**Rimossa jsp**
+>
+>[e282130d613ae70](https://github.com/consiglionazionaledellericerche/sigla-main/commit/e282130d613ae70) marco.spasiano *July 17, 2021*
+
+
+### Jira ORA-00907 
+
+>**FIX ORA-00907 on search incarichi**
+>
+>[ca865b2c45b22d3](https://github.com/consiglionazionaledellericerche/sigla-main/commit/ca865b2c45b22d3) marco.spasiano *July 28, 2021*
+
+
 ## Release 6.3.44  -- _July 16, 2021_ 
 **Changes**
 

docs/conf.py

@@ -23,7 +23,7 @@
 }
 
 project = 'Sistema Informativo Gestione Linee di Attività'
-release = '6.3.44'
+release = '6.3.45'
 author = u'Consiglio Nazionale delle Ricerche'
 
 show_authors = True

pom.xml

@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>it.cnr.si.sigla</groupId>
-	<version>6.3.45-SNAPSHOT</version>
+	<version>6.3.46-SNAPSHOT</version>
 	<artifactId>sigla-parent</artifactId>
 	<description>Sistema Informativo per la Gestione delle Linee di Attività</description>
 	<packaging>pom</packaging>

publiccode.yml

@@ -4,10 +4,10 @@
 
 publiccodeYmlVersion: '0.2'
 name: sigla
-releaseDate: '2021-07-16'
+releaseDate: '2021-07-28'
 url: 'https://github.com/consiglionazionaledellericerche/sigla-main'
 applicationSuite: jada
-softwareVersion: 6.3.44
+softwareVersion: 6.3.45
 developmentStatus: stable
 softwareType: standalone/web
 platforms:

sigla-backend/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>it.cnr.si.sigla</groupId>
 		<artifactId>sigla-parent</artifactId>
-		<version>6.3.45-SNAPSHOT</version>
+		<version>6.3.46-SNAPSHOT</version>
 	</parent>
 	<build>
 		<pluginManagement>
@@ -105,6 +105,13 @@
 			<version>${commons-io.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+			<version>1.3.1</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.oracle.ojdbc</groupId>
 			<artifactId>ojdbc8</artifactId>

sigla-backend/src/test/java/it/cnr/contab/generator/Generator.java

@@ -20,28 +20,90 @@
 import it.cnr.contab.generator.artifacts.ArtifactGenerator;
 import it.cnr.contab.generator.model.GeneratorBean;
 import it.cnr.contab.generator.util.DatabaseUtil;
+import org.apache.commons.cli.*;
 
 import java.io.File;
 import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 public class Generator {
+
+    public static final String PACKAGE_NAME = "packageName";
+    public static final String PREFIX = "prefix";
+    public static final String TABLE = "table";
+    public static final String DRIVER = "driver";
+    public static final String URL = "url";
+    public static final String SCHEMA = "schema";
+    public static final String USERNAME = "username";
+    public static final String PASSWORD = "password";
+
     public static void main(String[] args) {
         GeneratorBean bean = new GeneratorBean();
-        bean.setPackageName("it.cnr.contab.util.bulk");
-        bean.setSourceFolder(System.getProperty("user.home").concat(File.separator));
-        bean.setTargetXMLFolder(System.getProperty("user.home").concat(File.separator));
-        bean.setPrefix("Help");
-
-        bean.setTable("HELP_LKT");
-        bean.setDriver("oracle.jdbc.driver.OracleDriver");
-        bean.setUrl("jdbc:oracle:thin:@dbtest.cedrc.cnr.it:1521:SIGLAF");
-        bean.setSchema("PCIR009");
-        bean.setUser("PCIR009");
-        bean.setPassword("dbform");
+        final String userHome = System.getProperty("user.home");
+        bean.setSourceFolder(userHome.concat(File.separator));
+        bean.setTargetXMLFolder(userHome.concat(File.separator));
+        Options options = new Options();
+
+        Option packageName = new Option("n", PACKAGE_NAME, true, "You must set package name like \"it.cnr.contab.util.bulk\"");
+        packageName.setRequired(true);
+        options.addOption(packageName);
+
+        Option prefix = new Option("r", PREFIX, true, "You must set prefix of the class generated like \"Help\"");
+        prefix.setRequired(true);
+        options.addOption(prefix);
+
+        Option table = new Option("t", TABLE, true, "You must set table name like \"HELP_LKT\"");
+        table.setRequired(true);
+        options.addOption(table);
+
+        Option driver = new Option("d", DRIVER, true, "You must set driver name like \"oracle.jdbc.driver.OracleDriver\"");
+        driver.setRequired(true);
+        options.addOption(driver);
+
+        Option url = new Option("l", URL, true, "You must set url like \"jdbc:oracle:thin:@dbtest.cedrc.cnr.it:1521:SIGLAF\"");
+        url.setRequired(true);
+        options.addOption(url);
+
+        Option schema = new Option("s", SCHEMA, true, "You must set schema like \"PCIR009\"");
+        schema.setRequired(true);
+        options.addOption(schema);
+
+        Option username = new Option("u", USERNAME, true, "You must set db user like \"PCIR009\"");
+        username.setRequired(true);
+        options.addOption(username);
+
+        Option password = new Option("p", PASSWORD, true, "You must set db password");
+        password.setRequired(true);
+        options.addOption(password);
+
+        CommandLineParser parser = new DefaultParser();
+        HelpFormatter formatter = new HelpFormatter();
+        CommandLine cmd = null;
+        try {
+            cmd = parser.parse(options, args);
+        } catch (ParseException e) {
+            System.out.println(e.getMessage());
+            formatter.printHelp("utility-name", options);
+            System.exit(1);
+        }
+
+        bean.setPackageName(cmd.getOptionValue(PACKAGE_NAME));
+        bean.setPrefix(cmd.getOptionValue(PREFIX));
+        bean.setTable(cmd.getOptionValue(TABLE));
+        bean.setDriver(cmd.getOptionValue(DRIVER));
+        bean.setUrl(cmd.getOptionValue(URL));
+        bean.setSchema(cmd.getOptionValue(SCHEMA));
+        bean.setUser(cmd.getOptionValue(USERNAME));
+        bean.setPassword(cmd.getOptionValue(PASSWORD));
         ArtifactGenerator artifactGenerator = new ArtifactGenerator(bean);
         try {
             DatabaseUtil.getInstance().openConnection(bean);
             artifactGenerator.generate();
+            System.out.println("All class and xml was generated into folder: " + userHome.concat(File.separator));
         } catch (Exception e) {
             e.printStackTrace();
         }

sigla-backend/src/test/resources/it/cnr/contab/generator/properties/Messages.properties

@@ -26,8 +26,8 @@ GenerationWizardPage_title=Generazione artefatti
 GenerationWizardPage_description=Completare le informazioni richieste e premere [Finish] per la generazione.
 GenerationWizardPage_prefix=Prefix:
 GenerationWizardPage_folder=Resource Folder:
-GenerationWizardPage_artifact_exist=Alcuni artefatti gi� esistono. Confermare la sovrascrittura per continuare.
-GenerationWizardPage_artifact_overwrite=Sovrascrivere gli artefatti gi� esistenti (*)
+GenerationWizardPage_artifact_exist=Alcuni artefatti già esistono. Confermare la sovrascrittura per continuare.
+GenerationWizardPage_artifact_overwrite=Sovrascrivere gli artefatti già esistenti (*)
 GenerationWizardPage_prefix_err_qualified=Il prefisso non deve essere qualificato.
 GenerationWizardPage_folder_err_qualified=La cartella deve essere indicata.
 GenerationWizardPage_artifacts_caption=Verranno generati i seguenti artefatti:

sigla-ejb/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>it.cnr.si.sigla</groupId>
         <artifactId>sigla-parent</artifactId>
-        <version>6.3.45-SNAPSHOT</version>
+        <version>6.3.46-SNAPSHOT</version>
     </parent>
     <build>
         <pluginManagement>

sigla-ejb/src/main/java/it/cnr/contab/doccont00/comp/MandatoComponent.java

@@ -26,10 +26,7 @@
 import it.cnr.contab.compensi00.docs.bulk.CompensoBulk;
 import it.cnr.contab.compensi00.docs.bulk.ConguaglioBulk;
 import it.cnr.contab.compensi00.docs.bulk.ConguaglioHome;
-import it.cnr.contab.config00.bulk.Codici_siopeBulk;
-import it.cnr.contab.config00.bulk.Configurazione_cnrBulk;
-import it.cnr.contab.config00.bulk.Configurazione_cnrHome;
-import it.cnr.contab.config00.bulk.Parametri_cnrBulk;
+import it.cnr.contab.config00.bulk.*;
 import it.cnr.contab.config00.ejb.Configurazione_cnrComponentSession;
 import it.cnr.contab.config00.esercizio.bulk.EsercizioBulk;
 import it.cnr.contab.config00.pdcfin.bulk.Voce_fBulk;
@@ -4627,6 +4624,12 @@ public OggettoBulk modificaConBulk(UserContext userContext, OggettoBulk bulk)
                     mandato = (MandatoBulk) super.modificaConBulk(userContext, bulk);
                 }
             }
+            /**
+             * Verifica CIG su fatture
+             */
+            if (bulk instanceof MandatoIBulk) {
+                verificaCIGSUFatture(userContext, (MandatoIBulk) bulk);
+            }
             return mandato;
         } catch (Exception e) {
             throw handleException(bulk, e);
@@ -5367,6 +5370,28 @@ private void verificaCIGSUFatture(UserContext userContext, MandatoBulk mandatoBu
                 }
             }
             codiciCIG = codiciCIG.stream().distinct().collect(Collectors.toList());
+            /**
+             * Validazione del codice CIG
+             */
+            for(CigBulk cigBulk : codiciCIG.stream()
+                    .map(s -> new CigBulk(s))
+                    .map(cigBulk -> {
+                        try {
+                            return findByPrimaryKey(userContext, cigBulk);
+                        } catch (ComponentException e) {
+                            throw new DetailedRuntimeException("Cannot find CIG:" + cigBulk.getCdCig());
+                        }
+                    })
+                    .filter(CigBulk.class::isInstance)
+                    .map(CigBulk.class::cast)
+                    .collect(Collectors.toList())){
+                try {
+                    cigBulk.validate();
+                } catch (ValidationException e) {
+                    throw new ApplicationMessageFormatException("Il CIG {0} indicato sul documento amministrativo collegato non è valido!", cigBulk.getCdCig());
+                }
+            }
+
             motiviAssenzaCIG = motiviAssenzaCIG.stream().distinct().collect(Collectors.toList());
             if (isExistsFatturaEstera) {
                 if (codiciCIG.isEmpty() && motiviAssenzaCIG.isEmpty()) {

sigla-ejb/src/main/java/it/cnr/contab/incarichi00/comp/IncarichiRichiestaComponent.java

@@ -64,6 +64,7 @@
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 
 import javax.ejb.EJBException;
 
@@ -453,6 +454,7 @@ public RemoteIterator findListaIncarichiElencoArt18(UserContext userContext,Stri
 	}
 
 	public SQLBuilder addFiltriListaIncarichiElenco(SQLBuilder sql,String query,String dominio,Integer anno,String cdCds,String order,String strRicerca) throws ComponentException {
+		strRicerca = Optional.ofNullable(strRicerca).map(s -> s.replace("'", "''")).orElse(null);
 		if(dominio.equalsIgnoreCase("data"))
 			if (Constants.RICHIESTE_IN_CORSO.equalsIgnoreCase(query)) {
 				sql.addSQLClause(FindClause.AND,"to_number(to_char(sysdate,'yyyy')) = to_number(to_char(DT_STIPULA,'yyyy'))");
@@ -465,7 +467,7 @@ public SQLBuilder addFiltriListaIncarichiElenco(SQLBuilder sql,String query,Stri
 		if(cdCds!=null)
 			sql.addSQLClause("AND","CD_CDS",SQLBuilder.EQUALS,cdCds);
 
-		if(strRicerca!=null) {
+		if(Optional.ofNullable(strRicerca).isPresent()) {
 			sql.openParenthesis(FindClause.AND);
 			sql.addSQLClause(FindClause.OR,"instr(ESERCIZIO||'/'||PG_REPERTORIO,'"+strRicerca+"')>0");
 			sql.addSQLClause(FindClause.OR,"instr(UPPER(DS_UNITA_ORGANIZZATIVA),'"+strRicerca.toUpperCase()+"')>0");

sigla-web/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>it.cnr.si.sigla</groupId>
         <artifactId>sigla-parent</artifactId>
-        <version>6.3.45-SNAPSHOT</version>
+        <version>6.3.46-SNAPSHOT</version>
     </parent>
     <dependencyManagement>
         <dependencies>

sigla-ws/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>it.cnr.si.sigla</groupId>
 		<artifactId>sigla-parent</artifactId>
-		<version>6.3.45-SNAPSHOT</version>
+		<version>6.3.46-SNAPSHOT</version>
 	</parent>
 	<build>
 		<pluginManagement>