Merge branch 'jeedom:alpha' into alpha

jeedom · Jun 5, 2024 · e7c0fd6 · e7c0fd6
2 parents ff6f05f + 65702ef
commit e7c0fd6
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 7 deletions.
diff --git a/core/class/DB.class.php b/core/class/DB.class.php
@@ -34,10 +34,19 @@ class DB {
 
 	private static function initConnection() {
 		global $CONFIG;
+		$_options = [
+			PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci',
+			PDO::ATTR_PERSISTENT => true,
+			// silent mode, default for php7: https://www.php.net/manual/fr/pdo.error-handling.php
+			// exception mode for debug
+			PDO::ATTR_ERRMODE => (DEBUG ? PDO::ERRMODE_EXCEPTION : PDO::ERRMODE_SILENT),
+		];
 		if (isset($CONFIG['db']['unix_socket'])) {
-			static::$connection = new PDO('mysql:unix_socket=' . $CONFIG['db']['unix_socket'] . ';dbname=' . $CONFIG['db']['dbname'], $CONFIG['db']['username'], $CONFIG['db']['password'], array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci', PDO::ATTR_PERSISTENT => true));
+			static::$connection = new PDO('mysql:unix_socket=' . $CONFIG['db']['unix_socket'] . ';dbname=' . $CONFIG['db']['dbname'],
+			 $CONFIG['db']['username'], $CONFIG['db']['password'], $_options);
 		} else {
-			static::$connection = new PDO('mysql:host=' . $CONFIG['db']['host'] . ';port=' . $CONFIG['db']['port'] . ';dbname=' . $CONFIG['db']['dbname'], $CONFIG['db']['username'], $CONFIG['db']['password'], array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci', PDO::ATTR_PERSISTENT => true));
+			static::$connection = new PDO('mysql:host=' . $CONFIG['db']['host'] . ';port=' . $CONFIG['db']['port'] . ';dbname=' . $CONFIG['db']['dbname'], 
+			$CONFIG['db']['username'], $CONFIG['db']['password'], $_options);
 		}
 	}
 

diff --git a/core/class/history.class.php b/core/class/history.class.php
@@ -1027,14 +1027,14 @@ public function save($_cmd = null, $_direct = false) {
 			$this->setValue(round($this->getValue(), $cmd->getConfiguration('historizeRound')));
 		}
 		if ( $JEEDOM_INTERNAL_CONFIG['cmd']['type']['info']['subtype'][$cmd->getSubType()]['isHistorized']['canBeSmooth'] 
-		    && $cmd->getConfiguration('smooth', 0) > 0 
+		    && $cmd->getConfiguration('history::smooth', config::byKey('history::smooth','core',0)) > 0 
 			&& $cmd->getConfiguration('historizeMode', 'none') != 'none' 
 			&& $this->getValue() !== null ) {
 			if ($this->getTableName() == 'history') {
 				$time = strtotime($this->getDatetime());
-				$time -= $time % $cmd->getConfiguration('smooth', 0);
+				$time -= $time % $cmd->getConfiguration('history::smooth', config::byKey('history::smooth','core',0));
 				if ($this->getValue() == 0) {
-					$this->setDatetime(date('Y-m-d H:i:00', $time + $cmd->getConfiguration('smooth', 0)));
+					$this->setDatetime(date('Y-m-d H:i:00', $time + $cmd->getConfiguration('history::smooth', config::byKey('history::smooth','core',0))));
 					$values = array(
 						'cmd_id' => $this->getCmd_id(),
 						'datetime' => date('Y-m-d H:i:00', strtotime($this->getDatetime())),

diff --git a/core/config/default.config.ini b/core/config/default.config.ini
@@ -69,6 +69,7 @@ historyArchiveTime = 2
 historyArchivePackage = 1
 displayStatsWidget = 0
 history::defautShowPeriod = -1 month
+history::smooth = -2
 
 ;security
 security::maxFailedLogin = 6

diff --git a/desktop/js/plan.js b/desktop/js/plan.js
@@ -248,6 +248,7 @@ if (!jeeFrontEnd.plan) {
               jeedomUtils.addOrUpdateUrl('plan_id', jeephp2js.planHeader_id, data.name + ' - ' + JEEDOM_PRODUCT_NAME)
               jeeP.initEditOption(jeeFrontEnd.planEditOption.state)
               jeedomUtils.initReportMode()
+              jeedomUtils.initTooltips()
               window.scrollTo({top: 0, behavior: "smooth"})
               jeeFrontEnd.plan.setGraphResizes()
               jeeFrontEnd.modifyWithoutSave = false

diff --git a/desktop/modal/cmd.configure.php b/desktop/modal/cmd.configure.php
@@ -516,8 +516,9 @@
                 <sup><i class="fas fa-question-circle" title="{{Limite le nombre de valeur historisé par la commande en temps réel (avant le lissage de la nuit). Attention un mode de lissage doit absolument être défini.}}"></i></sup>
                 </label>
                 <div class="col-sm-6">
-                  <select class="form-control cmdAttr" data-l1key="configuration" data-l2key="smooth">
-                    <option value="0">{{Aucun}}</option>
+                  <select class="form-control cmdAttr" data-l1key="configuration" data-l2key="history::smooth">
+                    <option value="">{{Default}}</option>
+                    <option value="-1">{{Aucun}}</option>
                     <option value="60">{{1 min}}</option>
                     <option value="300">{{5 min}}</option>
                     <option value="600">{{10 min}}</option>

diff --git a/desktop/php/administration.php b/desktop/php/administration.php
@@ -1170,6 +1170,19 @@
 								<input type="text" class="configKey form-control" data-l1key="historyCalculTendanceThresholddMax">
 							</div>
 						</div>
+						<div class="form-group">
+							<label class="col-lg-4 col-md-4 col-sm-6 col-xs-6 control-label">{{Limiter à une valeur toute les}}
+							<sup><i class="fas fa-question-circle" title="{{Limite le nombre de valeur historisé par les commandes en temps réel (avant le lissage de la nuit). Attention un mode de lissage doit absolument être défini.}}"></i></sup>
+							</label>
+							<div class="col-lg-2 col-md-2 col-sm-5 col-xs-6">
+							<select class="form-control configKey" data-l1key="history::smooth">
+								<option value="-2">{{Aucun}}</option>
+								<option value="60">{{1 min}}</option>
+								<option value="300">{{5 min}}</option>
+								<option value="600">{{10 min}}</option>
+							</select>
+							</div>
+						</div>
 						<div class="form-group">
 							<label class="col-lg-4 col-md-4 col-sm-6 col-xs-6 control-label">{{Période d'affichage des graphiques par défaut}}</label>
 							<div class="col-lg-2 col-md-2 col-sm-5 col-xs-6">

diff --git a/docs/fr_FR/changelog.md b/docs/fr_FR/changelog.md
@@ -25,6 +25,9 @@
 - Correction d'un bug sur la verfication de la base de données ou il pouvait toujours manquer un index [LIEN](https://github.com/jeedom/core/issues/2655)
 - Correction d'un bug sur le graphique des liens [LIEN](https://github.com/jeedom/core/issues/2659)
 - Suppression sur service worker en mobile (plus utilisé) [LIEN](https://github.com/jeedom/core/issues/2660)
+- Correction d'un bug pouvant affecter la limitation du nombre d'evenement dans la timeline [LIEN](https://github.com/jeedom/core/issues/2663)
+- Correction d'un bug sur l'affichage des tooltips sur les designs [LIEN](https://github.com/jeedom/core/pull/2667)
+- Amélioration de la gestion des trace de PDO avec php8 [LIEN](https://github.com/jeedom/core/pull/2661)
 
 # 4.4.6