Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
577e2fa
register and user call done => WIP wizard
iamalx Nov 27, 2018
ce487af
done with wizard and call on service
iamalx Nov 27, 2018
e5bdd97
changes made to profile, and transition
iamalx Nov 27, 2018
12c7ce5
Deleted all requests to databases made in dashboard, history, timelin…
awstin17 Nov 27, 2018
d657456
Merge pull request #222 from SoftStackFactory/austin-demo
awstin17 Nov 27, 2018
33ada94
Merge pull request #223 from SoftStackFactory/alex-demo
iamalx Nov 27, 2018
94ddf89
html {{}}, and user comments
iamalx Nov 27, 2018
1a9f08e
changed styling on history page
awstin17 Nov 27, 2018
3ff7714
moved top navbar for slides into its own grid row, modified wizard sa…
gSoD17 Dec 18, 2018
00f8026
fixed header title for smaller screens using portrait media query, mo…
gSoD17 Dec 18, 2018
5b893e1
minor adjustments to nav, added no-padding to grid
gSoD17 Dec 18, 2018
4a6446e
fixed typo for assessment image in assets folder to correct broken im…
gSoD17 Dec 18, 2018
9515729
modified navbar to use flexbox, moved and formatted exit button to be…
gSoD17 Dec 18, 2018
0bd2aaa
commented out navbar
gSoD17 Dec 18, 2018
e700789
reformatted news page for desktop view
gSoD17 Dec 20, 2018
ff8dfb7
additional improvements to news page format for desktop view
gSoD17 Dec 20, 2018
2dc1f86
removed comment for new ion-content markup
gSoD17 Dec 20, 2018
b6e24cf
formatted self-assessment page for desktop view
gSoD17 Dec 20, 2018
ac64eef
No changes
WarrenG8 Jan 4, 2019
184ef94
Merge branch 'dev' into warren
WarrenG8 Jan 4, 2019
e7456be
Wizard directional arrows fixed
WarrenG8 Jan 15, 2019
bc3be25
Left arrow no longer shows up on 1st slide when clicking back
WarrenG8 Jan 15, 2019
725e28e
Dashboard now has link to self assessment
WarrenG8 Jan 15, 2019
65a8772
minor adjustments
gSoD17 Jan 15, 2019
4ebbe0d
commented out timeline component sass on lines 138-140 to adjust chec…
gSoD17 Jan 16, 2019
29e3678
commented out timeline component sass on lines 146-152 to indent imme…
gSoD17 Jan 16, 2019
a49fe70
Removed officer rank insignia question
WarrenG8 Jan 16, 2019
9606d99
Cleaned up link to assessment to match the other links on page
WarrenG8 Jan 16, 2019
b08e8ef
added a new margin-left on line 72 for the timeline sass component
gSoD17 Jan 16, 2019
ff0501e
changed timeline sass component from 10% to 8% on line 72
gSoD17 Jan 16, 2019
52b7ea8
Login merged in
WarrenG8 Jan 16, 2019
3ffec6c
Merge branch 'newspage' into warren
WarrenG8 Jan 16, 2019
59ea260
Removed "
WarrenG8 Jan 16, 2019
1479a03
Merge branch 'gridselfassess' into warren
WarrenG8 Jan 16, 2019
3b1c0a1
Merged in grid changes. Removed Officer Rank Insignia completely.
WarrenG8 Jan 16, 2019
0a4e1f5
Created dropdown menu for rank instead of making the user type in the…
WarrenG8 Jan 16, 2019
831af3d
Merging in history grid changes
WarrenG8 Jan 16, 2019
44f2740
Min-height added to 2nd row of items in dashboard
WarrenG8 Jan 16, 2019
ff19d5c
Resources page grid now added
WarrenG8 Jan 16, 2019
97ab4bf
Dashboard links are now placed in the bottom right corner of its card
WarrenG8 Jan 17, 2019
2c046cf
Please complete assessment text centered.
WarrenG8 Jan 17, 2019
d58c2d1
Made dashboard page responsive. Cards take up full width in iPad or i…
WarrenG8 Jan 17, 2019
f30569a
Fixed grid on self assessment page. Moved instructions to top of page
WarrenG8 Jan 17, 2019
d47153b
Fixed grid on self assessment page. Moved instructions to top of page
WarrenG8 Jan 17, 2019
5b9f905
Fixed grid for resources page. Created view to for user that has not …
WarrenG8 Jan 17, 2019
4856ce9
Fixed grid on resources page for iPad and web views
WarrenG8 Jan 17, 2019
a31bb5e
Fixed grid on history page for iPad and web views
WarrenG8 Jan 17, 2019
e1043f7
Fixed swiping on wizard.
WarrenG8 Jan 17, 2019
464d4d1
Adjusted chart resizing and trimmed padding
AlexRingrose Jan 17, 2019
db56408
Merge branch 'warren' of https://github.com/SoftStackFactory/reboot i…
AlexRingrose Jan 17, 2019
381a350
Alex R fixed chart aspect to make chart size more appropriate.
WarrenG8 Jan 18, 2019
1a1d186
Merged
AlexRingrose Jan 18, 2019
32d0f31
Resources now sort by lowest score to highest when an assessment has …
WarrenG8 Jan 18, 2019
12d70e1
Merge branch 'warren' of https://github.com/SoftStackFactory/reboot i…
WarrenG8 Jan 18, 2019
d7a8627
Fixed arrow bug
WarrenG8 Jan 18, 2019
42820ee
Fixed arrow bug. Refactored leftOrRightArrow
WarrenG8 Jan 18, 2019
af3a736
Refactored swipe locking logic. Added ionicChange methods to evauate …
WarrenG8 Jan 18, 2019
42e8254
Added comments
WarrenG8 Jan 18, 2019
20e397f
Fixed grid for iPad and web view
WarrenG8 Jan 18, 2019
35daafb
Changed question height in questionnaire to fit % disability question…
WarrenG8 Jan 18, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 104 additions & 29 deletions src/components/chart/chart.ts
Original file line number Diff line number Diff line change
@@ -1,83 +1,158 @@
import { ChartProvider } from './../../providers/chart/chart';
import { Component, ViewChild} from '@angular/core';
import { Component, ViewChild } from '@angular/core';
import { Chart } from 'chart.js';
// import 'chartjs-plugin-labelsreboot';

/**

* Generated class for the ChartComponent component.

*

* See https://angular.io/api/core/Component for more info on Angular

* Components.

*/
@Component({

@Component( {

selector: 'chart',

templateUrl: 'chart.html'
})

} )

export class ChartComponent {

@ViewChild('canvas') canvas;
@ViewChild( 'canvas' ) canvas;

chart: any;

chartValues: any;
constructor(public chartProvider: ChartProvider) {

constructor ( public chartProvider: ChartProvider ) {

//this subscribes to the provider which gets the data from the DB
this.chartProvider.mostRecentData().subscribe(res=>{

this.chartProvider.mostRecentData().subscribe( res => {

//calls the function that draws the chart on the canvas within the .html file of the component taking the response from the provider as an argument.
this.buildChart(res)
})

this.buildChart( res )

} )

}

//this builds the chart, it takes one parameter, the parameter needs to be an array with a length of 8 numbers in order for the chart to draw correctly
buildChart(data){
if (data.length < 1) return
this.chart = new Chart(this.canvas.nativeElement, {

buildChart ( data ) {

if ( data.length < 1 ) return

this.chart = new Chart( this.canvas.nativeElement, {

type: 'polarArea',
data: { labels: ["Career", "Finances", "Personal \n Growth", "Health", "Family", "Relationships", "Social life", "Attitude"],
datasets: [
{
backgroundColor: ["rgba(0,0,255, .6)", "rgba(255,0,0, .6)", "rgba(128,0,128, .6)", "rgba(0,128,0, .6)", "rgba(255,165,0, .6)", "rgba(0,128,128, .6)", "rgba(255,0,255, .6)", "rgba(0,255,0, .6)"],
borderColor: "black",
//data is the argument passed into the function.
data: data
}
]

data: {

labels: [ "Career", "Finances", "Personal \n Growth", "Health", "Family", "Relationships", "Social life", "Attitude" ],

datasets: [

{

backgroundColor: [ "rgba(0,0,255, .6)", "rgba(255,0,0, .6)", "rgba(128,0,128, .6)", "rgba(0,128,0, .6)", "rgba(255,165,0, .6)", "rgba(0,128,128, .6)", "rgba(255,0,255, .6)", "rgba(0,255,0, .6)" ],

borderColor: "black",

//data is the argument passed into the function.

data: data

}

]

},

options: {

//Set padding of the chart inside of the canvas element.

layout: {

padding: {
top: 55,
bottom: 55

top: 10,

bottom: 10

}

},

//Hides the chart legend.

legend: {

display: false

},

//Generates an event whenever a section of the chart has been clicked.
'onClick' : function(evt, item) {
let clickedOn = this.chart.getElementAtEvent(evt)
console.log(clickedOn)

'onClick': function ( evt, item ) {

let clickedOn = this.chart.getElementAtEvent( evt )

console.log( clickedOn )

},

plugins: {

//labelsReboot is the chartjs-labels plugin that has been revised for this project

//to allow the labels to be anchored to the outer radius of the chart regardless of chart value
labelsReboot: {

labelsReboot: {

render: 'label',

fontSize: 18,

fontStyle: 'bold',
fontColor: ["rgba(0,0,255, .6)", "rgba(255,0,0, .6)", "rgba(128,0,128, .6)", "rgba(0,128,0, .6)", "rgba(255,165,0, .6)", "rgba(0,128,128, .6)", "rgba(255,0,255, .6)", "rgba(0,255,0, .6)"],

fontColor: [ "rgba(0,0,255, .6)", "rgba(255,0,0, .6)", "rgba(128,0,128, .6)", "rgba(0,128,0, .6)", "rgba(255,165,0, .6)", "rgba(0,128,128, .6)", "rgba(255,0,255, .6)", "rgba(0,255,0, .6)" ],

arc: true,

position: "outside",

overlap: true,

}

},

aspectRatio: 3,

maintainAspectRatio: true,

}
});

} );

//This sets the ticks on the chart to always start at 0 and end at 10, utilizing the global API of the local chart.

this.chart.config.options.scale.ticks.min = 0;

this.chart.config.options.scale.ticks.max = 10;

this.chart.update();

}

}
24 changes: 14 additions & 10 deletions src/components/timeline/timeline.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ padding-left: 2em;
}

.item-checkbox {
margin-left: 12%;
margin-left: 8%;
// margin-left: 12%;
}

.item-checkbox-checked {
Expand Down Expand Up @@ -135,18 +136,21 @@ padding-left: 2em;
}

.item.item-md .checkbox-md {
margin: -6px 17px 8px -20px !important;
padding-left: 4%;
padding-top: 2%;
// margin: -6px 17px 8px -20px !important;
// padding-left: 4%;
// padding-top: 2%;
margin-right: 2%;
padding-left: 2%;
padding-right: 2%;
}

.item-ios h2:last-child, .item-ios h3:last-child, .item-ios h4:last-child, .item-ios h5:last-child, .item-ios h6:last-child, .item-ios p:last-child {
padding-left: 5% !important;
}
// .item-ios h2:last-child, .item-ios h3:last-child, .item-ios h4:last-child, .item-ios h5:last-child, .item-ios h6:last-child, .item-ios p:last-child {
// padding-left: 5% !important;
// }

h1:first-child,h2:first-child,h3:first-child,h4:first-child, h5:first-child, h6:first-child {
margin-left: 2%;
}
// h1:first-child,h2:first-child,h3:first-child,h4:first-child, h5:first-child, h6:first-child {
// margin-left: 2%;
// }

.bulletItem {
// padding-top: 1em;
Expand Down
4 changes: 2 additions & 2 deletions src/components/timeline/timeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ export class TimelineComponent {
{
title: 'Find out your separation date',
checkmark: true,
completed: false,
completed: true,
children: []
},
{
title: 'Complete Pre-Separation Counseling',
checkmark: true,
completed: false,
completed: true,
children: []
}
]
Expand Down
38 changes: 24 additions & 14 deletions src/pages/dashboard/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@

<ion-row>
<ion-col>
<h1 id="hello" text-center>Hello, {{ this.name }}!</h1>
<h1 id="hello" text-center>Hello, Peter!</h1>
<!-- <h1 id="hello" text-center>Hello, {{ this.name }}!</h1> -->
</ion-col>
</ion-row>

<ion-row>
<ion-col>
<ion-col col-xl-8 offset-xl-2>
<ion-card class="cards">
<ion-card-content id="welcome" text-center>
Welcome to the Military and Veteran's "InTransition" Personal Transition Assistant. Your personal guide to
Expand All @@ -34,8 +35,8 @@ <h1 id="hello" text-center>Hello, {{ this.name }}!</h1>
</ion-row>

<ion-row>
<ion-col>
<ion-card class="sep">
<ion-col col-xl-4 offset-xl-2>
<ion-card class="sep cards row2">
<ion-card-header class="headers" text-center *ngIf="daysTilSep > 0">
{{daysTilSep}} Days Until Separation!
</ion-card-header>
Expand All @@ -50,22 +51,23 @@ <h1 id="hello" text-center>Hello, {{ this.name }}!</h1>
Being informed and prepared will make your transition into civilization easier to see what your next steps
are. The next step is:
<br>
<br>
<h4 class="actionItemText"> {{ currentActionItem }} </h4>
<a (click)="toTimeline()" id="separationLink">See what's next
<a (click)="toTimeline()" class="dashboardLinks" id="separationLink">See what's next
<ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
</a>
</ion-card-content>
</ion-card>
</ion-col>

<ion-col>
<ion-card class="news">
<ion-col col-xl-4>
<ion-card class="news cards row2">
<ion-card-header class="headers" text-center>
Veterans Affairs News
</ion-card-header>
<ion-card-content id="separationContent">
<news-widget></news-widget>
<a id="separationLink" (click)="toNews()">More news
<a id="separationLink" class="dashboardLinks" (click)="toNews()">More news

<ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
</a>
Expand All @@ -76,20 +78,28 @@ <h4 class="actionItemText"> {{ currentActionItem }} </h4>
</ion-row>

<ion-row>
<ion-col>
<ion-col col-xl-8 offset-xl-2>
<ion-card class="cards">
<ion-card-header class="headers" text-center>
Transition Readiness Test
</ion-card-header>
<ion-card-content>
<chart ></chart>
<ion-card-content *ngIf="!prevAssess">

<h4 class="actionItemText">Please complete a Self Assessment</h4>

<a (click)="toSelfAssessment()" id="separationLink">Complete an assessment
<ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
</a>
</ion-card-content>
<ion-card-content *ngIf="prevAssess">
<chart></chart>
</ion-card-content>
</ion-card>
</ion-col>
</ion-row>

<ion-row>
<ion-col>
<ion-col col-xl-8 offset-xl-2>
<ion-card class="cards">
<ion-card-header id="networkHeader" class="headers" text-center>
Build Your Network
Expand All @@ -110,12 +120,12 @@ <h4 class="actionItemText"> {{ currentActionItem }} </h4>
a 2.</p>

<br>
<a id="networkingLink">Learn More
<a class="dashboardLinks" id="networkingLink">Learn More
<ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
</a>
</ion-card-content>
</ion-card>
</ion-col>\ <div class="feedgrabbr_widget" id="fgid_6df9b0bc92d7670f82a1d8650"></div>
</ion-col> <div class="feedgrabbr_widget" id="fgid_6df9b0bc92d7670f82a1d8650"></div>

</ion-row>
<div class="feedgrabbr_widget" id="fgid_6df9b0bc92d7670f82a1d8650"></div>
Expand Down
Loading