Compare commits

..

No commits in common. "e31ded9eb92ddf0643595440bb7ab18eacfc9c9e" and "024f768da9e8f033f2eecedf36148669aaa0f93d" have entirely different histories.

10 changed files with 9 additions and 108 deletions

View File

@ -2,7 +2,6 @@ export interface Reservai {
UserID: number,
EventoID: number,
codigoDescuento: string,
codigoUnico: string,
codigoUnicoID: number,
descuentoPorciento: number
}

View File

@ -1,5 +1,5 @@
export interface User {
userID: number;
id: number;
discotecaID: number;
userType: number;
username: string;

View File

@ -5,5 +5,5 @@
</ion-header>
<ion-content>
{{codigoReserva}}
</ion-content>

View File

@ -1,5 +1,4 @@
import { Component, OnInit } from '@angular/core';
import { NavParams } from '@ionic/angular';
@Component({
selector: 'app-reservamodal',
@ -8,11 +7,9 @@ import { NavParams } from '@ionic/angular';
})
export class ReservamodalPage implements OnInit {
codigoReserva: string;
constructor(private navParams: NavParams) { }
constructor() { }
ngOnInit() {
this.codigoReserva = this.navParams.get('codigo');
}
}

View File

@ -7,7 +7,6 @@ import { Discoteca } from '../discoteca';
import { UserLogin } from '../interfaces/user-login';
import { DiscotecaI } from '../interfaces/discoteca-i';
import { Eventoi } from '../interfaces/eventoi';
import { Reservai } from '../interfaces/reservai';
@Injectable({
@ -52,10 +51,6 @@ export class ApiService {
}
creaReserva(reserva: Reservai): Observable<Reservai>{
return this.http.post<Reservai>(this.baseUrl+"/reserva", reserva);
}

View File

@ -1,16 +0,0 @@
import { TestBed } from '@angular/core/testing';
import { CodigoreservaService } from './codigoreserva.service';
describe('CodigoreservaService', () => {
let service: CodigoreservaService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(CodigoreservaService);
});
it('should be created', () => {
expect(service).toBeTruthy();
});
});

View File

@ -1,27 +0,0 @@
import { Injectable } from '@angular/core';
@Injectable({
providedIn: 'root'
})
export class CodigoreservaService {
codigo: string;
length: number;
constructor() {
}
generarAleatorio(){
this.length = 7;
var result = [];
var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
var charactersLength = characters.length;
for ( var i = 0; i < this.length; i++ ) {
result.push(characters.charAt(Math.floor(Math.random() *
charactersLength)));
}
return result.join("");
}
}

View File

@ -17,7 +17,7 @@ export class LoginService {
constructor(private apiService: ApiService, private router: Router, private tab1service: Tab1Service, private feedService: FeedService) {
this.user = {
userID: 0,
id: 0,
discotecaID: 0,
userType: 0,
username: '',

View File

@ -31,9 +31,6 @@
Reserva
</ion-button>
</ion-row>
<ion-row>
<span>Código de descuento: </span><input type="text" id="codigoDescuento">
</ion-row>
</div>
</ion-grid>
</ion-content>

View File

@ -1,14 +1,10 @@
import { stringify } from '@angular/compiler/src/util';
import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { DiscotecaI } from '../interfaces/discoteca-i';
import { Eventoi } from '../interfaces/eventoi';
import { Reservai } from '../interfaces/reservai';
import { ReservamodalPage } from '../reservamodal/reservamodal.page';
import { ApiService } from '../services/api.service';
import { CodigoreservaService } from '../services/codigoreserva.service';
import { FeedService } from '../services/feed.service';
import { LoginService } from '../services/login.service';
@Component({
selector: 'app-view-evento-cliente',
@ -20,59 +16,19 @@ export class ViewEventoClientePage implements OnInit {
evento: Eventoi;
discoteca: DiscotecaI;
reserva: Reservai;
codigoReserva: string;
reservaRealizada: boolean;
constructor(private feedService: FeedService, private modalController: ModalController,
private codigoReservaService: CodigoreservaService, private loginService: LoginService, private apiService: ApiService) { }
constructor(private feedService: FeedService, private modalController: ModalController) { }
ngOnInit() {
this.reservaRealizada = false;
this.evento = this.feedService.getEventoByIndex(this.feedService.eventoIndex);
this.discoteca = this.feedService.discotecaEvento;
}
generarCodigo(){
return stringify(this.codigoReservaService.generarAleatorio());
}
initReserva(){
this.reserva = {
UserID: this.loginService.user.userID,
EventoID: this.evento.id,
codigoDescuento: null,
codigoUnico: '',
codigoUnicoID: null,
descuentoPorciento: null
}
}
openReserva(){
this.initReserva();
this.reserva.codigoDescuento = (<HTMLInputElement>document.getElementById("codigoDescuento")).value;
this.reserva.codigoUnico = this.generarCodigo();
this.creaReserva(this.reserva);
}
creaReserva(reserva){
this.apiService.creaReserva(reserva)
.subscribe(
data => {
console.log(data);
this.reserva = data;
this.reservaRealizada = true;
this.modalController.create({
component: ReservamodalPage,
componentProps : {
codigo: this.reserva.codigoUnico
}
}).then(modal => modal.present());
},
error => {
console.log(error);
}
)
}
}