@osimatic/helpers-js 1.2.7 → 1.2.8

package/date_time.js

@@ -121,7 +121,7 @@ class DateTime {
 
 	static getTimeDisplayWithNbDays(jsDate, jsPreviousDate, locale="fr-FR", timeZone="Europe/Paris") {
 		let str = this.getTimeDisplay(jsDate, locale, timeZone);
-		if (jsPreviousDate != 0 && jsPreviousDate != null) {
+		if (jsPreviousDate !== 0 && jsPreviousDate != null) {
 			let nbDaysDiff = this.getNbDayBetweenTwo(jsPreviousDate, jsDate, false);
 			if (nbDaysDiff > 0) {
 				str += ' (J+'+nbDaysDiff+')';
@@ -238,7 +238,7 @@ class DateTime {
 	}
 
 	static isDateEqual(jsDate1, jsDate2) {
-		return (jsDate1.getFullYear() == jsDate2.getFullYear() && jsDate1.getMonth() == jsDate2.getMonth() && jsDate1.getDate() == jsDate2.getDate());
+		return (jsDate1.getFullYear() === jsDate2.getFullYear() && jsDate1.getMonth() === jsDate2.getMonth() && jsDate1.getDate() === jsDate2.getDate());
 	}
 
 	static isDateInThePast(jsDate) {
@@ -465,7 +465,7 @@ class SqlTime {
 			return null;
 		}
 
-		if ((sqlTime.match(/\:/g) || []).length == 1) {
+		if ((sqlTime.match(/\:/g) || []).length === 1) {
 			sqlTime += ':00';
 		}
 

package/duration.js

@@ -51,18 +51,20 @@ class Duration {
 		return (durationInSecondsOriginal < 0 ? '- ' : '')+hours+':'+minutes+(displayMode==='input_time'?':':'.')+seconds;
 	}
 
-	static convertToDurationInHourStringDisplay(durationInSeconds, withSecondes=true, withMinutes=true, withLibelleMinute=true, libelleEntier=false) {
+	static convertToDurationInHourStringDisplay(durationInSeconds, withSeconds=true, withMinutes=true, withMinuteLabel=true, fullLabel=false, hideHourIfZeroHour=false) {
 		durationInSeconds = Math.round(durationInSeconds);
 
 		// Heures
 		let strHeure = '';
 		let nbHeures = this.getNbHoursOfDurationInSeconds(durationInSeconds);
-		strHeure += nbHeures;
-		if (libelleEntier) {
-			strHeure += ' heure'+(nbHeures>1?'s':'');
-		}
-		else {
-			strHeure += 'h';
+		if (!hideHourIfZeroHour || nbHeures > 0) {
+			strHeure += nbHeures;
+			if (fullLabel) {
+				strHeure += ' heure'+(nbHeures>1?'s':'');
+			}
+			else {
+				strHeure += 'h';
+			}
 		}
 		
 		// Minutes
@@ -73,8 +75,8 @@ class Duration {
 			strMinute += ' ';
 			//strMinute += sprintf('%02d', nbMinutes);
 			strMinute += nbMinutes.toString().padStart(2, '0');
-			if (withLibelleMinute) {
-				if (libelleEntier) {
+			if (withMinuteLabel) {
+				if (fullLabel) {
 					strMinute += ' minute'+(nbMinutes>1?'s':'');
 				}
 				else {
@@ -85,12 +87,12 @@ class Duration {
 		
 		// Secondes
 		let strSeconde = '';
-		if (withSecondes) {
+		if (withSeconds) {
 			let nbSecondes = this.getNbSecondsRemainingOfDurationInSeconds(durationInSeconds);
 			strSeconde += ' ';
 			//strSeconde += sprintf('%02d', nbSecondes);
 			strSeconde += nbSecondes.toString().padStart(2, '0');
-			if (libelleEntier) {
+			if (fullLabel) {
 				strSeconde += ' seconde'+(nbSecondes>1?'s':'');
 			}
 			else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"