@nixweb/nixloc-ui 0.0.263 → 0.0.265

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nixweb/nixloc-ui",
-  "version": "0.0.263",
+  "version": "0.0.265",
   "description": "Componentes UI",
   "author": "Fábio Ávila <fabio@nixweb.com.br>",
   "private": false,

package/src/component/forms/Select.vue

@@ -6,9 +6,9 @@
       <Tip :field="field" :formName="formName" />
     </label>
     <div class="select" :class="{
-      'select-invalid': notifications.length > 0 && formDirty,
-      border: showBorder,
-    }">
+        'select-invalid': notifications.length > 0 && formDirty,
+        border: showBorder,
+      }">
       <multiselect @open="onOpen" @select="onSelected" @search-change="onSearch" :options="data"
         v-model.trim="currentValue" :custom-label="label" placeholder :disabled="disabled" :showLabels="true"
         :noResult="false" :maxHeight="250" ref="multiselect" selectLabel deselectLabel selectedLabel>

package/src/component/shared/SaveCancel.vue

@@ -1,28 +1,13 @@
 <template>
   <div>
-    <FixedBar
-      :position="positionFixedBar"
-      backgroundColor="#FAFAFC"
-      v-show="formDirty && !modal.open && on || showFixed"
-    >
+    <FixedBar :position="positionFixedBar" backgroundColor="#FAFAFC"
+      v-show="formDirty && !modal.open && on || showFixed">
       <div class="margin" :style="'margin-bottom:' + marginBottom + 'px'">
-        <Button
-          _key="cancelSaveCancel"
-          eventName="cancelSaveCancel"
-          title="Cancelar"
-          type="danger"
-          size="small"
-          :clicked="cancel"
-        />
-        <Button
-          _key="saveSaveCancel"
-          :eventName="eventName"
-          classIcon="fa-solid fa-floppy-disk"
-          title="Salvar"
-          type="success"
-          :disabled="!isFormValid(formName)"
-          size="medium"
-        />
+        <Button _key="cancelSaveCancel" eventName="cancelSaveCancel" title="Cancelar" type="danger" size="small"
+          :clicked="cancel" />
+        <Button _key="saveSaveCancel" :eventName="eventName" classIcon="fa-solid fa-floppy-disk" title="Salvar"
+          type="success" :disabled="!isFormValid(formName)" size="medium" />
+        <slot></slot>
       </div>
     </FixedBar>
   </div>

package/src/component/shared/TotalizationReport.vue

@@ -2,23 +2,52 @@
   <div>
     <hr class="hr-report" />
     <div class="text-right">
-      <span class="title-report-header"> Total de Registro(s) </span>
-      <span class="title-report-header value-report-header"> {{ totalRecords }} </span>
+      <b-row>
+        <b-col sm="10">
+          <span class="title-report-header"> Total de Registros .................. </span>
+        </b-col>
+        <b-col sm="2">
+          <span class="title-report-header value-report-header"> {{ totalRecords }} </span>
+        </b-col>
+      </b-row>
     </div>
     <div class="text-right" v-for="item in totalization" :key="item.title">
-      <span :class="convertName(item[0]).classCss">
+      <b-row>
+        <b-col sm="10">
+          <span v-if="convertName(item[0]).type == 'currency'">
+            <span class="title-report-header">
+              {{ convertName(item[0]).title }} ..................
+            </span>
+          </span>
+        </b-col>
+        <b-col sm="2">
+          <span v-if="convertName(item[0]).type == 'currency'">
+            {{ item[1] | currency }}
+          </span>
+          <span v-if="convertName(item[0]).type == 'numeric'">
+            {{ Math.round(item[1]) }}
+          </span>
+        </b-col>
+      </b-row>
+
+
+      <!-- <span :class="convertName(item[0]).classCss">
         <span class="title-report-header">
           {{ convertName(item[0]).title }}
           <span class="title-report-header value-report-header">
-            <span v-if="convertName(item[0]).type == 'currency'">
-              {{ item[1] | currency }}
-            </span>
-            <span v-if="convertName(item[0]).type == 'numeric'">
-              {{ Math.round(item[1]) }}
-            </span>
+            <div class="side-by-side div-title">
+              <span v-if="convertName(item[0]).type == 'currency'">
+                {{ item[1] | currency }}
+              </span>
+            </div>
+            <div class="side-by-side div-value">
+              <span v-if="convertName(item[0]).type == 'numeric'">
+                {{ Math.round(item[1]) }}
+              </span>
+            </div>
           </span>
         </span>
-      </span>
+      </span> -->
     </div>
   </div>
 </template>
@@ -60,4 +89,8 @@ export default {
 .receipt {
   color: darkblue;
 }
+
+.div-title {
+  margin-right: 0px;
+}
 </style>

package/src/component/shared/query-builder/ConvertToOdata.js

@@ -46,7 +46,11 @@ export default class ConvertToOdata {
                 if (seq + 1 != size) query += ` or `;
             }
             if (type == "totalization") {
-                query += `${name} with ${value} as ${value}${name.charAt(0).toUpperCase() + name.slice(1)}`;
+
+                let field = value.split('_').pop();
+                field = field.charAt(0).toLowerCase() + field.slice(1);
+
+                query += `${field} with ${value.split('_')[0]} as ${value.replace(/_/g, '')}`;
                 if (seq + 1 != size) query += `,`;
             }
             seq++;

package/src/component/template/ViewTemplateReportPreview.vue

@@ -153,6 +153,8 @@ export default {
       rules: this.templateReport.rules,
     });
 
+    this.clearTotalization();
+
     if (this.id) this.getById();
 
     if (!this.id) this.removeLoadingWithTime();
@@ -166,6 +168,7 @@ export default {
       "addReport",
       "addInitialReportCustom",
       "removeInitialReportCustom",
+
     ]),
     ...mapMutations("generic", [
       "addEvent",
@@ -173,6 +176,9 @@ export default {
       "hideModal",
       "removeLoading",
     ]),
+    ...mapMutations("report", [
+      "clearTotalization"
+    ]),
     getById() {
       let params = { url: this.urlGetById, obj: { id: this.id } };
       this.getApi(params).then((response) => {
@@ -202,6 +208,7 @@ export default {
       let paramsQuery = { url: this.urlQuery };
       this.resetData();
       this.getApiOdata(paramsQuery).then((response) => {
+
         this.isLoading = true;
         let totalRecords = response["@odata.count"];
         this.loadingSearch = false;

package/src/store/modules/generic.js

@@ -448,6 +448,7 @@ export default {
                         context.commit('removeNotificarions');
                         return response.data;
                     } else {
+
                         context.commit('addNotifications', response.data.notifications)
                         context.commit('addToast', 'falhaGenerica');
                         return response.data;

package/src/store/modules/report.js

@@ -254,6 +254,9 @@ export default {
                 }
             });
         },
+        clearTotalization: (state) => {
+            state.finalQueryFormatOData.totalization = [];
+        }
     },
     actions: {
         addReport: async function (context, report) {