Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
531 commits
Select commit Hold shift + click to select a range
e322005
Data cleaning pass 1
sulkaharo Aug 10, 2017
6c940a5
* Glucose data smoothing / patching before calculating variability to…
sulkaharo Aug 11, 2017
dbe2927
Run packaging in post install instead of runtime
sulkaharo Aug 15, 2017
7564420
CSS bundling
sulkaharo Aug 15, 2017
abb4db2
Fix templates that linked to old bundle.js location
sulkaharo Aug 15, 2017
7df05f0
Removing Bower part 1
sulkaharo Aug 15, 2017
297064d
Flot plugins
sulkaharo Aug 15, 2017
5c68964
jQuery packaging has changed, adding these to the repo
sulkaharo Aug 15, 2017
dda4277
Generate source map, use a small font subset instead of loading compl…
sulkaharo Aug 16, 2017
9e055ad
Added missing icons, changed how jQuery and jQuery-UI is packaged
sulkaharo Aug 16, 2017
76988d6
Bower is gone
sulkaharo Aug 16, 2017
76ef41e
Remove Crossfilter (needed by /reports/compare, which is not supporte…
sulkaharo Aug 16, 2017
0e9977f
Oops forgot package-lock.json
sulkaharo Aug 16, 2017
1dcd4fd
Revert back to using Open Sans, but embedded
sulkaharo Aug 16, 2017
936d631
Re-enabled Ubuntu to fix the layouts. Icon font embedded.
sulkaharo Aug 18, 2017
99b1c16
Update cache busters
sulkaharo Aug 18, 2017
49378c0
Added variability measure explanations to reporting
sulkaharo Aug 18, 2017
340e76b
Finnish localization
sulkaharo Aug 18, 2017
89cee93
Fix battery icon, some tests
sulkaharo Aug 21, 2017
89a6b81
Added app cache manifest to speed things further
sulkaharo Aug 22, 2017
f451503
Launch PNG was missing
sulkaharo Aug 22, 2017
918ecc2
Return 404 on app cache request when in development mode, added bold …
sulkaharo Aug 23, 2017
530df90
Formatting improvements to app.js
sulkaharo Aug 23, 2017
2afafab
Merge pull request #2736 from sulkaharo/wip/variability
sulkaharo Aug 23, 2017
20a99a1
Added sync-exec in an attempt to appease Azure
sulkaharo Aug 23, 2017
f00f1ef
Merge pull request #2759 from sulkaharo/wip/variability
sulkaharo Aug 23, 2017
538dfbd
Added --scripts-prepend-node-path to Azure deploy script
sulkaharo Aug 23, 2017
f81bcf7
Merge pull request #2760 from sulkaharo/dev
sulkaharo Aug 23, 2017
9408fa6
IT Language
hichameyessou Aug 23, 2017
f27a438
update language.js
apanasef Aug 24, 2017
9c03008
Merge pull request #2762 from apanasef/patch-18
sulkaharo Aug 24, 2017
d016a96
Merge branch 'dev' into patch-1
sulkaharo Aug 24, 2017
64c3407
Merge pull request #2761 from hichameyessou/patch-1
sulkaharo Aug 24, 2017
3df4b91
Merge branch 'ns_dev' into alexaTranslations
tanja3981 Aug 25, 2017
2530596
RO update August, 27th - 2017
bogdangorescu Aug 26, 2017
eda7c77
Trigger app on DOM ready event (as recommended by HTML5 spec). Detect…
sulkaharo Aug 26, 2017
2bae58b
Better looking loader screen, prevent CSS blocking
sulkaharo Aug 26, 2017
4d0a372
Use ejs to render the app cache and cache buster tokens
sulkaharo Aug 27, 2017
cea9bff
Forgot cache buster generator script
sulkaharo Aug 27, 2017
51c2b7b
Image had ugly artifacts
sulkaharo Aug 27, 2017
1b24449
Upgrade Travis to build with Node 8.4, update package.json to 8.4
sulkaharo Aug 27, 2017
1415048
Merge branch 'dev' into wip/onlinestatus
sulkaharo Aug 27, 2017
ed42f27
Doh, 8.1.4 is the latest version of Node available in Azure
sulkaharo Aug 27, 2017
ffb36f6
Added note on configuring Azure to README
sulkaharo Aug 27, 2017
0c12c10
Separate messages for loading the client and connecting to server
sulkaharo Aug 27, 2017
edf8d79
Hide loader on auth fail
sulkaharo Aug 27, 2017
71d9852
Merge pull request #2 from nightscout/dev
boysim Aug 27, 2017
80ad6ca
Support both node 8.1.4 (Azure) and node 8.4.0 (Heroku).
PieterGit Aug 28, 2017
e39e113
Unit tests fixed
sulkaharo Aug 29, 2017
0b64d3f
Increasing test timeout significantly due to Travis fails
sulkaharo Aug 29, 2017
caae861
And add the longer timeout to Travis, too…
sulkaharo Aug 29, 2017
e31ac8f
Now it works
sulkaharo Aug 29, 2017
b10a119
Fixed Coverage running parameter order
sulkaharo Aug 29, 2017
7bef221
Report tests takes over 40 seconds to run in Travis, timeout increased
sulkaharo Aug 29, 2017
035b3ae
Merge pull request #2775 from sulkaharo/dev
sulkaharo Aug 29, 2017
ffad5b3
Merge commit '035b3aef7418d1dd4d2a2ffec86e3363dc7fe1b2' into wip/onli…
sulkaharo Aug 29, 2017
a1ac364
More test fixes
sulkaharo Aug 29, 2017
adfe575
Increasing Travis timeouts ridiculously, we need to do something to this
sulkaharo Aug 29, 2017
36220f8
Merge pull request #2767 from bogdangorescu/patch-22
sulkaharo Aug 30, 2017
b0a8463
Merge branch 'dev' into wip/onlinestatus
sulkaharo Aug 30, 2017
5d2a95f
Merge branch 'dev' of https://github.com/nightscout/cgm-remote-monito…
tanja3981 Sep 1, 2017
d17d69e
minor css fixes
jasoncalabrese Sep 2, 2017
325e307
Merge branch 'wip/onlinestatus' of https://github.com/sulkaharo/cgm-r…
jasoncalabrese Sep 2, 2017
7428040
see if document ready is the problem when testing on travis
jasoncalabrese Sep 3, 2017
0afd519
Revert "see if document ready is the problem when testing on travis"
jasoncalabrese Sep 3, 2017
6f9fd91
Merge branch 'dev' of https://github.com/nightscout/cgm-remote-monito…
PieterGit Sep 3, 2017
78115d0
Update openaps.js
philipgo Sep 4, 2017
753b7f6
Update openaps.js
philipgo Sep 5, 2017
c0f22fd
Update openaps.test.js
philipgo Sep 5, 2017
148fe90
change node-uuid to uuid
Sep 10, 2017
75c308d
npm update
Sep 10, 2017
dbdb143
add environment variables to .travis.yml
Sep 10, 2017
745730b
increase timeout to 30 secs for admintools test and change environmen…
Sep 10, 2017
f30f1b7
create bundle before tests and time tests execution for travis
Sep 10, 2017
1c81299
Makefiles requires tabs not space. I knew that...
Sep 10, 2017
54e14dd
change Makefile
Sep 10, 2017
4a4cc7e
last try for today
Sep 10, 2017
38b45bb
set timeout of profileeditor.test to 30 seconds
Sep 10, 2017
94f56ea
increase timeout for profileeditor tests
Sep 10, 2017
da55c95
only support node 8.4.0 and drop support for node 8.1.4
Sep 11, 2017
cd97fab
bundle creation is done by npm postinstall, so should not be called e…
Sep 11, 2017
ec2ca38
revert tests/fixtures/headless.js
Sep 11, 2017
de710ae
revert test/fixtures/headless.js (now without changing indent)
Sep 11, 2017
6681e4e
remove env's from .travis.yml (because they might not be needed)
Sep 11, 2017
3e6075c
Merge pull request #2773 from PieterGit/multiple_node8
sulkaharo Sep 11, 2017
be34ac5
Merge dev
sulkaharo Sep 11, 2017
fc0bd46
Move all html files to views folder, update to use the rendered cache…
sulkaharo Sep 11, 2017
e63453c
Merge pull request #2785 from drnoname82/dev-openaps-enacted-fix
sulkaharo Sep 11, 2017
32273fd
Fix tests to uses the view path :D
sulkaharo Sep 11, 2017
b8cf50e
Merge dev
sulkaharo Sep 11, 2017
ed12279
Update README to reflect correct Node version
sulkaharo Sep 11, 2017
3752158
Merge pull request #2689 from unsoluble/CSS-align-fix
sulkaharo Sep 11, 2017
b5ba1bc
Implements #2689
sulkaharo Sep 11, 2017
33e9304
Implements #2456
sulkaharo Sep 11, 2017
28ffdc1
Merge pull request #2707 from tanja3981/alexaTranslations
sulkaharo Sep 11, 2017
8b0d3c7
Merge dev
sulkaharo Sep 11, 2017
ca19385
One cache buster wasn't updated to dynamic form
sulkaharo Sep 11, 2017
3de2a5d
Merge pull request #2780 from nightscout/wip/onlinestatus
sulkaharo Sep 11, 2017
ddce2b9
decrease timeouts to detect regressions faster in future
PieterGit Sep 14, 2017
2676cee
Admintools and profileeditor test fails with 20 sec timeout. Increasi…
PieterGit Sep 14, 2017
2caa67d
optimize travis tests. see if 5 sec per test is enough (in stead of 5…
PieterGit Sep 14, 2017
ec06d5d
the following tests don't complete in 5 sec. increase timeout to 25 sec.
PieterGit Sep 14, 2017
2cadcb0
increase profileeditor tests to 40 sec
PieterGit Sep 14, 2017
2f46e05
hasauth.test.js fails with 25 sec. increasing to 40 sec
PieterGit Sep 14, 2017
a4dc5ff
Small fix to CGM data noise filtering
sulkaharo Sep 19, 2017
f1efb73
Add Node version to DEV Azure deploy json
sulkaharo Sep 22, 2017
f7af509
Testing Node 8.1.4 for Azure
sulkaharo Sep 22, 2017
904f80f
Testing disabling heap dumps
sulkaharo Sep 22, 2017
205bd5d
Update to 8.5.0 to see if that works without the problematic module
sulkaharo Sep 22, 2017
2484d8b
add food to websockets
MilosKozak Sep 22, 2017
c43d664
Merge branch 'dev' of https://github.com/nightscout/cgm-remote-monito…
MilosKozak Sep 22, 2017
275aeec
add node env for deploy in azure
MilosKozak Sep 22, 2017
7bbfa30
change node to 8.5.0
MilosKozak Sep 22, 2017
6e589fe
Merge pull request #2811 from MilosKozak/azure
sulkaharo Sep 22, 2017
b1a9f86
Prepare for 0.10 release
sulkaharo Sep 22, 2017
d7d5e8a
Revert part of changes from previous merge
sulkaharo Sep 22, 2017
9fce5db
Merge pull request #2812 from nightscout/dev
sulkaharo Sep 22, 2017
a7cb4c2
Bump Nightscout version number to 0.10.1-dev
sulkaharo Sep 23, 2017
08f3034
Merge pull request #3 from nightscout/dev
boysim Sep 24, 2017
bf82c43
Create issue_template.md
sulkaharo Sep 26, 2017
6adb76e
Fixes hourly filtering in distrubution reports, reported in #2864
sulkaharo Sep 28, 2017
e31cbb4
SVG dimension fix
unsoluble-test Oct 6, 2017
f28c3f9
preserve original treatment collection
MilosKozak Oct 7, 2017
ca39c92
add ZT (zero temp) prediction line
scottleibrand Oct 9, 2017
c17c004
package-lock.json
scottleibrand Oct 9, 2017
15702d7
display ZT PredBGs, and forecast tooltips
scottleibrand Oct 9, 2017
0d222d4
remove extra-big tooltip target around treatments; reduce font sizes
scottleibrand Oct 9, 2017
08e4aa9
make R3/R4 elements into very short arcs to reposition labels
scottleibrand Oct 9, 2017
4e1837d
Remove pattern regex from basal change field
unsoluble-test Oct 9, 2017
0404f0d
filter to only use actual SGV's (not rawbg's) to set the view window
scottleibrand Oct 9, 2017
3b33f2f
remove console.log
scottleibrand Oct 9, 2017
d6a0b10
Use lodash cloneDeep instead of JSON serialize/desearialize
sulkaharo Oct 11, 2017
18e7b35
update Russian
apanasef Oct 12, 2017
1ffa0b5
Merge pull request #2913 from apanasef/patch-19
sulkaharo Oct 13, 2017
4e2e871
Merge pull request #2894 from unsoluble/SVG-dimension-fix
sulkaharo Oct 13, 2017
16f55bc
Merge pull request #2904 from unsoluble/Allow-negative-values-in-CP
sulkaharo Oct 13, 2017
06774d7
Merge pull request #2911 from nightscout/fixv2apiv2
sulkaharo Oct 14, 2017
7e662ac
Cleanup: move cache buster token generation to /bin, remove /scripts
sulkaharo Oct 15, 2017
48c8e7e
Fix express-minify file cache path to reduce the memory footprint of …
sulkaharo Oct 15, 2017
3ab41ce
Display RSSI on Loop pill
sulkaharo Oct 15, 2017
94cd87f
Add missing fontello icons to main CSS
sulkaharo Oct 15, 2017
1f0b3ef
Update version to release
sulkaharo Oct 15, 2017
486f6c3
Merge branch 'master' into dev
sulkaharo Oct 15, 2017
42a3a65
Loop RSSI fix
sulkaharo Oct 15, 2017
703a30d
One more Loop RSSI fix
sulkaharo Oct 15, 2017
c99570f
Always show RSSI
sulkaharo Oct 15, 2017
9f7de63
Merge pull request #2918 from nightscout/dev
sulkaharo Oct 15, 2017
1c387b8
Update dev version to 0.10.2
sulkaharo Oct 15, 2017
349bc02
exclude package-lock.json from git
scottleibrand Oct 15, 2017
4ba9b3e
Merge branch 'dev' into ZT
scottleibrand Oct 15, 2017
ec25130
add package-lock.json to .gitignore to avoid merge conflicts
scottleibrand Oct 15, 2017
ae5a5d4
comments
scottleibrand Oct 15, 2017
defcae7
revert font change
scottleibrand Oct 15, 2017
68af094
Adding some test coverage for /lib/client/renderer.js
christopher-fredregill Oct 15, 2017
f13b6af
send foods via websockets
MilosKozak Oct 16, 2017
3457de5
use websockeets instead of rest api for food
MilosKozak Oct 16, 2017
257371f
add fat,protein,energy to food editor
MilosKozak Oct 16, 2017
94d21d2
Re-enable source maps
sulkaharo Oct 16, 2017
0d90008
Merge pull request #2924 from MilosKozak/dev
MilosKozak Oct 16, 2017
6c86a6d
replace 3HR with 2HR and (default) 4HR views
scottleibrand Oct 17, 2017
e433cc8
only show focusHours' worth of predictions; strip leading zero from b…
scottleibrand Oct 17, 2017
38d3539
fix spelling of focusRangeMS
scottleibrand Oct 17, 2017
e60ff3a
change default back to 3HR
scottleibrand Oct 17, 2017
fb4e74e
try larger label font: 35 instead of 25 (vs. 40)
scottleibrand Oct 17, 2017
33f16f4
allow treatment bubbles to scale up past 1U/20g size
scottleibrand Oct 18, 2017
fa7c74b
change font size back to default in this branch
scottleibrand Oct 18, 2017
7a6fda0
change Bolus Snooze to Bolus IOB
scottleibrand Oct 19, 2017
2d87384
change Bolus Snooze to Bolus IOB
scottleibrand Oct 19, 2017
e499e9b
Merge branch 'ZT' into rendering
scottleibrand Oct 19, 2017
8f66f09
back to smaller treatment dots
scottleibrand Oct 20, 2017
532d766
handle AAPS profile switches well
MilosKozak Oct 20, 2017
ddfd790
Merge pull request #2960 from MilosKozak/dev
MilosKozak Oct 20, 2017
3a7dc58
Fix URLs of [mongostring] and [autoconfigure]
schmitzn Oct 20, 2017
de2ff49
Merge pull request #2920 from christopher-fredregill/wip/increase_cov…
sulkaharo Oct 20, 2017
62f352c
update nodejs to 8.7.0 and npm update
PieterGit Oct 21, 2017
3995a26
do not upload temporary profiles from store
MilosKozak Oct 21, 2017
0c4ce20
Merge pull request #2968 from MilosKozak/dev
MilosKozak Oct 21, 2017
45d4853
Merge branch '201710_node870' of https://github.com/PieterGit/cgm-rem…
PieterGit Oct 21, 2017
64913d3
also update nodjes used by travis from 8.5.0 to 8.7.0
PieterGit Oct 21, 2017
43d6797
Upgrade travis node. Merge branch '201710_node870' of https://github.…
PieterGit Oct 21, 2017
2b5c660
Increase timeout for careportal.test.js and pluginbase.test from 25 t…
PieterGit Oct 21, 2017
c0388ab
increase timeout of admintools.test.js from 25 to 30 seconds
PieterGit Oct 21, 2017
cbee7f2
pluginbase.test.js fails with 30 sec. upping to 40 sec timeout
PieterGit Oct 22, 2017
f51a24f
update to nodejs 8.8.0 and npm update
PieterGit Oct 25, 2017
ccda13e
Update to node js 8.8.0 and npm update. Merge branch '201710_node870'…
PieterGit Oct 25, 2017
68536d9
npm update with nodejs 8.8.0
PieterGit Oct 25, 2017
ca7972a
Merge pull request #2967 from PieterGit/201710_node870
sulkaharo Oct 25, 2017
c6af0aa
Merge pull request #2800 from PieterGit/travis_improve
sulkaharo Oct 25, 2017
a869e3c
Update version, remove package-lock.json
sulkaharo Oct 25, 2017
dd1cc9c
upgrade node in .nvmrc from 8.1.4 to 8.8.0
PieterGit Oct 25, 2017
9c403e5
set sudo back to required (used for docker and mongodb commands)
PieterGit Oct 25, 2017
9b77bc5
Merge pull request #2982 from PieterGit/travis_fix
sulkaharo Oct 25, 2017
9c971f0
more node upgrade stuff
PieterGit Oct 25, 2017
56092f3
Update README.md
sulkaharo Oct 25, 2017
1e20d83
Merge pull request #2983 from PieterGit/travis_fix2
sulkaharo Oct 25, 2017
f6f5549
Fix a bug with time comparison on if-modified-since support for treat…
sulkaharo Oct 25, 2017
0efaffa
Merge branch 'dev' of github.com:nightscout/cgm-remote-monitor into dev
sulkaharo Oct 25, 2017
c16ad7b
Check both created_at and timestamp fields for treatments in if-modif…
sulkaharo Oct 25, 2017
3867bec
Add Total daily pasal to profile editor.
alimhassam Oct 15, 2017
dd5c125
Bump 8.8.0 to 8.8.1
sulkaharo Oct 26, 2017
55c0a38
Update to node 8.8.1. Merge branch 'dev' of https://github.com/nights…
Oct 27, 2017
3f01d32
cherry pick 33f16f4439262da2ec74c196bfa7f244910bb6fe
scottleibrand Oct 18, 2017
d2a8d50
merge rendering
scottleibrand Oct 17, 2017
4a0c508
Revert "add package-lock.json to .gitignore to avoid merge conflicts"
Oct 27, 2017
2f33b74
fix merge errors, up version and fix test
PieterGit Oct 27, 2017
edbf22b
bring back the ' U' for non-SMB's (> 1U insulin and with carbs)
PieterGit Oct 27, 2017
8f87490
Revert "bring back the ' U' for non-SMB's (> 1U insulin and with carbs)"
PieterGit Oct 27, 2017
4a3c1eb
fix typo foucusRangeMS to focusRangeMS in lib/client/chart.js
PieterGit Oct 27, 2017
bea449b
for some reasone change from foucusRangeMS to focusRangeMS was not im…
PieterGit Oct 27, 2017
0c171d6
bring back the ' U' for non-SMB's (> 1U insulin and with carbs)
PieterGit Oct 27, 2017
1fa753d
More test coverage for /lib/client/renderer.js (highlightBrushPoints)
christopher-fredregill Oct 26, 2017
5b0d683
Merge pull request #4 from nightscout/dev
boysim Oct 31, 2017
6607729
Merge remote-tracking branch 'origin/dev' into rendering
scottleibrand Oct 31, 2017
8ebfd94
Merge branch '201710_pieterg_zt' of https://github.com/PieterGit/cgm-…
scottleibrand Oct 31, 2017
d96d772
Merge branch 'PieterGit-201710_pieterg_zt' into rendering
scottleibrand Oct 31, 2017
9701c03
display Sensitivity Ratio in OpenAPS pill
scottleibrand Nov 1, 2017
6f83031
add comma
scottleibrand Nov 1, 2017
46e501b
Merge pull request #2921 from alimhassam/profileTotalBasal
sulkaharo Nov 1, 2017
23410f0
Merge pull request #2997 from christopher-fredregill/wip/increase_cov…
sulkaharo Nov 1, 2017
dc3611d
Fix SAGE pill test failing due to summer time change
sulkaharo Nov 1, 2017
5f57778
Merge pull request #2966 from schmitzn/fix-urls
sulkaharo Nov 1, 2017
9e0cc8b
Merge pull request #2926 from nightscout/rendering
sulkaharo Nov 1, 2017
0c1aff4
Merge pull request #3011 from nightscout/issue_template
sulkaharo Nov 1, 2017
63223e8
Upgrading to 8.9.0 LTS (first LTS release!) and also let travis run o…
PieterGit Nov 3, 2017
858158c
Drop building with nodejs 9.0.0 for now. Once NodeJS v10 almost appea…
PieterGit Nov 3, 2017
1fb52f1
Update German translation
schmitzn Nov 6, 2017
8925bad
Update German translation
schmitzn Nov 7, 2017
811ed3f
Merge pull request #3026 from schmitzn/update-german-translation
sulkaharo Nov 7, 2017
27c0fc3
Merge pull request #3013 from PieterGit/201711_node890_node900
sulkaharo Nov 7, 2017
fc88488
added dutch translations
boysim Nov 8, 2017
50df514
Merge pull request #3033 from boysim/dev
sulkaharo Nov 8, 2017
56d8834
Update Loop pill RSSI (#3034)
dm61 Nov 8, 2017
2f67610
Upgrade to node 8.9.1 and npm update and some dutch translation fixes…
PieterGit Nov 13, 2017
d0f94d9
deviceInfo.recent null check (#3048)
scottleibrand Nov 28, 2017
2f99f87
add root mean squared out of range metric (#3045)
jakepusateri Nov 28, 2017
68a44fc
Add recommended bolus and eventual BG to Loop pill (#3040)
dm61 Nov 28, 2017
6dc5b55
Update bgclock.html (#3039)
danielharrelson Nov 28, 2017
07a2ff7
Update version, improvements to glucose distribution filtering
sulkaharo Nov 28, 2017
eb4726d
fix reports (#3078)
MilosKozak Nov 28, 2017
7d32250
Shrinkwrap update
sulkaharo Nov 28, 2017
a4d307f
Downgrade npm to fix deployment issues
sulkaharo Nov 28, 2017
55f8fa5
Smarter formatting based on amount of data (#3086)
sulkaharo Nov 29, 2017
8dd4d42
better rendering of treatments with duration (#3082)
MilosKozak Nov 29, 2017
26dd858
* Update Finnish localization
sulkaharo Dec 1, 2017
5692d88
24 hour clock support for bgclock.html
sulkaharo Dec 1, 2017
881d3c6
Merge pull request #2981 from nightscout/dev
sulkaharo Dec 1, 2017
a03683b
Going down to 8.9.0 for Azure
sulkaharo Dec 2, 2017
50a01b4
Alternate versions in package.json
sulkaharo Dec 2, 2017
fa21ee3
One final change that should run on both Heroku and Azure
sulkaharo Dec 2, 2017
75e195a
Merge branch 'dev'
sulkaharo Dec 2, 2017
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
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ all: test

coverage:
NODE_ENV=test ${MONGO_SETTINGS} \
${ISTANBUL} cover ${MOCHA} -- -R tap ${TESTS}
${ISTANBUL} cover ${MOCHA} -- --timeout 30000 -R tap ${TESTS}

report:
test -f ${ANALYZED} && \
Expand All @@ -41,11 +41,11 @@ report:
YOURPACKAGE_COVERAGE=1 ./node_modules/codacy-coverage/bin/codacy-coverage.js) || echo "NO COVERAGE"

test:
${MONGO_SETTINGS} ${MOCHA} -R tap ${TESTS}
${MONGO_SETTINGS} ${MOCHA} --timeout 30000 -R tap ${TESTS}

travis:
NODE_ENV=test ${MONGO_SETTINGS} \
${ISTANBUL} cover ${MOCHA} --report lcovonly -- -R tap ${TESTS}
${ISTANBUL} cover ${MOCHA} --report lcovonly -- --timeout 30000 -R tap ${TESTS}

docker_release:
# Get the version from the package.json file
Expand Down
12 changes: 11 additions & 1 deletion lib/language.js
Original file line number Diff line number Diff line change
Expand Up @@ -10125,52 +10125,62 @@ function init() {
}
,'Time in fluctuation' : {
fi: 'Aika muutoksessa'
,it: 'Tempo in fluttuazione'
,it: 'Tempo in fluttuazione'
,ro: 'Timp în fluctuație'
,ru: 'время флуктуаций'
}
,'Time in rapid fluctuation' : {
fi: 'Aika nopeassa muutoksessa'
,it: 'Tempo in rapida fluttuazione'
,ro: 'Timp în fluctuație rapidă'
,ru: 'время быстрых флуктуаций'
}
,'This is only a rough estimation that can be very inaccurate and does not replace actual blood testing. The formula used is taken from:' : {
fi: 'Tämä on epätarkka arvio joka saattaa heittää huomattavasti mittaustuloksesta, eikä korvaa laboratoriotestiä. Laskentakaava on otettu artikkelista: '
,it: 'Questa è solo un\'approssimazione che può essere molto inaccurata e che non sostituisce la misurazione capillare. La formula usata è presa da:'
,ro: 'Aceasta este doar o aproximare brută, care poate fi foarte imprecisă și nu ține loc de testare capilară. Formula matematică folosită este luată din:'
,ru: 'Это приблизительная оценка не заменяющая фактический анализ крови. Используемая формула взята из:'
}
, 'Filter by hours' : {
fi: 'Huomioi raportissa seuraavat tunnit'
,it: 'Filtra per ore'
,ro: 'Filtrare pe ore'
,ru: 'почасовой фильтр'
}
, 'Time in fluctuation and Time in rapid fluctuation measure the % of time during the examined period, during which the blood glucose has been changing relatively fast or rapidly. Lower values are better.' : {
fi: 'Aika Muutoksessa ja Aika Nopeassa Muutoksessa mittaa osuutta tarkkailtavasta aikaperiodista, jolloin glukoosi on ollut nopeassa tai hyvin nopeassa muutoksessa. Pienempi arvo on parempi.'
,it: 'Tempo in fluttuazione e Tempo in rapida fluttuazione misurano la % di tempo durante il periodo esaminato, durante il quale la glicemia stà variando velocemente o rapidamente. Bassi valori sono migliori.'
,ro: 'Timpul în fluctuație și timpul în fluctuație rapidă măsoară procentul de timp, din perioada examinată, în care glicemia din sânge a avut o variație relativ rapidă sau rapidă. Valorile mici sunt de preferat.'
,ru: 'время флуктуаций и время быстрых флуктуаций означает % времени в рассматриваемый период в течение которого СК менялся относительно быстро или просто быстро. Более низкие значения предпочтительней'
}
, 'Mean Total Daily Change is a sum of the absolute value of all glucose excursions for the examined period, divided by the number of days. Lower is better.' : {
fi: 'Keskimääräinen Kokonaismuutos kertoo kerkimääräisen päivätason verensokerimuutoksien yhteenlasketun arvon. Pienempi arvo on parempi.'
,it: 'Media Totale Giornaliera Variazioni è la somma dei valori assoluti di tutte le escursioni glicemiche per il periodo esaminato, diviso per il numero di giorni. Bassi valori sono migliori.'
,ro: 'Schimbarea medie totală zilnică este suma valorilor absolute ale tuturor excursiilor glicemice din perioada examinată, împărțite la numărul de zile. Valorile mici sunt de preferat.'
,ru: 'усредненное ежедневное изменение это сумма абсолютных величин всех отклонений СК в рассматриваемый период, деленное на количество дней. Меньшая величина предпочтительней'
}
, 'Mean Hourly Change is a sum of the absolute value of all glucose excursions for the examined period, divided by the number of hours in the period. Lower is better.' : {
fi: 'Keskimääräinen tunti kertoo kerkimääräisen tuntitason verensokerimuutoksien yhteenlasketun arvon. Pienempi arvo on parempi.'
,it: 'Media Oraria Variazioni è la somma del valore assoluto di tutte le escursioni glicemiche per il periodo esaminato, diviso per il numero di ore. Bassi valori sono migliori.'
,ro: 'Variația media orară este suma valorilor absolute ale tuturor excursiilor glicemice din perioada examinată, împărțite la numărul de ore din aceeași perioadă. Valorile mici sunt de preferat.'
,ru: 'усредненное часовое изменение это сумма абсолютных величин всех отклонений СК в рассматриваемый период, деленное на количество часов в этот период. Более низкое предпочтительней'
}
, 'GVI and PGS are measures developed by Dexcom, detailed <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">here</a>.' : {
fi: 'GVI ja PGS ovat Dexcom-yrityksen kehittämiä mittaustapoja, joista voit lukea lisää <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">täällä</a>..'
,it: 'GVI e PGS sono misure sviluppate da Dexcom, dettagliate <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">qui</a>.'
,ro: 'GVI și PGS sunt caracteristici de măsurare inventate de Dexcom, ale căror detalii le găsiți <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">aici</a>.'
,ru: 'вариабельность гликемии и статус гликемии больного это величины, разработанные декскомом, подробнее <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">here</a>.'
}
, 'Mean Total Daily Change' : {
fi: 'Keskimääräinen Kokonaismuutos'
,it: 'Media Totale Giornaliera Variazioni'
,ro: 'Variația medie totală zilnică'
,ru: 'усредненное изменение за день'
}
, 'Mean Hourly Change' : {
fi: 'Keskimääräinen tuntimuutos'
,it: 'Media Oraria Variazioni'
,ro: 'Variația medie orară'
,ru: 'усредненное изменение за час'
}
, 'FortyFiveDown': {
Expand Down
2 changes: 1 addition & 1 deletion lib/profilefunctions.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function init (profileData) {
// TODO: Better warnings to user for missing configuration

var t = profile.getTimezone(spec_profile) ? moment(minuteTime).tz(profile.getTimezone(spec_profile)) : moment(minuteTime);

// Convert to seconds from midnight
var mmtMidnight = t.clone().startOf('day');
var timeAsSecondsFromMidnight = t.clone().diff(mmtMidnight, 'seconds');
Expand Down
5 changes: 3 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions tests/basalprofileplugin.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe('basalprofile', function ( ) {
, language: require('../lib/language')()
};

var time = new Date('2015-06-21T00:00:00').getTime();
var time = new Date('2015-06-21T00:00:00+00:00').getTime();


var sbx = sandbox.clientInit(ctx, time, data);
Expand All @@ -86,7 +86,7 @@ describe('basalprofile', function ( ) {
, language: require('../lib/language')()
};

var time = new Date('2015-06-21T00:00:00').getTime();
var time = new Date('2015-06-21T00:00:00+00:00').getTime();


var sbx = sandbox.clientInit(ctx, time, data);
Expand Down
3 changes: 2 additions & 1 deletion tests/careportal.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ describe('client', function ( ) {
});

it ('open careportal, and enter a treatment', function (done) {
var client = require('../lib/client');

var client = window.Nightscout.client;

var hashauth = require('../lib/hashauth');
hashauth.init(client,$);
hashauth.verifyAuthentication = function mockVerifyAuthentication(next) {
Expand Down
12 changes: 4 additions & 8 deletions tests/reports.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ exampleProfile[0].startDate.setMilliseconds(0);
describe('reports', function ( ) {
var self = this;
var headless = require('./fixtures/headless')(benv, this);
this.timeout(40000);
this.timeout(80000);

before(function (done) {
done( );
});
Expand Down Expand Up @@ -203,7 +204,7 @@ describe('reports', function ( ) {


it ('should produce some html', function (done) {
var client = require('../lib/client');
var client = window.Nightscout.client;

var hashauth = require('../lib/hashauth');
hashauth.init(client,$);
Expand Down Expand Up @@ -232,9 +233,6 @@ describe('reports', function ( ) {
// Load profile, we need to operate in UTC
client.sbx.data.profile.loadData(exampleProfile);

console.log('Profile', client.sbx.data.profile);


$('#treatments').addClass('selected');
$('a.presetdates :first').click();
$('#rp_notes').val('something');
Expand Down Expand Up @@ -265,12 +263,10 @@ describe('reports', function ( ) {
//var logfile = filesys.createWriteStream('out.txt', { flags: 'a'} )
//logfile.write($('body').html());

// console.log(result);

result.indexOf('Milk now').should.be.greaterThan(-1); // daytoday
result.indexOf('50 g (1.67U)').should.be.greaterThan(-1); // daytoday
result.indexOf('<td class="tdborder">0%</td><td class="tdborder">100%</td><td class="tdborder">0%</td><td class="tdborder">2</td>').should.be.greaterThan(-1); //dailystats
result.indexOf('td class="tdborder" style="background-color:#8f8"><strong>Normal: </strong></td><td class="tdborder">37.5%</td><td class="tdborder">6</td>').should.be.greaterThan(-1); // distribution
result.indexOf('td class="tdborder" style="background-color:#8f8"><strong>Normal: </strong></td><td class="tdborder">64.7%</td><td class="tdborder">6</td>').should.be.greaterThan(-1); // distribution
result.indexOf('<td>16 (100%)</td>').should.be.greaterThan(-1); // hourlystats
result.indexOf('<div id="success-grid">').should.be.greaterThan(-1); //success
result.indexOf('<b style="padding-left:4em">CAL</b>: Scale: 1.10 Intercept: 31102 Slope: 776.91').should.be.greaterThan(-1); //calibrations
Expand Down