@optimiser/common 1.0.327 → 1.0.329

package/dist/lib/utility.js

@@ -2217,14 +2217,15 @@ function FilterConditions(condition, match, fields) {
                     if (field.Schema.UIDataType === 'date' || field.Schema.UIDataType === 'datetime') {
                         var operator = obj.Operator;
                         var startCompareDate = void 0, endCompareDate = void 0;
+                        // below moment date was converted into utc by Shahzaib on 22/05/2023
                         if (operator === "custom") {
-                            startCompareDate = moment_1.default((_a = obj.Value) === null || _a === void 0 ? void 0 : _a.From, obj.DateFormat).startOf('day');
-                            endCompareDate = moment_1.default((_b = obj.Value) === null || _b === void 0 ? void 0 : _b.To, obj.DateFormat).endOf('day');
+                            startCompareDate = moment_1.default.utc((_a = obj.Value) === null || _a === void 0 ? void 0 : _a.From, obj.DateFormat).startOf('day'); //moment(obj.Value.From).startOf('day');
+                            endCompareDate = moment_1.default.utc((_b = obj.Value) === null || _b === void 0 ? void 0 : _b.To, obj.DateFormat).endOf('day'); //moment(obj.Value.To).endOf('day');
                         }
                         else {
                             var _d = helper_1.GetDateRangeFromOperatorValue(operator, obj.FiscalMonth, obj.FiscalFrom), startDate = _d.startDate, endDate = _d.endDate;
-                            startCompareDate = moment_1.default(startDate, obj.DateFormat).startOf('day');
-                            endCompareDate = moment_1.default(endDate, obj.DateFormat).endOf('day');
+                            startCompareDate = moment_1.default.utc(startDate, obj.DateFormat).startOf('day'); //moment(startDate).startOf('day');
+                            endCompareDate = moment_1.default.utc(endDate, obj.DateFormat).endOf('day'); //moment(endDate).endOf('day');
                         }
                         matchValue = { '$gte': new Date(moment_1.default(startCompareDate).toISOString()), '$lte': new Date(moment_1.default(endCompareDate).toISOString()) };
                     }
@@ -5054,39 +5055,45 @@ exports.ValidateUserInput = ValidateUserInput;
  * @return message in string
  */
 function CheckConditionalField(field, record, action) {
-    var msg = '';
-    var fieldData = record[field.Name];
-    if (field.Schema.ConditionalAction == 'enabled' && field.IsRequired == true) {
-        if (field.Schema.UIDataType != 'autoincrement' && (fieldData === '' || fieldData === null || (fieldData === undefined && action == "add"))) {
-            msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is required!';
+    try {
+        var msg = '';
+        var fieldData = record[field.Name];
+        if (field.Schema.ConditionalAction == 'enabled' && field.IsRequired == true) {
+            if (field.Schema.UIDataType != 'autoincrement' && (fieldData === '' || fieldData === null || (fieldData === undefined && action == "add"))) {
+                msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is required!';
+            }
         }
-    }
-    else if (record != undefined && eval(field.Schema.ConditionalExpression) == true) {
-        switch (field.Schema.ConditionalAction) {
-            case "mandatory":
-            case "enabled-mandatory":
-            case "show-enabled-mandatory":
-            case "show-disabled-mandatory":
-                if (field.Schema.UIDataType != 'autoincrement' && (fieldData === '' || fieldData === null || (fieldData === undefined && action == "add"))) {
-                    msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is conditionally required!';
-                }
-                break;
+        else if (record != undefined && eval(field.Schema.ConditionalExpression) == true) {
+            switch (field.Schema.ConditionalAction) {
+                case "mandatory":
+                case "enabled-mandatory":
+                case "show-enabled-mandatory":
+                case "show-disabled-mandatory":
+                    if (field.Schema.UIDataType != 'autoincrement' && (fieldData === '' || fieldData === null || (fieldData === undefined && action == "add"))) {
+                        msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is conditionally required!';
+                    }
+                    break;
+            }
         }
-    }
-    else {
-        switch (field.Schema.ConditionalAction) {
-            case "show-disabled-mandatory":
-            case "show-disabled-nonmandatory":
-                break;
-            case "show-enabled-mandatory":
-            case "show-enabled-nonmandatory":
-                if (fieldData) {
-                    msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is a hidden field and should not contain value.';
-                }
-                break;
+        else {
+            switch (field.Schema.ConditionalAction) {
+                case "show-disabled-mandatory":
+                case "show-disabled-nonmandatory":
+                    break;
+                case "show-enabled-mandatory":
+                case "show-enabled-nonmandatory":
+                    if (fieldData) {
+                        msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is a hidden field and should not contain value.';
+                    }
+                    break;
+            }
         }
+        return msg;
+    }
+    catch (error) {
+        console.error("Internal Error in CheckConditionalField Function : ", error);
+        return '';
     }
-    return msg;
 }
 /**
  * TODO: Create lookup of fields of list schema for Vat Setting data

package/package.json

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