From 559a503c2517a65572a0a49e8018bd864ef23cb5 Mon Sep 17 00:00:00 2001
From: Andres2908 <saavedratrejo24@gmail.com>
Date: Tue, 5 Jan 2021 16:43:09 -0600
Subject: [PATCH 1/3] tokens-cuestionario

---
 components/admin/inputTableA.vue           | 272 +++++++++++++++++++++
 components/responsable/cartaAceptacion.vue |  15 +-
 components/responsable/cartaTermino.vue    |  11 +-
 components/responsable/cuestionario.vue    |  42 +++-
 components/responsable/inputTable.vue      |  12 +-
 pages/admin/index.vue                      |   2 +-
 pages/responsable/nuevo/index.vue          |   1 -
 7 files changed, 338 insertions(+), 17 deletions(-)
 create mode 100644 components/admin/inputTableA.vue

diff --git a/components/admin/inputTableA.vue b/components/admin/inputTableA.vue
new file mode 100644
index 0000000..53f4aba
--- /dev/null
+++ b/components/admin/inputTableA.vue
@@ -0,0 +1,272 @@
+<template>
+  <div class="container">
+    <div class="columns">
+      <div class="column is-3 mb-0">
+        <b-field>
+          <b-input
+            placeholder="No.Cuenta"
+            icon="school"
+            rounded
+            v-model="numeroCuenta"
+            maxlength="9"
+          ></b-input>
+        </b-field>
+      </div>
+
+      <div class="column is-3 mb-4 pb-4">
+        <b-field>
+          <b-input
+            type="name"
+            placeholder="Nombre"
+            icon="account"
+            rounded
+            v-model="nombre"
+          ></b-input>
+        </b-field>
+      </div>
+
+      <div class="column is-3 mb-4 pb-4 ">
+        <b-field>
+          <b-select
+            placeholder="Status"
+            icon="information"
+            expanded
+            rounded
+            v-model="idStatus"
+          >
+            <optgroup>
+              <option value=""> Status </option>
+              <option value="1">Pre-registro</option>
+              <option value="2">Registro</option>
+              <option value="3">Registro Validado</option>
+              <option value="4">Pre-Término</option>
+              <option value="5">Término</option>
+              <option value="6">Liberación</option>
+              <option value="7">Carta Aceptacion Rechazada</option>
+              <option value="8">Carta Termino Rechazada</option>
+              <option value="9">Informe Global Rechazado</option>
+              <option value="10">Cancelado</option>
+            </optgroup>
+          </b-select>
+        </b-field>
+      </div>
+
+      <div class="buttons section pt-3 pl-5">
+        <b-button type="is-info" @click="obtenerDatos(idStatus)">
+          Buscar
+        </b-button>
+      </div>
+    </div>
+
+    <div class="columns">
+      <section class="column is-12">
+        <b-table
+          :data="data"
+          :loading="loading"
+          paginated
+          backend-pagination
+          :total="total"
+          :per-page="perPage"
+          @page-change="onPageChange"
+          hoverable
+          striped
+        >
+          <b-table-column field="nombre" label="Nombre" v-slot="props" centered>
+            <span @click="servicios(props.row.idServicio)">{{
+              props.row.nombre
+            }}</span>
+          </b-table-column>
+          <b-table-column
+            field="numeroCuenta"
+            label="Número de Cuenta"
+            v-slot="props"
+            centered
+            width="100"
+          >
+            <span @click="servicios(props.row.idServicio)">{{
+              props.row.numeroCuenta
+            }}</span>
+          </b-table-column>
+          <b-table-column
+            field="carrera"
+            label="Carrera"
+            v-slot="props"
+            centered
+          >
+            <span @click="servicios(props.row.idServicio)">{{
+              props.row.carrera
+            }}</span>
+          </b-table-column>
+          <b-table-column
+            field="fechaInicio"
+            truncate="10"
+            label="Fecha Inicio"
+            v-slot="props"
+            centered
+          >
+            <span @click="servicios(props.row.idServicio)">{{
+              fecha(props.row.fechaInicio)
+            }}</span>
+          </b-table-column>
+          <b-table-column
+            field="fechaFin"
+            label="Fecha Fin"
+            v-slot="props"
+            centered
+          >
+            <span @click="servicios(props.row.idServicio)">{{
+              fecha(props.row.fechaFin)
+            }}</span>
+          </b-table-column>
+          <b-table-column field="status" label="Status" v-slot="props" centered>
+            <span
+              @click="servicios(props.row.idServicio)"
+              class="tag"
+              :class="types(props.row.idStatus)"
+              >{{ props.row.status }}</span
+            >
+          </b-table-column>
+        </b-table>
+      </section>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import moment from "moment";
+
+export default {
+  data() {
+    return {
+      idUsuario: "",
+      data: [],
+      total: "",
+      loading: true,
+      page: 1,
+      perPage: 25,
+      numeroCuenta: "",
+      nombre: "",
+      idStatus: "",
+      token: {
+        headers: {
+          token: window.localStorage.getItem("token"),
+        },
+      },
+    };
+  },
+
+  methods: {
+    onPageChange(page) {
+      this.page = page;
+      this.obtenerDatos();
+      console.log(this.page);
+    },
+    types(idStatus) {
+      if (idStatus === 1) {
+        return "is-dark";
+      } else if (idStatus === 2) {
+        return "is-info";
+      } else if (idStatus === 3) {
+        return "is-link";
+      } else if (idStatus === 4) {
+        return "is-warning";
+      } else if (idStatus === 5) {
+        return "is-success";
+      } else if (idStatus === 6) {
+        return "is-link";
+      } else if (idStatus === 7) {
+        return "is-danger";
+      } else if (idStatus === 8) {
+        return "is-danger";
+      } else if (idStatus === 9) {
+        return "is-danger";
+      } else if (idStatus === 10) {
+        // admin
+        return "is-danger";
+      }
+    },
+    fecha(date) {
+      const fecha = moment(date.substr(0, 10));
+      return `${fecha.date()}/${fecha.month() + 1}/${fecha.year()}`;
+    },
+    obtenerDatos(idStatus) {
+      this.loading = true;
+      this.data = [];
+
+      axios
+        .get(
+          `${process.env.api}/servicio/servicios_admin?pagina=${this.page}&idStatus=${this.idStatus}&nombre=${this.nombre}&numeroCuenta=${this.numeroCuenta}`,
+          this.token
+        )
+        .then((res) => {
+          const servicios = res.data.servicios;
+
+          if (servicios.length !== 0) {
+            for (let i = 0; i < servicios.length; i++) {
+              this.data.push({
+                nombre: servicios[i].Usuario.nombre,
+                numeroCuenta: servicios[i].Usuario.usuario,
+                carrera: servicios[i].Carrera.carrera,
+                fechaInicio: servicios[i].fechaInicio,
+                fechaFin: servicios[i].fechaFin,
+                status: servicios[i].Status.status,
+                idStatus: servicios[i].Status.idStatus,
+                idServicio: servicios[i].idServicio,
+              });
+            }
+          }
+          let currentTotal = servicios.length;
+          let contador;
+
+          for (let i = 0; i < res.data.registros / 25 + 1; i++) {
+            contador = i;
+          }
+          currentTotal = this.perPage * contador;
+          this.total = currentTotal;
+          this.loading = false;
+        })
+        .catch((err) => {
+          if (error.response.status == 401) {
+            localStorage.clear();
+            this.$router.push("/");
+          }
+          console.log(err.response.data.message);
+          this.loading = false;
+        });
+    },
+    servicios(idServicio) {
+      window.localStorage.setItem("idServicio", idServicio);
+      this.$router.push("/admin/servicio");
+    },
+    getIdLocal() {
+      this.idUsuario = localStorage.getItem("idUsuario");
+    },
+  },
+  created() {
+    this.getIdLocal();
+    this.obtenerDatos(0);
+  },
+};
+</script>
+
+<style>
+.input:focus {
+  border: #1b3d70;
+  box-shadow: 0 0 8px 0 #1b3d70;
+}
+.select select:focus {
+  border-color: #1b3d70;
+  box-shadow: 0 0 8px 0 #1b3d70;
+}
+.select:not(.is-multiple):not(.is-loading)::after {
+  border-color: #1b3d70;
+}
+.pagination-link.is-current {
+  background-color: #1b3d70;
+  border-color: #1b3d70;
+}
+.b-table {
+  cursor: pointer;
+}
+</style>
diff --git a/components/responsable/cartaAceptacion.vue b/components/responsable/cartaAceptacion.vue
index 383dcb3..17953f7 100644
--- a/components/responsable/cartaAceptacion.vue
+++ b/components/responsable/cartaAceptacion.vue
@@ -94,11 +94,11 @@ export default {
       formData.append("cartaAceptacion", this.file);
       console.log(formData);
       axios
-        .put(`${process.env.api}/servicio/carta_aceptacion`, formData, {
-          headers: {
-            "Content-Type": "multipart/form-data",
-          },
-        })
+        .put(
+          `${process.env.api}/servicio/carta_aceptacion`,
+          formData,
+          this.token
+        )
         .then((res) => {
           console.log(res.data);
 
@@ -116,6 +116,11 @@ export default {
         })
         .catch((error) => {
           loadingComponent.close();
+          if (error.response.status == 401) {
+            localStorage.clear();
+            this.$router.push("/");
+          }
+
           this.$buefy.dialog.alert({
             title: "Error",
             message: error.response.data.message,
diff --git a/components/responsable/cartaTermino.vue b/components/responsable/cartaTermino.vue
index 2dacb78..14a3279 100644
--- a/components/responsable/cartaTermino.vue
+++ b/components/responsable/cartaTermino.vue
@@ -95,11 +95,7 @@ export default {
       formData.append("cartaTermino", this.file);
       console.log(formData);
       axios
-        .put(`${process.env.api}/servicio/carta_termino`, formData, {
-          headers: {
-            "Content-Type": "multipart/form-data",
-          },
-        })
+        .put(`${process.env.api}/servicio/carta_termino`, formData, this.token)
         .then((res) => {
           console.log(res.data);
 
@@ -117,6 +113,11 @@ export default {
         })
         .catch((error) => {
           loadingComponent.close();
+          if (error.response.status == 401) {
+            localStorage.clear();
+            this.$router.push("/");
+          }
+
           this.$buefy.dialog.alert({
             title: "Error",
             message: error.response.data.message,
diff --git a/components/responsable/cuestionario.vue b/components/responsable/cuestionario.vue
index a6b1f84..d79031a 100644
--- a/components/responsable/cuestionario.vue
+++ b/components/responsable/cuestionario.vue
@@ -200,11 +200,45 @@ export default {
       };
       console.log(data);
 
-      /*
       axios
-        .post(`${process.env.api}/cuestionario_programa`, data)
-        .then((res) => {});
-      */
+        .post(`${process.env.api}/cuestionario_programa`, data, this.token)
+        .then((res) => {
+          this.$buefy.dialog.alert({
+            title: "Success",
+            message: "Se enviaron los datos correctamente",
+            type: "is-success",
+            hasIcon: true,
+            icon: "checkbox-marked-circle",
+            iconPack: "mdi",
+            ariaRole: "alertdialog",
+            ariaModal: true,
+          });
+        })
+
+        .catch((error) => {
+          loadingComponent.close();
+          if (error.response.status == 401) {
+            localStorage.clear();
+            this.$router.push("/");
+          }
+
+          this.$buefy.dialog.alert({
+            title: "Error",
+            message: error.response.data.message,
+            type: "is-danger",
+            hasIcon: true,
+            icon: "alert-circle",
+            iconPack: "mdi",
+            ariaRole: "alertdialog",
+            ariaModal: true,
+          });
+        })
+
+        .finally(() => {
+          this.$router.push("/responsable");
+          localStorage.removeItem("idServicio");
+          localStorage.removeItem("cuestionario");
+        });
     },
     getIdLocal() {
       this.idServicio = localStorage.getItem("idServicio");
diff --git a/components/responsable/inputTable.vue b/components/responsable/inputTable.vue
index 7a591f5..6b8e449 100644
--- a/components/responsable/inputTable.vue
+++ b/components/responsable/inputTable.vue
@@ -241,6 +241,11 @@ export default {
       nombre: "",
       idStatus: "",
       idServicio: "",
+      token: {
+        headers: {
+          token: window.localStorage.getItem("token"),
+        },
+      },
     };
   },
   methods: {
@@ -308,7 +313,8 @@ export default {
       this.data = [];
       axios
         .get(
-          `${process.env.api}/servicio/servicios_responsable?idUsuario=${this.idUsuario}&pagina=${this.page}&idStatus=${this.idStatus}&nombre=${this.nombre}&numeroCuenta=${this.numeroCuenta}`
+          `${process.env.api}/servicio/servicios_responsable?idUsuario=${this.idUsuario}&pagina=${this.page}&idStatus=${this.idStatus}&nombre=${this.nombre}&numeroCuenta=${this.numeroCuenta}`,
+          this.token
         )
         .then((res) => {
           const servicios = res.data.servicios;
@@ -340,6 +346,10 @@ export default {
           this.loading = false;
         })
         .catch((err) => {
+          if (error.response.status == 401) {
+            localStorage.clear();
+            this.$router.push("/");
+          }
           console.log(err.response.data.message);
           this.loading = false;
         });
diff --git a/pages/admin/index.vue b/pages/admin/index.vue
index 7127b31..a2755ab 100644
--- a/pages/admin/index.vue
+++ b/pages/admin/index.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import InputTableA from "../../components/admin//servicio/inputTableA";
+import InputTableA from "../../components/admin/inputTableA";
 
 export default {
   components: {
diff --git a/pages/responsable/nuevo/index.vue b/pages/responsable/nuevo/index.vue
index 1358058..e2f67c4 100644
--- a/pages/responsable/nuevo/index.vue
+++ b/pages/responsable/nuevo/index.vue
@@ -381,7 +381,6 @@ export default {
             ariaRole: "alertdialog",
             ariaModal: true,
           });
-
           this.reset();
         })
         .catch((error) => {

From 5b704de6ca0dc2f08d735612ac4677ae0b84fc6e Mon Sep 17 00:00:00 2001
From: Andres2908 <saavedratrejo24@gmail.com>
Date: Tue, 5 Jan 2021 18:54:43 -0600
Subject: [PATCH 2/3] tokensErrores

---
 components/admin/inputTableA.vue           | 43 ++++++++++++---
 components/responsable/cartaAceptacion.vue | 64 +++++++++++++---------
 components/responsable/cartaTermino.vue    | 57 +++++++++++++------
 components/responsable/cuestionario.vue    | 51 +++++++++++------
 components/responsable/inputTable.vue      | 45 +++++++++++----
 5 files changed, 181 insertions(+), 79 deletions(-)

diff --git a/components/admin/inputTableA.vue b/components/admin/inputTableA.vue
index 53f4aba..1d179f4 100644
--- a/components/admin/inputTableA.vue
+++ b/components/admin/inputTableA.vue
@@ -142,7 +142,7 @@ export default {
       idUsuario: "",
       data: [],
       total: "",
-      loading: true,
+      isLoading: false,
       page: 1,
       perPage: 25,
       numeroCuenta: "",
@@ -224,15 +224,13 @@ export default {
           }
           currentTotal = this.perPage * contador;
           this.total = currentTotal;
-          this.loading = false;
         })
-        .catch((err) => {
-          if (error.response.status == 401) {
-            localStorage.clear();
-            this.$router.push("/");
-          }
-          console.log(err.response.data.message);
-          this.loading = false;
+        .catch((error) => {
+          error(error.response.data.message);
+        })
+
+        .finally(() => {
+          this.isLoading = false;
         });
     },
     servicios(idServicio) {
@@ -242,6 +240,33 @@ export default {
     getIdLocal() {
       this.idUsuario = localStorage.getItem("idUsuario");
     },
+    error(msj) {
+      if (msj == "jwt expired") {
+        msj = "Su sesión expiro";
+      } else if (msj == "invalid signature") {
+        msj = "El token no es valido";
+      }
+
+      this.$buefy.dialog.alert({
+        title: "Error",
+        message: msj,
+        type: "is-danger",
+        hasIcon: true,
+        icon: "alert-circle",
+        iconPack: "mdi",
+        ariaRole: "alertdialog",
+        ariaModal: true,
+      });
+
+      if (
+        msj == "El token no es valido" ||
+        msj == "Su sesión expiro" ||
+        msj == "No hay token"
+      ) {
+        localStorage.clear();
+        this.$router.push("/");
+      }
+    },
   },
   created() {
     this.getIdLocal();
diff --git a/components/responsable/cartaAceptacion.vue b/components/responsable/cartaAceptacion.vue
index 17953f7..a801445 100644
--- a/components/responsable/cartaAceptacion.vue
+++ b/components/responsable/cartaAceptacion.vue
@@ -49,6 +49,8 @@
         >Enviar</b-button
       >
     </b-field>
+    <b-loading :is-full-page="true" v-model="isLoading" :can-cancel="true">
+    </b-loading>
   </div>
 </template>
 
@@ -62,6 +64,7 @@ export default {
       file: [],
       idServicio: "",
       cartaAceptacion: "",
+      isLoading: false,
       token: {
         headers: {
           token: window.localStorage.getItem("token"),
@@ -92,17 +95,15 @@ export default {
       const formData = new FormData();
       formData.append("data", JSON.stringify(data));
       formData.append("cartaAceptacion", this.file);
-      console.log(formData);
+      this.isLoading = true;
       axios
-        .put(
-          `${process.env.api}/servicio/carta_aceptacion`,
-          formData,
-          this.token
-        )
+        .put(`${process.env.api}/servicio/carta_aceptacion`, formData, {
+          headers: {
+            "Content-Type": "multipart/form-data",
+            token: this.token.headers.token,
+          },
+        })
         .then((res) => {
-          console.log(res.data);
-
-          loadingComponent.close();
           this.$buefy.dialog.alert({
             title: "Success",
             message: "Se enviaron los datos correctamente",
@@ -115,24 +116,10 @@ export default {
           });
         })
         .catch((error) => {
-          loadingComponent.close();
-          if (error.response.status == 401) {
-            localStorage.clear();
-            this.$router.push("/");
-          }
-
-          this.$buefy.dialog.alert({
-            title: "Error",
-            message: error.response.data.message,
-            type: "is-danger",
-            hasIcon: true,
-            icon: "alert-circle",
-            iconPack: "mdi",
-            ariaRole: "alertdialog",
-            ariaModal: true,
-          });
+          error(error.response.data.message);
         })
         .finally(() => {
+          this.isLoading = false;
           this.$router.push("/responsable");
           localStorage.removeItem("idServicio");
           localStorage.removeItem("cartaAceptacion");
@@ -146,6 +133,33 @@ export default {
         this.$router.push("/responsable");
       }
     },
+    error(msj) {
+      if (msj == "jwt expired") {
+        msj = "Su sesión expiro";
+      } else if (msj == "invalid signature") {
+        msj = "El token no es valido";
+      }
+
+      this.$buefy.dialog.alert({
+        title: "Error",
+        message: msj,
+        type: "is-danger",
+        hasIcon: true,
+        icon: "alert-circle",
+        iconPack: "mdi",
+        ariaRole: "alertdialog",
+        ariaModal: true,
+      });
+
+      if (
+        msj == "El token no es valido" ||
+        msj == "Su sesión expiro" ||
+        msj == "No hay token"
+      ) {
+        localStorage.clear();
+        this.$router.push("/");
+      }
+    },
   },
   watch: {
     file: function(newFile, oldFile) {
diff --git a/components/responsable/cartaTermino.vue b/components/responsable/cartaTermino.vue
index 14a3279..fdde0ac 100644
--- a/components/responsable/cartaTermino.vue
+++ b/components/responsable/cartaTermino.vue
@@ -49,6 +49,8 @@
         Enviar
       </b-button>
     </b-field>
+    <b-loading :is-full-page="true" v-model="isLoading" :can-cancel="true">
+    </b-loading>
   </div>
 </template>
 
@@ -62,6 +64,7 @@ export default {
       file: [],
       idServicio: "",
       cartaTermino: "",
+      isLoading: false,
       token: {
         headers: {
           token: window.localStorage.getItem("token"),
@@ -93,9 +96,14 @@ export default {
       const formData = new FormData();
       formData.append("data", JSON.stringify(data));
       formData.append("cartaTermino", this.file);
-      console.log(formData);
+      this.isLoading = true;
       axios
-        .put(`${process.env.api}/servicio/carta_termino`, formData, this.token)
+        .put(`${process.env.api}/servicio/carta_termino`, formData, {
+          headers: {
+            "Content-Type": "multipart/form-data",
+            token: this.token.headers.token,
+          },
+        })
         .then((res) => {
           console.log(res.data);
 
@@ -112,24 +120,10 @@ export default {
           });
         })
         .catch((error) => {
-          loadingComponent.close();
-          if (error.response.status == 401) {
-            localStorage.clear();
-            this.$router.push("/");
-          }
-
-          this.$buefy.dialog.alert({
-            title: "Error",
-            message: error.response.data.message,
-            type: "is-danger",
-            hasIcon: true,
-            icon: "alert-circle",
-            iconPack: "mdi",
-            ariaRole: "alertdialog",
-            ariaModal: true,
-          });
+          error(error.response.data.message);
         })
         .finally(() => {
+          this.isLoading = false;
           this.$router.push("/responsable");
           localStorage.removeItem("idServicio");
           localStorage.removeItem("cartaTermino");
@@ -143,6 +137,33 @@ export default {
         this.$router.push("/responsable");
       }
     },
+    error(msj) {
+      if (msj == "jwt expired") {
+        msj = "Su sesión expiro";
+      } else if (msj == "invalid signature") {
+        msj = "El token no es valido";
+      }
+
+      this.$buefy.dialog.alert({
+        title: "Error",
+        message: msj,
+        type: "is-danger",
+        hasIcon: true,
+        icon: "alert-circle",
+        iconPack: "mdi",
+        ariaRole: "alertdialog",
+        ariaModal: true,
+      });
+
+      if (
+        msj == "El token no es valido" ||
+        msj == "Su sesión expiro" ||
+        msj == "No hay token"
+      ) {
+        localStorage.clear();
+        this.$router.push("/");
+      }
+    },
   },
   watch: {
     file: function(newFile, oldFile) {
diff --git a/components/responsable/cuestionario.vue b/components/responsable/cuestionario.vue
index d79031a..ec4f81b 100644
--- a/components/responsable/cuestionario.vue
+++ b/components/responsable/cuestionario.vue
@@ -160,6 +160,9 @@
         >
       </b-field>
     </section>
+
+    <b-loading :is-full-page="true" v-model="isLoading" :can-cancel="true">
+    </b-loading>
   </div>
 </template>
 
@@ -170,6 +173,7 @@ export default {
     return {
       idServicio: "",
       cuestionario: "",
+      isLoading: false,
 
       actividad1: "",
       actividad2: "",
@@ -198,8 +202,8 @@ export default {
         p6: this.p6,
         p7: this.p7,
       };
-      console.log(data);
 
+      this.isLoading = true;
       axios
         .post(`${process.env.api}/cuestionario_programa`, data, this.token)
         .then((res) => {
@@ -216,25 +220,11 @@ export default {
         })
 
         .catch((error) => {
-          loadingComponent.close();
-          if (error.response.status == 401) {
-            localStorage.clear();
-            this.$router.push("/");
-          }
-
-          this.$buefy.dialog.alert({
-            title: "Error",
-            message: error.response.data.message,
-            type: "is-danger",
-            hasIcon: true,
-            icon: "alert-circle",
-            iconPack: "mdi",
-            ariaRole: "alertdialog",
-            ariaModal: true,
-          });
+          error(error.response.data.message);
         })
 
         .finally(() => {
+          this.isLoading = false;
           this.$router.push("/responsable");
           localStorage.removeItem("idServicio");
           localStorage.removeItem("cuestionario");
@@ -248,6 +238,33 @@ export default {
         this.$router.push("/responsable");
       }
     },
+    error(msj) {
+      if (msj == "jwt expired") {
+        msj = "Su sesión expiro";
+      } else if (msj == "invalid signature") {
+        msj = "El token no es valido";
+      }
+
+      this.$buefy.dialog.alert({
+        title: "Error",
+        message: msj,
+        type: "is-danger",
+        hasIcon: true,
+        icon: "alert-circle",
+        iconPack: "mdi",
+        ariaRole: "alertdialog",
+        ariaModal: true,
+      });
+
+      if (
+        msj == "El token no es valido" ||
+        msj == "Su sesión expiro" ||
+        msj == "No hay token"
+      ) {
+        localStorage.clear();
+        this.$router.push("/");
+      }
+    },
   },
   created() {
     this.getIdLocal();
diff --git a/components/responsable/inputTable.vue b/components/responsable/inputTable.vue
index 6b8e449..c9e47af 100644
--- a/components/responsable/inputTable.vue
+++ b/components/responsable/inputTable.vue
@@ -234,7 +234,7 @@ export default {
       idUsuario: "",
       data: [],
       total: "",
-      loading: true,
+      isLoading: false,
       page: 1,
       perPage: 25,
       numeroCuenta: "",
@@ -309,7 +309,7 @@ export default {
       return `${fecha.year()}/${fecha.month() + 1}/${fecha.date()}`;
     },
     obtenerDatos(idStatus) {
-      this.loading = true;
+      this.isLoading = true;
       this.data = [];
       axios
         .get(
@@ -343,15 +343,13 @@ export default {
           }
           currentTotal = this.perPage * contador;
           this.total = currentTotal;
-          this.loading = false;
         })
-        .catch((err) => {
-          if (error.response.status == 401) {
-            localStorage.clear();
-            this.$router.push("/");
-          }
-          console.log(err.response.data.message);
-          this.loading = false;
+        .catch((error) => {
+          error(error.response.data.message);
+        })
+
+        .finally(() => {
+          this.isLoading = false;
         });
     },
     cartaAceptacion(idServicio, idStatus) {
@@ -363,6 +361,33 @@ export default {
       this.idTipoUsuario = localStorage.getItem("idTipoUsuario");
       this.idUsuario = localStorage.getItem("idUsuario");
     },
+    error(msj) {
+      if (msj == "jwt expired") {
+        msj = "Su sesión expiro";
+      } else if (msj == "invalid signature") {
+        msj = "El token no es valido";
+      }
+
+      this.$buefy.dialog.alert({
+        title: "Error",
+        message: msj,
+        type: "is-danger",
+        hasIcon: true,
+        icon: "alert-circle",
+        iconPack: "mdi",
+        ariaRole: "alertdialog",
+        ariaModal: true,
+      });
+
+      if (
+        msj == "El token no es valido" ||
+        msj == "Su sesión expiro" ||
+        msj == "No hay token"
+      ) {
+        localStorage.clear();
+        this.$router.push("/");
+      }
+    },
   },
   created() {
     this.getIdLocal();

From ac7445143304f37d9c9a705114e7671cd42cb1ea Mon Sep 17 00:00:00 2001
From: Andres2908 <saavedratrejo24@gmail.com>
Date: Tue, 5 Jan 2021 20:28:26 -0600
Subject: [PATCH 3/3] FuncionError

---
 components/admin/inputTableA.vue           | 44 +++++++++++++++-------
 components/responsable/cartaAceptacion.vue | 26 +++++++------
 components/responsable/cartaTermino.vue    | 26 +++++++------
 components/responsable/cuestionario.vue    | 26 +++++++------
 components/responsable/inputTable.vue      | 41 +++++++++++++-------
 5 files changed, 102 insertions(+), 61 deletions(-)

diff --git a/components/admin/inputTableA.vue b/components/admin/inputTableA.vue
index 1d179f4..196d152 100644
--- a/components/admin/inputTableA.vue
+++ b/components/admin/inputTableA.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="container">
+  <div
+    v-if="this.idTipoUsuario == 1 && this.tipoUsuario == 'admin'"
+    class="container"
+  >
     <div class="columns">
       <div class="column is-3 mb-0">
         <b-field>
@@ -62,7 +65,7 @@
       <section class="column is-12">
         <b-table
           :data="data"
-          :loading="loading"
+          :loading="isLoading"
           paginated
           backend-pagination
           :total="total"
@@ -140,6 +143,8 @@ export default {
   data() {
     return {
       idUsuario: "",
+      idTipoUsuario: "",
+      tipoUsuario: "",
       data: [],
       total: "",
       isLoading: false,
@@ -191,7 +196,7 @@ export default {
       return `${fecha.date()}/${fecha.month() + 1}/${fecha.year()}`;
     },
     obtenerDatos(idStatus) {
-      this.loading = true;
+      this.isLoading = true;
       this.data = [];
 
       axios
@@ -225,6 +230,7 @@ export default {
           currentTotal = this.perPage * contador;
           this.total = currentTotal;
         })
+
         .catch((error) => {
           error(error.response.data.message);
         })
@@ -239,12 +245,27 @@ export default {
     },
     getIdLocal() {
       this.idUsuario = localStorage.getItem("idUsuario");
+      this.idTipoUsuario = localStorage.getItem("idTipoUsuario");
+      this.tipoUsuario = localStorage.getItem("tipoUsuario");
+
+      if (this.idTipoUsuario != 1 && this.tipoUsuario != "admin") {
+        this.$router.push("/");
+      }
     },
     error(msj) {
-      if (msj == "jwt expired") {
-        msj = "Su sesión expiro";
-      } else if (msj == "invalid signature") {
-        msj = "El token no es valido";
+      let salir = false;
+      switch (msj) {
+        case "invalid signature":
+          msj = "tu token no es valido, inicia sesión de nuevo";
+          break;
+        case "jwt expired":
+          msj = "tu sesión ha expirado, inicia sesión de nuevo";
+          break;
+        case "no hay token":
+          msj = "no has enviado tu token, inicia sesión de nuevo";
+          break;
+        default:
+          salir = true;
       }
 
       this.$buefy.dialog.alert({
@@ -257,14 +278,9 @@ export default {
         ariaRole: "alertdialog",
         ariaModal: true,
       });
-
-      if (
-        msj == "El token no es valido" ||
-        msj == "Su sesión expiro" ||
-        msj == "No hay token"
-      ) {
+      if (salir === true) {
         localStorage.clear();
-        this.$router.push("/");
+        this.$router.push(`/`);
       }
     },
   },
diff --git a/components/responsable/cartaAceptacion.vue b/components/responsable/cartaAceptacion.vue
index a801445..b13f639 100644
--- a/components/responsable/cartaAceptacion.vue
+++ b/components/responsable/cartaAceptacion.vue
@@ -134,10 +134,19 @@ export default {
       }
     },
     error(msj) {
-      if (msj == "jwt expired") {
-        msj = "Su sesión expiro";
-      } else if (msj == "invalid signature") {
-        msj = "El token no es valido";
+      let salir = false;
+      switch (msj) {
+        case "invalid signature":
+          msj = "tu token no es valido, inicia sesión de nuevo";
+          break;
+        case "jwt expired":
+          msj = "tu sesión ha expirado, inicia sesión de nuevo";
+          break;
+        case "no hay token":
+          msj = "no has enviado tu token, inicia sesión de nuevo";
+          break;
+        default:
+          salir = true;
       }
 
       this.$buefy.dialog.alert({
@@ -150,14 +159,9 @@ export default {
         ariaRole: "alertdialog",
         ariaModal: true,
       });
-
-      if (
-        msj == "El token no es valido" ||
-        msj == "Su sesión expiro" ||
-        msj == "No hay token"
-      ) {
+      if (salir === true) {
         localStorage.clear();
-        this.$router.push("/");
+        this.$router.push(`/`);
       }
     },
   },
diff --git a/components/responsable/cartaTermino.vue b/components/responsable/cartaTermino.vue
index fdde0ac..09a705f 100644
--- a/components/responsable/cartaTermino.vue
+++ b/components/responsable/cartaTermino.vue
@@ -138,10 +138,19 @@ export default {
       }
     },
     error(msj) {
-      if (msj == "jwt expired") {
-        msj = "Su sesión expiro";
-      } else if (msj == "invalid signature") {
-        msj = "El token no es valido";
+      let salir = false;
+      switch (msj) {
+        case "invalid signature":
+          msj = "tu token no es valido, inicia sesión de nuevo";
+          break;
+        case "jwt expired":
+          msj = "tu sesión ha expirado, inicia sesión de nuevo";
+          break;
+        case "no hay token":
+          msj = "no has enviado tu token, inicia sesión de nuevo";
+          break;
+        default:
+          salir = true;
       }
 
       this.$buefy.dialog.alert({
@@ -154,14 +163,9 @@ export default {
         ariaRole: "alertdialog",
         ariaModal: true,
       });
-
-      if (
-        msj == "El token no es valido" ||
-        msj == "Su sesión expiro" ||
-        msj == "No hay token"
-      ) {
+      if (salir === true) {
         localStorage.clear();
-        this.$router.push("/");
+        this.$router.push(`/`);
       }
     },
   },
diff --git a/components/responsable/cuestionario.vue b/components/responsable/cuestionario.vue
index ec4f81b..1f2042e 100644
--- a/components/responsable/cuestionario.vue
+++ b/components/responsable/cuestionario.vue
@@ -239,10 +239,19 @@ export default {
       }
     },
     error(msj) {
-      if (msj == "jwt expired") {
-        msj = "Su sesión expiro";
-      } else if (msj == "invalid signature") {
-        msj = "El token no es valido";
+      let salir = false;
+      switch (msj) {
+        case "invalid signature":
+          msj = "tu token no es valido, inicia sesión de nuevo";
+          break;
+        case "jwt expired":
+          msj = "tu sesión ha expirado, inicia sesión de nuevo";
+          break;
+        case "no hay token":
+          msj = "no has enviado tu token, inicia sesión de nuevo";
+          break;
+        default:
+          salir = true;
       }
 
       this.$buefy.dialog.alert({
@@ -255,14 +264,9 @@ export default {
         ariaRole: "alertdialog",
         ariaModal: true,
       });
-
-      if (
-        msj == "El token no es valido" ||
-        msj == "Su sesión expiro" ||
-        msj == "No hay token"
-      ) {
+      if (salir === true) {
         localStorage.clear();
-        this.$router.push("/");
+        this.$router.push(`/`);
       }
     },
   },
diff --git a/components/responsable/inputTable.vue b/components/responsable/inputTable.vue
index c9e47af..8d619aa 100644
--- a/components/responsable/inputTable.vue
+++ b/components/responsable/inputTable.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="container">
+  <div
+    v-if="this.idTipoUsuario == 2 && this.tipoUsuario == 'responsable'"
+    class="container"
+  >
     <div class="columns">
       <div class="column is-3 mb-0">
         <b-field>
@@ -55,7 +58,7 @@
       <section class="column is-12">
         <b-table
           :data="data"
-          :loading="loading"
+          :loading="isLoading"
           hoverable
           striped
           paginated
@@ -232,6 +235,7 @@ export default {
     return {
       idTipoUsuario: "",
       idUsuario: "",
+      tipoUsuario: "",
       data: [],
       total: "",
       isLoading: false,
@@ -358,14 +362,28 @@ export default {
       this.$router.push("/responsable/carta_aceptacion");
     },
     getIdLocal() {
-      this.idTipoUsuario = localStorage.getItem("idTipoUsuario");
       this.idUsuario = localStorage.getItem("idUsuario");
+      this.idTipoUsuario = localStorage.getItem("idTipoUsuario");
+      this.tipoUsuario = localStorage.getItem("tipoUsuario");
+
+      if (this.idTipoUsuario != 2 && this.tipoUsuario != "responsable") {
+        this.$router.push("/");
+      }
     },
     error(msj) {
-      if (msj == "jwt expired") {
-        msj = "Su sesión expiro";
-      } else if (msj == "invalid signature") {
-        msj = "El token no es valido";
+      let salir = false;
+      switch (msj) {
+        case "invalid signature":
+          msj = "tu token no es valido, inicia sesión de nuevo";
+          break;
+        case "jwt expired":
+          msj = "tu sesión ha expirado, inicia sesión de nuevo";
+          break;
+        case "no hay token":
+          msj = "no has enviado tu token, inicia sesión de nuevo";
+          break;
+        default:
+          salir = true;
       }
 
       this.$buefy.dialog.alert({
@@ -378,14 +396,9 @@ export default {
         ariaRole: "alertdialog",
         ariaModal: true,
       });
-
-      if (
-        msj == "El token no es valido" ||
-        msj == "Su sesión expiro" ||
-        msj == "No hay token"
-      ) {
+      if (salir === true) {
         localStorage.clear();
-        this.$router.push("/");
+        this.$router.push(`/`);
       }
     },
   },