merge

code/moya-management-portal/src/app/organization/event-list/event-list.component.html

 <mat-card *ngFor="let event of events" style="margin:1em;max-width:75%">
   <mat-card-title>{{event.title}}</mat-card-title>
   <mat-card-subtitle>{{event.date}}</mat-card-subtitle>
-  <!--<mat-card-actions>
-    <button mat-raised-button color="primary" (click)="onClick()" style="float:right;margin-top: ;margin-right:1em;">Edit</button>
-  </mat-card-actions>-->
+  <mat-card-actions>
+    <button mat-raised-button color="primary" (click)="onClick()" style="margin-left:0.8em;">Go to event</button>
+  </mat-card-actions>
 </mat-card>
\ No newline at end of file

code/moya-management-portal/src/app/organization/event-list/event-list.component.ts

@@ -8,7 +8,7 @@ import { OnChanges } from '@angular/core/src/metadata/lifecycle_hooks';
   styleUrls: ['./event-list.component.scss']
 })
 export class EventListComponent implements OnInit, OnChanges {
-  @Input() organisation: string;
+  @Input() organization: string;
   public events: any;
 
   constructor(private appService: EventsService) {
@@ -19,12 +19,12 @@ export class EventListComponent implements OnInit, OnChanges {
   }
 
   ngOnInit() {
-    console.log(this.organisation);
-    this.events = this.appService.get(this.organisation);
+    console.log(this.organization);
+    this.events = this.appService.get(this.organization);
   }
 
   ngOnChanges(changes: SimpleChanges): void {
     console.log(changes);
-    this.events = this.appService.get(changes.organisation.currentValue);
+    this.events = this.appService.get(changes.organization.currentValue);
   }
 }

code/moya-management-portal/src/app/organization/organization-list/organization-list.component.html

@@ -2,6 +2,4 @@
   <mat-select placeholder="Organization" [(ngModel)]="selectedValue" (ngModelChange)="onChange($event)">
     <mat-option *ngFor="let organization of organizations" value={{organization.name}}>{{organization.name}}</mat-option>
   </mat-select>
-</mat-form-field>
-
-{{selectedValue}}
\ No newline at end of file
+</mat-form-field>
\ No newline at end of file

code/moya-management-portal/src/app/organization/organization.component.html

@@ -6,8 +6,13 @@
   <a style="float:right; font-size:20px; margin-top: 20px" href="#">Moya Login</a>
 </div>
 <div style="width:50%; float:left">
+<<<<<<< HEAD
   <h2 style="margin-left: 10px">Coming events</h2>
   <moya-event-list [organisation]="currentOrganisation" style="margin-top:5em;"></moya-event-list>
+=======
+  <h2 style="margin-left: 10px">Tulevat tapahtumat</h2>
+  <moya-event-list [organization]="currentOrganization" style="margin-top:5em;"></moya-event-list>
+>>>>>>> b6bb15bc0dea08e0c1d6588d2424d194218ce163
 </div>
 <div style="width:50%; float:right">
   <h2>Ei omaa organisaatiota?</h2>

code/moya-management-portal/src/app/organization/organization.component.ts

@@ -8,7 +8,7 @@ import { Component, OnInit } from '@angular/core';
 export class OrganizationComponent implements OnInit {
 
   title = 'Moay';
-  public currentOrganisation: string;
+  public currentOrganization: string;
 
   constructor() { }
 
@@ -16,7 +16,7 @@ export class OrganizationComponent implements OnInit {
   }
 
   onOrganizationChange(event) {
-    this.currentOrganisation = event;
+    this.currentOrganization = event;
   }
 
 }