Skip to content

Commit

Permalink
Merge pull request #55 from IrvingCM123/release
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
IrvingCM123 authored May 24, 2023
2 parents 12859e3 + e254d06 commit e57f0d1
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/app/Views/UI/inicio/inicio.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ export class InicioComponent implements OnInit {
}

async obtener_cantidadEstudiantes() {
let nrc: string[] | any = this.Materias.map( (materia: any) => materia.nrc_materia );
let carrera: string[] | any = this.Materias.map( (materia: any) => materia.carrera_materia );
let nrc: string[] | any = await this.Materias.map( (materia: any) => materia.nrc_materia );
let carrera: string[] | any = await this.Materias.map( (materia: any) => materia.carrera_materia );

for (let a = 0; a <= nrc.length - 1; a++) {
this.cantidad_alumnos[a] = await this.datos_Locales.getCantidadEstudiantes(nrc[a], carrera[a]);
Expand Down
24 changes: 15 additions & 9 deletions src/app/Views/UI/listas/FirestoreListas.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,25 @@ export class FirestoreService {
}

async getListaAsistencia(nrc: string, carrera: string) {

let url = '/' + carrera + '/Materias/' + nrc;
const lista_encontrada = await this.firestore.collection(url).get().toPromise();

if (lista_encontrada) {
const datos_lista = lista_encontrada.docs.map((alumnos) => alumnos.data());
return datos_lista;
} else {
console.log('No se pudo obtener la información de Firestore.');
try {
let url = '/' + carrera + '/Materias/' + nrc;
const lista_encontrada = await this.firestore.collection(url).get().toPromise();
console.log("Lista Asistencia", lista_encontrada);
if (lista_encontrada) {
const datos_lista = await lista_encontrada.docs.map((alumnos) => alumnos.data());
console.log("Dato", datos_lista);
return datos_lista;
} else {
console.log('No se pudo obtener la información de Firestore.');
return [];
}
} catch (error) {
console.error('Error al obtener la información de Firestore:', error);
return [];
}
}


async getCantidadEstudiantes(nrc: string, carrera: string) {
let url = '/' + carrera + '/Materias/' + nrc;
const lista_encontrada = await this.firestore.collection(url).get().toPromise();
Expand Down
14 changes: 7 additions & 7 deletions src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ export const environment = {
apiUrl:'https://my-json-server.typicode.com/IrvingCM123/Consumir_Apis',
apiMensaje: 'http://localhost:2000/Servidor/enviar/',
firebase: {
apiKey: 'AIzaSyDIahzHtIBUdWUOWGam_MesAxCUBgkcQkg',
authDomain: "sistemaasistencia-9d5e1.firebaseapp.com",
projectId: "sistemaasistencia-9d5e1",
storageBucket: "sistemaasistencia-9d5e1.appspot.com",
messagingSenderId: "245812703918",
appId: "1:245812703918:web:68c6faf48e5971ab5c333f",
measurementId: "G-V4BQXPDH5X"
apiKey: 'AIzaSyBJwetPrTGU_1DS3YNvI5sL8FZNpXNWXjk',
authDomain: 'listasasistencia-f6f1d.firebaseapp.com',
projectId: 'listasasistencia-f6f1d',
storageBucket: 'listasasistencia-f6f1d.appspot.com',
messagingSenderId: '678706300098',
appId: '1:678706300098:web:8695fa0606bac74a81275b',
measurementId: 'G-064GBWZ9SK',
}
};

0 comments on commit e57f0d1

Please sign in to comment.