CIDWA/servicio_social_front
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

error merge

Browse Source
This commit is contained in:
Lemuel Marquez
2021-01-05 14:47:03 -06:00
parent 6245352d39 4b836f6f5a
commit 2aebf2112c
5 changed files with 122 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/alumno/DataAlumno.vue
+16 -8
View File
@@ -15,12 +15,12 @@
></b-step-item>
<b-step-item
:clickable="false"
label="Registro"
label="Pre Registro validado"
icon="account-clock"
></b-step-item>
<b-step-item
:clickable="false"
label="Registro Validado"
label="Registro"
icon="account"
></b-step-item>
<b-step-item
@@ -59,10 +59,7 @@
<p><strong> Dependencia: </strong> {{ programa.dependencia }}</p>
<p><strong> Clave del programa: </strong> {{ programa.clave }}</p>
<div v-if="programa.acatlan == true">
<p>
<strong> Programa Interno: </strong>
{{ programa.programaInterno }}
</p>
<p><strong> Programa Interno: </strong> {{ programa.programaInterno }}</p>
<p><strong> Profesor: </strong> {{ programa.profesor }}</p>
</div>
</div>
@@ -72,7 +69,7 @@
<p><strong> Número de cuenta: </strong> {{ alumno.cuenta }}</p>
<p><strong> Carrera: </strong> {{ alumno.carrera }}</p>
<p>
<strong> Créditos: </strong>{{ alumno.creditos}} <span v-if="alumno.creditos">%</span>
<strong> Créditos: </strong>{{ alumno.creditos}}<span v-if="alumno.creditos">%</span>
</p>
<p><strong> Correo del alumno: </strong> {{ alumno.correo }}</p>
<p><strong> Fecha de inicio: </strong> {{ fecha(alumno.inicio) }}</p>
@@ -101,6 +98,8 @@
placeholder="Fecha de nacimiento"
icon="calendar-today"
v-model="nacimiento"
:min-date="minDate"
:max-date="maxDate"
>
</b-datepicker>
</b-field>
@@ -227,6 +226,8 @@ export default {
isFullPage: true,
file: [],
nacimiento: [],
minDate: new Date(),
maxDate: new Date(),
telefono: '',
direccion: '',
alumno: {
@@ -278,7 +279,7 @@ export default {
{ status: 6, mensaje: '' },
{ status: 7, mensaje: '' },
{ status: 8, mensaje: '' },
{ status: 9, mensaje: '' }
{ status: 9, mensaje: 'Informe global de actividades rechazado. Por favor reenvia el informe correctamente' }
]
}
},
@@ -455,6 +456,13 @@ export default {
this.file = []
}
}
},
mounted (){
let i = new Date().getFullYear() - 80 // hoy - 80 años fecha minima
let j = new Date().getFullYear() - 10 //hoy - 10 años
this.minDate.setFullYear(i)
this.maxDate.setFullYear(j)
}
}
</script>
layouts/default.vue
+13
View File
@@ -16,3 +16,16 @@ export default {
components: { Header, Footer, Logout },
};
</script>
<style>
/* quitar flechas en input number en todas las vistas*/
input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
-webkit-appearance: none;
margin: 0;
}
/* Firefox */
input[type=number] {
-moz-appearance: textfield;
}
</style>
nuxt.config.js
+3 -3
View File
@@ -46,9 +46,9 @@ export default {
// Build Configuration (https://go.nuxtjs.dev/config-build)
build: {},
env: {
api: "http://localhost:3000",
// api: "https://venus.acatlan.unam.mx/ss-pruebas",
//api: "https://890af9d598a4.ngrok.io"
// api: 'http://localhost:3000'
api: "https://venus.acatlan.unam.mx/ss-pruebas",
// api: "https://890af9d598a4.ngrok.io"
// api: 'https//venus.acatlan.unam.mx/pruebas_pcpuma'
},
};
pages/alumno/cuestionario/index.vue
+55 -44
View File
@@ -1,6 +1,17 @@
<template>
<section class="container my-5 px-3 ">
<div v-if="idCuestionario === 'null'">
<b-button
tag="router-link"
to="/alumno"
type="is-info is-light "
icon-left="arrow-left-box"
class="border-info my-5"
size="is-medium"
>
regresar
</b-button>
<div class="my-5 mensaje">
<p class="is-size-2">Evaluación de programas de servicio social</p>
<p>
@@ -27,8 +38,9 @@
placeholder="Edad"
v-model="answers.edad"
type="number"
min="0"
max="100"
min="10"
max="80"
step="1"
>
</b-input>
</b-field>
@@ -43,38 +55,6 @@
> {{Sm}} </b-radio>
</div>
<!-- <b-radio
@click="answers.servicioMedicoOtro= ''"
v-model="answers.servicioMedico"
native-value="IMSS"
type="is-info"
>
IMSS
</b-radio>
<b-radio
@click="answers.servicioMedicoOtro= ''"
v-model="answers.servicioMedico"
native-value="ISSSTE"
type="is-info"
>
ISSSTE
</b-radio>
<b-radio
@click="answers.servicioMedicoOtro= ''"
v-model="answers.servicioMedico"
native-value="Ninguno"
type="is-info"
>
Ninguno
</b-radio>
<b-radio
@click="answers.servicioMedicoOtro= ''"
v-model="answers.servicioMedico"
native-value="Otro"
type="is-info"
>
Otro
</b-radio> -->
<b-field>
<b-input
@@ -693,7 +673,7 @@
</b-field>
<div class="my-6 mb-6">
<b-field>
<b-field class="centro">
<button
:disabled="available()"
class="button is-success is-medium"
@@ -706,13 +686,7 @@
</div>
<div class="buttons px-auto is-justify-content-center">
<b-button class="navPages button is-info is-light" tag="router-link" to="/alumno">
<b-icon
icon="home"
type="is-info">
</b-icon></b-button>
<button class="navPages button is-info" :class="{ active: current==1 }" @click="current=1" > A</button>
<button class="navPages button is-info" :class="{ active: current==1 }" @click="current=1" > A</button>
<button class="navPages button is-info" :class="{ active: current==2 }" @click="current=2" :disabled="navB()" > B</button>
<button class="navPages button is-info" :class="{ active: current==3 }" @click="current=3" :disabled="navC()"> C</button>
<button class="navPages button is-info" :class="{ active: current==4 }" @click="current=4" :disabled="navD()"> D</button>
@@ -724,6 +698,7 @@
<h1>Ya has contestado tu cuestionario :)</h1>
</div>
</section>
</template>
@@ -902,7 +877,7 @@ export default {
else return true
},
navE () {
if(this.answers.p14[0] != null && this.answers.p14[1] != null && this.answers.p14[2] != null && this.answers.p14[3] != null && this.answers.p15[0] != null && this.answers.p15[1] != null && this.answers.p15[2] != null && this.answers.p15[3] != null && this.answers.p17.length ==3 && this.answers.p16) return false
if(this.answers.p14[0] != null && this.answers.p14[1] != null && this.answers.p14[2] != null && this.answers.p14[3] != null && this.answers.p15[0] != null && this.answers.p15[1] != null && this.answers.p15[2] != null && this.answers.p15[3] != null && this.answers.p17.length ==3 && this.answers.p16 !=null) return false
else return true
},
navF () {
@@ -922,7 +897,40 @@ export default {
const data = {
idServicio: localStorage.getItem('idServicio'),
asnwers: this.answers
sexo : this.answers.sexo ,
edad : this.answers.edad ,
servicioMedico : this.answers.servicioMedico ,
pUno : this.answers.p1 ,
pDos : this.answers.p2 ,
pTres : this.answers.p3 ,
pCuatro : this.answers.p4 ,
pCinco : this.answers.p5 ,
pSeis : this.answers.p6 ,
pSiete : this.answers.p7 ,
pOcho : this.answers.p8 ,
pNueve : this.answers.p9 ,
pDiez : this.answers.p10 ,
pOnce : this.answers.p11 ,
pDoce : this.answers.p12 ,
pTrece : this.answers.p13 ,
pCatorce : this.answers.p14 ,
pQuince : this.answers.p15 ,
pDieciseis : this.answers.p16 ,
pDiecisiete : this.answers.p17 ,
pDieciocho : this.answers.p18 ,
pDiecinueve : this.answers.p19 ,
pVeinte : this.answers.p20 ,
pVeintiuno : this.answers.p21 ,
pVeintidos : this.answers.p22 ,
pVeintitres : this.answers.p23 ,
pVeinticuatro : this.answers.p24 ,
pVeinticinco : this.answers.p25 ,
pVeintiseis : this.answers.p26 ,
pVeintisiete : this.answers.p27 ,
pVeintiocho : this.answers.p28 ,
pVeintinueve : this.answers.p29 ,
pTreinta : this.answers.p30 ,
}
console.log(data)
@@ -1011,4 +1019,7 @@ export default {
.active, .active:hover{
background-color:#bb8800;
}
.centro {
text-align: center;
}
</style>
pages/responsable/nuevo/index.vue
+35 -9
View File
@@ -8,6 +8,8 @@
type="is-info is-light "
icon-left="arrow-left-box"
class="border-info my-5"
size="is-medium"
>
regresar
</b-button>
@@ -84,10 +86,11 @@
<b-field label="Seleccione programa">
<b-select
placeholder="programa"
placeholder="Seleccionar"
expanded
v-model="programaSelectedID"
>
<option value="">Seleccionar</option>
<option
v-for="programa in programas"
v-bind:key="programa.idPrograma"
@@ -198,13 +201,7 @@
<b-field class="derecha">
<button
:disabled="
file == '' ||
noCuenta == '' ||
alumno.correo == '' ||
alumno.inicio == '' ||
alumno.fin == ''
"
:disabled="disabled()"
class="button enviar is-success is-medium"
@click="Enviar()"
>
@@ -233,7 +230,7 @@ export default {
noCuenta: '',
sizeOk: '',
searched: false,
minDate: new Date('2020-12-25'),
minDate: new Date('2020-12-20'),
programaSelectedID: '',
file: [],
programas: [],
@@ -287,6 +284,33 @@ export default {
this.noCuenta = ''
this.file = []
this.programaSelectedID= ''
},
disabled () {
if(this.programaSelected.acatlan == false){
if(
this.file != '' &&
this.noCuenta != '' &&
this.alumno.correo != '' &&
this.alumno.inicio != '' &&
this.alumno.fin != '' &&
this.programaSelectedID != ''
) return false
else return true
}
else{
if(
this.file != '' &&
this.noCuenta != '' &&
this.alumno.correo != '' &&
this.alumno.inicio != '' &&
this.alumno.fin != '' &&
this.programaSelectedID != '' &&
this.programaSelected.programaInterno != '' &&
this.programaSelected.profesor != ''
) return false
else return true
}
},
esNumero (numero) {
const ultimaLetra = numero.length - 1
@@ -354,6 +378,8 @@ export default {
numeroCuenta: this.alumno.cuenta,
creditos: (this.alumno.creditos).toString(),
correo: this.alumno.correo,
programaInterno:this.programaSelected.programaInterno,
profesor:this.programaSelected.profesor,
fechaInicio: moment(this.alumno.inicio),
fechaFin: moment(this.alumno.fin)
}