@osimatic/helpers-js 1.4.21 → 1.4.23

package/date_time.js

@@ -298,6 +298,16 @@ class DateTime {
 }
 
 class DatePeriod {
+	static isSameDay(jsDate1, jsDate2) {
+		return jsDate1.getFullYear() === jsDate2.getFullYear() &&
+			jsDate1.getMonth() === jsDate2.getMonth() &&
+			jsDate1.getDate() === jsDate2.getDate();
+	}
+
+	static isHalfDay(partOfDay) {
+		return partOfDay === DatePeriod.PART_OF_DAY_MORNING || partOfDay === DatePeriod.PART_OF_DAY_AFTERNOON;
+	}
+
 	static getNbDayBetweenTwo(jsDate1, jsDate2, asPeriod=false, timeZone="Europe/Paris") {
 		//jsDate1.set
 		if (jsDate1 == null || jsDate2 == null) {
@@ -627,4 +637,9 @@ class SqlDateTime {
 
 }
 
+// Part of day
+DatePeriod.PART_OF_DAY_MORNING 		= 'MORNING';
+DatePeriod.PART_OF_DAY_AFTERNOON 	= 'AFTERNOON';
+
+
 module.exports = { DateTime, DatePeriod, TimestampUnix, SqlDate, SqlTime, SqlDateTime };

package/http_client.js

@@ -289,7 +289,14 @@ class HTTPClient {
 
 	static download(method, url, data, errorCallback=null, completeCallback=null, additionalHeaders={}) {
 		HTTPClient.requestBlob(method, url, data,
-			(blobData, response) => File.download(blobData, response.headers.get('content-type'), response.headers.get('content-disposition')),
+			(blobData, response) => {
+				const contentType = response.headers.get('content-type');
+				// Si la réponse est du JSON, on ne télécharge pas de fichier
+				if (contentType && contentType.includes('application/json')) {
+					return;
+				}
+				File.download(blobData, contentType, response.headers.get('content-disposition'));
+			},
 			errorCallback,
 			completeCallback,
 			additionalHeaders
@@ -346,9 +353,17 @@ class HTTPClient {
 			}
 
 			if (response.ok) {
-				const blobData = await response.blob();
-				if (typeof successCallback == 'function') {
-					successCallback(blobData, response);
+				if (response.headers.get('Content-Type') === 'application/json') {
+					const json = await response.json();
+					if (typeof successCallback == 'function') {
+						successCallback(json, response);
+					}
+				}
+				else {
+					const blobData = await response.blob();
+					if (typeof successCallback == 'function') {
+						successCallback(blobData, response);
+					}
 				}
 			}
 			else {

package/package.json

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