diff --git a/src/pages/history/history.html b/src/pages/history/history.html index 57ba83dd..ea20fc9e 100644 --- a/src/pages/history/history.html +++ b/src/pages/history/history.html @@ -13,25 +13,89 @@ - + - - + + - Self Assessment History +

Self Assessment History

+ + + + +

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

+
+
+
+
+
+
+
+ + + + + + + + Timeset + + *placeholder* + + + + + - - - - Self Assessments Over Time - + + 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; + } } 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; diff --git a/src/providers/chart/chart.ts b/src/providers/chart/chart.ts index 0915e9df..0f3c03d3 100644 --- a/src/providers/chart/chart.ts +++ b/src/providers/chart/chart.ts @@ -9,10 +9,10 @@ import { of as observableOf } from 'rxjs/observable/of' @Injectable() export class ChartProvider { - + allResults: any; chartSections: any; - requestUrl: string = ENV.url + '/charts?access_token=' + sessionStorage.getItem('token') + requestUrl: string; testChart: any = []; chartHistory; mostRecentChart; @@ -21,11 +21,18 @@ export class ChartProvider { constructor(public http: HttpClient, private storage: StorageProvider) { } - addAssessment(assessment) { + checkSessionCredentials(){ + //Updates the request url to reflect the current credentials in Session storage. + this.requestUrl = ENV.url + '/appUsers/' + sessionStorage.getItem('userId') + '/charts?access_token=' + sessionStorage.getItem('token'); + } + + addAssessment ( assessment ) { + this.checkSessionCredentials(); return this.http.post(this.requestUrl, assessment); } getChartHistory() { + this.checkSessionCredentials(); return this.http.get(this.requestUrl).map((res:any[])=>{ //Initialized an array to store the values. let allData:any = [] @@ -39,6 +46,7 @@ export class ChartProvider { } mostRecentData() { + this.checkSessionCredentials(); //calls the API to get the assesments from the db return this.http.get(this.requestUrl).map((res:any[])=>{ //Returns all data, recent gets the last or most recent item from the DB @@ -53,5 +61,5 @@ export class ChartProvider { }) } - + }