Merge pull request #8 from jesusarockias/master

build error cleared

src/components/AllHardware.vue

@@ -93,9 +93,11 @@ export default Vue.extend({
       dateRangeChanged: function (args) {
         // check wheather the value is empty or not
         if (args.startDate && args.endDate) {
-          var predicatesStart = new Predicate('DOP', 'greaterthanorequal', args.startDate)
-          var predicatesEnd = new Predicate('DOP', 'lessthanorequal', args.endDate)
-          this.filterSettings = {type: 'Menu', columns: [predicatesStart, predicatesEnd]}
+          var filter = [
+            { field: 'DOP', operator: 'greaterthanorequal', predicate: 'and', value: args.startDate },
+            { field: 'DOP', operator: 'lessthanorequal', predicate: 'and', value: args.endDate }
+          ];
+           this.filterSettings = {type: 'Menu', columns: filter}
         } else {
           this.filterSettings = {type: 'Menu', columns: []}
         }

src/components/AllIssuedLicenses.vue

@@ -86,9 +86,11 @@ export default Vue.extend({
       dateRangeChanged: function (args) {
         // check wheather the value is empty or not
         if (args.startDate && args.endDate) {
-          var predicatesStart = new Predicate('IssuedOn', 'greaterthanorequal', args.startDate)
-          var predicatesEnd = new Predicate('IssuedOn', 'lessthanorequal', args.endDate)
-          this.filterSettings = {type: 'Menu', columns: [predicatesStart, predicatesEnd]}
+          var filter = [
+            { field: 'IssuedOn', operator: 'greaterthanorequal', predicate: 'and', value: args.startDate },
+            { field: 'IssuedOn', operator: 'lessthanorequal', predicate: 'and', value: args.endDate }
+          ];
+          this.filterSettings = {type: 'Menu', columns: filter}
         } else {
           this.filterSettings = {type: 'Menu', columns: []}
         }

src/components/AllRequests.vue

@@ -90,9 +90,11 @@ export default Vue.extend({
       dateRangeChanged: function (args) {
         // check wheather the value is empty or not
         if (args.startDate && args.endDate) {
-          var predicatesStart = new Predicate('RequestedOn', 'greaterthanorequal', args.startDate)
-          var predicatesEnd = new Predicate('RequestedOn', 'lessthanorequal', args.endDate)
-          this.filterSettings = {type: 'Menu', columns: [predicatesStart, predicatesEnd]}
+          var filter = [
+            { field: 'RequestedOn', operator: 'greaterthanorequal', predicate: 'and', value: args.startDate },
+            { field: 'RequestedOn', operator: 'lessthanorequal', predicate: 'and', value: args.endDate }
+          ];
+          this.filterSettings = {type: 'Menu', columns: filter}
         } else {
           this.filterSettings = {type: 'Menu', columns: []}
         }

src/components/AllSoftware.vue

@@ -90,9 +90,11 @@ export default Vue.extend({
       dateRangeChanged: function (args) {
         // check wheather the value is empty or not
         if (args.startDate && args.endDate) {
-          var predicatesStart = new Predicate('DOP', 'greaterthanorequal', args.startDate)
-          var predicatesEnd = new Predicate('DOP', 'lessthanorequal', args.endDate)
-          this.filterSettings = {type: 'Menu', columns: [predicatesStart, predicatesEnd]}
+         var filter = [
+            { field: 'DOP', operator: 'greaterthanorequal', predicate: 'and', value: args.startDate },
+            { field: 'DOP', operator: 'lessthanorequal', predicate: 'and', value: args.endDate }
+          ];
+          this.filterSettings = {type: 'Menu', columns: filter}
         } else {
           this.filterSettings = {type: 'Menu', columns: []}
         }