diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css
index 082e05c8e..6aeefd5a5 100644
--- a/html/css/style-classic7.css
+++ b/html/css/style-classic7.css
@@ -264,6 +264,45 @@ td.tool a.mtitle:hover {
}
+ }
+ #module .nav-pills a.nav-link:hover {
+ color:white !important;
+ border:1px solid transparent;
+ }
+ #module .nav-item-active , #module .nav-item-active > a.nav-link{
+ background-color: #5d90cd ;
+ color:white !important;
+ border: 0px solid black;
+ }
+ /* animate module : sliding */
+ #module .nav-item-module {
+ position:relative;
+ background-color: white;
+ color:navy;
+ }
+ #module .nav-item-module.nav-item-slide::before {
+ content:'';
+ top:0;
+ left:0;
+ bottom:0;
+ right:0;
+ position:absolute;
+ background-color:#5d90cd;
+ z-index:-1;
+ transform:scaleX(0);
+ transition:transform 300ms ease-in-out;
+ mix-blend-mode: darken;
+ }
+ #module .nav-item-module.nav-item-slide:hover::before,
+ #module .nav-item-module.nav-item-slide:focus::before {
+ transform:scaleX(1);
+ }
+ #module .nav-item-slide {
+ z-index:0;
+ transition:color 300ms ease-in-out;
+ }
+
+
#module .nav-fill #module .nav-item {
@@ -3799,3 +3838,53 @@ h2.h-section {
.nav-level3 .nav-link.active::after {
background-color:yellow;
}
+/***
+ * Animate menu
+ *
+ */
+
+.nav-item {
+ position:relative;
+
+}
+
+.nav-item.nav-item-underline::before {
+ content:'';
+ left:0;
+ bottom:0;
+ right:0;
+ position:absolute;
+ height:var(--border-size);
+ background-color:lightblue;
+ transform:scaleX(0);
+ transition:transform 300ms ease-in-out;
+}
+
+.nav-item.nav-item-underline:hover::before,
+.nav-item.nav-item-underline:focus::before
+{
+ transform:scaleX(1);
+}
+
+ .nav-item.li-active.nav-item-underline::before {
+ transform: scale(1);
+ background-color: darkred;
+ }
+
+ /**
+ * For level 2 and 3 no animation but border difference if active
+ */
+
+ .nav-level2 .nav-link.active::after, .nav-level3 .nav-link.active::after {
+ content: '';
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ background-color:darkorange;
+ height: 3px;
+ }
+
+ .nav-level3 .nav-link.active::after {
+ background-color:yellow;
+ }
\ No newline at end of file
diff --git a/html/test.php b/html/test.php
index 8bae03bfa..7afef0b02 100644
--- a/html/test.php
+++ b/html/test.php
@@ -70,7 +70,7 @@ define('ALLOWED', 1);
global $aAvaible_module;
/*
- * Find all the folder
+ * Find all the folders
*/
$directory=NOALYSS_BASE."/scenario";
$folder=scandir($directory);
diff --git a/include/class/todo_list.class.php b/include/class/todo_list.class.php
index af3928e89..94e6bf507 100644
--- a/include/class/todo_list.class.php
+++ b/include/class/todo_list.class.php
@@ -79,7 +79,8 @@ class Todo_List
}
if ( strcmp ($p_idx, 'tl_date') == 0 )
{
- if ( noalyss_strlentrim($p_value) ==0 ||strlen($p_value) > 12 || isDate ($p_value) == false) return false;
+ if ( noalyss_strlentrim($p_value) ==0 ||strlen($p_value) > 12 || isDate ($p_value) == false)
+ { $p_value = null;return true;}
}
if ( strcmp ($p_idx, 'tl_title') == 0 )
{
@@ -113,7 +114,7 @@ class Todo_List
{
if ( isDate($this->tl_date) == false )
{
- $this->tl_date=date('d.m.Y');
+ $this->tl_date=null;
}
return 0;
}
@@ -129,7 +130,7 @@ class Todo_List
{
if ( $this->verify() != 0 ) return;
if (trim($this->tl_title)=='')
- $this->tl_title=mb_substr(trim($this->tl_desc),0,30);
+ $this->tl_title=mb_substr(trim($this->tl_desc??""),0,30);
if (trim($this->tl_title)=='')
{
@@ -142,6 +143,12 @@ class Todo_List
$sql="insert into todo_list (tl_date,tl_title,tl_desc,use_login,is_public) ".
" values (to_date($1,'DD.MM.YYYY'),$2,$3,$4,$5) returning tl_id";
+
+ if ($this->tl_date == null) {
+ $sql="insert into todo_list (tl_date,tl_title,tl_desc,use_login,is_public) ".
+ " values ($1,$2,$3,$4,$5) returning tl_id";
+
+ }
$res=$this->cn->exec_sql(
$sql,
array($this->tl_date,
@@ -172,6 +179,11 @@ class Todo_List
$sql="update todo_list set tl_title=$1,tl_date=to_date($2,'DD.MM.YYYY'),tl_desc=$3,is_public=$5 ".
" where tl_id = $4";
+
+ if ($this->tl_date == null) {
+ $sql="update todo_list set tl_title=$1,tl_date=$2,tl_desc=$3,is_public=$5 ".
+ " where tl_id = $4";
+ }
$res=$this->cn->exec_sql(
$sql,
array($this->tl_title,
@@ -296,7 +308,7 @@ class Todo_List
}
/**
- * Display the note
+ * @brief Display the note
* @return html string
*/
function display()
diff --git a/include/sql/mod1/data.sql b/include/sql/mod1/data.sql
index f15f5c971..62e870ec7 100644
--- a/include/sql/mod1/data.sql
+++ b/include/sql/mod1/data.sql
@@ -4,6 +4,7 @@ set search_path = public,comptaproc,pg_catalog ;
SET statement_timeout = 0;
SET lock_timeout = 0;
SET idle_in_transaction_session_timeout = 0;
+SET transaction_timeout = 0;
SET client_encoding = 'UTF8';
SET standard_conforming_strings = on;
SELECT pg_catalog.set_config('search_path', '', false);
@@ -14,36 +15,14 @@ SET row_security = off;
SELECT pg_catalog.lo_create('2346174');
-
-
-
SELECT pg_catalog.lo_create('2346176');
-
-
-
SELECT pg_catalog.lo_create('2346177');
-
-
-
SELECT pg_catalog.lo_create('2346178');
-
-
-
SELECT pg_catalog.lo_create('2346179');
-
-
-
SELECT pg_catalog.lo_create('2346181');
-
-
-
SELECT pg_catalog.lo_create('2346476');
-
-
-
-
INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES (800, 'Ajout de fiche', 'fiche', 'FICADD');
INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES (805, 'Création, modification et effacement de fiche', 'fiche', 'FIC');
INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES (910, 'création, modification et effacement de catégorie de fiche', 'fiche', 'FICCAT');
diff --git a/include/sql/mod1/make-sql b/include/sql/mod1/make-sql
index 8b725ae28..f7116ea34 100755
--- a/include/sql/mod1/make-sql
+++ b/include/sql/mod1/make-sql
@@ -9,7 +9,7 @@ export TEMPLATE=${DOMAIN}mod1
psql -X $TEMPLATE -c "delete from user_local_pref"
psql -X $TEMPLATE -c "delete from user_local_pref"
-pg_dump -O -U dany -s $TEMPLATE|grep -v "COMMENT ON SCHEMA public IS 'Standard public schema';" |sed "/^--/d" > schema.sql
+pg_dump -Ox -U dany -s $TEMPLATE|grep -v "COMMENT ON SCHEMA public IS 'Standard public schema';" |sed "/^--/d" > schema.sql
sed -i -e "/COMMENT ON EXTENSION/d" schema.sql
sed -i -e "/CREATE EXTENSION/d" schema.sql
sed -ne '0,/ADD CONSTRAINT/p' schema.sql > tmpSchema.sql
diff --git a/include/sql/mod1/schema.sql b/include/sql/mod1/schema.sql
index fdabc9401..afc0887fe 100644
--- a/include/sql/mod1/schema.sql
+++ b/include/sql/mod1/schema.sql
@@ -3,6 +3,7 @@
SET statement_timeout = 0;
SET lock_timeout = 0;
SET idle_in_transaction_session_timeout = 0;
+SET transaction_timeout = 0;
SET client_encoding = 'UTF8';
SET standard_conforming_strings = on;
SELECT pg_catalog.set_config('search_path', '', false);
@@ -16,6 +17,12 @@ CREATE SCHEMA comptaproc;
+<<<<<<< HEAD
+=======
+
+
+
+>>>>>>> review-stash
CREATE SCHEMA tva_belge;
diff --git a/include/sql/mod2/make-sql b/include/sql/mod2/make-sql
index 5adf3172e..eec26117c 100755
--- a/include/sql/mod2/make-sql
+++ b/include/sql/mod2/make-sql
@@ -9,7 +9,7 @@ export TEMPLATE=${DOMAIN}mod2
psql -X $TEMPLATE -c "delete from user_local_pref"
psql -X $TEMPLATE -c "delete from user_local_pref"
-pg_dump -O -U dany -s $TEMPLATE|grep -v "COMMENT ON SCHEMA public IS 'Standard public schema';" |sed "/^--/d" > schema.sql
+pg_dump -Ox -U dany -s $TEMPLATE|grep -v "COMMENT ON SCHEMA public IS 'Standard public schema';" |sed "/^--/d" > schema.sql
sed -i -e "/COMMENT ON EXTENSION/d" schema.sql
sed -i -e "/CREATE EXTENSION/d" schema.sql
sed -ne '0,/ADD CONSTRAINT/p' schema.sql > tmpSchema.sql
@@ -17,5 +17,5 @@ sed -ne '/ADD CONSTRAINT/,$p' schema.sql |sed -e '1d' > constraint.sql
cp tmpSchema.sql schema.sql
echo "set search_path = public,comptaproc,pg_catalog ;" > data.sql
-pg_dump -O -U dany --data-only --column-inserts -O ${TEMPLATE}|sed "/^--/d" | sed -e "/SET search_path/d" >> data.sql
+pg_dump -Ox -U dany --data-only --column-inserts -O ${TEMPLATE}|sed "/^--/d" | sed -e "/SET search_path/d" >> data.sql
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index bfacd4c4d..fe37f2c7e 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,3 +1,3 @@
-
-- change color selected menu
-update parm_appearance set a_value='#000074' where a_code='MENU1-SELECTED' and a_value='#7191ea';
\ No newline at end of file
+update parm_appearance set a_value='#000074' where a_code='MENU1-SELECTED' and a_value='#7191ea';
+ALTER TABLE public.todo_list ALTER COLUMN tl_date drop NOT NULL;