- {{ this.name }}, please refer to the link below to take your first assessment.
-
-
-
- {{ this.name }}, it's been {{assessDate}} days since your last assessment.
-
-
-
-
-
-
-
-
- 1-6
-
-
- 7-11
-
-
- 12-20
-
-
- 20+
-
-
+
+ Assessment Status
+
+
-
-
-
-
+
+
Build Your Network
@@ -176,17 +84,17 @@
-
+
-
-
+
+
Veterans Affairs News
+
diff --git a/src/pages/dashboard/dashboard.scss b/src/pages/dashboard/dashboard.scss
index ee4841d1..4cf29761 100644
--- a/src/pages/dashboard/dashboard.scss
+++ b/src/pages/dashboard/dashboard.scss
@@ -1,18 +1,10 @@
page-dashboard {
-
-
.welcome {
font-size: 26px;
color:#2a3d4f;
font-weight: bold;
}
- .cards {
- // background-color:#dff1d31f;
- background-color: #5f9ad629;
- // background-color: color($colors, light);
- // position: relative;
- }
.headers {
font-weight: bold;
font-size: 26px;
@@ -21,129 +13,22 @@ page-dashboard {
color: #2a3d4fb3;
}
+ .card-header-md + .card-content-md {
+ padding-top: 20px;
+ }
.actionItemText {
font-size: 20px;
text-align: center;
}
-
-
- .warningMeter {
- display: flex;
- justify-content: center;
- margin-top: 2em;
- align-items: center;
- align-content: center;
- padding: 0 3em 0 3em;
- }
-
- .box {
- background-color: grey;
- height: 125px;
- width: 80px;
- border-radius: 5px;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-basis: 15rem;
- }
-
- .good {
- background-color: green;
- }
-
- .weak {
- background-color: yellow;
- }
-
- .poor {
- background-color: orange;
- }
-
- .danger {
- background-color: red;
- }
-
- .grow {
- height: 100px;
- flex-basis: 25rem;
- padding: 5rem 1rem;
- font-size: 2.5em;
- text-decoration: underline;
- border-radius: 10px;
- }
-
- .range {
- text-align: center;
- font-weight: bold;
- padding-top: 5px;
- }
-
- .zoneWrapper {
- display: flex;
- justify-content: center;
- margin-top: 40px;
- }
- .conditionP {
- font-size: 16px;
- background-color: transparent;
- }
-
+
.card-md p {
font-size: 1.6em;
}
- .assessmentButton {
- font-weight: bold;
- font-size: 1.6em;
- background-color: transparent;
- color: #488aff;
- }
-
- .assessmentConditionMetButton {
- font-size: 1em;
- background-color: transparent;
- color: #488aff;
- }
-
- .whyTakeAssessmentHeader {
- font-weight: bold;
- text-decoration: underline;
- }
-
- .headerWrapper {
- text-align: center;
- padding: 20px 40px 10px 40px;
- }
-
- .ifUndefined {
- text-align: center;
- }
-
- .zoneExHeader {
- font-size: 26px;
- font-weight: bold;
- letter-spacing: 1px;
- }
-
- .greenHeader {
- color: green;
- }
-
- .yellowHeader {
- color: yellow
- }
-
- .orangeHeader {
- color: orange;
- }
-
- .redHeader {
- color: red;
- }
-
- .zoneDescription {
- margin-top: 15px;
- line-height: 1.5;
+ news-widget .title {
+ font-size: 30px;
+ // text-transform: bold;
+ padding-bottom: 10px;
}
.graphDescriptionWrapper {
@@ -167,13 +52,11 @@ page-dashboard {
.linkIcons {
font-size: 40px;
margin: 10px;
-
}
.networkImages {
margin-top: 15px;
display: flex;
- // justify-content: center;
justify-content: space-around;
}
@@ -184,26 +67,18 @@ page-dashboard {
.networkingAdvice {
padding: 0px 30px 10px 30px;
- font-size: 20px;
+ font-size: 18px;
text-align: center;
}
-
.input-wrapper {
background-color: transparent;
}
- // button {
- // background-color: transparent;
- // color: #488aff;
- // }
-
-
button:hover {
color: #8eafe8;
}
-
.card-content ion-item.item-block {
min-height: 2rem;
}
@@ -218,8 +93,71 @@ page-dashboard {
.button-md {
font-size: 18px;
- // margin: .5em 1em;
}
+ .card-ios p {
+ color: black;
+ font-size: 18px;
+ }
+
+ /* Mobile Styles */
+ @media only screen and (max-width: 400px) {
+ .welcome {
+ font-size: 18px;
+ }
+
+ .headers {
+ font-size: 18px;
+ }
+
+ .networkingAdvice {
+ font-size: 18px;
+ padding: 0px;
+ }
+
+ .card-md p {
+ font-size: 1em;
+ }
+ news-widget .title {
+ font-size: 25px;
+ }
+
+ ion-card.round-card .card-header {
+ font-size: 20px;
+ }
+ }
+
+ /* Tablet Styles */
+ @media only screen and (min-width: 401px) and (max-width: 960px) {
+
+ .welcome {
+ font-size: 18px;
+ }
+
+ .headers {
+ font-size: 18px;
+ }
+
+ .networkingAdvice {
+ padding: 0px;
+ }
+
+ .card-md p {
+ font-size: 1em;
+ }
+
+ news-widget .title {
+ font-size: 25px;
+ }
+
+ ion-card.round-card .card-header {
+ font-size: 20px;
+ }
+ }
+
+
+
+
+
}
diff --git a/src/pages/dashboard/dashboard.ts b/src/pages/dashboard/dashboard.ts
index 0abc3a0d..fea60034 100644
--- a/src/pages/dashboard/dashboard.ts
+++ b/src/pages/dashboard/dashboard.ts
@@ -35,7 +35,8 @@ export class DashboardPage {
private storage: Storage,
public user: UserProvider,
public actionItem: ActionItemProvider,
- public timelineProvider: TimelineProvider) {
+ public timelineProvider: TimelineProvider,
+ ) {
this.currentActionItem = this.actionItem.currentItem;
}
@@ -63,16 +64,17 @@ export class DashboardPage {
this.user.getUserChart()
.subscribe( (data: Array) => {
- if (!data.length) return
+ if (!data.length) return // if array is empty return nothing
this.prevAssess = true;
this.assessDate = moment(data[0].date.substring(0,10), "YYYY-MM-DD").toDate().getTime();
- console.log(this.assessDate, 'first');
+ console.log(moment(data[0].date.substring(0,10), "YYYY-MM-DD"), 'first');
let now = new Date().getTime();
this.assessDate = Math.ceil((this.assessDate - now)/86400000);
console.log(this.assessDate, 'second');
this.assessDate = Math.abs(this.assessDate);
- console.log(data);
+ console.log(data, "chartData");
console.log(this.assessDate, 'third');
+ this.user.assessDate = this.assessDate;
}, error => {console.log("error")},
() => {
this.lastDate();
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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Timeset
+
+ *placeholder*
+
+
+
+
+
-
-
-
- Self Assessments Over Time
-
+
+
-
-
- To find out which range you fall within
- -
-
-
-
-
-
- GREEN
-Being in the green means orem ipsum dolor sit amet, id nec voluptaria - complectitur concludaturque, iuvaret deleniti mea ne, mea in tractatos instructior. Per id tollit - latine, bonorum perfecto no nam.
--
Why assessments are important
--
Assessments are a vital part of the process... lorem ipsum dolor sit amet, id nec voluptaria - complectitur concludaturque, iuvaret deleniti mea ne, mea in tractatos instructior. Per id tollit - latine, bonorum perfecto no nam.
--
Take another assessment
-
-
-
-
-
-
- YELLOW
-Being in the yellow means lorem ipsum dolor sit amet, id nec voluptaria - complectitur concludaturque, iuvaret deleniti mea ne, mea in tractatos instructior. Per id tollit - latine, bonorum perfecto no nam.
--
Why assessments are important
--
Assessments are a vital part of the process... lorem ipsum dolor sit amet, id nec voluptaria - complectitur concludaturque, iuvaret deleniti mea ne, mea in tractatos instructior. Per id tollit - latine, bonorum perfecto no nam.
--
Take another assessment
-
-
-
-
-
-
- ORANGE
-Being in the orange means lorem ipsum dolor sit amet, id nec voluptaria - complectitur concludaturque, iuvaret deleniti mea ne, mea in tractatos instructior. Per id tollit - latine, bonorum perfecto no nam.
--
Why assessments are important
--
Assessments are a vital part of the process... lorem ipsum dolor sit amet, id nec voluptaria - complectitur concludaturque, iuvaret deleniti mea ne, mea in tractatos instructior. Per id tollit - latine, bonorum perfecto no nam.
--
Take another assessment
-
-
-
-
-
-
+ RED
-Being in the red means lorem ipsum dolor sit amet, id nec voluptaria - complectitur concludaturque, iuvaret deleniti mea ne, mea in tractatos instructior. Per id tollit - latine, bonorum perfecto no nam.
--
Why assessments are important
--
Assessments are a vital part of the process... lorem ipsum dolor sit amet, id nec voluptaria - complectitur concludaturque, iuvaret deleniti mea ne, mea in tractatos instructior. Per id tollit - latine, bonorum perfecto no nam.
--
Take another assessment
-
+ {{ this.name }}, it's been {{user.assessDate}} days since your last assessment.
-
+ RED
+
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:
+
+ 
@@ -60,7 +60,7 @@ 
+ 
@@ -74,7 +74,7 @@ 
+ 
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 {
})
}
-
+
}
diff --git a/src/providers/user/user.ts b/src/providers/user/user.ts
index 8b3b0080..2b88a741 100644
--- a/src/providers/user/user.ts
+++ b/src/providers/user/user.ts
@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { ENV } from '@app/env';
-import { StorageProvider } from '../storage/storage'
+import { StorageProvider } from '../storage/storage';
/*
Generated class for the UserProvider provider.
@@ -17,6 +17,7 @@ export class UserProvider {
firstName: "",
lastName: "",
email: "",
+ password: "",
maritalStatus: "",
employmentStatus: "",
@@ -33,6 +34,8 @@ export class UserProvider {
codeIdentifier: ""
}
+ assessDate: any;
+
requestUrl: string = ENV.url
userName: any = "Maurice";
@@ -81,5 +84,11 @@ export class UserProvider {
return this.http.get(this.requestUrl + 'appUsers/' + this.getCredentials().userId + '/charts?access_token=' + creds.token);
}
+ passwordReset(password:any) {
+ const creds = this.getCredentials()
+ let passwordObj:any = { newPassword: password }
+ return this.http.post(this.requestUrl + 'appUsers/reset-password?access_token=' + creds.token, passwordObj, { observe: 'response' });
+ }
+
}