Merge branch 'v24.1.1'

inrae · Oct 15, 2024 · e9558fe · e9558fe
2 parents 0abba61 + a9d9ed7
commit e9558fe
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 26 deletions.
diff --git a/documentation/sturwild.dbm b/documentation/sturwild.dbm
@@ -3,8 +3,8 @@
 CAUTION: Do not modify this file unless you know what you are doing.
  Unexpected results may occur if the code is changed deliberately.
 -->
-<dbmodel pgmodeler-ver="1.1.3" use-changelog="false" max-obj-count="44"
-	 last-position="1596,0" last-zoom="1" scene-rect="0,0,3399.25,1817.32"
+<dbmodel pgmodeler-ver="1.1.4" use-changelog="false" max-obj-count="44"
+	 last-position="0,68" last-zoom="0.5" scene-rect="0,-10,3399.25,1827.32"
 	 default-owner="postgres"
 	 layers="Default layer"
 	 active-layers="0"
@@ -194,11 +194,11 @@ CAUTION: Do not modify this file unless you know what you are doing.
 	<role name="sturwild"/>
 </sequence>
 
-<table name="dbparam" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
+<table name="dbparam" layers="0" collapse-mode="2" max-obj-count="6" z-value="0">
 	<schema name="sturwild"/>
 	<role name="sturwild"/>
 	<comment> <![CDATA[Table of parameters intrinsically associated to the instance]]> </comment>
-	<position x="2180" y="1280"/>
+	<position x="1740" y="1040"/>
 	<column name="dbparam_id" not-null="true" sequence="sturwild.dbparam_dbparam_id_seq">
 		<type name="integer" length="0"/>
 	</column>
@@ -210,6 +210,14 @@ CAUTION: Do not modify this file unless you know what you are doing.
 		<type name="character varying" length="0"/>
 		<comment> <![CDATA[Value of the parameter]]> </comment>
 	</column>
+	<column name="dbparam_description">
+		<type name="varchar" length="0"/>
+		<comment> <![CDATA[Description of the parameter]]> </comment>
+	</column>
+	<column name="dbparam_description_en">
+		<type name="varchar" length="0"/>
+		<comment> <![CDATA[Description of the parameter, in English]]> </comment>
+	</column>
 	<constraint name="dbparam_pk" type="pk-constr" table="sturwild.dbparam">
 		<columns names="dbparam_id" ref-type="src-columns"/>
 	</constraint>
@@ -234,7 +242,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 	<schema name="sturwild"/>
 	<role name="sturwild"/>
 	<comment> <![CDATA[Table des versions de la base de donnees]]> </comment>
-	<position x="2180" y="1460"/>
+	<position x="1280" y="1040"/>
 	<column name="dbversion_id" not-null="true" sequence="sturwild.dbversion_dbversion_id_seq">
 		<type name="integer" length="0"/>
 	</column>
@@ -251,7 +259,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 	</constraint>
 	<initial-data>
 <![CDATA["dbversion_number";"dbversion_date"
-"24.0";"2024-02-05"
+"24.1";"2024-07-15"
 ]]>
 	</initial-data>
 </table>

diff --git a/install/pgsql/createtables.sql b/install/pgsql/createtables.sql
@@ -174,6 +174,8 @@ CREATE TABLE sturwild.dbparam (
 	dbparam_id integer NOT NULL DEFAULT nextval('sturwild.dbparam_dbparam_id_seq'::regclass),
 	dbparam_name character varying NOT NULL,
 	dbparam_value character varying,
+	dbparam_description varchar NULL,
+	dbparam_description_en varchar NULL,
 	CONSTRAINT dbparam_pk PRIMARY KEY (dbparam_id)
 );
 -- ddl-end --
@@ -182,27 +184,19 @@ COMMENT ON TABLE sturwild.dbparam IS E'Table of parameters intrinsically associa
 COMMENT ON COLUMN sturwild.dbparam.dbparam_name IS E'Name of the parameter';
 -- ddl-end --
 COMMENT ON COLUMN sturwild.dbparam.dbparam_value IS E'Value of the parameter';
+COMMENT ON COLUMN sturwild.dbparam.dbparam_description IS 'Description of the parameter';
+COMMENT ON COLUMN sturwild.dbparam.dbparam_description_en IS 'Description of the parameter, in English';
 -- ddl-end --
 ALTER TABLE sturwild.dbparam OWNER TO sturwild;
 -- ddl-end --
 create unique index if not exists dbparamname_idx on sturwild.dbparam (dbparam_name);
-INSERT INTO sturwild.dbparam (dbparam_name, dbparam_value) VALUES (E'APPLI_code', E'sturwild');
--- ddl-end --
-INSERT INTO sturwild.dbparam (dbparam_name, dbparam_value) VALUES (E'APPLI_title', E'STURWILD');
--- ddl-end --
-INSERT INTO sturwild.dbparam (dbparam_name, dbparam_value) VALUES (E'mapDefaultX', E'-0.70');
--- ddl-end --
-INSERT INTO sturwild.dbparam (dbparam_name, dbparam_value) VALUES (E'mapDefaultY', E'44.77');
--- ddl-end --
-INSERT INTO sturwild.dbparam (dbparam_name, dbparam_value) VALUES (E'mapDefaultZoom', E'7');
--- ddl-end --
-INSERT INTO sturwild.dbparam (dbparam_name, dbparam_value) VALUES (E'otp_issuer', E'sturwild.society.com');
-insert into sturwild.dbparam (dbparam_name, dbparam_value)
-values (
-'APPLI_code', 
-'INSTITUTE-CODE'
-) 
-on conflict do nothing;
+INSERT INTO sturwild.dbparam (dbparam_name,dbparam_value,dbparam_description,dbparam_description_en) VALUES
+	 ('APPLI_code','Institute','Code de l''institut. Ce code est utilisé pour les échanges d''informations','Code of the institute. This code is used to exchange data'),
+	 ('APPLI_title','STURWILD','Nom de l''instance, affiché dans l''interface','Instance name, displayed in the interface'),
+	 ('mapDefaultX','-0.70','Longitude de positionnement par défaut des cartes','Default positioning longitude for maps'),
+	 ('mapDefaultY','44.77','Latitude de positionnement par défaut des cartes','Default positioning latitude for maps'),
+	 ('mapDefaultZoom','7','Niveau de zoom par défaut dans les cartes','Default zoom level in maps'),
+	 ('otp_issuer','sturwild.mysociety.com','Nom affiché dans les applications de génération de codes uniques pour l''identification à double facteur','Name displayed in applications generating unique codes for two-factor identification');
 
 -- ddl-end --
 

diff --git a/vendor/equinton/ppci/src/Views/templates/ppci/droits/groupList.tpl b/vendor/equinton/ppci/src/Views/templates/ppci/droits/groupList.tpl
@@ -6,7 +6,7 @@
 {t}Nouveau groupe racine...{/t}
 </a>
 
-<table id="groupListe" class="table table-bordered table-hover " >
+<table id="groupListe" class="table table-bordered table-hover display" >
 <thead>
 <tr>
 <th>{t}Nom du groupe{/t}</th>

diff --git a/vendor/equinton/ppci/src/Views/templates/ppci/droits/loginList.tpl b/vendor/equinton/ppci/src/Views/templates/ppci/droits/loginList.tpl
@@ -28,7 +28,7 @@
 		<a href="aclloginChange?acllogin_id=0">
 			{t}Nouveau login...{/t}
 		</a>
-		<table id="loginListe" class="table table-bordered table-hover datatable-searching" id="table_id" data-order='[[ 0, "asc" ]]'
+		<table id="loginListe" class="table table-bordered table-hover datatable-searching display" id="table_id" data-order='[[ 0, "asc" ]]'
 			data-page-length='25'>
 			<thead>
 				<tr>

diff --git a/vendor/equinton/ppci/src/Views/templates/ppci/ident/loginliste.tpl b/vendor/equinton/ppci/src/Views/templates/ppci/ident/loginliste.tpl
@@ -29,7 +29,7 @@
 	<div class="col-lg-8">
 		<div class="row">
 			<div class="col-lg-12">
-				<table class="table table-bordered table-hover datatable-searching" data-order='[[ 1, "asc" ]]'>
+				<table class="table table-bordered table-hover datatable-searching display" data-order='[[ 1, "asc" ]]'>
 					<thead>
 						<tr>
 							<th>{t}Login{/t}</th>