@nixweb/nixloc-ui 0.0.127 → 0.0.129

package/src/store/modules/generic.js

@@ -71,79 +71,87 @@ export default {
             let documentHtml = state.documentHtml
             let ret = documentHtml;
 
-            var tables = document.getElementsByTagName("table");
-            let total = tables.length;
-
-            let config = [];
-
-            let index = 0;
-            while (index <= total - 1) {
-
-                let table = document.getElementsByTagName("table")[index];
-                let th = table.getElementsByTagName("th")[0];
-
-                let obj = {
-                    vForGrouped: "",
-                    vForSimple: "",
-                    nameGroup: "",
-                    nameGroupReplace: ""
-                };
-
-                if (th) {
-                    let isGrouped = th.innerText.includes("n.grupo");
-                    let isProduct = th.innerText.includes("n.produto");
-                    let isPeriod = th.innerText.includes("n.periodo");
-                    let isPayment = th.innerText.includes("n.pagamento");
-
-                    if (isProduct) {
-                        obj.vForSimple = "v-for='p in d.produto'";
-                        config.push(obj);
-                    } else if (isPeriod) {
-                        obj.vForSimple = "v-for='pe in d.periodo'";
-                        config.push(obj);
-                    } else if (isPayment) {
-                        obj.vForSimple = "v-for='pg in d.pagamento'";
-                        config.push(obj);
-                    } else if (isGrouped) {
-                        obj.vForGrouped = "v-for='(produto, grN) in produtoAgrupado'";
-                        obj.vForSimple = "v-for='p in d.produto'";
-
-                        var initIndex = documentHtml.split("<tbody>", index + 1).join("<tbody>").length;
-                        var lastIndex = documentHtml.split("</tbody>", index + 1).join("</tbody>").length;
-
-                        let tbody = documentHtml.substring(documentHtml.indexOf("<tbody>", initIndex), documentHtml.lastIndexOf("</tbody>", lastIndex));
-
-                        let tr = tbody.substring(tbody.indexOf("<tr>"), tbody.lastIndexOf("</tr>"));
-
-                        obj.nameGroup = tr.substring(0, tr.indexOf('</tr>')) + "</tr>";
-                        obj.nameGroup = obj.nameGroup.replaceAll("\"", "'");
-                        obj.nameGroupReplace = obj.nameGroup.replace("<tr>", "").replace("</tr>", "");
-                        config.push(obj);
-
+            var template = document.getElementById("template");
+
+            if (template != null) {
+                var tables = template.getElementsByTagName("table");
+                let total = tables.length;
+                let config = [];
+
+                let index = 0;
+                while (index <= total - 1) {
+
+                    let table = template.getElementsByTagName("table")[index];
+                    let th = table.getElementsByTagName("th")[0];
+
+                    let obj = {
+                        vForGrouped: "",
+                        vForSimple: "",
+                        nameGroup: "",
+                        nameGroupReplace: ""
+                    };
+
+                    if (th) {
+
+                        let isGrouped = th.innerText.includes("n.grupo");
+                        let isProduct = th.innerText.includes("p.pLoc");
+                        let isPeriod = th.innerText.includes("n.periodo");
+                        let isPayment = th.innerText.includes("n.pagamento");
+                        let isMoviment = th.innerText.includes("p.pMoviment");
+
+                        if (isProduct) {
+                            obj.vForSimple = "v-for='p in d.pLoc'";
+                            config.push(obj);
+                        } else if (isPeriod) {
+                            obj.vForSimple = "v-for='pe in d.periodo'";
+                            config.push(obj);
+                        } else if (isPayment) {
+                            obj.vForSimple = "v-for='pg in d.pagamento'";
+                            config.push(obj);
+                        } else if (isGrouped) {
+                            obj.vForGrouped = "v-for='(produto, grN) in produtoAgrupado'";
+                            obj.vForSimple = "v-for='p in d.pLoc'";
+
+                            var initIndex = documentHtml.split("<tbody>", index + 1).join("<tbody>").length;
+                            var lastIndex = documentHtml.split("</tbody>", index + 1).join("</tbody>").length;
+
+                            let tbody = documentHtml.substring(documentHtml.indexOf("<tbody>", initIndex), documentHtml.lastIndexOf("</tbody>", lastIndex));
+
+                            let tr = tbody.substring(tbody.indexOf("<tr>"), tbody.lastIndexOf("</tr>"));
+
+                            obj.nameGroup = tr.substring(0, tr.indexOf('</tr>')) + "</tr>";
+                            obj.nameGroup = obj.nameGroup.replaceAll("\"", "'");
+                            obj.nameGroupReplace = obj.nameGroup.replace("<tr>", "").replace("</tr>", "");
+                            config.push(obj);
+
+                        } else if (isMoviment) {
+                            obj.vForSimple = "v-for='pM in d.pMoviment'";
+                            config.push(obj);
+                        } else {
+                            config.push(obj);
+                        }
                     } else {
                         config.push(obj);
                     }
-                } else {
-                    config.push(obj);
+                    index++;
                 }
-                index++;
-            }
 
-            let replace = "";
-            config.forEach(x => {
-                replace += `.replace("<tbody>${x.nameGroup}<tr>", "<tbody ${x.vForGrouped}>${x.nameGroupReplace}<tr ${x.vForSimple}>")`;
-            });
-
-            var retParse = ret.replaceAll("\"", "'");
-            retParse = eval(`ret${replace}`);
+                let replace = "";
+                config.forEach(x => {
+                    replace += `.replace("<tbody>${x.nameGroup}<tr>", "<tbody ${x.vForGrouped}>${x.nameGroupReplace}<tr ${x.vForSimple}>")`;
+                });
 
-            var classImportant = retParse
-                .replaceAll("n.grupo", "")
-                .replaceAll("n.produto", "")
-                .replaceAll("n.periodo", "")
-                .replaceAll("n.pagamento", "")
-                .replaceAll("<p>&nbsp!important;</p>", "<p>&nbsp</p>");
+                var retParse = ret.replaceAll("\"", "'");
+                retParse = eval(`ret${replace}`);
 
+                var classImportant = retParse
+                    .replaceAll("n.grupo", "")
+                    .replaceAll("p.pLoc", "")
+                    .replaceAll("p.pMoviment", "")
+                    .replaceAll("n.periodo", "")
+                    .replaceAll("n.pagamento", "")
+                    .replaceAll("<p>&nbsp!important;</p>", "<p>&nbsp</p>");
+            }
             return classImportant;
         },
         groupBy: () => (obj) => {
@@ -190,10 +198,14 @@ export default {
             state.toast.type = action;
         },
         addMethodExecutedApi: (state, action) => {
-            state.methodExecutedApi = action;
+            setTimeout(function () {
+                state.methodExecutedApi = action;
+            }, 100);
         },
         cleanMethodExecutedApi: (state) => {
-            state.methodExecutedApi = "";
+            setTimeout(function () {
+                state.methodExecutedApi = "";
+            }, 100);
         },
         addLoading: (state, key) => {
             state.loading.push(key);
@@ -219,9 +231,11 @@ export default {
             state.documentHtml = value;
         },
         addEvent: (state, obj) => {
-            state.event.dateTime = new Date();
-            state.event.name = obj.name;
-            state.event.data = obj.data;
+            setTimeout(function () {
+                state.event.dateTime = new Date();
+                state.event.name = obj.name;
+                state.event.data = obj.data;
+            }, 100);
         },
         removeEvent: (state) => {
             state.event = {};
@@ -255,7 +269,7 @@ export default {
                 headers: new Token().tokenHeaders(),
             })
                 .then((response) => {
-                   
+
                     if (response.data.success) {
                         context.commit('addMethodExecutedApi', 'postApi');
 
@@ -263,7 +277,10 @@ export default {
                             context.commit('addToast', 'postApi');
 
                         context.commit('removeNotificarions');
-                        context.commit('validation/removeFormDirty', null, { root: true });
+
+                        if (!params.notRemoveFormDirty)
+                            context.commit('validation/removeFormDirty', null, { root: true });
+
                         return response.data;
                     } else {
 
@@ -273,8 +290,6 @@ export default {
                     }
                 }, (err) => {
 
-                    console.log(err);
-
                     if (err.response)
                         if (err.response.status === 403)
                             context.commit('addNotifications', [{ message: "Usuário sem permissão para adicionar!" }])
@@ -336,6 +351,17 @@ export default {
                     return false;
                 })
         },
+        orderAllApi: async function (context, params) {
+            return axios.put(params.url, params.obj, {
+                headers: new Token().tokenHeaders(),
+            })
+                .then((response) => {
+                    return response.data;
+                }, (err) => {
+                    context.commit('addNotificationErrorApi');
+                    return false;
+                })
+        },
         getApiOdata: async function (context, params) {
             return axios.get(params.url, {
                 headers: new Token().tokenHeaders(),
@@ -491,5 +517,28 @@ export default {
                     return false;
                 })
         },
+        getDocumentApi: async function (context, params) {
+            console.log(params.obj);
+            context.commit('cleanMethodExecutedApi');
+            return axios.get(params.url, {
+                params: params.obj,
+                headers: {
+                    "Content-Type": "application/json",
+                    Authorization: "Bearer " + params.obj.token
+                },
+            })
+                .then((response) => {
+                    if (response.data.success) {
+
+                        return response.data;
+                    } else {
+
+                        return response.data;
+                    }
+                }, (err) => {
+
+                    return false;
+                })
+        },
     }
 }

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,12 @@ export default {
         },
         updateParameterRental: (state, parameterRental) => {
             state.userLogged.parameterRental = parameterRental;
+        },
+        updateParameterStock: (state, parameterStock) => {
+            state.userLogged.parameterStock = parameterStock;
+        },
+        updateToken: (state, token) => {
+            state.userLogged.token = token;
         }
     },
 }

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>