Merge pull request 'dev' (#57) from dev into master

Reviewed-on: WillaEngine-Project/WillaEngine#57

resources/js/Global/components/Inputs/TooltipButton.vue

@@ -10,16 +10,19 @@
     <template v-slot:activator="{ on }">
       <v-btn
         slot="activator"
-        fab
         :color="buttonColor"
         :dark="dark"
         :light="light"
         v-on="on"
-        @click="$emit('click')"
+        @click="$emit('click', $event)"
         :small="small"
         :large="large"
         :x-large="xLarge"
         :x-small="xSmall"
+        :type="type"
+        :outlined="outlined"
+        :icon="onlyIcon"
+        fab
       >
         <v-icon dark>{{ icon }}</v-icon>
       </v-btn>
@@ -48,12 +51,6 @@ export default {
       type: String,
       default: "black",
     },
-    top: {
-      type: Boolean,
-      default: function () {
-        return !this.bottom && !this.left && !this.right ? true : false;
-      },
-    },
     bottom: {
       type: Boolean,
       default: false,
@@ -70,21 +67,13 @@ export default {
       type: String,
       default: "fade-transition",
     },
-    dark: {
-      type: Boolean,
-      default: function () {
-        return !this.light ? true : false;
-      },
-    },
     light: {
       type: Boolean,
       default: false,
     },
     small: {
       type: Boolean,
-      default: function () {
-        return !this.large && !this.xSmall && !this.xLarge ? true : false;
-      },
+      default: false,
     },
     large: {
       type: Boolean,
@@ -98,6 +87,26 @@ export default {
       type: Boolean,
       default: false,
     },
+    type: {
+      type: String,
+      default: "button",
+    },
+    outlined: {
+      type: Boolean,
+      default: false,
+    },
+    onlyIcon: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    top() {
+      return !this.bottom && !this.left && !this.right ? true : false;
+    },
+    dark() {
+      return !this.light ? true : false;
+    },
   },
 };
 </script>

resources/js/Global/utils/common/CreateFilterObject.js

@@ -2,67 +2,69 @@ const createFilterObject = filters => {
     let filterObject = {};
     for (const key in filters) {
         if (filters.hasOwnProperty(key)) {
-            if (filters[key]["type"]) {
+            if (filters[key] && typeof filters[key]["type"] !== "undefined") {
                 let filterValue = window[filters[key]["type"]](filters[key]);
                 if (filterValue) {
                     filterObject[key] = filterValue;
                 }
+            } else {
+                filterObject[key] = filters[key];
             }
         }
     }
-    var filters= {};
+    var filters = {};
     for (var filter in filterObject) {
-        if(filterObject.hasOwnProperty(filter)){
+        if (filterObject.hasOwnProperty(filter)) {
             filters[`filters[${filter}]`] = filterObject[filter];
         }
     }
     return filters;
 };
-window['between'] = function (filter) {
+window["between"] = function(filter) {
     var value = null;
     if (filter.val1 && filter.val2) {
         value = `<${filter.val1},${filter.val2}>`;
     } else if (filter.val1) {
         filter.val = filter.val1;
         value = greater(filter);
-    } else if(filter.val2) {
+    } else if (filter.val2) {
         filter.val = filter.val2;
         value = less(filter);
     }
     return value;
-}
-window['greater'] = function (filter) {
+};
+window["greater"] = function(filter) {
     var value = null;
     if (filter.val) {
         value = `(ge)${filter.val}`;
     }
     return value;
-}
-window['less'] = function (filter) {
+};
+window["less"] = function(filter) {
     var value = null;
     if (filter.val) {
         value = `(le)${filter.val}`;
     }
     return value;
-}
+};
 
-window['like'] = function(filter) {
+window["like"] = function(filter) {
     var value = null;
-    if (filter.val) {
+    if (filter.val !== null) {
         value = `%${filter.val}%`;
     }
     return value;
-}
-window['in'] = function(filter) {
+};
+window["in"] = function(filter) {
     var value = null;
     if (filter.val) {
         if (Array.isArray(filter.val)) {
-            value = filter.val.join(',');
+            value = filter.val.join(",");
         } else {
             value = `${filter.val}`;
         }
     }
     return value;
-}
+};
 
 export default createFilterObject;