Merge branch 'master' of https://github.com/InseeFr/ARC.git

arc-core/src/main/java/fr/insee/arc/core/dataobjects/ColumnEnum.java

@@ -62,11 +62,13 @@ public enum ColumnEnum {
 	, NORME("norme", TypeEnum.TEXT, "") // ihm_ws_context
 	, OPERATION("operation", TypeEnum.TEXT, "") // pilotage_batch
 	, ORDRE("ordre", TypeEnum.INTEGER, "") // ext_type_fichier_chargement,ext_type_controle,ext_type_normage
+	, ORDRE_PRIORITE("ordre_priorite", TypeEnum.INTEGER, "") // ihm_entrepot
 	, PERIODICITE("periodicite", TypeEnum.TEXT, "") // ihm_controle_regle,ihm_jeuderegle,ihm_calendrier,ihm_mapping_regle,ihm_normage_regle,ihm_expression,ihm_ws_context,ihm_norme,ihm_chargement_regle
 	, PRE_ACTION("pre_action", TypeEnum.TEXT, "") // ihm_controle_regle
 	, QUERY_ID("query_id", TypeEnum.INTEGER, "") // ihm_ws_query
 	, QUERY_NAME("query_name", TypeEnum.TEXT, "") // ihm_ws_query
 	, QUERY_VIEW("query_view", TypeEnum.INTEGER, "") // ihm_ws_query
+	, REGLE_PRIORITE("regle_priorite", TypeEnum.TEXT, "") // ihm_entrepot
 	, RUBRIQUE("rubrique", TypeEnum.TEXT, "") // ihm_normage_regle
 	, RUBRIQUE_FILS("rubrique_fils", TypeEnum.TEXT, "") // ihm_controle_regle
 	, RUBRIQUE_NMCL("rubrique_nmcl", TypeEnum.TEXT, "") // ihm_normage_regle

arc-core/src/main/java/fr/insee/arc/core/dataobjects/ViewEnum.java

@@ -37,7 +37,8 @@ public enum ViewEnum {
 			ColumnEnum.BORNE_SUP, ColumnEnum.CONDITION, ColumnEnum.PRE_ACTION, ColumnEnum.TODO, ColumnEnum.COMMENTAIRE,
 			ColumnEnum.XSD_ORDRE, ColumnEnum.XSD_LABEL_FILS, ColumnEnum.XSD_ROLE, ColumnEnum.BLOCKING_THRESHOLD,
 			ColumnEnum.ERROR_ROW_PROCESSING) //
-	, IHM_ENTREPOT("ihm_entrepot", SchemaEnum.ARC_METADATA, ColumnEnum.ID_ENTREPOT, ColumnEnum.ID_LOADER) //
+	, IHM_ENTREPOT("ihm_entrepot", SchemaEnum.ARC_METADATA, ColumnEnum.ID_ENTREPOT, ColumnEnum.ID_LOADER,
+			ColumnEnum.ORDRE_PRIORITE, ColumnEnum.REGLE_PRIORITE) //
 	, IHM_EXPRESSION("ihm_expression", SchemaEnum.ARC_METADATA, ColumnEnum.ID_REGLE, ColumnEnum.ID_NORME,
 			ColumnEnum.VALIDITE_INF, ColumnEnum.VALIDITE_SUP, ColumnEnum.VERSION, ColumnEnum.PERIODICITE,
 			ColumnEnum.EXPR_NOM, ColumnEnum.EXPR_VALEUR, ColumnEnum.COMMENTAIRE) //

arc-core/src/main/resources/BdD/script_function_constraint.sql

@@ -314,6 +314,9 @@ select public.check_function('type_variable_metier', 'public.check_type');
 -- nmcl
 select public.check_function('nom_table', 'public.check_identifier');
 
+-- entrepot
+select public.check_function('regle_priorite', 'public.check_sql');
+
 -- chargement rules
 select public.check_function('format', 'public.check_sql');
 

arc-core/src/main/resources/BdD/script_global.sql

@@ -351,6 +351,10 @@ CREATE TABLE IF NOT EXISTS arc.ihm_entrepot
 ); 
 INSERT INTO arc.ihm_entrepot values ('DEFAULT','DEFAULT') ON CONFLICT DO NOTHING;
 
+-- priorisations des entrepôts et leurs fichiers
+ALTER TABLE arc.ihm_entrepot ADD COLUMN IF NOT EXISTS ordre_priorite integer;
+ALTER TABLE arc.ihm_entrepot ADD COLUMN IF NOT EXISTS regle_priorite text;
+
 -- table de gestion des webservices
 CREATE TABLE IF NOT EXISTS arc.ihm_ws_context 
 ( 

arc-web/src/main/java/fr/insee/arc/web/gui/entrepot/dao/EntrepotDao.java

@@ -26,7 +26,7 @@ public void initializeViewEntrepot(VObject viewEntrepot) {
 		// view query
 		ArcPreparedStatementBuilder query = new ArcPreparedStatementBuilder();
 		StringBuilder columns = query.sqlListeOfColumnsFromModel(dataModelEntrepot);
-		query.build(SQL.SELECT, "row_number() over (order by id_entrepot,id_loader)", SQL.AS, ColumnEnum.I, SQL.COMMA, columns);
+		query.build(SQL.SELECT, "row_number() over (order by ordre_priorite,id_entrepot,id_loader)", SQL.AS, ColumnEnum.I, SQL.COMMA, columns);
 		query.build(SQL.FROM, nameOfViewEntrepot);
 		// default value
 		Map<String, String> defaultInputFields = new HashMap<>();

arc-web/src/main/java/fr/insee/arc/web/gui/entrepot/model/ViewEntrepot.java

@@ -13,8 +13,10 @@ public class ViewEntrepot extends VObject {
 
 	static {
 		columnMap.put("i", new ColumnRendering(false, "i", "0%", "text", null, false));
-		columnMap.put("id_entrepot", new ColumnRendering(true, "label.filestore", "50%", "text", null, true));
-		columnMap.put("id_loader", new ColumnRendering(true, "label.loader", "50%", "text", null, true));
+		columnMap.put("id_entrepot", new ColumnRendering(true, "label.filestore", "20%", "text", null, true));
+		columnMap.put("id_loader", new ColumnRendering(true, "label.loader", "20%", "text", null, true));
+		columnMap.put("ordre_priorite", new ColumnRendering(true, "label.priorityOrder", "10%", "text", null, true));
+		columnMap.put("regle_priorite", new ColumnRendering(true, "label.priorityRule", "50%", "text", null, true));
 
 	}
 

arc-web/src/main/resources/messages_en.properties

@@ -71,7 +71,7 @@ managementSandbox.batch.status=The batch is {0}.\nThe next initialization batch
 managementSandbox.batch.status.active=active
 managementSandbox.batch.status.inactive=inactive
 managementSandbox.batch.status.switch.on=The batch is active.
-managementSandbox.batch.status.switch.off=The batch is inactive. 
+managementSandbox.batch.status.switch.off=The batch is inactive.
 managementSandbox.batch.init.time=The next initialization batch will start after {0}.
 managementSandbox.batch.replay.files=File(s) marked for restoration
 managementSandbox.batch.replay.archives=Archive(s) marked for restoration
@@ -211,11 +211,13 @@ label.state=State
 label.normFamily=Norm family
 label.filestore=Filestore
 label.loader=Loader
+label.priorityOrder=Filestore priority
+label.priorityRule=Priority rule on files
 label.archive=Archive name
 label.validity.min=Validity min
 label.validity.max=Validity max
 label.version=Version
-label.date.production=Production date 
+label.date.production=Production date
 label.date.disable=Disable date
 label.file.type=Type of file
 label.file.delimiter=Delimiter
@@ -291,7 +293,7 @@ view.envManagement.fileStore=Files in this store
 view.family=Norms families
 view.client.softwares=Client softwares
 view.mapmodel.tables=Model tables
-view.mapmodel.fields=Data model fields 
+view.mapmodel.fields=Data model fields
 view.mapmodel.whitelist=Allowed Hosts
 
 home.welcome=Welcome in the ARC application
@@ -344,10 +346,10 @@ CONTROLE\u0020OK\u0020KO=Control OK / KO
 MAPPING\u0020OK=Map OK
 MAPPING\u0020KO=Map KO
 
-parameter.ihm.sandbox.maxNumberOfFilesRegisteredAtTheSameTime=Maximum number of file that can be registered by the reception module in the sandbox execution 
+parameter.ihm.sandbox.maxNumberOfFilesRegisteredAtTheSameTime=Maximum number of file that can be registered by the reception module in the sandbox execution
 parameter.ihm.sandbox.sandboxListWithProductionGUI=List of the sandboxes with a production type GUI
 parameter.ihm.sandbox.sandboxListWithBatchMode=List of the sandboxes with batch mode
-parameter.parallel.numberOfThread.p1.load=Number of threads allocated to the module #1 "Load"            
+parameter.parallel.numberOfThread.p1.load=Number of threads allocated to the module #1 "Load"
 parameter.database.version.global=Current global database version identifier corresponding to the ARC version identifier on git
 parameter.parallel.numberOfThread.p2.xmlStructurize=Number of threads allocated to the module #2 "Structurize XML"
 parameter.parallel.numberOfThread.p3.control=Number of threads allocated to the module #3 "Control"
@@ -363,7 +365,7 @@ parameter.batch.execution.howManyStepsFurtherModuleAreExecuted=Set the maximum d
 parameter.batch.execution.sleepingDelayDuringPipelineLoopInMs=Set the total sleeping delay spent during a batch execution cycle
 parameter.batch.execution.booleanUseEnvironmentDeclaredInDatabase=Set if the batch executes the pipeline on the sandbox/metadata schemas defined in database parameters LanceurARC.env and LanceurARC.envExecution
 parameter.batch.execution.environmentOfRuleset=Name of the database metadata schema used by the batch when LanceurARC.envFromDatabase is true
-parameter.batch.execution.environmentForExecution=Name of the database sandbox schema used by the batch when LanceurARC.envFromDatabase is true                      
+parameter.batch.execution.environmentForExecution=Name of the database sandbox schema used by the batch when LanceurARC.envFromDatabase is true
 parameter.batch.execution.maxNumberOfFilesRegisteredInReceptionModule=Maximum number of files to be injected in the processing pipeline by the reception module
 parameter.batch.execution.maxCompressedArchiveSizeRegisteredInReceptionModule=Maximum archive size to be injected in the processing pipeline by the reception module
 parameter.batch.execution.maxCompressedArchiveSizeRegisteredInReceptionModuleGui=Maximum archive size to be injected in the gui processing pipeline by the reception module

arc-web/src/main/resources/messages_fr.properties

@@ -70,8 +70,8 @@ managementSandbox.undo.fail=Le retour arri\u00e8re a \u00e9chou\u00e9
 managementSandbox.batch.status=Le batch est {0}.\nLe prochain batch d''initialisation est programm\u00e9 apr\u00e8s {1}.
 managementSandbox.batch.status.active=actif
 managementSandbox.batch.status.inactive=inactif
-managementSandbox.batch.status.switch.on=Production activ\u00e9e 
-managementSandbox.batch.status.switch.off=Production arr\u00eat\u00e9e 
+managementSandbox.batch.status.switch.on=Production activ\u00e9e
+managementSandbox.batch.status.switch.off=Production arr\u00eat\u00e9e
 managementSandbox.batch.init.time=Le prochain batch d''initialisation aura lieu apr\u00e8s {0}.
 managementSandbox.batch.replay.files=Fichier(s) \u00e0 rejouer
 managementSandbox.batch.replay.archives=Archive(s) \u00e0 rejouer
@@ -184,7 +184,7 @@ gui.button.stopProd=Demander l''arr\u00eat de la production
 gui.button.stopProd.confirm=\u00cates-vous s\u00fbr(e) de demander l''arr\u00eat imm\u00e9diat de la production ?
 gui.textarea.envDescription.placeholder=Commentez l''utilisation du bac \u00e0 sable ici
 gui.button.applyRulesProd=Appliquer les r\u00e8gles en production
-gui.button.applyRulesProd.confirm=Voulez-vous appliquer les r\u00e8gles en production ? Il est recommand\u00e9 de pr\u00e9alablement arr\u00e9ter la production. Les modifications concernant les familles de norme ne peuvent pas \u00eatre mise en production via cette action et requierent une initialisation compl\u00e8te pour s''appliquer.  
+gui.button.applyRulesProd.confirm=Voulez-vous appliquer les r\u00e8gles en production ? Il est recommand\u00e9 de pr\u00e9alablement arr\u00e9ter la production. Les modifications concernant les familles de norme ne peuvent pas \u00eatre mise en production via cette action et requierent une initialisation compl\u00e8te pour s''appliquer.
 
 gui.button.exportStart=Lancer les exports
 gui.title.parquetExport=Export des tables de mapping en parquet
@@ -212,11 +212,13 @@ label.state=\u00c9tat
 label.normFamily=Famille de norme
 label.filestore=Entrep\u00f4t de fichiers
 label.loader=Loader
+label.priorityOrder=Priorit\u00e9 de l''entrep\u00f4t
+label.priorityRule=R\u00e8gle de priorit\u00e9 des fichiers
 label.archive=Nom de l''archive
 label.validity.min=Debut de validit\u00e9
 label.validity.max=Fin de validit\u00e9
 label.version=Version
-label.date.production=Date production 
+label.date.production=Date production
 label.date.disable=Date inactif
 label.file.type=Type de fichier
 label.file.delimiter=D\u00e9limiteur
@@ -345,10 +347,10 @@ CONTROLE\u0020OK\u0020KO=Contr\u00f4le OK / KO
 MAPPING\u0020OK=Mapping OK
 MAPPING\u0020KO=Mapping KO
 
-parameter.ihm.sandbox.maxNumberOfFilesRegisteredAtTheSameTime=Nombre maximum de fichiers pouvant \u00eatre enregistr\u00e9s par le module de r\u00e9ception dans l''ex\u00e9cution du sandbox 
+parameter.ihm.sandbox.maxNumberOfFilesRegisteredAtTheSameTime=Nombre maximum de fichiers pouvant \u00eatre enregistr\u00e9s par le module de r\u00e9ception dans l''ex\u00e9cution du sandbox
 parameter.ihm.sandbox.sandboxListWithProductionGUI=Liste des bacs \u00e0 sable avec une interface graphique de type production
 parameter.ihm.sandbox.sandboxListWithBatchMode=Liste des bacs \u00e0 sable en mode batch
-parameter.parallel.numberOfThread.p1.load=Nombre de threads allou\u00e9s au module #1 "Load"            
+parameter.parallel.numberOfThread.p1.load=Nombre de threads allou\u00e9s au module #1 "Load"
 parameter.database.version.global=Identifiant de version de base de donn\u00e9es globale actuelle correspondant \u00e0 l''identifiant de version ARC sur git
 parameter.parallel.numberOfThread.p2.xmlStructurize=Nombre de threads allou\u00e9s au module #2 "Structurer XML"
 parameter.parallel.numberOfThread.p3.control=Nombre de threads allou\u00e9s au module #3 "Control"

arc-web/src/main/webapp/WEB-INF/jsp/gererEntrepot.jsp

@@ -21,7 +21,7 @@ spellcheck="false" method="post" accept-charset="UTF-8">
 
 <div class="container-fluid">
 <div class="row">
-<div class="col-md-4">
+<div class="col-md-6">
 <!-- filestore list -->
 <c:set var="view" value="${viewEntrepot}"  scope="request"/>
 <c:import url="tiles/templateVObject.jsp">