got colors working, goddamn janky shit

This commit is contained in:
Joachim 2018-09-08 20:28:02 +02:00
parent ff4d5695a3
commit b1581cfe91
3 changed files with 18 additions and 4 deletions

View File

@ -15,6 +15,7 @@ import { ChampionshipselectordialogComponent } from './championshipselectordialo
import { RacetimepipePipe } from './racetimepipe.pipe'; import { RacetimepipePipe } from './racetimepipe.pipe';
import { MinutesPipe } from './minutes.pipe'; import { MinutesPipe } from './minutes.pipe';
import { TimespanComponent } from './timespan/timespan.component'; import { TimespanComponent } from './timespan/timespan.component';
import { SecondsPipe } from './seconds.pipe';
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -27,7 +28,8 @@ import { TimespanComponent } from './timespan/timespan.component';
ChampionshipselectordialogComponent, ChampionshipselectordialogComponent,
RacetimepipePipe, RacetimepipePipe,
MinutesPipe, MinutesPipe,
TimespanComponent TimespanComponent,
SecondsPipe
], ],
imports: [ imports: [
BrowserModule, BrowserModule,

View File

@ -8,7 +8,8 @@
<!--</ng-container>--> <!--</ng-container>-->
<div class="toplevelheader" [ngStyle]="{'grid-column': 2, 'grid-row' : 1}">penalty</div> <div class="toplevelheader" [ngStyle]="{'grid-column': 2, 'grid-row' : 1}">penalty</div>
<div class="toplevelheader" [ngStyle]="{'grid-column': 3, 'grid-row' : 1}">racetijd</div> <div class="toplevelheader" [ngStyle]="{'grid-column': 3, 'grid-row' : 1}">racetijd</div>
<div class="toplevelheader" [ngStyle]="{'grid-column': 4, 'grid-row' : 1}">result</div> <div class="toplevelheader" [ngStyle]="{'grid-column': 4, 'grid-row' : 1}">penalised</div>
<div class="toplevelheader" [ngStyle]="{'grid-column': 5, 'grid-row' : 1}">result</div>
<!--start looping over teams, make a block for each--> <!--start looping over teams, make a block for each-->
@ -36,8 +37,10 @@
<!--do a penalty for this race/team combo--> <!--do a penalty for this race/team combo-->
<div class="penaltycell" [ngStyle]="{'grid-column':2, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}"> <div class="penaltycell" [ngStyle]="{'grid-column':2, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}">
<!--<span class="timecell seconds">{{getPenaltySum(raceindex, team.idteam)}}</span>--> <!--<span class="timecell seconds">{{getPenaltySum(raceindex, team.idteam)}}</span>-->
<app-timespan [theNumber]="getPenaltySum(raceindex, team.idteam)" [theUnit]="'s'"></app-timespan> <app-timespan [prefix] = "'+'" [theNumber]="getPenaltySum(raceindex, team.idteam)" [theUnit]="'s'"></app-timespan>
</div> </div>
<!--the total time-->
<div class="totalcell" [ngStyle]="{'grid-column':3, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}" <div class="totalcell" [ngStyle]="{'grid-column':3, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}"
[class]="'timerank'+getTimeRank(raceindex, team.idteam)" [class]="'timerank'+getTimeRank(raceindex, team.idteam)"
> >
@ -45,11 +48,19 @@
<app-timespan [theNumber]="getRaceTimeSeconds(raceindex, team.idteam)" [theUnit]="'s'"></app-timespan> <app-timespan [theNumber]="getRaceTimeSeconds(raceindex, team.idteam)" [theUnit]="'s'"></app-timespan>
</div> </div>
<!--total time + penalty-->
<div class="penalisedtime" [ngStyle]="{'grid-column':4, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}"
[class]="'timerank'+getTimeRank(raceindex, team.idteam)"
>
<app-timespan [theNumber]="getPenalisedRaceTime(raceindex, team.idteam) | minutes" [theUnit]="'m'"></app-timespan>
<app-timespan [theNumber]="getPenalisedRaceTime(raceindex, team.idteam) | seconds" [theUnit]="'s'"></app-timespan>
</div>
</ng-container> </ng-container>
<!--this only has to be added once for each team...--> <!--this only has to be added once for each team...-->
<div class="resultcell" [ngStyle]="{'grid-column':4, <div class="resultcell" [ngStyle]="{'grid-column':5,
'grid-row-start':2+(teamindex*(maxRaces+1))+1, 'grid-row-start':2+(teamindex*(maxRaces+1))+1,
'grid-row-end': 2+(teamindex*(maxRaces+1))+1+maxRaces}"> 'grid-row-end': 2+(teamindex*(maxRaces+1))+1+maxRaces}">
<app-timespan [theNumber]="getAvgOfBestTwo(team.idteam) | minutes" [theUnit]="'m'"></app-timespan> <app-timespan [theNumber]="getAvgOfBestTwo(team.idteam) | minutes" [theUnit]="'m'"></app-timespan>

View File

@ -36,6 +36,7 @@
.penaltycell { .penaltycell {
color: red; color: red;
font-weight: bolder;
} }
.resultcell { .resultcell {
font-size: 120%; font-size: 120%;