@nixweb/nixloc-ui 0.0.127 → 0.0.128

package/src/store/modules/report.js

@@ -85,14 +85,17 @@ export default {
             let totalization = "";
             let indexQuery = 0;
             let indexTotalization = 0;
-            var size = state.finalQueryFormatOData.fields.length;
+            var sizeFields = state.finalQueryFormatOData.fields.length;
+            var sizeTotalization = state.finalQueryFormatOData.totalization.length;
             var andOr = [];
 
+
             state.finalQueryFormatOData.fields.forEach(function (rule) {
+
                 if (rule.type == "field") {
-                    if (indexQuery == 0 && size > 0) query += `$filter=${rule.formatOdata}`;
+                    if (indexQuery == 0 && sizeFields > 0) query += `$filter=${rule.formatOdata}`;
 
-                    if (indexQuery > 0 && size > 0) {
+                    if (indexQuery > 0 && sizeFields > 0) {
                         query += ` ${rule.andOr} ${rule.formatOdata}`;
                         andOr.push(rule.andOr);
                     }
@@ -116,6 +119,14 @@ export default {
                     indexTotalization++;
                 }
             });
+
+            state.finalQueryFormatOData.totalization.forEach(function (rule) {
+
+                if (indexTotalization == 0 && sizeTotalization > 0) totalization = `${rule.formatOdata}`;
+                if (indexTotalization > 0 && sizeTotalization > 0) totalization = `,${rule.formatOdata}`;
+                indexTotalization++;
+            });
+
             return { query, totalization };
         },
         tags: (state) => {
@@ -198,24 +209,31 @@ export default {
             // para ser consumido nos getters oDataSelect e oDataFilter
 
             state.finalQueryFormatOData = { fields: [], totalization: [] };
+            var convertToOdata = new ConvertToOdata();
 
             selectedRules.forEach(function (rule) {
-                /*  if (key.query.choices && key.query.type == "totalization") {
-                      key.query.choices.forEach(function (value) {
-                          let obj = {
-                              title: value.como.title,
-                              value: value.como.value,
-                              classCss: key.query.classCss,
-                              type: value.como.type,
-                          };
-                          state.totalization.push(obj);
-                      });
-                  }*/
-
-
-                if (rule.value != null && rule.value != "" && rule.value != undefined) {
-
-                    let convertToOdata = new ConvertToOdata();
+
+                if (rule.value != null && rule.value != "" && rule.value != undefined && rule.type == "totalization") {
+                    let formatOdata = convertToOdata.convertRule(rule);
+
+                    rule.value.forEach(value => {
+                        // adiciona no array somente a opção da regra selecionada
+                        var ruleSelected = rule.options.filter(x => x.value == value);
+
+                        let ruleOdata = {
+                            title: ruleSelected[0].aggregate.title,
+                            value: ruleSelected[0].aggregate.value,
+                            classCss: ruleSelected[0].aggregate.classCss,
+                            type: ruleSelected[0].aggregate.type,
+                            formatOdata: formatOdata,
+                        };
+
+                        state.finalQueryFormatOData.totalization.push(ruleOdata);
+                    });
+                }
+
+                if (rule.value != null && rule.value != "" && rule.value != undefined && rule.type == "field") {
+
                     let formatOdata = convertToOdata.convertRule(rule);
 
                     let ruleOdata = {

package/src/store/modules/user.js

@@ -36,6 +36,9 @@ export default {
         },
         updateParameterRental: (state, parameterRental) => {
             state.userLogged.parameterRental = parameterRental;
+        },
+        updateToken: (state, token) => {
+            state.userLogged.token = token;
         }
     },
 }

package/src/store/modules/validation.js

@@ -1,39 +1,39 @@
-export default {
-    namespaced: true,
-    state: {
-        formDirty: false,
-        validations: [],
-        resetForm: {
-            name: undefined,
-            dateTime: undefined
-        }
-    },
-    getters: {
-        isFormValid: (state) => (formName) => {
-            var hasNotification = state.validations.find(obj => {
-                return obj.formName === formName
-            })
-            if (hasNotification != undefined) return false;
-            return true;
-        }
-    },
-    mutations: {
-        addValidation: (state, obj) => {
-            state.validations.push(obj);
-        },
-        removeValidation: (state, obj) => {
-            let filter = state.validations.filter(v => v.key != obj.key);
-            state.validations = filter;
-        },
-        resetValidation: (state, formName) => {
-            state.resetForm.dateTime = new Date();
-            state.resetForm.name = formName;
-        },
-        updateFormDirty: (state, formDirty) => {
-            state.formDirty = formDirty;
-        },
-        removeFormDirty: (state) => {
-            state.formDirty = false;
-        }
-    },
+export default {
+    namespaced: true,
+    state: {
+        formDirty: false,
+        validations: [],
+        resetForm: {
+            name: undefined,
+            dateTime: undefined
+        }
+    },
+    getters: {
+        isFormValid: (state) => (formName) => {
+            var hasNotification = state.validations.find(obj => {
+                return obj.formName === formName
+            })
+            if (hasNotification != undefined) return false;
+            return true;
+        }
+    },
+    mutations: {
+        addValidation: (state, obj) => {
+            state.validations.push(obj);
+        },
+        removeValidation: (state, obj) => {
+            let filter = state.validations.filter(v => v.key != obj.key);
+            state.validations = filter;
+        },
+        resetValidation: (state, formName) => {
+            state.resetForm.dateTime = new Date();
+            state.resetForm.name = formName;
+        },
+        updateFormDirty: (state, formDirty) => {
+            state.formDirty = formDirty;
+        },
+        removeFormDirty: (state) => {
+            state.formDirty = false;
+        }
+    },
 }

package/src/store/store.js

@@ -1,14 +1,14 @@
-import Vue from 'vue';
-import Vuex from 'vuex';
-
-import user from './modules/user'
-import generic from './modules/generic'
-import validation from './modules/validation'
-
-Vue.use(Vuex)
-
-export default new Vuex.Store({
-  modules: {
-    generic, validation, user
-  }
+import Vue from 'vue';
+import Vuex from 'vuex';
+
+import user from './modules/user'
+import generic from './modules/generic'
+import validation from './modules/validation'
+
+Vue.use(Vuex)
+
+export default new Vuex.Store({
+  modules: {
+    generic, validation, user
+  }
 })

package/src/component/shared/query-builder/Totalization.vue

@@ -1,38 +0,0 @@
-<template>
-  <div>
-    <Molded>
-      <div v-for="item in data" :key="item.title">
-        <div :class="item.classCss">
-          <b-row>
-            <b-col class="text-right" sm="10">
-              <span class="title">{{ item.title }}</span>
-            </b-col>
-            <b-col class="text-right" sm="2">
-              <span class="title">{{ item.valor }}</span>
-            </b-col>
-          </b-row>
-        </div>
-      </div>
-    </Molded>
-  </div>
-</template>
-<script>
-import Molded from "@nixweb/nixloc-ui/src/component/layout/Molded";
-
-export default {
-  name: "RodapeRelatorio",
-  components: {
-    Molded,
-  },
-  props: {
-    data: Array,
-  },
-};
-</script>
-
-<style scoped>
-.title {
-  font-size: 15px;
-  font-weight: 400;
-}
-</style>