añadida pagina para ver discoteca desde cliente

src/app/app-routing.module.ts

@@ -1,49 +1,62 @@
-import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
-import { LoginPage } from './login/login.page';
-
-
-const routes: Routes = [
-
-  {
-    path: 'login',
-    component: LoginPage
-  },
-  {
-    path: 'tabs',
-    loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
-  },
-  {
-    path: 'tabsUser',
-    loadChildren: () => import('./tabs-user/tabs-user.module').then(m => m.TabsUserPageModule)
-  },
-  {
-    path: 'view-evento',
-    loadChildren: () => import('./view-evento/view-evento.module').then( m => m.ViewEventoPageModule)
-  },
-  {
-    path: 'galeriamodal',
-    loadChildren: () => import('./galeriamodal/galeriamodal.module').then( m => m.GaleriamodalPageModule)
-  },
-  {
-    path:'',
-    redirectTo: 'login',
-    pathMatch: 'full'
-  },
-  {
-    path: 'tabs-user',
-    loadChildren: () => import('./tabs-user/tabs-user.module').then( m => m.TabsUserPageModule)
+import { NgModule } from '@angular/core';
+import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
+import { LoginPage } from './login/login.page';
+
+
+const routes: Routes = [
+
+  {
+    path: 'login',
+    component: LoginPage
+  },
+  {
+    path: 'tabs',
+    loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
+  },
+  {
+    path: 'tabsUser',
+    loadChildren: () => import('./tabs-user/tabs-user.module').then(m => m.TabsUserPageModule)
+  },
+  {
+    path: 'view-evento',
+    loadChildren: () => import('./view-evento/view-evento.module').then( m => m.ViewEventoPageModule)
+  },
+  {
+    path: 'galeriamodal',
+    loadChildren: () => import('./galeriamodal/galeriamodal.module').then( m => m.GaleriamodalPageModule)
+  },
+  {
+    path:'',
+    redirectTo: 'login',
+    pathMatch: 'full'
+  },
+  {
+    path: 'tabs-user',
+    loadChildren: () => import('./tabs-user/tabs-user.module').then( m => m.TabsUserPageModule)
+  },
+  {
+    path: 'feed',
+    loadChildren: () => import('./feed/feed.module').then( m => m.FeedPageModule)
+  },
+  {
+    path: 'view-evento-cliente',
+    loadChildren: () => import('./view-evento-cliente/view-evento-cliente.module').then( m => m.ViewEventoClientePageModule)
+  },
+  {
+    path: 'view-discoteca-cliente',
     loadChildren: () => import('./view-discoteca-cliente/view-discoteca-cliente.module').then( m => m.ViewDiscotecaClientePageModule)
   },
-
-
-
- 
-];
-@NgModule({
-  imports: [
-    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
-  ],
-  exports: [RouterModule]
-})
-export class AppRoutingModule {}
+
+
+
+
+
+
+ 
+];
+@NgModule({
+  imports: [
+    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
+  ],
+  exports: [RouterModule]
+})

src/app/feed/feed-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { FeedPage } from './feed.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: FeedPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class FeedPageRoutingModule {}

src/app/feed/feed.component.html

@@ -1,3 +0,0 @@
-<p>
-  feed works!
-</p>

src/app/feed/feed.component.ts

@@ -1,14 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-feed',
-  templateUrl: './feed.component.html',
-  styleUrls: ['./feed.component.scss'],
-})
-export class FeedComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {}
-
-}

src/app/feed/feed.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { FeedPageRoutingModule } from './feed-routing.module';
+
+import { FeedPage } from './feed.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    FeedPageRoutingModule
+  ],
+  declarations: [FeedPage]
+})
+export class FeedPageModule {}

src/app/feed/feed.page.html

@@ -0,0 +1,35 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>Eventos Próximos</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <ion-grid>
+  <ion-row>
+    <ion-col size="12">
+    <div *ngIf="eventos.length>0" class="eventos">
+      <ion-list>
+          <ion-item *ngFor="let evento of eventos" button (click)="mostrarEvento(evento)">
+          <div class="evento">
+            <div class="eventoHeader">
+            {{evento.nombre}} · 
+            <ion-icon name="calendar-outline"></ion-icon>
+            {{evento.fecha}} · 
+            <ion-icon name="cash-outline"></ion-icon>
+            {{evento.precio1}},{{evento.precio2}}
+            </div>
+            <div class="eventoDesc">
+            {{evento.descripcion}}
+            </div>
+            <div class="discotecaEvento">
+              {{discotecas[idsDiscoteca.indexOf(evento.discotecaID)]?.nombre}}
+            </div>
+          </div>
+          </ion-item>
+      </ion-list>
+    </div>
+  </ion-col>
+  </ion-row>
+</ion-grid>
+</ion-content>

src/app/feed/feed.page.spec.ts

@@ -1,19 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { IonicModule } from '@ionic/angular';
 
-import { FeedComponent } from './feed.component';
+import { FeedPage } from './feed.page';
 
-describe('FeedComponent', () => {
-  let component: FeedComponent;
-  let fixture: ComponentFixture<FeedComponent>;
+describe('FeedPage', () => {
+  let component: FeedPage;
+  let fixture: ComponentFixture<FeedPage>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ FeedComponent ],
+      declarations: [ FeedPage ],
       imports: [IonicModule.forRoot()]
     }).compileComponents();
 
-    fixture = TestBed.createComponent(FeedComponent);
+    fixture = TestBed.createComponent(FeedPage);
     component = fixture.componentInstance;
     fixture.detectChanges();
   }));

src/app/feed/feed.page.ts

@@ -0,0 +1,59 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { Eventoi } from '../interfaces/eventoi';
+import { DiscotecaI } from '../interfaces/discoteca-i';
+import { ApiService } from '../services/api.service';
+import { FeedService } from '../services/feed.service';
+import { Tab1Service } from '../tab1/tab1.service';
+
+@Component({
+  selector: 'app-feed',
+  templateUrl: './feed.page.html',
+  styleUrls: ['./feed.page.scss'],
+})
+export class FeedPage implements OnInit {
+
+  eventos: Eventoi[];
+  discotecas: DiscotecaI[];
+  idsDiscoteca: number[];
+  constructor(private feedService:FeedService, private tab1Service: Tab1Service, private router:Router, private apiService: ApiService ) { }
+
+  ngOnInit() {
+    this.eventos = this.feedService.eventos;
+    this.idsDiscoteca = [];
+    this.discotecas=[];
+    this.getDiscotecasDistintas();
+  }
+
+  mostrarEvento(evento: Eventoi){
+
+    this.feedService.eventoIndex = this.eventos.indexOf(evento);
+    let discotecaDelEvento: DiscotecaI = this.discotecas[this.idsDiscoteca.indexOf(evento.discotecaID)];
+    this.feedService.discotecaEvento = discotecaDelEvento;
+    this.router.navigate(['/tabsUser/tab2/view-evento-cliente']);
+
+  }
+
+  getDiscotecasDistintas(){
+    this.eventos.forEach(
+      evento => {
+         if(!(this.idsDiscoteca.find(id => evento.discotecaID==id))){
+            this.idsDiscoteca.push(evento.discotecaID);
+        }
+      }
+    )
+
+    this.idsDiscoteca.forEach(
+      idDiscoteca => {
+        this.apiService.getUserDiscoteca(idDiscoteca)
+        .subscribe(discoteca => {
+          console.log(discoteca[0]);
+          this.discotecas.push(discoteca[0]);
+        })
+      }
+    )
+  }
+
+
+
+}

src/app/login/login.page.html

@@ -6,7 +6,7 @@
 
 <ion-content>
   <span>Usuario: </span><input type="text" id="username">
-  <span>Contraseña: </span><input type="text" id="password">
+  <span>Contraseña: </span><input type="password" id="password">
   <ion-button (click)="login()">
     Login
   </ion-button>

src/app/prompt-evento/prompt-evento.page.ts

@@ -37,20 +37,7 @@ export class PromptEventoPage implements OnInit{
   onSubmit(){
     this.submitted = true;
     if (this.eventoForm.valid){
-      let evento: Eventoi = {
-        id: null,
-        discotecaID: this.tab1Service.discotecaI.discotecaID,
-        nombre: '',
-        localizacion: this.tab1Service.discotecaI.localizacion,
-        fecha: null,
-        hora: null,
-        descripcion: '',
-        precio1: null,
-        precio2: null
-
-      };
-      this.asignarEvento(evento);
-
+      this.asignarEvento(this.tab1Service.eventos[this.tab1Service.eventoIndex]);
     }
   }
   asignarEvento(evento: Eventoi){
@@ -59,14 +46,16 @@ export class PromptEventoPage implements OnInit{
     var fecha = this.eventoForm.get('fecha').value;
     fecha = fecha.split("T")[0];
     evento.fecha = fecha;
-    let hora = this.eventoForm.get('hora').value;
-    hora = hora.split("T")[1];
+    var hora = this.eventoForm.get('hora').value;
+    if (!this.tab1Service.editarEvento){
+      hora = hora.split("T")[1];}
     hora = hora.split(":")[0]+(":")+hora.split(":")[1];
+    console.log(hora);
     evento.hora = hora;
     evento.precio1 = this.eventoForm.get('precio1').value;
     evento.precio2 = this.eventoForm.get('precio2').value;
     if (!this.tab1Service.eventos){
-      this.tab1Service.initEventos();}
+      this.tab1Service.eventos=[];}
     if(!this.tab1Service.eventoForms){
       this.tab1Service.initEventoForms();}
     this.tab1Service.postEvento(evento);

src/app/services/feed.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
+import { DiscotecaI } from '../interfaces/discoteca-i';
 import { Eventoi } from '../interfaces/eventoi';
 import { ApiService } from './api.service';
 
@@ -9,6 +10,8 @@ import { ApiService } from './api.service';
 export class FeedService {
 
   eventos: Eventoi[];
+  eventoIndex: number;
+  discotecaEvento: DiscotecaI;
 
   constructor(private apiService: ApiService, private router: Router) { }
 
@@ -19,4 +22,10 @@ export class FeedService {
       this.router.navigate(['/tabsUser'])
     })
   }
+
+  getEventoByIndex(eventoIndex: number):Eventoi{
+    return this.eventos[eventoIndex];
+  } 
+
+  
 }

src/app/tab2/tab2-routing.module.ts

@@ -1,11 +1,23 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+import { FeedPage } from '../feed/feed.page';
 import { Tab2Page } from './tab2.page';
+import { ViewEventoClientePage } from '../view-evento-cliente/view-evento-cliente.page';
+import { ViewDiscotecaClientePage } from '../view-discoteca-cliente/view-discoteca-cliente.page';
 
 const routes: Routes = [
   {
     path: '',
-    component: Tab2Page,
+    component: FeedPage,
+
+  },
+  {
+    path: 'view-evento-cliente',
+    component: ViewEventoClientePage
+  },
+  {
+    path: 'view-discoteca-cliente',
+    component: ViewDiscotecaClientePage
   }
 ];
 

src/app/tab2/tab2.page.html

@@ -1,33 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>Eventos Próximos</ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <ion-grid>
-  <ion-row>
-    <ion-col size="12">
-    <div *ngIf="eventos.length>0" class="eventos">
-      <ion-list>
-          <ion-item *ngFor="let evento of eventos" button (click)="mostrarEvento(evento)">
-          <div class="evento">
-            <div class="eventoHeader">
-            {{evento.nombre}} · 
-            <ion-icon name="calendar-outline"></ion-icon>
-            {{evento.fecha}} · 
-            <ion-icon name="cash-outline"></ion-icon>
-            {{evento.precio1}},{{evento.precio2}}
-            <ion-button (click)="editarEvento(evento);$event.stopPropagation();"><ion-icon name="pencil-outline"></ion-icon></ion-button>
-            </div>
-            <div class="eventoDesc">
-            {{evento.descripcion}}
-            </div>
-          </div>
-          </ion-item>
-      </ion-list>
-    </div>
-  </ion-col>
-  </ion-row>
-</ion-grid>
-</ion-content>

src/app/tab2/tab2.page.ts

@@ -9,11 +9,11 @@ import { FeedService } from '../services/feed.service';
 })
 export class Tab2Page implements OnInit{
 
-  eventos: Eventoi[];
-  constructor(private feedService: FeedService) {}
+
+  constructor() {}
 
   ngOnInit(){
-    this.eventos = this.feedService.eventos;
+    
   }
 
 }

src/app/view-discoteca-cliente/view-discoteca-cliente-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ViewDiscotecaClientePage } from './view-discoteca-cliente.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ViewDiscotecaClientePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ViewDiscotecaClientePageRoutingModule {}

src/app/view-discoteca-cliente/view-discoteca-cliente.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ViewDiscotecaClientePageRoutingModule } from './view-discoteca-cliente-routing.module';
+
+import { ViewDiscotecaClientePage } from './view-discoteca-cliente.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    ViewDiscotecaClientePageRoutingModule
+  ],
+  declarations: [ViewDiscotecaClientePage]
+})
+export class ViewDiscotecaClientePageModule {}

src/app/view-discoteca-cliente/view-discoteca-cliente.page.html

@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>view-discoteca-cliente</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+
+</ion-content>

src/app/view-discoteca-cliente/view-discoteca-cliente.page.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ViewDiscotecaClientePage } from './view-discoteca-cliente.page';
+
+describe('ViewDiscotecaClientePage', () => {
+  let component: ViewDiscotecaClientePage;
+  let fixture: ComponentFixture<ViewDiscotecaClientePage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ViewDiscotecaClientePage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ViewDiscotecaClientePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/view-discoteca-cliente/view-discoteca-cliente.page.ts

@@ -0,0 +1,27 @@
+import { Component, OnInit } from '@angular/core';
+import { DiscotecaI } from '../interfaces/discoteca-i';
+import { Eventoi } from '../interfaces/eventoi';
+import { FeedService } from '../services/feed.service';
+
+@Component({
+  selector: 'app-view-discoteca-cliente',
+  templateUrl: './view-discoteca-cliente.page.html',
+  styleUrls: ['./view-discoteca-cliente.page.scss'],
+})
+export class ViewDiscotecaClientePage implements OnInit {
+
+  discoteca: DiscotecaI
+  eventos: Eventoi[]
+
+  constructor(private feedService: FeedService) { }
+
+  ngOnInit() {
+    this.discoteca = this.feedService.discotecaEvento;
+    this.feedService.eventos.forEach(evento => {
+      if (this.discoteca.discotecaID == evento.discotecaID){
+        this.eventos.push(evento);
+      }
+    })
+  }
+
+}

src/app/view-evento-cliente/view-evento-cliente-routing.module.ts

@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { ViewDiscotecaClientePage } from '../view-discoteca-cliente/view-discoteca-cliente.page';
+
+import { ViewEventoClientePage } from './view-evento-cliente.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ViewEventoClientePage
+  },
+  {
+    path: 'view-discoteca-cliente',
+    component: ViewDiscotecaClientePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ViewEventoClientePageRoutingModule {}

src/app/view-evento-cliente/view-evento-cliente.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ViewEventoClientePageRoutingModule } from './view-evento-cliente-routing.module';
+
+import { ViewEventoClientePage } from './view-evento-cliente.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    ViewEventoClientePageRoutingModule
+  ],
+  declarations: [ViewEventoClientePage]
+})
+export class ViewEventoClientePageModule {}

src/app/view-evento-cliente/view-evento-cliente.page.html

@@ -0,0 +1,31 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>ViewEvento</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <ion-grid>
+      <div class="evento">
+        <ion-row>
+          <div class="eventoHeader">
+          {{evento.nombre}} · 
+          <ion-icon name="calendar-outline"></ion-icon>
+          {{evento.fecha}} · 
+          <ion-icon name="cash-outline"></ion-icon>
+          {{evento.precio1}},{{evento.precio2}}
+          </div>
+        </ion-row>
+        <ion-row>
+          <div class="eventoDesc">
+          {{evento.descripcion}}
+          </div>
+        </ion-row>
+        <ion-row>
+          <div class="discotecaEvento">
+            <a [routerLink]="['/tabsUser/tab2/view-discoteca-cliente']">{{discoteca?.nombre}}</a>
+          </div>
+        </ion-row>
+      </div>
+  </ion-grid>
+</ion-content>

src/app/view-evento-cliente/view-evento-cliente.page.scss

@@ -0,0 +1,3 @@
+.discotecaEvento{
+    padding: 40px;
+}

src/app/view-evento-cliente/view-evento-cliente.page.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ViewEventoClientePage } from './view-evento-cliente.page';
+
+describe('ViewEventoClientePage', () => {
+  let component: ViewEventoClientePage;
+  let fixture: ComponentFixture<ViewEventoClientePage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ViewEventoClientePage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ViewEventoClientePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/view-evento-cliente/view-evento-cliente.page.ts

@@ -0,0 +1,22 @@
+import { Component, OnInit } from '@angular/core';
+import { DiscotecaI } from '../interfaces/discoteca-i';
+import { Eventoi } from '../interfaces/eventoi';
+import { FeedService } from '../services/feed.service';
+
+@Component({
+  selector: 'app-view-evento-cliente',
+  templateUrl: './view-evento-cliente.page.html',
+  styleUrls: ['./view-evento-cliente.page.scss'],
+})
+export class ViewEventoClientePage implements OnInit {
+
+  evento: Eventoi;
+  discoteca: DiscotecaI;
+  constructor(private feedService: FeedService) { }
+
+  ngOnInit() {
+    this.evento = this.feedService.getEventoByIndex(this.feedService.eventoIndex);
+    this.discoteca = this.feedService.discotecaEvento;
+  }
+
+}