From 14f9937d93042649fe05d2ae289ef6a1338833a0 Mon Sep 17 00:00:00 2001
From: martin chaparro <mdchaparror@gmail.com>
Date: Tue, 15 Jun 2021 19:36:51 -0500
Subject: [PATCH] sort tables ok

---
 APP/layouts/default.vue     |   1 +
 APP/nuxt.config.js          |   4 +-
 APP/pages/compras.vue       |   8 ++-
 APP/pages/configuracion.vue |  16 ++++-
 APP/pages/index.vue         |   3 +
 APP/pages/ingresos.vue      |   6 +-
 APP/pages/presupuesto.vue   |   1 +
 APP/store/index.js          | 135 +++++++++++++++++-------------------
 routes/compras.js           |   8 ++-
 routes/ingresos.js          |   8 ++-
 routes/presupuesto.js       |   4 +-
 11 files changed, 109 insertions(+), 85 deletions(-)

diff --git a/APP/layouts/default.vue b/APP/layouts/default.vue
index 22f2ccf..6bb1c48 100644
--- a/APP/layouts/default.vue
+++ b/APP/layouts/default.vue
@@ -4,6 +4,7 @@
       :background-color="sidebarBackground"
       short-title="MD"
       title="Finanzas"
+    
     >
       <notifications></notifications>
       <template slot-scope="props" slot="links">
diff --git a/APP/nuxt.config.js b/APP/nuxt.config.js
index 5b31a07..8f08af1 100644
--- a/APP/nuxt.config.js
+++ b/APP/nuxt.config.js
@@ -60,8 +60,8 @@ export default {
   // Axios module configuration (https://go.nuxtjs.dev/config-axios)
   axios: {
      //baseURL: "http://192.168.1.111:4000/api"
-      baseURL:"http://localhost:4000/api"
-    //baseURL:"https://finanzasm.herokuapp.com/api"
+     // baseURL:"http://localhost:4000/api"
+    baseURL:"https://finanzasm.herokuapp.com/api"
   },
 
   /*
diff --git a/APP/pages/compras.vue b/APP/pages/compras.vue
index 9562536..9e463f4 100644
--- a/APP/pages/compras.vue
+++ b/APP/pages/compras.vue
@@ -44,7 +44,7 @@
                   icon
                   size="sm"
                   class="btn-link"
-                  @click="updateCompraClic($index)"
+                  @click="updateCompraClic(row._id)"
                 >
                   <i class="el-icon-edit"></i>
                 </base-button>
@@ -134,6 +134,7 @@ export default {
       const axiosHeader = {
         headers: {
           token: this.$store.state.auth.token,
+          filtro:this.$store.state.filtro.fechas
         },
       };
       this.$axios
@@ -183,9 +184,10 @@ export default {
     },
     updateCompraClic(id) {
       this.isUpdate = true;
-      this.newCompra = JSON.parse(JSON.stringify(this.compras[id]));
+      var reg_edit = this.compras.filter((ic) => ic._id===id)[0];
+      this.newCompra = JSON.parse(JSON.stringify(reg_edit));
       this.openForm = true;
-      console.log("SJS")
+      console.log(reg_edit)
     },
 
     deleteCompra(id) {
diff --git a/APP/pages/configuracion.vue b/APP/pages/configuracion.vue
index 0672d06..24f149b 100644
--- a/APP/pages/configuracion.vue
+++ b/APP/pages/configuracion.vue
@@ -1,5 +1,10 @@
 <template>
   <div>
+    <card title='Filtro general'>
+      <base-input label="Filtro de fechas" v-model="filtro.fechas"></base-input>
+      <base-input label="Número de presupuestos" type="number" v-model="filtro.npresupuesto"></base-input>
+      <base-button @click='guardarFiltro()' type="info">Guardar</base-button>
+    </card>
     <div class="row">
       <card title="Categorias">
         <div class="row">
@@ -123,16 +128,16 @@
 
 <script>
 import { Table, TableColumn } from "element-ui";
-
 export default {
   middleware: "authenticated",
-  components: {
+  components: {   
     [Table.name]: Table,
     [TableColumn.name]: TableColumn,
   },
   mounted() {
     this.getCategorias();
      this.getMetodos();
+     this.filtro=this.$store.state.filtro
   },
   data() {
     return {
@@ -178,9 +183,16 @@ export default {
       ],
       categorias: [],
       metodos: [],
+      filtro:{
+        fechas:this.$store.state.filtro.fechas,
+        npresupuesto:this.$store.state.filtro.npresupuesto
+      }
     };
   },
   methods: {
+    guardarFiltro(){
+      this.$store.commit("actualizarFiltro",this.filtro)
+    },
     enviarCategoria() {
       const axiosHeader = {
         headers: {
diff --git a/APP/pages/index.vue b/APP/pages/index.vue
index 1b4d7bf..567dc5d 100644
--- a/APP/pages/index.vue
+++ b/APP/pages/index.vue
@@ -7,6 +7,9 @@
 <script>
 export default {
  middleware: 'authenticated',
+  mounted(){
+        $nuxt.$router.push("/compras")
+    }
 }
 </script>
 
diff --git a/APP/pages/ingresos.vue b/APP/pages/ingresos.vue
index 6c097d2..8694562 100644
--- a/APP/pages/ingresos.vue
+++ b/APP/pages/ingresos.vue
@@ -32,7 +32,7 @@
                   icon
                   size="sm"
                   class="btn-link"
-                  @click="updateIngresoClic($index)"
+                  @click="updateIngresoClic(row._id)"
                 >
                   <i class="el-icon-edit"></i>
                 </base-button>
@@ -109,6 +109,7 @@ export default {
       const axiosHeader = {
         headers: {
           token: this.$store.state.auth.token,
+          filtro:this.$store.state.filtro.fechas
         },
       };
       this.$axios
@@ -158,7 +159,8 @@ export default {
     },
     updateIngresoClic(id) {
       this.isUpdate = true;
-      this.newIngreso = JSON.parse(JSON.stringify(this.ingresos[id]));
+      var reg_edit = this.ingresos.filter((ic) => ic._id===id)[0];
+      this.newIngreso = JSON.parse(JSON.stringify(reg_edit));
       this.openForm = !this.openForm;
     },
 
diff --git a/APP/pages/presupuesto.vue b/APP/pages/presupuesto.vue
index c360e35..452b0f9 100644
--- a/APP/pages/presupuesto.vue
+++ b/APP/pages/presupuesto.vue
@@ -261,6 +261,7 @@ export default {
       const axiosHeader = {
         headers: {
           token: this.$store.state.auth.token,
+          limite:this.$store.state.filtro.npresupuesto
         },
       };
 
diff --git a/APP/store/index.js b/APP/store/index.js
index f99843f..2c4acb6 100644
--- a/APP/store/index.js
+++ b/APP/store/index.js
@@ -1,94 +1,85 @@
 export const state = () => ({
-    auth: null,
-    notifications: [],
-    fecha: fechaString(),
-    categorias:[],
-    metodos_de_pago:[]
-  });
+  auth: null,
+  notifications: [],
+  filtro: {fechas:fechaString().slice(0, 7),npresupuesto:5},
+  fecha: fechaString(),
+  categorias: [],
+  metodos_de_pago: []
+});
 
-  export const mutations = {
+export const mutations = {
+  setAuth(state, auth) {
+    state.auth = auth;
+  },
 
-    setAuth(state, auth) {
-      state.auth = auth;
-    },
-  
-    setNotifications(state, notifications) {
-      state.notifications = notifications;
-    },
+  setNotifications(state, notifications) {
+    state.notifications = notifications;
+  },
 
-    setCategorias(state, categorias) {
-      state.categorias = categorias;
-    },
+  setCategorias(state, categorias) {
+    state.categorias = categorias;
+  },
 
-    setMetodos(state, metodos) {
-      state.metodos_de_pago = metodos;
-    },
-  
- 
-  
-  };
+  setMetodos(state, metodos) {
+    state.metodos_de_pago = metodos;
+  },
+  actualizarFiltro(state,filtro) {
 
-  function fechaString(){
-    let data = new Date();
-    let year= data.getFullYear();
-    let month = (data.getMonth() + 1)<9?"0"+(data.getMonth() + 1):(data.getMonth() + 1)
-    let day = data.getDate()<9?"0"+data.getDate():data.getDate()
-    let dataF=`${year}-${month}-${day}`
-    return dataF;
-   
+    state.filtro=filtro
+    
+  }
+};
+
+function fechaString() {
+  let data = new Date();
+  let year = data.getFullYear();
+  let month =
+    data.getMonth() + 1 < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+  let day = data.getDate() < 9 ? "0" + data.getDate() : data.getDate();
+  let dataF = `${year}-${month}-${day}`;
+  return dataF;
 }
 
 export const actions = {
-
-    readToken() {
-      let auth = null;
-      try {
-        auth = JSON.parse(localStorage.getItem("auth"));
-      } catch (error) {
-        console.log(err);
+  readToken() {
+    let auth = null;
+    try {
+      auth = JSON.parse(localStorage.getItem("auth"));
+    } catch (error) {
+      console.log(err);
+    }
+    //saving auth in state
+    this.commit("setAuth", auth);
+  },
+  getCategorias() {
+    const axiosHeader = {
+      headers: {
+        token: this.state.auth.token
       }
-      //saving auth in state
-      this.commit("setAuth", auth);
-    },
-    getCategorias() {
-  
-      const axiosHeader = {
-        headers: {
-          token: this.state.auth.token
-        }
-      };
+    };
 
-
-    this.$axios.get("/categoria", axiosHeader)
-    .then(res => {
-     
-      this.commit("setCategorias", res.data.data);
-     
-
-    }).catch(error => {
-      console.log(error);
-    });
-    
+    this.$axios
+      .get("/categoria", axiosHeader)
+      .then(res => {
+        this.commit("setCategorias", res.data.data);
+      })
+      .catch(error => {
+        console.log(error);
+      });
   },
 
   getMetodos() {
-  
     const axiosHeader = {
       headers: {
-        token: this.state.auth.token,
-      },
+        token: this.state.auth.token
+      }
     };
     this.$axios
       .get("/metodo", axiosHeader)
-      .then((res) => {
-        
+      .then(res => {
         this.commit("setMetodos", res.data.data);
       })
-      .catch((e) => console.log(e));
-  
-},
-
-
-
-}
+      .catch(e => console.log(e));
+  },
 
+};
diff --git a/routes/compras.js b/routes/compras.js
index 665fd39..c066a6a 100644
--- a/routes/compras.js
+++ b/routes/compras.js
@@ -5,8 +5,12 @@ const { checkAuth } = require("../middlewares/authentication");
 
 router.get("/compras", checkAuth, async (req, res) => {
     var compras;
-  
-    compras = await Compra.find({ user: req.userData._id }).sort({
+    let  miFiltro = req.get('filtro');
+    const filtros = {
+      fecha: { $regex: miFiltro, $options: "i" },
+    };
+
+    compras = await Compra.find({$and:[{ user: req.userData._id },filtros]}).sort({
       fecha: "desc",
     });
   
diff --git a/routes/ingresos.js b/routes/ingresos.js
index f828757..97472d6 100644
--- a/routes/ingresos.js
+++ b/routes/ingresos.js
@@ -5,7 +5,13 @@ const { checkAuth } = require("../middlewares/authentication");
 
 router.get("/ingreso", checkAuth, async (req, res) => {
     var Ingresos; 
-    Ingresos = await Ingreso.find({ user: req.userData._id }).sort({
+    let  miFiltro = req.get('filtro');
+    const filtros = {
+      fecha: { $regex: miFiltro, $options: "i" },
+    };
+
+
+    Ingresos = await Ingreso.find({$and:[{ user: req.userData._id },filtros]}).sort({
       fecha: "desc",
     });
   
diff --git a/routes/presupuesto.js b/routes/presupuesto.js
index c48c455..1ab69f1 100644
--- a/routes/presupuesto.js
+++ b/routes/presupuesto.js
@@ -5,9 +5,11 @@ const { checkAuth } = require("../middlewares/authentication");
 
 router.get("/presupuesto", checkAuth, async (req, res) => {
   var presupuestos;
+  let  limite = req.get('limite');
   presupuestos = await presupuesto.find({ user: req.userData._id }).sort({
     date: "desc",
-  });
+  }).limit(parseInt(limite));
+ 
 
   return res.send({
     status: "ok",