@optimiser/common 1.0.302 → 1.0.304

package/dist/lib/helper.js

@@ -406,7 +406,7 @@ var GetDateRangeFromOperatorValue = function (operator, fiscalMonth, fiscalFrom)
     var getFiscalMonthIndex = moment_1.default.monthsShort().findIndex(function (month) { return month === fiscalMonth; });
     // GET FISCAL MONTH INDEX
     // if (operator.includes("Fiscal")) {
-    if (operator.includes("Fiscal") || ["Year to Date", "year-to-date"].includes(operator)) {
+    if (operator.toLowerCase().includes("fiscal") || ["Year to Date", "year-to-date"].includes(operator)) {
         if (fiscalFrom === "End") {
             fiscalMonth = momentObj.clone().month(fiscalMonth).add(1, "months").format('MMM'); // Modify FiscalMonth in FiscalFrom - End
         }
@@ -595,7 +595,7 @@ var GetDateRangeFromOperatorValue = function (operator, fiscalMonth, fiscalFrom)
             }
             break;
         case "This Fiscal Year":
-        case "this-fiscal-quarter":
+        case "this-fiscal-year":
             if (fiscalFrom === "Start") {
                 if (getFiscalMonthIndex == 0 || getFiscalMonthIndex && getFiscalMonthIndex <= momentObj.clone().month()) {
                     startDate = moment_1.default(startDate, currentDateFormat).clone().month(fiscalMonth).startOf('month').format(requiredDateFormat);
@@ -618,7 +618,7 @@ var GetDateRangeFromOperatorValue = function (operator, fiscalMonth, fiscalFrom)
             }
             break;
         case "Next Fiscal Year":
-        case "next-fiscal-quarter":
+        case "next-fiscal-year":
             if (fiscalFrom === "Start") {
                 if (getFiscalMonthIndex == 0 || getFiscalMonthIndex && getFiscalMonthIndex <= momentObj.clone().month()) {
                     startDate = moment_1.default(startDate, currentDateFormat).clone().month(fiscalMonth).add(1, "years").startOf('month').format(requiredDateFormat);

package/dist/lib/utility.js

@@ -4571,6 +4571,9 @@ function ValidateUserInput(options) {
                                     }
                                     field = schemaFields.find(function (x) { return x.Name == fieldName; });
                                     if (!field) return [3 /*break*/, 52];
+                                    if ((field.UIDataType == 'date' || field.UIDataType == 'datetime') && IsStringValue(fieldData) && fieldData.trim() == '') {
+                                        inputFields[fieldName] = null;
+                                    }
                                     if (fieldData && IsStringValue(fieldData) && field.UIDataType != 'dropdown') {
                                         fieldData = fieldData.trim();
                                         if (["text", "email", "phone"].includes(field.UIDataType)) {
@@ -4662,7 +4665,7 @@ function ValidateUserInput(options) {
                                     {
                                         filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
                                         if (!filter.test(fieldData)) {
-                                            msg = 'Invalid email for ' + field.DisplayName + '!';
+                                            msg = fieldData + ' is invalid email for ' + field.DisplayName + '!';
                                         }
                                     }
                                     return [3 /*break*/, 51];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.302",
+  "version": "1.0.304",
   "description": "",
   "main": "dist/index.js",
   "scripts": {