diff --git a/src/app/live/live.page.html b/src/app/live/live.page.html index 6295424..4d610f1 100644 --- a/src/app/live/live.page.html +++ b/src/app/live/live.page.html @@ -20,7 +20,8 @@

{{ currentMatch.Matchdetail.Match.Number }}

{{ currentMatch.Matchdetail.Match.Coverage_level }}

{{ currentMatch.Matchdetail.Status }}

-

{{ currentMatch.Matchdetail.Tosswonby }}, {{ currentMatch.Matchdetail.Toss_elected_to }}

+

{{ currentMatch.Teams[currentMatch.Matchdetail.Tosswonby].Name_Short }} won the toss and elected to {{ currentMatch.Matchdetail.Toss_elected_to }}

+

{{ currentMatch.Matchdetail.Equation }}

@@ -59,7 +60,7 @@ - {{ currentMatch.Teams[inning.Battingteam].Players[batsman].Name_Full }}
+ {{ currentMatch.Teams[inning.Battingteam].Players[batsman.Batsman].Name_Full }}
{{ batsman.Howout }} diff --git a/src/app/live/live.page.scss b/src/app/live/live.page.scss index 12bcb77..93708f3 100644 --- a/src/app/live/live.page.scss +++ b/src/app/live/live.page.scss @@ -171,8 +171,11 @@ } .card { - width: 100%; + width: 90%; + margin: 20px auto; padding: 15px; + background-color: lighten($brand-blue, 1%); + border-radius: 7px; } table { diff --git a/src/app/match-details/match-details.page.html b/src/app/match-details/match-details.page.html index b6bedb1..0b5f321 100644 --- a/src/app/match-details/match-details.page.html +++ b/src/app/match-details/match-details.page.html @@ -21,7 +21,7 @@
-
+
{{ currentMatch.Teams[inning.Battingteam].Name_Short }}
@@ -53,10 +53,10 @@ - - + + -
+
{{ batsman.Howout }} @@ -112,34 +112,33 @@ - - + + + + + + + + {{ bowler.Wickets }} + + + + {{ bowler.Overs }} + + + + {{ bowler.Dots }} + + + + {{ bowler.Runs }} + + + + {{ bowler.Economyrate }} + + - - - - - - - {{ bowler.Wickets }} - - - - {{ bowler.Overs }} - - - - {{ bowler.Dots }} - - - - {{ bowler.Runs }} - - - - {{ bowler.Economyrate }} - -
@@ -148,26 +147,37 @@
-
+
+ +
+
+
{{ currentMatch.Teams[inning.Battingteam].Name_Short }}
{{ inning.Total }}/{{ inning.Wickets }} ({{ inning.Overs }})
+
+
-
-
Commentary
-
+
    +
    +
    Innings #{{ list.InningNo }}
    +
    -
      -
    • +
    • {{ commentary.Runs }} + + + + +

      {{ commentary.Commentary }}

      -
      +
      Score: {{ commentary.Score }} Strike: {{ commentary.Batsman_Name }} Bowling: {{ commentary.Bowler_Name }} diff --git a/src/app/match-details/match-details.page.scss b/src/app/match-details/match-details.page.scss index a24da9b..a02812c 100644 --- a/src/app/match-details/match-details.page.scss +++ b/src/app/match-details/match-details.page.scss @@ -5,6 +5,7 @@ padding-bottom: 60px; width: 100%; z-index: 0; + position: relative; header { padding: 0 5%; @@ -12,6 +13,30 @@ font-size: 14px; } + .score-card { + box-shadow: 0px 0px 15px -6px darken($brand-blue, 10%); + margin: 0px auto 30px; + position: sticky; + position: -webkit-sticky; + top: 140px; + z-index: 1; + } + + .score-card .team { + header { + background-color: white; + margin-bottom: 0; + + &:first-child { + border-bottom: 1px solid rgba($brand-blue, 0.1); + } + + h5 { + margin-right: 10px; + } + } + } + ul { list-style: none; color: darken($brand-blue, 20%); @@ -346,7 +371,7 @@ border-radius: 7px; overflow: hidden; width: 90%; - margin: 30px auto; + margin: 10px auto 30px; .container { width: 90%; diff --git a/src/app/match-details/match-details.page.ts b/src/app/match-details/match-details.page.ts index a18bdd0..fbdadb8 100644 --- a/src/app/match-details/match-details.page.ts +++ b/src/app/match-details/match-details.page.ts @@ -29,6 +29,8 @@ interface RawCommentaryForBall { Ball_Speed: string; } +// 200556 + export interface RawCommentary { InningNo: string; BattingTeam_Id: string; @@ -59,7 +61,7 @@ export class MatchDetailsPage implements OnInit { selectedPlayer: string = ''; - commentaryList: Array = []; + commentaryList: Array = []; constructor( private location: Location, @@ -75,14 +77,18 @@ export class MatchDetailsPage implements OnInit { this.currentMatch = match_data; }); - this.matchService.getCommentary(match_id).then((data: Array) => { - this.commentaryList = data; + this.matchService.getCommentary(match_id).then((data: Array) => { + this.commentaryList = data; }, (err) => { console.log(err); this.toastService.presentToastWithOptions("Failed to fetch Commentary", "danger"); }) } + getReversedArray(array: Array) { + return array.reverse(); + } + back() { this.location.back(); } diff --git a/src/app/services/match.service.ts b/src/app/services/match.service.ts index df90df8..15f54b6 100644 --- a/src/app/services/match.service.ts +++ b/src/app/services/match.service.ts @@ -22,7 +22,7 @@ export class MatchService { getFixtures() { return this.http.get(BASE_URL + '/fixtures/').toPromise(); } - + // 200556 getMatchDetails(id: number | string) { return this.http.get(BASE_URL + '/match/' + id).toPromise(); } diff --git a/src/index.html b/src/index.html index 0236bda..9fa8f70 100644 --- a/src/index.html +++ b/src/index.html @@ -24,30 +24,6 @@ - - - - - - - -