From d4f44b3eaf428b204ece638c3e67c57b5f150790 Mon Sep 17 00:00:00 2001 From: mxrco Date: Mon, 16 Nov 2020 13:45:00 -0600 Subject: [PATCH 1/4] cuarto commit --- components/admin/servicio/modificar/form.vue | 59 +++++++++++++++----- components/admin/servicio/vistaServicio.vue | 48 +++++++++------- 2 files changed, 71 insertions(+), 36 deletions(-) diff --git a/components/admin/servicio/modificar/form.vue b/components/admin/servicio/modificar/form.vue index 69ab048..af9cece 100644 --- a/components/admin/servicio/modificar/form.vue +++ b/components/admin/servicio/modificar/form.vue @@ -1,6 +1,6 @@ @@ -128,13 +127,13 @@ export default { fechaNacimiento: [], fechaInicio: [], fechaFin: [], - minDate1: new Date('2020-01-02') + minDate1: new Date('2020-01-01') } }, methods: { dangerToast () { this.$buefy.toast.open({ - message: 'Correo invalido', + message: 'Asegurate de ingresar un PDF', type: 'is-danger' }) }, @@ -151,9 +150,39 @@ export default { this.nuevo.informeGlobal.name || this.nuevo.idStatus ) { + if (this.nuevo.correo) { + if (validator.isEmail(this.nuevo.correo)) { + return true + } else { + return false + } + } return true } - return false + }, + validarExt (a) { + const extPermitidas = /(.pdf)$/i + switch (a) { + case 1: if (!extPermitidas.exec(this.nuevo.cartaAceptacion.name)) { + this.dangerToast() + this.nuevo.cartaAceptacion = {} + } + break + case 2: if (!extPermitidas.exec(this.nuevo.cartaTermino.name)) { + this.dangerToast() + this.nuevo.cartaTermino = {} + } + break + case 3: if (!extPermitidas.exec(this.nuevo.informeGlobal.name)) { + this.dangerToast() + this.nuevo.informeGlobal = {} + } + break + } + }, + regresar () { + localStorage.removeItem('idRegistro') + this.$router.push('/admin/servicio') } }, computed: { diff --git a/components/admin/servicio/vistaServicio.vue b/components/admin/servicio/vistaServicio.vue index 2bdaa59..7d2cc6e 100644 --- a/components/admin/servicio/vistaServicio.vue +++ b/components/admin/servicio/vistaServicio.vue @@ -1,7 +1,30 @@ From afaf0db0044c490bb967d27b149d3d878403a408 Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Mon, 16 Nov 2020 13:48:12 -0600 Subject: [PATCH 2/4] V-1.4-boton --- components/responsable/inputTable.vue | 162 ++++++++++++++++++++------ pages/responsable/index.vue | 9 +- 2 files changed, 132 insertions(+), 39 deletions(-) diff --git a/components/responsable/inputTable.vue b/components/responsable/inputTable.vue index 5d47023..7c7b8b2 100644 --- a/components/responsable/inputTable.vue +++ b/components/responsable/inputTable.vue @@ -1,39 +1,71 @@ - + diff --git a/pages/responsable/index.vue b/pages/responsable/index.vue index ccc7580..751a8f8 100644 --- a/pages/responsable/index.vue +++ b/pages/responsable/index.vue @@ -6,12 +6,12 @@ Para registrar a un alumno de servicio social pulsa el botón Agregar Alumno y sigue las instrucciones.
Para visualizar los datos completos de un alumno ya registrado o subir - su carta de término, poulsa su nombre y se desplegará la ficha técnica + su carta de término, pulsa su nombre y se desplegará la ficha técnica con toda la información.

- + Agregar alumno
@@ -29,6 +29,11 @@ import InputTable from '../../components/responsable/inputTable' export default { components: { InputTable + }, + methods: { + agregarAlumno () { + this.$router.push('/responsable/nuevo') + } } } From 7576a5bbfe11deae3f9e8c678183c6d1ea38c37f Mon Sep 17 00:00:00 2001 From: mxrco Date: Thu, 19 Nov 2020 16:12:38 -0600 Subject: [PATCH 3/4] tabla responsables --- components/admin/servicio/modificar/form.vue | 6 +- .../servicio/programa/tablaResponsables.vue | 253 ++++++++++++++++++ components/admin/servicio/vistaServicio.vue | 104 ++++++- components/alumno/ejemplo.vue | 4 +- pages/admin/programa/index.vue | 16 ++ pages/alumno/index.vue | 65 ++++- 6 files changed, 433 insertions(+), 15 deletions(-) create mode 100644 components/admin/servicio/programa/tablaResponsables.vue create mode 100644 pages/admin/programa/index.vue diff --git a/components/admin/servicio/modificar/form.vue b/components/admin/servicio/modificar/form.vue index af9cece..4bbd800 100644 --- a/components/admin/servicio/modificar/form.vue +++ b/components/admin/servicio/modificar/form.vue @@ -49,7 +49,7 @@

Carta de aceptación


- +

@@ -63,7 +63,7 @@

Carta de término


- +

@@ -77,7 +77,7 @@

Informe global


- +

diff --git a/components/admin/servicio/programa/tablaResponsables.vue b/components/admin/servicio/programa/tablaResponsables.vue new file mode 100644 index 0000000..aa12468 --- /dev/null +++ b/components/admin/servicio/programa/tablaResponsables.vue @@ -0,0 +1,253 @@ + + + + + diff --git a/components/admin/servicio/vistaServicio.vue b/components/admin/servicio/vistaServicio.vue index 7d2cc6e..72209ad 100644 --- a/components/admin/servicio/vistaServicio.vue +++ b/components/admin/servicio/vistaServicio.vue @@ -1,10 +1,14 @@ @@ -32,9 +95,9 @@ export default { data () { return { alumno: { - fechaInicio: '', - fechaFin: '', - idStatus: 6 + fechaInicio: '14/2/2020', + fechaFin: '14/8/2020', + idStatus: 5 }, idRegistro: window.localStorage.getItem('idRegistro'), token: { @@ -55,6 +118,33 @@ export default { } }, methods: { + mostrarConfirmar () { + if (this.alumno.idStatus === 1) return true + else if (this.alumno.idStatus === 5) { + if (!this.alumno.acatlanContigo) return true + else if (this.vistoBueno) return true + } + return false + } } } + + diff --git a/components/alumno/ejemplo.vue b/components/alumno/ejemplo.vue index 014129f..be22198 100644 --- a/components/alumno/ejemplo.vue +++ b/components/alumno/ejemplo.vue @@ -1,6 +1,6 @@ diff --git a/pages/admin/programa/index.vue b/pages/admin/programa/index.vue new file mode 100644 index 0000000..475375c --- /dev/null +++ b/pages/admin/programa/index.vue @@ -0,0 +1,16 @@ + + + diff --git a/pages/alumno/index.vue b/pages/alumno/index.vue index 014129f..006d05e 100644 --- a/pages/alumno/index.vue +++ b/pages/alumno/index.vue @@ -1,9 +1,68 @@ From c897295b53b5889a16c30ffa6c27721b92e58024 Mon Sep 17 00:00:00 2001 From: mxrco Date: Thu, 19 Nov 2020 16:21:02 -0600 Subject: [PATCH 4/4] regresar/localstorage --- components/admin/servicio/programa/tablaResponsables.vue | 2 +- pages/admin/programa/index.vue | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/components/admin/servicio/programa/tablaResponsables.vue b/components/admin/servicio/programa/tablaResponsables.vue index aa12468..a576070 100644 --- a/components/admin/servicio/programa/tablaResponsables.vue +++ b/components/admin/servicio/programa/tablaResponsables.vue @@ -208,7 +208,7 @@ export default { }, methods: { verRegistro (idResponsable) { - window.localStorage.setItem('idResponsable', idResponsable) + localStorage.setItem('idResponsable', idResponsable) this.$router.push('/programa/responsableinfo') console.log(idResponsable) }, diff --git a/pages/admin/programa/index.vue b/pages/admin/programa/index.vue index 475375c..81cf115 100644 --- a/pages/admin/programa/index.vue +++ b/pages/admin/programa/index.vue @@ -1,7 +1,7 @@ @@ -11,6 +11,12 @@ import tablaResponsables from '../../../components/admin/servicio/programa/tabla export default { components: { tablaResponsables + }, + methods: { + regresar () { + localStorage.removeItem('idRegistro') + this.$router.push('./') + } } }