From d28cf16b9a6ae14006caadec1ae5bdf9943dbafa Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Mon, 14 Mar 2022 16:29:00 -0600 Subject: [PATCH 01/25] habilitamos las 4 areas --- components/registro/CapturaDatos.vue | 23 ++++++++++++++++++++--- components/registro/DatosUsuario.vue | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/components/registro/CapturaDatos.vue b/components/registro/CapturaDatos.vue index ad1f6dd..971cbfe 100644 --- a/components/registro/CapturaDatos.vue +++ b/components/registro/CapturaDatos.vue @@ -12,11 +12,25 @@ CEDETEC

+
+ + Windows + Mac + Linux + Mesa para + laptop +
+
- - - @@ -30,6 +44,9 @@ > + + + Date: Mon, 14 Mar 2022 23:38:59 -0600 Subject: [PATCH 02/25] campos editables --- components/admin/tableTickets.vue | 41 ++++++++--- components/admin/ticket.vue | 113 ++++++++++++++++-------------- 2 files changed, 93 insertions(+), 61 deletions(-) diff --git a/components/admin/tableTickets.vue b/components/admin/tableTickets.vue index 8af75e0..9ed1a40 100644 --- a/components/admin/tableTickets.vue +++ b/components/admin/tableTickets.vue @@ -39,7 +39,7 @@ {{ props.row.Usuario.numeroCuenta }} - {{ props.row.folio }} @@ -47,14 +47,12 @@ {{ props.row.monto }} - - Ver ticket - + Validar + + Cancelar + + + + Ver ticket
diff --git a/components/admin/ticket.vue b/components/admin/ticket.vue index ddd380e..3249bbd 100644 --- a/components/admin/ticket.vue +++ b/components/admin/ticket.vue @@ -6,23 +6,9 @@ -
- -
@@ -36,9 +22,48 @@

-

Folio: {{ $route.query.folio }}

-

Cantidad: {{ $route.query.monto }}

-

Fecha del ticket: {{ fecha($route.query.fecha) }}

+ + +

+ + +

+ + + + +

+ + +

+ + + + + +

+ + +

+
import axios from 'axios' -import moment from 'moment' export default { props: { @@ -84,10 +108,16 @@ export default { return { token: '', - isImageModalActive: false, + switchFolio: true, + switchMonto: true, + switchFecha: true, + + fechaTicket: new Date(this.$route.query.fecha), + isLoading: true, isFullPage: true, urlTicket: '', + validado: null, } }, @@ -128,8 +158,18 @@ export default { this.$router.go(-1) }) }, - fecha(fecha) { - return moment(fecha).format('L') + habilitar(tipo) { + tipo == 'folio' && this.switchFolio == true + ? (this.switchFolio = false) + : (this.switchFolio = true) + + tipo == 'monto' && this.switchMonto == true + ? (this.switchMonto = false) + : (this.switchMonto = true) + + tipo == 'fecha' && this.switchFecha == true + ? (this.switchFecha = false) + : (this.switchFecha = true) }, regresar() { this.$router.go(-1) @@ -150,37 +190,6 @@ export default { padding-bottom: 470px; } -.overlay { - position: absolute; - top: 4%; - bottom: 0; - left: 0; - right: 40%; - height: 470px; - width: 350px; - opacity: 0; - transition: 0.5s ease; - background-color: white; -} - -/* When you mouse over the container, fade in the overlay icon*/ -.containerImg:hover .overlay { - opacity: 0.3; -} - -/* The icon inside the overlay is positioned in the middle vertically and horizontally */ -.icon { - color: black; - font-size: 100px; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - -ms-transform: translate(-50%, -50%); - text-align: center; - z-index: 2; -} - .zoom { transition: transform 0.2s; } From 4e0c70aae16990a6abcb9cddbe717d0075cfd3f4 Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Mon, 14 Mar 2022 23:45:43 -0600 Subject: [PATCH 03/25] Cuenta --- components/admin/tableTickets.vue | 1 + components/admin/ticket.vue | 3 +++ nuxt.config.js | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/admin/tableTickets.vue b/components/admin/tableTickets.vue index 9ed1a40..f9c5708 100644 --- a/components/admin/tableTickets.vue +++ b/components/admin/tableTickets.vue @@ -144,6 +144,7 @@ export default { fecha: value.fechaTicket, }, }) + localStorage.setItem('noCuenta', value.Usuario.numeroCuenta) }, validarSinTicket() { this.updateIsLoading(true) diff --git a/components/admin/ticket.vue b/components/admin/ticket.vue index 3249bbd..2bf76cc 100644 --- a/components/admin/ticket.vue +++ b/components/admin/ticket.vue @@ -22,6 +22,8 @@

+

Número de cuenta: {{ numeroCuenta }}

+ Date: Tue, 15 Mar 2022 18:27:20 -0600 Subject: [PATCH 04/25] actualizacion del ticket --- components/admin/datosTicket.vue | 154 ++++++++++++++++++++++++++++++ components/admin/tableTickets.vue | 13 +-- components/admin/ticket.vue | 90 +++++------------ nuxt.config.js | 4 +- 4 files changed, 185 insertions(+), 76 deletions(-) create mode 100644 components/admin/datosTicket.vue diff --git a/components/admin/datosTicket.vue b/components/admin/datosTicket.vue new file mode 100644 index 0000000..f4eaf18 --- /dev/null +++ b/components/admin/datosTicket.vue @@ -0,0 +1,154 @@ + + + diff --git a/components/admin/tableTickets.vue b/components/admin/tableTickets.vue index f9c5708..0d6d144 100644 --- a/components/admin/tableTickets.vue +++ b/components/admin/tableTickets.vue @@ -136,15 +136,12 @@ export default { }) }, verTicket(value) { - this.$router.push({ - path: '/admin/ticket/', - query: { - folio: value.folio, - monto: value.monto, - fecha: value.fechaTicket, - }, - }) + this.$router.push('/admin/ticket') + localStorage.setItem('monto', value.monto) + localStorage.setItem('folio', value.folio) + localStorage.setItem('fechaTicket', value.fechaTicket) localStorage.setItem('noCuenta', value.Usuario.numeroCuenta) + localStorage.setItem('inscripcion', value.idInscripcion) }, validarSinTicket() { this.updateIsLoading(true) diff --git a/components/admin/ticket.vue b/components/admin/ticket.vue index 2bf76cc..7099abe 100644 --- a/components/admin/ticket.vue +++ b/components/admin/ticket.vue @@ -21,52 +21,18 @@ alumno.

-
-

Número de cuenta: {{ numeroCuenta }}

+ - - -

- - -

- - - - -

- - -

- - - - - -

- - -

- -
import axios from 'axios' +import DatosTicket from './datosTicket.vue' export default { + components: { + DatosTicket, + }, props: { imprimirMensaje: { type: Function, require: true }, imprimirError: { type: Function, require: true }, @@ -110,12 +80,9 @@ export default { return { token: '', - switchFolio: true, - switchMonto: true, - switchFecha: true, - - fechaTicket: new Date(this.$route.query.fecha), - numeroCuenta: localStorage.getItem('noCuenta'), + fechaTicket: new Date(localStorage.getItem('fechaTicket')), + folio: localStorage.getItem('folio'), + monto: localStorage.getItem('monto'), isLoading: true, isFullPage: true, @@ -127,7 +94,7 @@ export default { methods: { traerTicket() { axios - .get(`${process.env.api}/admin/ticket?folio=${this.$route.query.folio}`) + .get(`${process.env.api}/admin/ticket?folio=${this.folio}`) .then((res) => { this.isLoading = false this.urlTicket = res.config.url @@ -142,7 +109,7 @@ export default { }, validar() { const data = { - folio: this.$route.query.folio, + folio: this.folio, validacion: this.validado, } @@ -161,21 +128,12 @@ export default { this.$router.go(-1) }) }, - habilitar(tipo) { - tipo == 'folio' && this.switchFolio == true - ? (this.switchFolio = false) - : (this.switchFolio = true) - - tipo == 'monto' && this.switchMonto == true - ? (this.switchMonto = false) - : (this.switchMonto = true) - - tipo == 'fecha' && this.switchFecha == true - ? (this.switchFecha = false) - : (this.switchFecha = true) + actualizarFolio() { + this.folio = localStorage.getItem('folio') + console.log(this.folio) }, regresar() { - this.$router.go(-1) + this.$router.push('/admin') }, }, created() { diff --git a/nuxt.config.js b/nuxt.config.js index 6808126..e57502c 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -22,9 +22,9 @@ export default { axios: {}, build: {}, env: { - // api: 'http://localhost:3000', + api: 'http://localhost:3000', // api: "https://890af9d598a4.ngrok.io" - api: 'https://venus.acatlan.unam.mx/inscripciones_test', + // api: 'https://venus.acatlan.unam.mx/inscripciones_test', // api: 'https://venus.acatlan.unam.mx/inscripciones', }, } From 5fe0100d100f644bf584c35bc1fba74c9f6458ee Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Tue, 15 Mar 2022 18:51:07 -0600 Subject: [PATCH 05/25] cancelacion de una inscripcion --- components/admin/tableTickets.vue | 40 ++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/components/admin/tableTickets.vue b/components/admin/tableTickets.vue index 0d6d144..823208c 100644 --- a/components/admin/tableTickets.vue +++ b/components/admin/tableTickets.vue @@ -68,18 +68,16 @@ " >Validar + + Cancelar { + this.imprimirMensaje(res.data.message) + this.updateIsLoading(false) + }) + .catch((err) => { + this.imprimirError(err.response.data) + this.updateIsLoading(false) + }) }, - imprimirError(err = {}, title = '¡Hubo un error!', onConfirm = () => {}) { this.$buefy.dialog.alert({ ariaRole: 'alertdialog', From e51da59352631275c6210c9af09a63a8d9147a10 Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Thu, 17 Mar 2022 00:26:53 -0600 Subject: [PATCH 06/25] 2da pagina (servicios) --- components/informacion/tablaCostos.vue | 20 +++ pages/registro/index.vue | 13 +- pages/registro/servicios.vue | 217 +++++++++++++++++++++++++ 3 files changed, 243 insertions(+), 7 deletions(-) create mode 100644 components/informacion/tablaCostos.vue create mode 100644 pages/registro/servicios.vue diff --git a/components/informacion/tablaCostos.vue b/components/informacion/tablaCostos.vue new file mode 100644 index 0000000..b950601 --- /dev/null +++ b/components/informacion/tablaCostos.vue @@ -0,0 +1,20 @@ + + + diff --git a/pages/registro/index.vue b/pages/registro/index.vue index 367a3b8..525b223 100644 --- a/pages/registro/index.vue +++ b/pages/registro/index.vue @@ -20,10 +20,9 @@
  • 4. Este servicio y su inscripción válida, es para hacer uso de una mesa - a la vez dentro del CEDETEC, en el área indicada en el Departamento de Servicios - de Cómputo (DSC), donde podrás - trabajar con tus dispositivos móviles personales y solo para realizar - actividades académicas. + a la vez dentro del CEDETEC, en el área indicada en el Departamento de + Servicios de Cómputo (DSC), donde podrás trabajar con tus dispositivos + móviles personales y solo para realizar actividades académicas.
  • 5. Los horarios de servicio son de lunes a viernes de 9:00 a 19:45 hrs @@ -108,7 +107,7 @@
    Aceptar @@ -124,8 +123,8 @@ export default { } }, methods: { - pushRegistro() { - this.$router.push('/registro/inscripcion') + pushServicios() { + this.$router.push('/registro/servicios') }, }, } diff --git a/pages/registro/servicios.vue b/pages/registro/servicios.vue new file mode 100644 index 0000000..a0319a5 --- /dev/null +++ b/pages/registro/servicios.vue @@ -0,0 +1,217 @@ + + + From 8301c8229d7b70efbbba49bffbdf6a44cebb3e4f Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Thu, 17 Mar 2022 00:45:27 -0600 Subject: [PATCH 07/25] api --- nuxt.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nuxt.config.js b/nuxt.config.js index e57502c..6808126 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -22,9 +22,9 @@ export default { axios: {}, build: {}, env: { - api: 'http://localhost:3000', + // api: 'http://localhost:3000', // api: "https://890af9d598a4.ngrok.io" - // api: 'https://venus.acatlan.unam.mx/inscripciones_test', + api: 'https://venus.acatlan.unam.mx/inscripciones_test', // api: 'https://venus.acatlan.unam.mx/inscripciones', }, } From ea1d9f28cf2f58c1c86387399cbe62c690ede440 Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Thu, 17 Mar 2022 11:58:19 -0600 Subject: [PATCH 08/25] Correo y actualizacion de la 2da pagina --- components/registro/CapturaDatos.vue | 3 + pages/registro/index.vue | 300 +++++++++++++++++---------- 2 files changed, 196 insertions(+), 107 deletions(-) diff --git a/components/registro/CapturaDatos.vue b/components/registro/CapturaDatos.vue index 971cbfe..7ba479e 100644 --- a/components/registro/CapturaDatos.vue +++ b/components/registro/CapturaDatos.vue @@ -146,6 +146,7 @@ export default { terminos: false, idCarrera: '', + usuario: '', token: '', minDate: this.diaMin(today), @@ -178,6 +179,7 @@ export default { let formData = new FormData() if (this.error === false) { formData.append('idUsuario', this.idUsuario) + formData.append('numeroCuenta', this.usuario) formData.append('folio', this.folio) if (this.monto === '') this.monto = 0 formData.append('monto', this.monto) @@ -256,6 +258,7 @@ export default { }, }, created() { + this.usuario = localStorage.getItem('usuario') this.getLocalhostInfo() }, } diff --git a/pages/registro/index.vue b/pages/registro/index.vue index 525b223..a0319a5 100644 --- a/pages/registro/index.vue +++ b/pages/registro/index.vue @@ -1,130 +1,216 @@ From 4b97608c3edc5a8c4c6440aa7659d58a88d0883b Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Thu, 17 Mar 2022 18:53:37 -0600 Subject: [PATCH 11/25] acordeon --- components/Login.vue | 5 +---- components/registro/CapturaDatos.vue | 6 ------ nuxt.config.js | 4 ++-- pages/registro/index.vue | 18 +++++++++++------- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/components/Login.vue b/components/Login.vue index f4f7074..2f7cff4 100644 --- a/components/Login.vue +++ b/components/Login.vue @@ -3,10 +3,7 @@

    - Inscripción del servicio -

    -

    - Mesa para dispositivos móviles. + Inscripción del servicios de CeDeTec

    diff --git a/components/registro/CapturaDatos.vue b/components/registro/CapturaDatos.vue index 7ba479e..f5b45ca 100644 --- a/components/registro/CapturaDatos.vue +++ b/components/registro/CapturaDatos.vue @@ -23,10 +23,6 @@ Linux - Mesa para - laptop
    @@ -134,11 +130,9 @@ export default { area1: true, area2: true, area3: true, - area4: true, error: false, - idArea: '4', folio: '', monto: '', fechaTicket: null, diff --git a/nuxt.config.js b/nuxt.config.js index dd18c48..c9fe5ce 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -22,9 +22,9 @@ export default { axios: {}, build: {}, env: { - // api: 'http://localhost:3000', + api: 'http://localhost:3000', // api: "https://890af9d598a4.ngrok.io" - api: 'https://venus.acatlan.unam.mx/inscripciones_test', + // api: 'https://venus.acatlan.unam.mx/inscripciones_test', // api: 'https://venus.acatlan.unam.mx/inscripciones', }, } diff --git a/pages/registro/index.vue b/pages/registro/index.vue index 3475c7f..f3319ae 100644 --- a/pages/registro/index.vue +++ b/pages/registro/index.vue @@ -1,13 +1,11 @@ + + diff --git a/components/admin/ticket.vue b/components/admin/ticket.vue index 7099abe..6646c45 100644 --- a/components/admin/ticket.vue +++ b/components/admin/ticket.vue @@ -37,25 +37,15 @@ Validar - Denegar + + Regresar
    • @@ -65,10 +55,12 @@ diff --git a/components/admin/ticket.vue b/components/admin/ticket.vue index 6646c45..066da75 100644 --- a/components/admin/ticket.vue +++ b/components/admin/ticket.vue @@ -14,13 +14,11 @@

    Administrador por favor revisa que todos los datos sean correctos, en - caso de ser así valida el ticket. -

    -

    - Recuerda que al validar el ticket también se confirma la inscripción del - alumno. + caso de ser así valida el ticket y la inscripción.

    + + -

    +

    ¿Desear continuar con la inscripción ?

    From 4123f518417cd156ba30a3feced574e5232b7a40 Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Fri, 18 Mar 2022 11:18:58 -0600 Subject: [PATCH 14/25] estilos --- components/admin/isCancelacion.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/admin/isCancelacion.vue b/components/admin/isCancelacion.vue index 0075019..69322a4 100644 --- a/components/admin/isCancelacion.vue +++ b/components/admin/isCancelacion.vue @@ -1,9 +1,9 @@ diff --git a/nuxt.config.js b/nuxt.config.js index dd18c48..c9fe5ce 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -22,9 +22,9 @@ export default { axios: {}, build: {}, env: { - // api: 'http://localhost:3000', + api: 'http://localhost:3000', // api: "https://890af9d598a4.ngrok.io" - api: 'https://venus.acatlan.unam.mx/inscripciones_test', + // api: 'https://venus.acatlan.unam.mx/inscripciones_test', // api: 'https://venus.acatlan.unam.mx/inscripciones', }, } From 0913fc6166c68f2c190aa737581cfa1889981ecb Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Fri, 18 Mar 2022 18:24:59 -0600 Subject: [PATCH 18/25] loading --- components/layouts/Logout.vue | 3 +-- components/registro/CapturaDatos.vue | 16 ++++++++-------- nuxt.config.js | 4 ++-- pages/registro/inscripcion.vue | 3 +++ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/components/layouts/Logout.vue b/components/layouts/Logout.vue index c4d6c2d..14def44 100644 --- a/components/layouts/Logout.vue +++ b/components/layouts/Logout.vue @@ -1,10 +1,9 @@ @@ -41,6 +43,7 @@ export default { return { idUsuario: '', inscripcionesUsuario: [], + isLoading: false, } }, methods: { From d2ed0ff465972fef87d98f9e0d4e597bb69d21f2 Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Sat, 19 Mar 2022 20:26:29 -0600 Subject: [PATCH 19/25] Cambios revision --- components/registro/CapturaDatos.vue | 2 +- pages/registro/index.vue | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/components/registro/CapturaDatos.vue b/components/registro/CapturaDatos.vue index deb9adc..3ee728d 100644 --- a/components/registro/CapturaDatos.vue +++ b/components/registro/CapturaDatos.vue @@ -104,7 +104,7 @@ :disabled="!(idArea !== '' && terminos)" @click=" imprimirWarning( - '¿Los datos para la inscripción al servicio de mesa para dispositivos móviles personales son correctos?', + '¿Los datos para la inscripción a CEDETEC son correctos?', inscribir ) " diff --git a/pages/registro/index.vue b/pages/registro/index.vue index 14ba99d..b1c385d 100644 --- a/pages/registro/index.vue +++ b/pages/registro/index.vue @@ -1,7 +1,7 @@