@optimiser/common 1.0.312 → 1.0.314

package/dist/lib/utility.js

@@ -1869,97 +1869,88 @@ function BuildGridFieldProjection(project, field, group) {
     var searchConcatArry = [];
     switch (field.Schema.UIDataType) {
         // below code was added by Shahzaib on 05/09/2022
-        // case "lookup":
-        // case "multilookup":
-        // case "dropdown":
-        // case "multiselect":
-        //     alias = fldName + constants.LookupAlias;
-        //     project[fldName] = 1;
-        //     project[alias] = 1;
-        //     project[searchAlias] = 1;
-        //     break;
-        // Below code was commented by Shahzaib on 05/09/2022, searchAlias was added instead of it.
         case "lookup":
-            alias = fldName + constants_1.default.LookupAlias;
-            project[fldName] = 1;
-            project[alias] = 1;
-            var _loop_13 = function (i) {
-                if (field.Schema.ExcludeLookupFieldsOnSearch && field.Schema.ExcludeLookupFieldsOnSearch.filter(function (x) { return x == field.Schema.LookupFields[i]; }).length != 0) {
-                    return "continue";
-                }
-                // searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], ""] });
-                // added by Shahzaib, make int to string and concat  
-                searchConcatArry.push({ "$ifNull": [{ $toString: '$' + alias + '.' + field.Schema.LookupFields[i] }, ""] });
-                if (i < field.Schema.LookupFields.length - 1) {
-                    searchConcatArry.push(" ");
-                }
-            };
-            for (var i = 0; i < field.Schema.LookupFields.length; i++) {
-                _loop_13(i);
-            }
-            ;
-            project[fldName + '_SearchValue'] = { $concat: searchConcatArry };
-            break;
         case "multilookup":
-            alias = fldName + constants_1.default.LookupAlias;
-            project[fldName] = 1;
-            project[alias] = 1;
-            for (var i = 0; i < field.Schema.LookupFields.length; i++) {
-                searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], [" "]] });
-                if (i < field.Schema.LookupFields.length - 1) {
-                    searchConcatArry.push([" "]);
-                }
-            }
-            ;
-            //project[fldName + '_SearchValue'] = { $concatArrays: searchConcatArry };
-            project[fldName + '_SearchValue'] = {
-                $reduce: {
-                    input: { $concatArrays: searchConcatArry },
-                    initialValue: "",
-                    //in: { $concat: ["$$value", "$$this"] }        // Commented by and below line was added by Shahzaib, make int to string 
-                    in: { $concat: ["$$value", { $toString: "$$this" }] }
-                }
-            };
-            break;
         case "dropdown":
-            alias = fldName + constants_1.default.LookupAlias;
-            project[fldName] = 1;
-            project[alias] = 1;
-            if (field.Schema.LookupObject) {
-                for (var i = 0; i < field.Schema.LookupFields.length; i++) {
-                    //searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], ""] });
-                    // added by Mohan, make int to string and concat  
-                    searchConcatArry.push({ "$ifNull": [{ $toString: '$' + alias + '.' + field.Schema.LookupFields[i] }, ""] });
-                    if (i < field.Schema.LookupFields.length - 1) {
-                        searchConcatArry.push(" ");
-                    }
-                }
-                ;
-                project[fldName + '_SearchValue'] = { $concat: searchConcatArry };
-            }
-            else {
-                project[fldName + '_SearchValue'] = '$' + alias + '.Value';
-            }
-            break;
         case "multiselect":
             alias = fldName + constants_1.default.LookupAlias;
             project[fldName] = 1;
             project[alias] = 1;
-            if (field.Schema.LookupObject) {
-                for (var i = 0; i < field.Schema.LookupFields.length; i++) {
-                    searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], [" "]] });
-                    if (i < field.Schema.LookupFields.length - 1) {
-                        searchConcatArry.push([" "]);
-                    }
-                }
-                ;
-                project[fldName + '_SearchValue'] = { $concatArrays: searchConcatArry };
-            }
-            else {
-                searchConcatArry.push('$' + alias + '.Value');
-                project[fldName + '_SearchValue'] = { $concatArrays: searchConcatArry };
-            }
+            project[searchAlias] = 1;
             break;
+        // Below code was commented by Shahzaib on 05/09/2022, searchAlias was added instead of it.
+        // case "lookup":
+        //     alias = fldName + constants.LookupAlias;
+        //     project[fldName] = 1;
+        //     project[alias] = 1;
+        //     for (let i = 0; i < field.Schema.LookupFields.length; i++) {
+        //         if (field.Schema.ExcludeLookupFieldsOnSearch && field.Schema.ExcludeLookupFieldsOnSearch.filter((x: AnyObjectInterface) => x == field.Schema.LookupFields[i]).length != 0) {
+        //             continue;
+        //         }
+        //         // searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], ""] });
+        //         // added by Shahzaib, make int to string and concat  
+        //         searchConcatArry.push({ "$ifNull": [{$toString : '$' + alias + '.' + field.Schema.LookupFields[i]}, ""] });
+        //         if (i < field.Schema.LookupFields.length - 1) {
+        //             searchConcatArry.push(" ");
+        //         }
+        //     };
+        //     project[fldName + '_SearchValue'] = { $concat: searchConcatArry };
+        //     break;
+        // case "multilookup":
+        //     alias = fldName + constants.LookupAlias;
+        //     project[fldName] = 1;
+        //     project[alias] = 1;
+        //     for (let i = 0; i < field.Schema.LookupFields.length; i++) {
+        //         searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], [" "]] });
+        //         if (i < field.Schema.LookupFields.length - 1) {
+        //             searchConcatArry.push([" "]);
+        //         }
+        //     };
+        //     //project[fldName + '_SearchValue'] = { $concatArrays: searchConcatArry };
+        //     project[fldName + '_SearchValue'] = {
+        //         $reduce: {
+        //             input: { $concatArrays: searchConcatArry },
+        //             initialValue: "",
+        //             //in: { $concat: ["$$value", "$$this"] }        // Commented by and below line was added by Shahzaib, make int to string 
+        //             in: { $concat: ["$$value", { $toString : "$$this" }] }
+        //         }
+        //     };
+        //     break;
+        // case "dropdown":
+        //     alias = fldName + constants.LookupAlias;
+        //     project[fldName] = 1;
+        //     project[alias] = 1;
+        //     if (field.Schema.LookupObject) {
+        //         for (let i = 0; i < field.Schema.LookupFields.length; i++) {
+        //             //searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], ""] });
+        //             // added by Mohan, make int to string and concat  
+        //             searchConcatArry.push({ "$ifNull": [{$toString : '$' + alias + '.' + field.Schema.LookupFields[i]}, ""] });
+        //             if (i < field.Schema.LookupFields.length - 1) {
+        //                 searchConcatArry.push(" ");
+        //             }
+        //         };
+        //         project[fldName + '_SearchValue'] = { $concat: searchConcatArry };
+        //     } else {
+        //         project[fldName + '_SearchValue'] = '$' + alias + '.Value';
+        //     }
+        //     break;
+        // case "multiselect":
+        //     alias = fldName + constants.LookupAlias;
+        //     project[fldName] = 1;
+        //     project[alias] = 1;
+        //     if (field.Schema.LookupObject) {
+        //         for (let i = 0; i < field.Schema.LookupFields.length; i++) {
+        //             searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], [" "] ] });
+        //             if (i < field.Schema.LookupFields.length - 1) {
+        //                 searchConcatArry.push([" "]);
+        //             }
+        //         };
+        //         project[fldName + '_SearchValue'] = { $concatArrays: searchConcatArry };
+        //     } else {
+        //         searchConcatArry.push('$' + alias + '.Value');
+        //         project[fldName + '_SearchValue'] = { $concatArrays: searchConcatArry };
+        //     }
+        //     break;
         case "file":
         case "image":
             alias = fldName + constants_1.default.LookupAlias;
@@ -2144,9 +2135,16 @@ function FilterConditions(condition, match, fields) {
             match.$or = new Array();
             sets = match.$or;
         }
-        var _loop_14 = function (i) {
+        var _loop_13 = function (i) {
             var _a, _b, _c;
             var obj = condition.Filters[i];
+            if (condition.DateFormat) {
+                obj.DateFormat = condition.DateFormat;
+            }
+            if (condition.FiscalFrom || condition.FiscalMonth) {
+                obj.FiscalFrom = condition.FiscalFrom;
+                obj.FiscalMonth = condition.FiscalMonth;
+            }
             if (obj.Type == "Child") {
                 var childMatch = {};
                 sets.push(childMatch);
@@ -2201,13 +2199,13 @@ function FilterConditions(condition, match, fields) {
                         var operator = obj.Operator;
                         var startCompareDate = void 0, endCompareDate = void 0;
                         if (operator === "custom") {
-                            startCompareDate = moment_1.default((_a = obj.Value) === null || _a === void 0 ? void 0 : _a.From, "DD-MMM-YYYY").startOf('day');
-                            endCompareDate = moment_1.default((_b = obj.Value) === null || _b === void 0 ? void 0 : _b.To, "DD-MMM-YYYY").endOf('day');
+                            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');
                         }
                         else {
                             var _d = helper_1.GetDateRangeFromOperatorValue(operator, obj.FiscalMonth, obj.FiscalFrom), startDate = _d.startDate, endDate = _d.endDate;
-                            startCompareDate = moment_1.default(startDate, "DD-MMM-YYYY").startOf('day');
-                            endCompareDate = moment_1.default(endDate, "DD-MMM-YYYY").endOf('day');
+                            startCompareDate = moment_1.default(startDate, obj.DateFormat).startOf('day');
+                            endCompareDate = moment_1.default(endDate, obj.DateFormat).endOf('day');
                         }
                         matchValue = { '$gte': new Date(moment_1.default(startCompareDate).toISOString()), '$lte': new Date(moment_1.default(endCompareDate).toISOString()) };
                     }
@@ -2328,7 +2326,7 @@ function FilterConditions(condition, match, fields) {
             }
         };
         for (var i = 0; i < condition.Filters.length; i++) {
-            _loop_14(i);
+            _loop_13(i);
         }
     }
 }
@@ -2336,7 +2334,7 @@ exports.FilterConditions = FilterConditions;
 function GirdHeaderFilters(filters, fields) {
     try {
         var sets = [];
-        var _loop_15 = function (i) {
+        var _loop_14 = function (i) {
             var obj = filters[i];
             var field = fields.find(function (x) { return x.UniqueID == obj.Name; });
             if (field) {
@@ -2389,7 +2387,7 @@ function GirdHeaderFilters(filters, fields) {
             }
         };
         for (var i = 0; i < filters.length; i++) {
-            _loop_15(i);
+            _loop_14(i);
         }
         return { '$and': sets };
     }
@@ -2401,7 +2399,7 @@ exports.GirdHeaderFilters = GirdHeaderFilters;
 function FieldsGridHeaderFilters(filters, fields) {
     var sets = [];
     var lookupFieldsSets = [];
-    var _loop_16 = function (i) {
+    var _loop_15 = function (i) {
         var _a;
         var obj = filters[i];
         var field = fields.find(function (x) { return x.UniqueID == obj.Name; });
@@ -2445,7 +2443,7 @@ function FieldsGridHeaderFilters(filters, fields) {
         }
     };
     for (var i = 0; i < filters.length; i++) {
-        _loop_16(i);
+        _loop_15(i);
     }
     return { '$and': sets, 'lookupConditions': lookupFieldsSets };
 }
@@ -2483,7 +2481,7 @@ function AddLog(req, objectName, logAction, objLogProp, db, next) {
 exports.AddLog = AddLog;
 function CheckFilterFieldsProjection(condition, fields, pageData, project) {
     if (condition != undefined && condition.Filters.length > 0) {
-        var _loop_17 = function (i) {
+        var _loop_16 = function (i) {
             var objFilter = condition.Filters[i];
             if (objFilter.Type == "Child") {
                 CheckFilterFieldsProjection(objFilter, fields, pageData, project);
@@ -2501,7 +2499,7 @@ function CheckFilterFieldsProjection(condition, fields, pageData, project) {
             }
         };
         for (var i = 0; i < condition.Filters.length; i++) {
-            _loop_17(i);
+            _loop_16(i);
         }
     }
 }
@@ -4178,7 +4176,7 @@ exports.GetDayIndex = GetDayIndex;
 function GetUserProfile(msp_d, db, mdb, next) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var userData, userProfile_1, error_3, objectIDs_1, modules_1, licenceDetail, companylicenceDetail, receptionLicense, moduleList, _loop_18, i, error_4;
+        var userData, userProfile_1, error_3, objectIDs_1, modules_1, licenceDetail, companylicenceDetail, receptionLicense, moduleList, _loop_17, i, error_4;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -4257,14 +4255,14 @@ function GetUserProfile(msp_d, db, mdb, next) {
                         moduleList = userProfile_1[0].ModuleList;
                         userProfile_1[0].HasControlPanelAccess = [];
                         if (userProfile_1[0].Permissions) {
-                            _loop_18 = function (i) {
+                            _loop_17 = function (i) {
                                 userProfile_1[0].Permissions[i].ModuleData = moduleList.find(function (x) { return x._id == userProfile_1[0].Permissions[i].ModuleID; });
                                 if ((_a = userProfile_1[0].Permissions[i].Operations) === null || _a === void 0 ? void 0 : _a.includes("Control Panel")) {
                                     userProfile_1[0].HasControlPanelAccess.push(userProfile_1[0].Permissions[i].ModuleID);
                                 }
                             };
                             for (i = 0; i < userProfile_1[0].Permissions.length; i++) {
-                                _loop_18(i);
+                                _loop_17(i);
                             }
                         }
                         if (moduleList.length == 0) {
@@ -4561,7 +4559,7 @@ function IsAnotherObjectField(pageData, fieldName) {
 */
 function ValidateUserInput(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var inputFields, pageData, documentID, db, action, objectSchema, objectName, pageFields, schemaFields, inputField, msg, _loop_19, _i, inputField_1, name_1, state_1, _loop_20, isValid, isValid, validateResp, _a, pageFields_1, pageField, state_2, countryData, err_3;
+        var inputFields, pageData, documentID, db, action, objectSchema, objectName, pageFields, schemaFields, inputField, msg, _loop_18, _i, inputField_1, name_1, state_1, _loop_19, isValid, isValid, validateResp, _a, pageFields_1, pageField, state_2, countryData, err_3;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -4582,7 +4580,7 @@ function ValidateUserInput(options) {
                     inputField = Object.keys(inputFields);
                     msg = '';
                     if (inputField && inputField.length) {
-                        _loop_19 = function (name_1) {
+                        _loop_18 = function (name_1) {
                             var field = pageFields.find(function (x) { return x.Name == name_1; });
                             if (field == undefined && !IsSystemField(objectName, name_1)) {
                                 msg = name_1 + " is not valid field!";
@@ -4591,12 +4589,12 @@ function ValidateUserInput(options) {
                         };
                         for (_i = 0, inputField_1 = inputField; _i < inputField_1.length; _i++) {
                             name_1 = inputField_1[_i];
-                            state_1 = _loop_19(name_1);
+                            state_1 = _loop_18(name_1);
                             if (state_1 === "break")
                                 break;
                         }
                     }
-                    _loop_20 = function (pageField) {
+                    _loop_19 = function (pageField) {
                         var fieldName, fieldData, field, searchQuery, result, _a, filter, searchObj, result, searchObj, totalRecord, _b, schemaData, result, searchObj, result, schemaData, result, searchObj, totalRecord, regexpression, phone, files, _i, fieldData_1, obj, searchObj, totalRecord, searchObj, result, _c, fieldData_2, obj;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
@@ -4982,7 +4980,7 @@ function ValidateUserInput(options) {
                 case 1:
                     if (!(_a < pageFields_1.length)) return [3 /*break*/, 4];
                     pageField = pageFields_1[_a];
-                    return [5 /*yield**/, _loop_20(pageField)];
+                    return [5 /*yield**/, _loop_19(pageField)];
                 case 2:
                     state_2 = _b.sent();
                     if (state_2 === "break")

package/package.json

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