From b1581cfe911b679bc25ce5a1c492316e85b6b5b9 Mon Sep 17 00:00:00 2001
From: Joachim <joachim@nielandt.be>
Date: Sat, 8 Sep 2018 20:28:02 +0200
Subject: [PATCH] got colors working, goddamn janky shit

---
 src/app/app.module.ts                      |  4 +++-
 src/app/content/poule/poule.component.html | 17 ++++++++++++++---
 src/app/content/poule/poule.component.scss |  1 +
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 040d56d..fa6782b 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -15,6 +15,7 @@ import { ChampionshipselectordialogComponent } from './championshipselectordialo
 import { RacetimepipePipe } from './racetimepipe.pipe';
 import { MinutesPipe } from './minutes.pipe';
 import { TimespanComponent } from './timespan/timespan.component';
+import { SecondsPipe } from './seconds.pipe';
 
 @NgModule({
   declarations: [
@@ -27,7 +28,8 @@ import { TimespanComponent } from './timespan/timespan.component';
     ChampionshipselectordialogComponent,
     RacetimepipePipe,
     MinutesPipe,
-    TimespanComponent
+    TimespanComponent,
+    SecondsPipe
   ],
   imports: [
     BrowserModule,
diff --git a/src/app/content/poule/poule.component.html b/src/app/content/poule/poule.component.html
index 9010411..dadd968 100644
--- a/src/app/content/poule/poule.component.html
+++ b/src/app/content/poule/poule.component.html
@@ -8,7 +8,8 @@
   <!--</ng-container>-->
   <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': 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-->
@@ -36,8 +37,10 @@
       <!--do a penalty for this race/team combo-->
       <div class="penaltycell" [ngStyle]="{'grid-column':2, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}">
         <!--<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>
+
+      <!--the total time-->
       <div class="totalcell" [ngStyle]="{'grid-column':3, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}"
            [class]="'timerank'+getTimeRank(raceindex, team.idteam)"
       >
@@ -45,11 +48,19 @@
         <app-timespan [theNumber]="getRaceTimeSeconds(raceindex, team.idteam)" [theUnit]="'s'"></app-timespan>
       </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>
 
     <!--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-end': 2+(teamindex*(maxRaces+1))+1+maxRaces}">
       <app-timespan [theNumber]="getAvgOfBestTwo(team.idteam) | minutes" [theUnit]="'m'"></app-timespan>
diff --git a/src/app/content/poule/poule.component.scss b/src/app/content/poule/poule.component.scss
index 95c7a02..ddc9a4e 100644
--- a/src/app/content/poule/poule.component.scss
+++ b/src/app/content/poule/poule.component.scss
@@ -36,6 +36,7 @@
 
 .penaltycell {
   color: red;
+  font-weight: bolder;
 }
 .resultcell {
   font-size: 120%;