Skip to content

Commit

Permalink
Merge branch 'master' of github.com:goinvo/hGraph
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Madonna authored and Matthew Madonna committed May 31, 2013
2 parents 70442ec + 70efe20 commit 3121d80
Show file tree
Hide file tree
Showing 28 changed files with 49 additions and 11,583 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -5,7 +5,7 @@ An open source javascript-based web application for visualizing health data.

Website: [hgraph.org](http://hgraph.org/)

hGraph Demo: http://www.hscoremixer.org/hGraph/
hGraph Demo: http://demo.hgraph.org/

hMixer Demo: http://www.hscoremixer.org/
hMixer Repo: https://github.com/goinvo/hMixer
Expand Down
23 changes: 13 additions & 10 deletions examples/multiuser/css/global.css
View file
Expand Up @@ -50,7 +50,7 @@ body {
}
/* line 46, ../scss/partials/_structure.scss */
#main #viz {
min-height: 680px;
min-height: 660px;
}
}
/* line 7, ../scss/partials/_multiuser.scss */
Expand Down Expand Up @@ -113,33 +113,36 @@ html, body {
position: absolute;
bottom: 0;
left: 0;
height: 15%;
background-color: #e2e4e3;
width: 100%;
text-align: center;
-moz-box-shadow: 0px -3px 3px #eee;
-webkit-box-shadow: 0px -3px 3px #eee;
box-shadow: 0px -3px 3px #eee;
}
/* line 75, ../scss/partials/_multiuser.scss */
/* line 74, ../scss/partials/_multiuser.scss */
#user-selection .user {
display: inline-block;
margin-left: 15px;
margin-right: 15px;
cursor: pointer;
width: 120px;
}
/* line 82, ../scss/partials/_multiuser.scss */
/* line 81, ../scss/partials/_multiuser.scss */
#user-selection .user:hover {
-webkit-transform: translate(0, -5px);
transition: all 0.1s ease-in-out;
}
/* line 87, ../scss/partials/_multiuser.scss */
/* line 86, ../scss/partials/_multiuser.scss */
#user-selection .user.selected {
-webkit-transform: translate(0, -5px);
transition: all 0.25s ease-in-out;
}
/* line 92, ../scss/partials/_multiuser.scss */
/* line 91, ../scss/partials/_multiuser.scss */
#user-selection .user .image {
margin-top: 8px;
}
/* line 95, ../scss/partials/_multiuser.scss */
#user-selection .user img {
border-radius: 50%;
background-color: #97be8c;
Expand All @@ -149,13 +152,13 @@ html, body {
margin-bottom: 5px;
}

/* line 104, ../scss/partials/_multiuser.scss */
/* line 107, ../scss/partials/_multiuser.scss */
.hline {
position: absolute;
width: 100%;
}

/* line 110, ../scss/partials/_multiuser.scss */
/* line 113, ../scss/partials/_multiuser.scss */
.hline:before,
.hline:after {
border-top: 1px solid #e2e4e3;
Expand All @@ -168,14 +171,14 @@ html, body {
left: 0;
}

/* line 121, ../scss/partials/_multiuser.scss */
/* line 124, ../scss/partials/_multiuser.scss */
.hline:after {
right: 0;
left: auto;
}

@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) {
/* line 128, ../scss/partials/_multiuser.scss */
/* line 131, ../scss/partials/_multiuser.scss */
#user-info {
font-size: 0.8rem;
}
Expand Down
124 changes: 0 additions & 124 deletions examples/multiuser/data/metrics.json
View file
Expand Up @@ -566,111 +566,6 @@
{
"gender": "child",
"metrics": [

{
"name" : "Total Cholesterol",
"details" : [
{
"name": "LDL",
"features": {
"healthyrange": [
0,
130
],
"totalrange": [
0,
200
],
"boundayflags": [
false,
true
],
"weight": 9,
"unitlabel": "mg/dl"
}
},
{
"name": "HDL",
"features": {
"healthyrange": [
40,
90
],
"totalrange": [
0,
130
],
"boundayflags": [
false,
true
],
"weight": 4,
"unitlabel": "mg/dl"
}
},
{
"name": "Triglycerides",
"features": {
"healthyrange": [
0,
150
],
"totalrange": [
0,
600
],
"boundayflags": [
false,
true
],
"weight": 3,
"unitlabel": "mg/dl"
}
}]
},

{
"name" : "Blood Pressure",
"details" : [
{
"name": "Blood Pressure Systolic",
"features": {
"healthyrange": [
90,
105
],
"totalrange": [
0,
200
],
"boundayflags": [
false,
true
],
"weight": 5,
"unitlabel": "mm/Hg"
}
},
{
"name": "Blood Pressure Diastolic",
"features": {
"healthyrange": [
60,
90
],
"totalrange": [
0,
140
],
"boundayflags": [
false,
true
],
"weight": 5,
"unitlabel": "mm/Hg"
}
}]
},
{
"name": "Alcohol",
"features": {
Expand Down Expand Up @@ -823,25 +718,6 @@
"weight": 3,
"unitlabel": "happiness scale"
}
},
{
"name": "Glucose",
"features": {
"healthyrange": [
100,
200
],
"totalrange": [
0,
400
],
"boundayflags": [
false,
true
],
"weight": 10,
"unitlabel": "mg/dl"
}
}
]
}
Expand Down
24 changes: 12 additions & 12 deletions examples/multiuser/data/user-data/sonin_kate.json
View file
Expand Up @@ -5,59 +5,59 @@
"score_data" : [
{
"Weight" : 14,
"value" : 204
"value" : 112
},
{
"LDL" : 1,
"value" : 251
"value" : 110
},
{
"HDL" : 2,
"value" : 35
"value" : 55
},
{
"Triglycerides" : 3,
"value" : 140
"value" : 128
},
{
"Sleep" : 4,
"value" : 5
"value" : 6
},
{
"Exercise" : 5,
"value" : 3
},
{
"Happiness" : 6,
"value" : 9
"value" : 8
},
{
"Glucose" : 7,
"value" : 101
"value" : 99
},
{
"Blood Pressure Systolic" : 8,
"value" : 117
"value" : 122
},
{
"Blood Pressure Diastolic" : 9,
"value" : 79
"value" : 85
},
{
"Alcohol" : 10,
"value" : 0
"value" : 1
},
{
"Smoking" : 11,
"value" : 0
},
{
"Waist Circumference" : 12,
"value" : 34
"value" : 26
},
{
"Pain" : 13,
"value" : 1
"value" : 2
}
]
}
34 changes: 5 additions & 29 deletions examples/multiuser/data/user-data/sonin_udo.json
View file
Expand Up @@ -5,23 +5,11 @@
"score_data" : [
{
"Weight" : 14,
"value" : 204
},
{
"LDL" : 1,
"value" : 251
},
{
"HDL" : 2,
"value" : 35
},
{
"Triglycerides" : 3,
"value" : 140
"value" : 36
},
{
"Sleep" : 4,
"value" : 5
"value" : 9
},
{
"Exercise" : 5,
Expand All @@ -30,19 +18,7 @@
{
"Happiness" : 6,
"value" : 9
},
{
"Glucose" : 7,
"value" : 101
},
{
"Blood Pressure Systolic" : 8,
"value" : 117
},
{
"Blood Pressure Diastolic" : 9,
"value" : 79
},
},
{
"Alcohol" : 10,
"value" : 0
Expand All @@ -53,11 +29,11 @@
},
{
"Waist Circumference" : 12,
"value" : 34
"value" : 21
},
{
"Pain" : 13,
"value" : 1
"value" : 0
}
]
}

0 comments on commit 3121d80

Please sign in to comment.