From 78261f38d9d957afb340def2d3ce46e9efdb8a0e Mon Sep 17 00:00:00 2001 From: AlexRingrose Date: Wed, 13 Mar 2019 21:49:02 -0700 Subject: [PATCH 1/5] Column resize --- src/pages/history/history.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/history/history.html b/src/pages/history/history.html index 57ba83dd..a47f92a0 100644 --- a/src/pages/history/history.html +++ b/src/pages/history/history.html @@ -13,9 +13,9 @@ - + - + Self Assessment History @@ -27,7 +27,7 @@ - + Self Assessments Over Time From 25882d83cdd7ea715f80497d4e93879b0b42ea13 Mon Sep 17 00:00:00 2001 From: AlexRingrose Date: Mon, 18 Mar 2019 17:55:13 -0700 Subject: [PATCH 2/5] Overview basic layout --- src/pages/history/history.html | 57 ++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/src/pages/history/history.html b/src/pages/history/history.html index a47f92a0..49b63539 100644 --- a/src/pages/history/history.html +++ b/src/pages/history/history.html @@ -14,6 +14,63 @@ + + + + + + + +
Name:
+
+ +
First Started:
+
+ +
Seperation Date:
+
+ +
Last Updated:
+
+
+ + +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vel fringilla dui, sed malesuada nibh.

+
+
+
+
+
+
+ + + + + +
Most Improved:
+

Career

+
+ +
Highest Score:
+

9

+
+ +
Next Test Date:
+

01/01/19

+
+ +
Tests Taken:
+

25

+
+ +
Lowest Score:
+

1

+
+
+
+
+
+
From 66ae70741a50eb86942138ce2e0c5af08529307e Mon Sep 17 00:00:00 2001 From: AlexRingrose Date: Mon, 18 Mar 2019 21:05:52 -0700 Subject: [PATCH 3/5] Overview card layout --- src/pages/history/history.html | 68 +++++++++++++++++----------------- src/pages/history/history.scss | 11 +++++- 2 files changed, 43 insertions(+), 36 deletions(-) diff --git a/src/pages/history/history.html b/src/pages/history/history.html index 49b63539..bc87672e 100644 --- a/src/pages/history/history.html +++ b/src/pages/history/history.html @@ -15,22 +15,22 @@ - + - - + + -
Name:
+

Name:

-
First Started:
+

First Started:

-
Seperation Date:
+

Seperation Date:

-
Last Updated:
+

Last Updated:

@@ -39,37 +39,35 @@
Last Updated:
+ + + +

Most Improved:

+

Career

+
+ +

Highest Score:

+

9

+
+ +

Next Test Date:

+

01/01/19

+
+
+ + +

Tests Taken:

+

25

+
+ +

Lowest Score:

+

1

+
+
+
- - - - - -
Most Improved:
-

Career

-
- -
Highest Score:
-

9

-
- -
Next Test Date:
-

01/01/19

-
- -
Tests Taken:
-

25

-
- -
Lowest Score:
-

1

-
-
-
-
-
diff --git a/src/pages/history/history.scss b/src/pages/history/history.scss index f0d6efdc..62490b25 100644 --- a/src/pages/history/history.scss +++ b/src/pages/history/history.scss @@ -20,7 +20,7 @@ page-history { } #rows { - border-bottom: 1px solid black; + border-bottom: 1px solid black; padding: 20px 0px; } @@ -32,4 +32,13 @@ page-history { #chart { padding-left: 10%; } + + .small-label{ + font-size: 1rem; + } + + .card-align{ + display:flex; + align-items: stretch; + } } From 73233af310cbc92f041c0eb5d0496f0fd66a5145 Mon Sep 17 00:00:00 2001 From: AlexRingrose Date: Tue, 19 Mar 2019 21:07:53 -0700 Subject: [PATCH 4/5] Card Styling --- src/pages/history/history.html | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/pages/history/history.html b/src/pages/history/history.html index bc87672e..af2ec0e8 100644 --- a/src/pages/history/history.html +++ b/src/pages/history/history.html @@ -16,8 +16,9 @@ - + +

Self Assessment History

@@ -71,10 +72,7 @@

1

- - - Self Assessment History - + @@ -83,10 +81,7 @@

1

- - - Self Assessments Over Time - + From edc9bb1aec5d08567c1f2e0b1287ebd2354388d6 Mon Sep 17 00:00:00 2001 From: AlexRingrose <43159722+AlexRingrose@users.noreply.github.com> Date: Sun, 24 Mar 2019 22:11:23 -0700 Subject: [PATCH 5/5] Timeframe selector --- src/pages/history/history.html | 16 +++++++++++++++- src/pages/history/history.ts | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/pages/history/history.html b/src/pages/history/history.html index af2ec0e8..ea20fc9e 100644 --- a/src/pages/history/history.html +++ b/src/pages/history/history.html @@ -17,8 +17,10 @@ + +

Self Assessment History

+
-

Self Assessment History

@@ -74,6 +76,18 @@

1

+ + + + + Timeset + + *placeholder* + + + + + diff --git a/src/pages/history/history.ts b/src/pages/history/history.ts index 9c714ba0..f1cae0e0 100644 --- a/src/pages/history/history.ts +++ b/src/pages/history/history.ts @@ -17,6 +17,7 @@ export class HistoryPage { lineColors = ["rgba(0,0,255, .3)", "rgba(255,0,0, .3)", "rgba(128,0,128, .3)", "rgba(0,128,0, .3)", "rgba(255,165,0, .3)", "rgba(0,128,128, .3)", "rgba(255,0,255, .3)", "rgba(0,255,0, .3)"]; dataArrays = [] history:any; + chartSelctor:string; constructor(public navCtrl: NavController, public navParams: NavParams, public chartProvider: ChartProvider) { this.chartProvider.getChartHistory().subscribe(res=>{ this.history = res;