Added navigation links for match history.

ErkoKnoll · Sep 27, 2017 · a2f8733 · a2f8733
1 parent dab5f75
commit a2f8733
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 10 deletions.
diff --git a/Backend/Controllers/ManageReputationsController.cs b/Backend/Controllers/ManageReputationsController.cs
@@ -41,6 +41,7 @@ public class ManageReputationsController : IDisposable {
                     Name = ur.User.Name
                 },
                 Lobby = new Models.Lobby() {
+                    Id = ur.Lobby.Id,
                     LobbyId = ur.Lobby.LobbyId.ToString(),
                     Name = ur.Lobby.Name
                 }

diff --git a/Backend/Controllers/MatchHistoryController.cs b/Backend/Controllers/MatchHistoryController.cs
@@ -50,6 +50,7 @@ public class MatchHistoryController : IDisposable {
                         SSteamId = r.User.SteamId.ToString()
                     },
                     Reputation = new Models.Reputation {
+                        Id = r.Reputation.Id,
                         Name = r.Reputation.Name,
                         Type = r.Reputation.Type
                     }

diff --git a/Client/Client/src/app/app.models.ts b/Client/Client/src/app/app.models.ts
@@ -100,6 +100,7 @@ export interface UserReputation {
 }
 
 export interface Lobby {
+    id: number;
     lobbyId: string;
     name: string;
 }

diff --git a/Client/Client/src/app/history/history-page/history-page.component.ts b/Client/Client/src/app/history/history-page/history-page.component.ts
@@ -8,7 +8,7 @@ import 'rxjs/add/operator/startWith';
 import 'rxjs/add/observable/merge';
 import 'rxjs/add/operator/map';
 
-import { AppService, HttpService, MatchDetailsDialogComponent, MatchDetailsDialogData } from '../../shared';
+import { AppService, HttpService, TrackingService, MatchDetailsDialogComponent, MatchDetailsDialogData } from '../../shared';
 import { MatchHistory } from '../../app.models';
 
 @Component({
@@ -24,7 +24,7 @@ export class HistoryPageComponent implements OnInit {
     private matches: MatchHistory[];
     @ViewChild(MdPaginator) paginator: MdPaginator;
 
-    constructor(private appService: AppService, private httpService: HttpService, private dialogController: MdDialog) {
+    constructor(private appService: AppService, private httpService: HttpService, private dialogController: MdDialog, private trackingService: TrackingService) {
     }
 
     public ngOnInit() {
@@ -38,6 +38,7 @@ export class HistoryPageComponent implements OnInit {
             },
             width: window.innerWidth * 0.75 + "px",
         });
+        this.trackingService.sendEvent("HistoryPage", "OpenMatchDetails");
     }
 
     private getMatches() {

diff --git a/...nt/src/app/reputations/reputation-details-dialog/reputation-details-dialog.component.html b/...nt/src/app/reputations/reputation-details-dialog/reputation-details-dialog.component.html
@@ -5,7 +5,7 @@
         <md-table [dataSource]="userReputationsDataSource" class="noTablePadding">
             <ng-container cdkColumnDef="lobbyName">
                 <md-header-cell *cdkHeaderCellDef>Lobby Name</md-header-cell>
-                <md-cell *cdkCellDef="let reputation">{{reputation.lobby?.name}}</md-cell>
+                <md-cell *cdkCellDef="let reputation"><span class="clickable" (click)="openMatchDetails(reputation.lobby)">{{reputation.lobby?.name}}</span></md-cell>
             </ng-container>
             <ng-container cdkColumnDef="player">
                 <md-header-cell *cdkHeaderCellDef>Player</md-header-cell>

diff --git a/...ient/src/app/reputations/reputation-details-dialog/reputation-details-dialog.component.ts b/...ient/src/app/reputations/reputation-details-dialog/reputation-details-dialog.component.ts
@@ -8,8 +8,8 @@ import 'rxjs/add/operator/startWith';
 import 'rxjs/add/observable/merge';
 import 'rxjs/add/operator/map';
 
-import { AppService, ReputationService, TrackingService, UserProfileDialogComponent, UserProfileDialogData, ConfirmationDialogComponent, ConfirmationDialogData } from '../../shared';
-import { Reputation, UserReputation } from '../../app.models';
+import { AppService, ReputationService, TrackingService, UserProfileDialogComponent, UserProfileDialogData, ConfirmationDialogComponent, ConfirmationDialogData, MatchDetailsDialogComponent, MatchDetailsDialogData } from '../../shared';
+import { Reputation, UserReputation, Lobby } from '../../app.models';
 
 @Component({
     selector: 'reputation-details-dialog',
@@ -74,6 +74,16 @@ export class ReputationDetailsDialogComponent implements OnInit {
             }
         });
     }
+
+    public openMatchDetails(lobby: Lobby) {
+        let dialog = this.dialogController.open(MatchDetailsDialogComponent, {
+            data: <MatchDetailsDialogData>{
+                id: lobby.id
+            },
+            width: window.innerWidth * 0.75 + "px",
+        });
+        this.trackingService.sendEvent("ReputationTypeDetailsDialog", "OpenMatchDetails");
+    }
 }
 
 export class UserReputationsDataSource extends DataSource<UserReputation> {

diff --git a/Client/Client/src/app/shared/user-profile-dialog/user-profile-dialog.component.html b/Client/Client/src/app/shared/user-profile-dialog/user-profile-dialog.component.html
@@ -60,7 +60,7 @@
         <md-table *ngIf="profile.reputations?.length > 0" [dataSource]="userReputationsDataSource" class="noTablePadding">
             <ng-container cdkColumnDef="lobbyName">
                 <md-header-cell *cdkHeaderCellDef>Lobby Name</md-header-cell>
-                <md-cell *cdkCellDef="let reputation">{{reputation.lobby?.name}}</md-cell>
+                <md-cell *cdkCellDef="let reputation"><span class="clickable" (click)="openMatchDetails(reputation.lobby)">{{reputation.lobby?.name}}</span></md-cell>
             </ng-container>
             <ng-container cdkColumnDef="reputationType">
                 <md-header-cell *cdkHeaderCellDef>Reputation Type</md-header-cell>

diff --git a/Client/Client/src/app/shared/user-profile-dialog/user-profile-dialog.component.ts b/Client/Client/src/app/shared/user-profile-dialog/user-profile-dialog.component.ts
@@ -5,8 +5,8 @@ import { shell } from 'electron';
 
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 
-import { BasePlayer, Reputation, ReputationType, User, UserReputation } from '../../app.models';
-import { HttpService, AppService, TrackingService, ConfirmationDialogComponent, ConfirmationDialogData, ReputationService, ConfigurationService } from '../';
+import { HttpService, AppService, TrackingService, ConfirmationDialogComponent, ConfirmationDialogData, ReputationService, ConfigurationService, MatchDetailsDialogComponent, MatchDetailsDialogData } from '../';
+import { BasePlayer, Reputation, ReputationType, User, UserReputation, Lobby } from '../../app.models';
 
 @Component({
     selector: 'user-profile-dialog',
@@ -20,7 +20,7 @@ export class UserProfileDialogComponent implements OnInit {
     public userReputationsDataSource: UserReputationsDataSource;
     public displayedColumns = ["lobbyName", "reputationType", "added", "comment", "actions"];
 
-    constructor( @Inject(MD_DIALOG_DATA) private data: UserProfileDialogData, private appService: AppService, private reputationService: ReputationService, private httpService: HttpService, private trackingService: TrackingService, private configurationService: ConfigurationService, private dialog: MdDialogRef<UserProfileDialogComponent>, private confirmationDialog: MdDialog) {
+    constructor( @Inject(MD_DIALOG_DATA) private data: UserProfileDialogData, private appService: AppService, private reputationService: ReputationService, private httpService: HttpService, private trackingService: TrackingService, private configurationService: ConfigurationService, private dialog: MdDialogRef<UserProfileDialogComponent>, private dialogController: MdDialog) {
     }
 
     public ngOnInit() {
@@ -29,7 +29,7 @@ export class UserProfileDialogComponent implements OnInit {
     }
 
     public deleteReputation(reputation: UserReputation) {
-        let dialog = this.confirmationDialog.open(ConfirmationDialogComponent, {
+        let dialog = this.dialogController.open(ConfirmationDialogComponent, {
             data: <ConfirmationDialogData>{
                 title: "Deleting Reputation",
                 question: "Are you sure you want to delete assigned reputation?"
@@ -51,6 +51,16 @@ export class UserProfileDialogComponent implements OnInit {
         });
     }
 
+    public openMatchDetails(lobby: Lobby) {
+        let dialog = this.dialogController.open(MatchDetailsDialogComponent, {
+            data: <MatchDetailsDialogData>{
+                id: lobby.id
+            },
+            width: window.innerWidth * 0.75 + "px",
+        });
+        this.trackingService.sendEvent("UserProfileDialog", "OpenMatchDetails");
+    }
+
     public openSteamProfile() {
         shell.openExternal("http://steamcommunity.com/profiles/" + this.profile.sSteamId);
         this.trackingService.sendEvent("UserProfileDialog", "SteamProfileOpened");