-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/naopeke/MagicApp into pos…
…t-final-adjustments-nao
- Loading branch information
Showing
10 changed files
with
121 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,86 @@ | ||
| import { Component, EventEmitter, Input, Output } from '@angular/core'; | ||
| import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; | ||
| import { Deck } from 'src/app/models/deck'; | ||
| import { User } from 'src/app/models/user'; | ||
| import { DeckService } from 'src/app/shared/deck.service'; | ||
| import { UsersService } from 'src/app/shared/users.service'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-decks', | ||
| templateUrl: './decks.component.html', | ||
| styleUrls: ['./decks.component.css'] | ||
| }) | ||
| export class DecksComponent { | ||
| public explorar: boolean = false | ||
| public score: number; | ||
| public selectedStar: number | ||
| export class DecksComponent implements OnInit { | ||
| @Input () typeRating: number; | ||
| @Input () mazo: Deck | ||
| @Input() maxrating: number = 5; | ||
| @Output() eventoExplorar = new EventEmitter<number>(); | ||
| @Output() eventoPuntuacion = new EventEmitter<{id_deck:number, score:number}>() | ||
|
|
||
| public explora(id_deck:number){ | ||
| this.explorar = true | ||
| this.eventoExplorar.emit(id_deck) | ||
| public maxRatingArr:number[] = [1,2,3,4,5] | ||
| public explorar: boolean = false | ||
| public score: number; | ||
| public currentUser: User; | ||
| constructor(private deckService:DeckService, private userService:UsersService ){ | ||
|
|
||
| } | ||
|
|
||
| Handle(id_deck:number, score:number){ | ||
| this.eventoPuntuacion.emit({id_deck, score}) | ||
| async ngOnInit(): Promise<void> { | ||
| await this.loadCurrentUser(); | ||
| this.deckService.getScore(this.currentUser.id_user, this.mazo.id_deck).subscribe((res:any) => { | ||
| if (res.data[0]) { | ||
| console.log(res.data[0].date); | ||
| this.mazo.previousScore = { date: res.data[0].date, id_user: res.data[0].id_user, score: res.data[0].score }; | ||
| console.log(this.mazo.previousScore); | ||
| } else { | ||
| this.mazo.previousScore = { date: '', id_user: 0, score: 0 }; | ||
| } | ||
| }); | ||
|
|
||
| this.selectedStar = score; | ||
| console.log(this.selectedStar); | ||
|
|
||
| } | ||
|
|
||
| private async loadCurrentUser(): Promise<void> { | ||
| return new Promise<void>((resolve) => { | ||
| this.userService.currentUserChanges().subscribe(user => { | ||
| this.currentUser = user; | ||
| resolve(); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| HandleMouseEnter(index:number){ | ||
| this.mazo.selectedStar=index+1 | ||
| } | ||
|
|
||
| HandleMouseLeave(){ | ||
| if(this.mazo.previousScore.score !== 0){ | ||
| this.mazo.selectedStar = this.mazo.previousScore.score | ||
| } | ||
| else { | ||
| this.mazo.selectedStar = 0 | ||
| } | ||
| } | ||
|
|
||
| rating(index:number, id_deck){ | ||
| if(this.mazo.previousScore.score == 0 && this.mazo.id_user != this.currentUser.id_user){ | ||
| this.mazo.selectedStar= index + 1; | ||
| this.mazo.previousScore.score= this.mazo.selectedStar | ||
| } | ||
| this.score = this.mazo.selectedStar | ||
| this.eventoPuntuacion.emit({id_deck, score:this.score}); | ||
| } | ||
|
|
||
| roundMediaScore(){ | ||
| let resultado; | ||
| if (this.mazo.mediaScore !== undefined) { | ||
| resultado = Math.round(this.mazo.mediaScore); | ||
| } else { | ||
| resultado = 0 | ||
| } | ||
| return resultado | ||
| } | ||
|
|
||
| public explora(id_deck:number){ | ||
| this.explorar = true | ||
| this.eventoExplorar.emit(id_deck) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters