diff --git a/.nvmrc b/.nvmrc index e5c15102d9b..486db33615e 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -8.9.0 +8.9.1 diff --git a/.travis.yml b/.travis.yml index 2545a71d11f..fb6fd879e6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: node_js sudo: required dist: trusty node_js: - - "8.9.0" + - "8.9.1" matrix: fast_finish: true services: diff --git a/Dockerfile.example b/Dockerfile.example index bcd0737675e..d4c13c0ecd9 100644 --- a/Dockerfile.example +++ b/Dockerfile.example @@ -1,4 +1,4 @@ -FROM node:8.9.0 +FROM node:8.9.1 MAINTAINER Nightscout Contributors diff --git a/bower.json b/bower.json index 3207a1153d9..9c69a0346c5 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "nightscout", - "version": "0.10.2-release-20171103", + "version": "0.10.3-dev-20171205"", "dependencies": { "colorbrewer": "~1.0.0", "jQuery-Storage-API": "~1.7.2", diff --git a/lib/client/renderer.js b/lib/client/renderer.js index 239c9afdf05..e9478e4a378 100644 --- a/lib/client/renderer.js +++ b/lib/client/renderer.js @@ -444,13 +444,18 @@ function init (client, d3) { } if ( treatment.insulin > 0) { - var dosage_units = Math.round(treatment.insulin * 100)/100; + var dosage_units = '' + Math.round(treatment.insulin * 100)/100; + var unit_of_measurement = ' U'; // One international unit of insulin (1 IU) is shown as '1 U' - if ( treatment.insulin < 1 && !treatment.carbs ) { // don't show the unit of measurement for insulin boluses < 1 without carbs (e.g. oref0 SMB's). Otherwise lot's of small insulin only dosages are often unreadable + var enteredBy = '' + treatment.enteredBy; + + if ( treatment.insulin < 1 && !treatment.carbs && enteredBy.indexOf('openaps') > -1) { // don't show the unit of measurement for insulin boluses < 1 without carbs (e.g. oref0 SMB's). Otherwise lot's of small insulin only dosages are often unreadable unit_of_measurement = ''; + // remove leading zeros to avoid overlap with adjacent boluses + dosage_units = (dosage_units+"").replace(/^0/,""); } - // remove leading zeros to avoid overlap with adjacent boluses - arc_data[3].element = (dosage_units+"").replace(/^0/,"")+unit_of_measurement; + + arc_data[3].element = dosage_units + unit_of_measurement; } if (treatment.status) { @@ -855,10 +860,12 @@ function init (client, d3) { .attr('class', 'path') .attr('id', 'label') .style('fill', 'white'); + + // reduce the treatment label font size to make it readable with SMB + var fontBaseSize = (opts.treatments >= 30) ? 40 : 50 - Math.floor((25-opts.treatments)/30 * 10); label.append('text') - // reduce the treatment label font size to make it readable with SMB - .style('font-size', 30 / opts.scale) + .style('font-size', fontBaseSize / opts.scale) .style('text-shadow', '0px 0px 10px rgba(0, 0, 0, 1)') .attr('text-anchor', 'middle') .attr('dy', '.35em') @@ -874,11 +881,19 @@ function init (client, d3) { } renderer.drawTreatments = function drawTreatments(client) { + + var treatmentCount = 0; + + _.forEach(client.ddata.treatments, function eachTreatment (d) { + if (Number(d.insulin) > 0 || Number(d.carbs) > 0) { treatmentCount += 1; }; + }); + // add treatment bubbles _.forEach(client.ddata.treatments, function eachTreatment (d) { renderer.drawTreatment(d, { scale: renderer.bubbleScale() , showLabels: true + , treatments: treatmentCount }, client.sbx.data.profile.getCarbRatio(new Date())); }); }; diff --git a/lib/language.js b/lib/language.js index 9c49d961f1f..bd0ee2384d8 100644 --- a/lib/language.js +++ b/lib/language.js @@ -40,6 +40,7 @@ function init() { 'Listening on port' : { cs: 'Poslouchám na portu' ,es: 'Escuchando en el puerto' + ,dk: 'Lytter på port' ,fr: 'Ecoute sur port' ,pt: 'Escutando porta' ,sv: 'Lyssnar på port' @@ -464,7 +465,7 @@ function init() { ,hr: 'Danas' ,sv: 'Idag' ,it: 'Oggi' - ,dk: 'Idag' + ,dk: 'I dag' ,fi: 'Tänään' ,nb: 'Idag' ,he: 'היום' @@ -1015,7 +1016,7 @@ function init() { ,bg: 'Зареждане на въведените лечения от' ,hr: 'Učitavanje podataka o tretmanu' ,it: 'Carico dati dei trattamenti' - ,dk: 'Indlæser data for' + ,dk: 'Indlæser behandlingsdata for' ,fi: 'Lataan toimenpidetietoja: ' ,nb: 'Leser behandlingsdata for' ,he: 'טוען נתוני טיפולים של' @@ -1131,7 +1132,7 @@ function init() { ,bg: 'няма' ,hr: 'Prazno' ,it: 'Nessuno' - ,dk: 'ingen' + ,dk: 'Ingen' ,fi: 'tyhjä' ,nb: 'ingen' ,he: 'ללא' @@ -1300,7 +1301,7 @@ function init() { ,pl: 'Statystyki godzinowe' ,ru: 'Почасовая статистика' ,sk: 'Hodinové štatistiky' - ,nl: 'Statistieken elk uur' + ,nl: 'Statistieken per uur' ,ko: '시간 통계' ,zh_cn: '每小时状态' } @@ -1407,7 +1408,7 @@ function init() { ,bg: 'Период' ,hr: 'Period' ,it: 'Periodo' - ,dk: 'Period' + ,dk: 'Periode' ,fi: 'Aikaväli' ,nb: 'Periode' ,he: 'תקופה' @@ -1887,7 +1888,7 @@ function init() { ,hr: 'Standardna devijacija' ,sv: 'Standardavvikelse' ,it: 'Deviazione Standard' - ,dk: 'Standardafgivelse' + ,dk: 'Standardafvigelse' ,fi: 'Keskijakauma' ,nb: 'Standardavvik' ,he: 'סטיית תקן' @@ -2048,7 +2049,7 @@ function init() { ,hr: 'Nema pohranjenog API tajnog hasha. Unesite tajni API' ,sv: 'Hemlig api-nyckel saknas. Du måste ange API hemlighet' ,it: 'API hash segreto non è ancora memorizzato. È necessario inserire API segreto.' - ,dk: 'Mangler API-nøgle. Du skal indtaste API hemmelighed' + ,dk: 'Mangler API-nøgle. Du skal indtaste API nøglen' ,fi: 'Salainen API-tarkiste puuttuu. Syötä API tarkiste.' ,nb: 'Mangler API nøkkel. Du må skrive inn API hemmelighet.' ,pl: 'Nie ma żadnego poufnego hasha API zapisanego. Należy wprowadzić poufny hash API.' @@ -2230,7 +2231,7 @@ function init() { ,hr: 'Uredi zapis' ,sv: 'Editera post' ,it: 'Modifica registro' - ,dk: 'Editere post' + ,dk: 'Rediger post' ,fi: 'Muokkaa tallennetta' ,nb: 'Editere registrering' ,he: 'ערוך רשומה' @@ -2374,7 +2375,7 @@ function init() { ,pl: 'Błędny klucz API' ,ru: 'Плохой пароль API' ,sk: 'Nesprávne API heslo' - ,nl: 'Onjuiste API wachtwoord' + ,nl: 'Onjuist API wachtwoord' ,ko: '잘못된 API secret' ,zh_cn: 'API密钥错误' ,zh_tw: 'API密鑰錯誤' @@ -2397,7 +2398,7 @@ function init() { ,pl: 'Poufne klucz API zapisane' ,ru: 'Пароль API сохранен' ,sk: 'Hash API hesla uložený' - ,nl: 'Geheime API wachtwoord opgeslagen' + ,nl: 'API wachtwoord opgeslagen' ,ko: 'API secret hash가 저장 되었습니다.' ,zh_cn: 'API密钥已存储' ,zh_tw: 'API密鑰已存儲' @@ -2512,7 +2513,6 @@ function init() { ,pl: 'Filtr' ,ru: 'Фильтр' ,sk: 'Filter' - ,nl: 'Filter' ,ko: '필터' ,zh_cn: '过滤器' } @@ -2943,7 +2943,7 @@ function init() { ,hr: 'Koristi korekciju GUK-a u izračunu' ,sv: 'Använd BS-korrektion för beräkning' ,it: 'Utilizzare la correzione nei calcoli delle Glicemie' - ,dk: 'Anvend BS-korrektion før beregning' + ,dk: 'Anvend BS-korrektion i beregning' ,fi: 'Käytä korjausannosta laskentaan' ,nb: 'Bruk blodsukkerkorrigering i beregning' ,pl: 'Użyj BG w obliczeniach korekty' @@ -3031,7 +3031,7 @@ function init() { ,hr: 'Brzi izbor' ,sv: 'Snabbval' ,it: 'Scelta rapida' - ,dk: 'Hurtig snack' + ,dk: 'Hurtig valg' ,fi: 'Pikavalinta' ,nb: 'Hurtigvalg' ,pl: 'Szybki wybór' @@ -3209,7 +3209,7 @@ function init() { ,hr: 'Unesi korekciju inzulinom u tretman' ,sv: 'Ange insulinkorrektion för händelse' ,it: 'Inserisci correzione insulina nella somministrazione' - ,dk: 'Indtast insulionkorrektion' + ,dk: 'Indtast insulinkorrektion' ,fi: 'Syötä insuliinikorjaus' ,nb: 'Task inn insulinkorrigering' ,pl: 'Wprowadź wartość korekty w leczeniu' @@ -3886,7 +3886,7 @@ function init() { ,hr: 'Status autentikacije' ,sv: 'Autentiseringsstatus' ,it: 'Stato di autenticazione' - ,dk: 'Autentifikationsstatus' + ,dk: 'Godkendelsesstatus' ,fi: 'Autentikoinnin tila' ,nb: 'Autentiseringsstatus' ,pl: 'Status uwierzytelnienia' @@ -4109,6 +4109,7 @@ function init() { ,'Logarithmic (Dynamic)' : { cs: 'Logaritmické (Dynamické)' ,de: 'Logaritmisch (dynamisch)' + ,dk: 'Logaritmisk (Dynamisk)' ,it: 'Logaritmica (Dinamica)' ,el: 'Λογαριθμική (Δυναμική)' ,ro: 'Logaritmic (Dinamic)' @@ -4128,6 +4129,7 @@ function init() { ,'Insulin-on-Board' : { cs: 'IOB' ,de: 'Aktives Bolus-Insulin' + ,dk: 'Aktivt insulin (IOB)' ,it: 'IOB-Insulina a Bordo' ,nb: 'AI' ,el: 'Ενεργή Ινσουλίνη (IOB)' @@ -4147,6 +4149,7 @@ function init() { ,'Carbs-on-Board' : { cs: 'COB' ,de: 'Aktiv wirksame Kohlenhydrate' + ,dk: 'Aktive kulhydrater (COB)' ,it: 'COB-Carboidrati a Bordo' ,nb: 'AK' ,el: 'Ενεργοί Υδατάνθρακες (COB)' @@ -4166,6 +4169,7 @@ function init() { ,'Bolus Wizard Preview' : { cs: 'BWP-Náhled bolusového kalk.' ,de: 'Bolus-Kalkulator Vorschau' + ,dk: 'Bolus Wizard (BWP)' ,it: 'BWP-Calcolatore di bolo' ,nb: 'Boluskalkulator' ,el: 'Εργαλείο Εκτίμησης Επάρκειας Ινσουλίνης (BWP)' @@ -4185,6 +4189,7 @@ function init() { ,'Value Loaded' : { cs: 'Hodnoty načteny' ,de: 'Geladener Wert' + ,dk: 'Værdi indlæst' ,it: 'Valori Caricati' ,nb: 'Verdi lastet' ,el: 'Τιμή ανακτήθηκε' @@ -4204,6 +4209,7 @@ function init() { ,'Cannula Age' : { cs: 'CAGE-Stáří kanyly' ,de: 'Kanülenalter' + ,dk: 'Insuflon alder (CAGE)' ,it: 'CAGE-Cambio Ago' ,el: 'Ημέρες Χρήσης Κάνουλας (CAGE)' ,nb: 'Nålalder' @@ -4223,6 +4229,7 @@ function init() { ,'Basal Profile' : { cs: 'Bazál' ,de: 'Basalraten-Profil' + ,dk: 'Basal profil' ,it: 'BASAL-Profilo Basale' ,el: 'Προφίλ Βασικής Ινσουλίνης (BASAL)' ,nb: 'Basalprofil' @@ -4343,7 +4350,7 @@ function init() { ,bg: '3часа' ,hr: '3h' ,it: '3ORE' - ,dk: '3tim' + ,dk: '3t' ,fi: '3h' ,nb: '3t' ,pl: '3h' @@ -4366,7 +4373,7 @@ function init() { ,bg: '6часа' ,hr: '6h' ,it: '6ORE' - ,dk: '6tim' + ,dk: '6t' ,fi: '6h' ,nb: '6t' ,pl: '6h' @@ -4384,7 +4391,7 @@ function init() { ,fr: '12hr' ,el: '12 ώρες' ,pt: '12h' - ,sv: '12tim' + ,sv: '12t' ,ro: '12h' ,bg: '12часа' ,hr: '12h' @@ -4412,7 +4419,7 @@ function init() { ,bg: '24часа' ,hr: '24h' ,it: '24ORE' - ,dk: '24tim' + ,dk: '24t' ,fi: '24h' ,nb: '24t' ,pl: '24h' @@ -4435,7 +4442,7 @@ function init() { ,bg: 'Настройки' ,hr: 'Postavke' ,it: 'Impostazioni' - ,dk: 'Opsætning' + ,dk: 'Indstillinger' ,fi: 'Asetukset' ,nb: 'Innstillinger' ,pl: 'Ustawienia' @@ -4481,7 +4488,7 @@ function init() { ,bg: 'Формат на датата' ,hr: 'Format datuma' ,it: 'Formato data' - ,dk: 'dato format' + ,dk: 'Dato format' ,fi: 'Aikamuoto' ,nb: 'Datoformat' ,pl: 'Format daty' @@ -4918,7 +4925,7 @@ function init() { ,bg: 'Кръвна захар' ,hr: 'Vrijednost GUK-a' ,it: 'Lettura glicemie' - ,dk: 'Glukose aflæsning' + ,dk: 'Blodsukker aflæsning' ,fi: 'Verensokeri' ,nb: 'Blodsukkermåling' ,he: 'מדידת סוכר' @@ -5127,7 +5134,7 @@ function init() { ,bg: 'Много висока КЗ' ,hr: 'Hitni alarm za hiper' ,it: 'Urgente:Glicemia Alta' - ,dk: 'Høj grænse overskredet' + ,dk: 'Kritisk grænse overskredet' ,fi: 'Kriittinen korkea' ,nb: 'Kritisk høy alarm' ,he: 'התראת גבוה דחופה' @@ -5246,7 +5253,7 @@ function init() { ,bg: 'Много стари данни' ,hr: 'Hitno: Stari podaci' ,it: 'Notifica:Urgente' - ,dk: 'Advarsel: Gamle data' + ,dk: 'Kritisk: Gamle data' ,fi: 'Vanhat tiedot: hälytys' ,nb: 'Advarsel: Veldig gamle data' ,pl: 'Uwaga: brak odczytów' @@ -5476,7 +5483,7 @@ function init() { ,bg: 'Име на страницата' ,hr: 'Vlastiti naziv' ,it: 'Titolo personalizzato' - ,dk: 'Egen titel' + ,dk: 'Valgfri titel' ,fi: 'Omavalintainen otsikko' ,nb: 'Egen tittel' ,pl: 'Własny tytuł strony' @@ -5559,6 +5566,7 @@ function init() { ,'Colorblind-friendly colors' : { cs: 'Pro barvoslepé' ,de: 'Farbenblind-freundliche Darstellung' + ,dk: 'Farveblindvenlige farver' ,nb: 'Fargeblindvennlige farger' ,el: 'Χρώματα συμβατά για αχρωματοψία' ,pt: 'Cores para daltônicos' @@ -5676,7 +5684,7 @@ function init() { ,bg: 'в бъдещето' ,hr: 'U budućnosti' ,it: 'nel futuro' - ,dk: 'fremtiden' + ,dk: 'i fremtiden' ,fi: 'tulevaisuudessa' ,nb: 'fremtiden' ,pl: 'w przyszłości' @@ -5722,7 +5730,7 @@ function init() { ,bg: 'час по-рано' ,hr: 'sat unazad' ,it: 'ora fa' - ,dk: 'Time siden' + ,dk: 'time siden' ,fi: 'tunti sitten' ,nb: 'Time siden' ,pl: 'godzina temu' @@ -5745,7 +5753,7 @@ function init() { ,bg: 'часа по-рано' ,hr: 'sati unazad' ,it: 'ore fa' - ,dk: 'Timer siden' + ,dk: 'timer siden' ,fi: 'tuntia sitten' ,nb: 'Timer siden' ,pl: 'godzin temu' @@ -5768,13 +5776,13 @@ function init() { ,bg: 'мин. по-рано' ,hr: 'minuta unazad' ,it: 'minuto fa' - ,dk: 'minutter siden' + ,dk: 'minut siden' ,fi: 'm sitten' ,nb: 'minutter siden' ,pl: 'minuta temu' ,ru: 'мин. назад' ,sk: 'min. pred' - ,nl: 'minuut geleden' + ,nl: 'm geleden' ,ko: '분 전' ,zh_cn: '分钟前' ,zh_tw: '分鐘前' @@ -5797,7 +5805,7 @@ function init() { ,pl: 'minut temu' ,ru: 'минут назад' ,sk: 'min. pred' - ,nl: 'minuten geleden' + ,nl: 'm geleden' ,ko: '분 전' ,zh_cn: '分钟前' ,zh_tw: '分鐘前' @@ -5952,7 +5960,7 @@ function init() { ,bg: 'Висок' ,hr: 'Teško' ,it: 'Pesante' - ,dk: 'Voldsom' + ,dk: 'Meget' ,fi: 'Raskas' ,nb: 'Mye' ,pl: 'Wysoki' @@ -6167,6 +6175,7 @@ function init() { ,'Language' : { cs: 'Jazyk' ,de: 'Sprache' + ,dk: 'Sprog' ,sv: 'Språk' ,nb: 'Språk' ,el: 'Γλώσσα' @@ -6186,6 +6195,7 @@ function init() { ,'Add new' : { cs: 'Přidat nový' ,de: 'Neu hinzufügen' + ,dk: 'Tilføj ny' ,sv: 'Lägg till ny' ,ro: 'Adaugă nou' ,el: 'Προσθήκη' @@ -6204,6 +6214,7 @@ function init() { ,'g' : { // grams shortcut cs: 'g' ,de: 'g' + ,dk: 'g' ,sv: 'g' ,ro: 'g' ,bg: 'гр' @@ -6222,6 +6233,7 @@ function init() { ,'ml' : { // milliliters shortcut cs: 'ml' ,de: 'ml' + ,dk: 'ml' ,sv: 'ml' ,ro: 'ml' ,bg: 'мл' @@ -6240,6 +6252,7 @@ function init() { ,'pcs' : { // pieces shortcut cs: 'ks' ,de: 'Stk.' + ,dk: 'stk' ,sv: 'st' ,ro: 'buc' ,bg: 'бр' @@ -6258,6 +6271,7 @@ function init() { ,'Drag&drop food here' : { cs: 'Sem táhni & pusť jídlo' ,de: 'Mahlzeit hierher verschieben' + ,dk: 'Hiv og slip mad her' ,sv: 'Dra&Släpp mat här' ,ro: 'Drag&drop aliment aici' ,el: 'Σύρετε εδώ φαγητό' @@ -6278,6 +6292,7 @@ function init() { ,sv: 'Care Portal' ,it: 'Somministrazioni' ,de: 'Behandlungs-Portal' + ,dk: 'Omsorgsportal' ,ro: 'Care Portal' ,bg: 'Въвеждане на данни' ,nb: 'Omsorgsportal' @@ -6295,6 +6310,7 @@ function init() { cs: 'Střední/Neznámá' ,sv: 'Medium/Okänt' ,de: 'Mittel/Unbekannt' + ,dk: 'Medium/Ukendt' ,ro: 'Mediu/Necunoscut' ,el: 'Μέσος/Άγνωστος' ,bg: 'Среден/неизвестен' @@ -6314,6 +6330,7 @@ function init() { ,sv: 'Framtida' ,ro: 'ÎN VIITOR' ,de: 'IN DER ZUKUNFT' + ,dk: 'I fremtiden' ,el: 'ΣΤΟ ΜΕΛΛΟΝ' ,bg: 'В БЪДЕШЕТО' ,nb: 'I fremtiden' @@ -6330,6 +6347,7 @@ function init() { ,'Update' : { // Update button cs: 'Aktualizovat' ,de: 'Aktualisieren' + ,dk: 'Opdater' ,sv: 'Uppdatera' ,nb: 'Oppdater' ,pt: 'Atualizar' @@ -6349,6 +6367,7 @@ function init() { ,'Order' : { cs: 'Pořadí' ,de: 'Reihenfolge' + ,dk: 'Sorter' ,sv: 'Sortering' ,nb: 'Sortering' ,el: 'Σειρά κατάταξης' @@ -6367,6 +6386,7 @@ function init() { ,'oldest on top' : { cs: 'nejstarší nahoře' ,de: 'älteste oben' + ,dk: 'ældste øverst' ,sv: 'Äldst först' ,nb: 'Eldste først' ,el: 'τα παλαιότερα πρώτα' @@ -6386,6 +6406,7 @@ function init() { cs: 'nejnovější nahoře' ,sv: 'Nyast först' ,de: 'neueste oben' + ,dk: 'nyeste øverst' ,nb: 'Nyeste først' ,el: 'τα νεότερα πρώτα' ,ro: 'mai noi primele' @@ -6405,6 +6426,7 @@ function init() { ,sv: 'Alla sensorhändelser' ,nb: 'Alle sensorhendelser' ,de: 'Alle Sensor-Ereignisse' + ,dl: 'Alle sensor begivenheder' ,el: 'Όλα τα συμβάντα του αισθητήρα' ,ro: 'Evenimente legate de senzor' ,bg: 'Всички събития от сензора' @@ -6423,6 +6445,7 @@ function init() { ,nb: 'Fjern fremtidige elementer fra mongo database' ,el: 'Αφαίρεση μελλοντικών εγγραφών από τη βάση δεδομένων' ,de: 'Entferne zukünftige Objekte aus Mongo-Datenbank' + ,dk: 'Fjern fremtidige værdier fra mongo databasen' ,ro: 'Șterge date din viitor din baza de date mongo' ,sv: 'Ta bort framtida händelser från mongodatabasen' ,bg: 'Премахни бъдещите точки от Монго базата с данни' @@ -6442,6 +6465,7 @@ function init() { ,nb: 'Finn og fjern fremtidige behandlinger' ,el: 'Εύρεση και αφαίρεση μελλοντικών ενεργειών από τη βάση δεδομένων' ,de: 'Finde und entferne zukünftige Behandlungen' + ,dk: 'Find og fjern fremtidige behandlinger' ,ro: 'Caută și elimină tratamente din viitor' ,sv: 'Hitta och ta bort framtida behandlingar' ,bg: 'Намери и премахни събития в бъдещето' @@ -6460,6 +6484,7 @@ function init() { cs: 'Tento úkol najde a odstraní ošetření v budoucnosti.' ,nb: 'Finn og fjern fremtidige behandlinger' ,de: 'Finde und entferne Behandlungen in der Zukunft.' + ,dk: 'Denne handling finder og fjerner fremtidige behandlinger.' ,el: 'Αυτή η ενέργεια αφαιρεί μελλοντικές ενέργειες από τη βάση δεδομένων' ,ro: 'Acest instrument curăță tratamentele din viitor.' ,sv: 'Denna uppgift hittar och rensar framtida händelser' @@ -6479,6 +6504,7 @@ function init() { cs: 'Odstraň ošetření v budoucnosti' ,nb: 'Fjern fremtidige behandlinger' ,de: 'Entferne Behandlungen in der Zukunft' + ,dk: 'Fjern behandlinger i fremtiden' ,el: 'Αφαίρεση μελλοντικών ενεργειών' ,ro: 'Șterge tratamentele din viitor' ,sv: 'Ta bort framtida händelser' @@ -6497,6 +6523,7 @@ function init() { ,'Find and remove entries in the future' : { cs: 'Najít a odstranit CGM data v budoucnosti' ,de: 'Finde und entferne Einträge in der Zukunft' + ,dk: 'Find og fjern indgange i fremtiden' ,nb: 'Finn og fjern fremtidige hendelser' ,el: 'Εύρεση και αφαίρεση μελλοντικών εγγραφών από τη βάση δεδομένων' ,bg: 'Намери и премахни данни от сензора в бъдещето' @@ -6518,6 +6545,7 @@ function init() { ,nb: 'Finn og fjern fremtidige cgm data lastet opp med feil dato/tid' ,el: 'Αυτή η ενέργεια αφαιρεί δεδομένα αιθητήρα τα οποία εισήχθησαν με λάθος ημερομηνία και ώρα, από τη βάση δεδομένων' ,de: 'Finde und entferne CGM Daten in der Zukunft, die vom Uploader mit falschem Datum/Uhrzeit erstellt wurden.' + ,dk: 'Denne handling finder og fjerner CGM data i fremtiden forårsaget af indlæsning med forkert dato/tid.' ,bg: 'Тази опция ще намери и премахне данни от сензора в бъдещето, създадени поради грешна дата/време.' ,ro: 'Instrument de căutare și eliminare a datelor din viitor, create de uploader cu ora setată greșit' ,sv: 'Denna uppgift hittar och tar bort framtida CGM-data skapad vid felaktig tidsinställning' @@ -6536,6 +6564,7 @@ function init() { cs: 'Odstraň CGM data v budoucnosti' ,nb: 'Fjern fremtidige hendelser' ,de: 'Entferne Einträge in der Zukunft' + ,dk: 'Fjern indgange i fremtiden' ,el: 'Αφαίρεση μελλοντικών ενεργειών' ,bg: 'Премахни данните от сензора в бъдещето' ,ro: 'Elimină înregistrările din viitor' @@ -6555,6 +6584,7 @@ function init() { cs: 'Nahrávám databázi ...' ,nb: 'Leser database ...' ,de: 'Lade Datenbank' + ,dk: 'Indlæser database ...' ,el: 'Φόρτωση Βάσης Δεδομένων' ,bg: 'Зареждане на базата с данни ...' ,ro: 'Încarc baza de date' @@ -6577,6 +6607,7 @@ function init() { ,ro: 'Baza de date conține %1 înregistrări din viitor' ,sv: 'Databas innehåller %1 framtida händelser' ,de: 'Datenbank enthält %1 zukünftige Einträge' + ,dk: 'Databasen indeholder %1 fremtidige indgange' ,bg: 'Базата с дани съдържа %1 бъдещи записи' ,it: 'Contiene Database %1 record futuri' ,fi: 'Tietokanta sisältää %1 merkintää tulevaisuudessa' @@ -6594,6 +6625,7 @@ function init() { ,nb: 'Fjern %1 valgte elementer?' ,el: 'Αφαίρεση των επιλεγμένων εγγραφών?' ,de: 'Lösche ausgewählten %1 Eintrag?' + ,dk: 'Fjern %1 valgte indgange?' ,ro: 'Șterg %1 înregistrări selectate?' ,sv: 'Ta bort %1 valda händelser' ,bg: 'Премахване на %1 от избраните записи?' @@ -6612,6 +6644,7 @@ function init() { cs: 'Chyba při nahrávání databáze' ,nb: 'Feil udner lasting av database' ,de: 'Fehler beim Laden der Datenbank' + ,dk: 'Fejl ved indlæsning af database' ,el: 'Σφάλμα στη φόρτωση της βάσης δεδομένων' ,ro: 'Eroare la încărcarea bazei de date' ,sv: 'Fel vid laddning av databas' @@ -6631,6 +6664,7 @@ function init() { cs: 'Záznam %1 odstraněn ...' ,nb: 'Element %1 fjernet' ,de: 'Eintrag %1 entfernt' + ,dk: 'Indgang %1 fjernet ...' ,el: 'Οι εγγραφές αφαιρέθηκαν' ,ro: 'Înregistrarea %1 a fost ștearsă...' ,sv: 'Händelse %1 borttagen ...' @@ -6650,6 +6684,7 @@ function init() { cs: 'Chyba při odstaňování záznamu %1' ,nb: 'Feil under fjerning av element %1' ,de: 'Fehler beim Entfernen des Eintrags %1' + ,dk: 'Fejl ved fjernelse af indgang %1' ,el: 'Σφάλμα αφαίρεσης εγγραφών' ,ro: 'Eroare la ștergerea înregistrării %1' ,sv: 'Fel vid borttagning av %1' @@ -6671,6 +6706,7 @@ function init() { ,ro: 'Se șterg înregistrările...' ,el: 'Αφαίρεση Εγγραφών' ,de: 'Entferne Einträge ...' + ,dk: 'Sletter indgange ...' ,sv: 'Tar bort händelser ...' ,bg: 'Изтриване на записите...' ,it: 'Elimino dei record ...' @@ -6690,6 +6726,7 @@ function init() { ,ro: 'Curăță tabela despre status din Mongo' ,el: 'Καθαρισμός βάσης δεδομένων Mongo' ,de: 'Bereinige Mongo Status-Datenbank' + ,dk: 'Slet Mongo status database' ,sv: 'Rensa Mongo status databas' ,bg: 'Изчисти статуса на Монго базата с данни' ,it: 'Pulisci database di Mongo' @@ -6706,6 +6743,7 @@ function init() { cs: 'Odstranění všech záznamů z kolekce devicestatus' ,nb: 'Fjern alle dokumenter fra device status tabell' ,de: 'Lösche alle Dokumente der Gerätestatus-Sammlung' + ,dk: 'Fjerne alle dokumenter fra device status tabellen' ,el: 'Διαγραφή όλων των δεδομένων σχετικών με κατάσταση της συσκευής ανάγνωσης του αισθητήρα' ,ro: 'Șterge toate documentele din colecția de status dispozitiv' ,sv: 'Ta bort alla dokument i devicestatus collektionen' @@ -6718,13 +6756,14 @@ function init() { ,sk: 'Odstránenie všetkých záznamov z kolekcie "devicestatus"' ,ko: 'devicestatus 수집에서 모든 문서들을 지우세요' ,zh_cn: '从设备状态采集删除所有文档' - ,nl: 'Verwijder alle documenten uit "devicestatus" databank' + ,nl: 'Verwijder alle documenten uit "devicestatus" database' } ,'This task removes all documents from devicestatus collection. Useful when uploader battery status is not properly updated.' : { cs: 'Tento úkol odstraní všechny dokumenty z kolekce devicestatus. Je to vhodné udělat, pokud se ukazatel stavu baterie neobnovuje správně.' ,nb: 'Denne funksjonen fjerner alle dokumenter fra device status tabellen. Nyttig når status for opplaster batteri ikke blir opppdatert' ,el: 'Αυτή η ενέργεια διαγράφει όλα τα δεδομένα της κατάστασης της συσκευής ανάγνωσης. Χρήσιμη όταν η κατάσταση της συσκευής ανάγνωσης δεν ανανεώνεται σωστά.' ,de: 'Diese Aufgabe entfernt alle Dokumente aus der Gerätestatus-Sammlung. Nützlich wenn der Uploader-Batteriestatus sich nicht aktualisiert.' + ,dk: 'Denne handling fjerner alle dokumenter fra device status tabellen. Brugbart når uploader betteri status ikke er korrekt opdateret.' ,ro: 'Acest instrument șterge toate documentele din colecția devicestatus. Se folosește când încărcarea bateriei nu se afișează corect.' ,sv: 'Denna uppgift tar bort alla dokument från devicestatuskollektionen. Användbart när batteristatus ej uppdateras' ,bg: 'Тази опция премахва всички документи от папката статус-устройство. Полезно е, когато статусът на батерията не се обновява.' @@ -6736,7 +6775,7 @@ function init() { ,sk: 'Táto úloha vymaže všetky záznamy z kolekcie "devicestatus". Je to vhodné keď sa stav batérie nezobrazuje správne.' ,ko: '이 작업은 모든 문서를 devicestatus 수집에서 지웁니다. 업로더 배터리 상태가 적절하게 업데이트 되지 않을 때 유용합니다.' ,zh_cn: '此功能从设备状态采集中删除所有文档。适用于上传设备电量信息不能正常同步时使用。' - ,nl: 'Dit commando verwijdert alle documenten uit "devicestatus" databank. Handig wanneer de batterij status niet correct wordt geupload.' + ,nl: 'Dit commando verwijdert alle documenten uit "devicestatus" database. Handig wanneer de batterij status niet correct wordt geupload.' } ,'Delete all documents' : { cs: 'Odstranit všechny dokumenty' @@ -6744,6 +6783,7 @@ function init() { ,ro: 'Șterge toate documentele' ,el: 'Διαγραφή όλων των δεδομένων' ,de: 'Lösche alle Dokumente' + ,dk: 'Slet alle dokumenter' ,sv: 'Ta bort alla dokument' ,bg: 'Изтрий всички документи' ,it: 'Eliminare tutti i documenti' @@ -6761,6 +6801,7 @@ function init() { ,nb: 'Fjern alle dokumenter fra device status tabellen?' ,el: 'Διαγραφή όλων των δεδομένων της κατάστασης της συσκευής ανάγνωσης?' ,de: 'Löschen aller Dokumente der Gerätestatus-Sammlung?' + ,dk: 'Fjern alle dokumenter fra device status tabellen' ,ro: 'Șterg toate documentele din colecția devicestatus?' ,sv: 'Ta bort alla dokument från devicestatuscollektionen' ,bg: 'Изтриване на всички документи от папката статус-устройство?' @@ -6778,6 +6819,7 @@ function init() { cs: 'Databáze obsahuje %1 záznamů' ,nb: 'Databasen inneholder %1 elementer' ,de: 'Datenbank enthält %1 Einträge' + ,dk: 'Databasen indeholder %1 indgange' ,el: 'Η βάση δεδομένων περιέχει 1% εγγραφές' ,ro: 'Baza de date conține %1 înregistrări' ,sv: 'Databasen innehåller %1 händelser' @@ -6796,6 +6838,7 @@ function init() { cs: 'Všechny záznamy odstraněny ...' ,nb: 'Alle elementer fjernet ...' ,de: 'Alle Einträge entfernt...' + ,dk: 'Alle indgange fjernet ...' ,el: 'Έγινε διαγραφή όλων των δεδομένων' ,ro: 'Toate înregistrările au fost șterse.' ,sv: 'Alla händelser raderade ...' @@ -6815,6 +6858,7 @@ function init() { ,nb: 'Administrasjonsoppgaver' ,ro: 'Instrumente de administrare' ,de: 'Administrator Werkzeuge' + ,dl: 'Administrator opgaver' ,el: 'Εργαλεία Διαχειριστή' ,sv: 'Adminverktyg' ,bg: 'Настройки на администратора' @@ -6835,6 +6879,7 @@ function init() { ,ro: 'Rapoarte Nightscout' ,el: 'Αναφορές' ,de: 'Nightscout-Berichte' + ,dk: 'Nightscout - rapporter' ,sv: 'Nightscout - Statistik' ,bg: 'Найтскаут статистика' ,it: 'Nightscout - Statistiche' @@ -6850,6 +6895,7 @@ function init() { ,'Cancel' : { cs: 'Zrušit' ,de: 'Abbruch' + ,dk: 'Annuller' ,nb: 'Avbryt' ,el: 'Ακύρωση' ,ro: 'Renunță' @@ -6870,6 +6916,7 @@ function init() { ,nb: 'Editer behandling' ,ro: 'Modifică înregistrarea' ,de: 'Bearbeite Behandlung' + ,dk: 'Rediger indgang' ,el: 'Επεξεργασία Εγγραφής' ,sv: 'Redigera behandling' ,bg: 'Редакция на събитие' @@ -6887,6 +6934,7 @@ function init() { cs: 'Doba trvání' ,ro: 'Durata' ,de: 'Dauer' + ,dk: 'Varighed' ,el: 'Διάρκεια' ,sv: 'Varaktighet' ,bg: 'Времетраене' @@ -6904,6 +6952,7 @@ function init() { ,'Duration in minutes' : { cs: 'Doba trvání v minutách' ,de: 'Dauer in Minuten' + ,dk: 'Varighed i minutter' ,ro: 'Durata în minute' ,el: 'Διάρκεια σε λεπτά' ,sv: 'Varaktighet i minuter' @@ -6922,6 +6971,7 @@ function init() { ,'Temp Basal' : { cs: 'Dočasný bazál' ,de: 'Temporäre Basalrate' + ,dk: 'Midlertidig basal' ,ro: 'Bazală temporară' ,sv: 'Temporär basal' ,bg: 'Временен базал' @@ -6941,6 +6991,7 @@ function init() { ,ro: 'Start bazală temporară' ,sv: 'Temporär basalstart' ,de: 'Start Temporäre Basalrate' + ,dk: 'Midlertidig basal start' ,bg: 'Начало на временен базал' ,it: 'Inizio Basale Temp' ,nb: 'Midlertidig basal start' @@ -6960,6 +7011,7 @@ function init() { ,bg: 'Край на временен базал' ,it: 'Fine Basale Temp' ,de: 'Ende Temporäre Basalrate' + ,dk: 'Midlertidig basal slut' ,nb: 'Midlertidig basal stopp' ,fi: 'Tilapäinen basaali loppu' ,pl: 'Koniec tymczasowej dawki podstawowej' @@ -6974,6 +7026,7 @@ function init() { cs: 'Procenta' ,ro: 'Procent' ,de: 'Prozent' + ,dk: 'Procent' ,el: 'Επι τοις εκατό' ,sv: 'Procent' ,bg: 'Процент' @@ -6994,6 +7047,7 @@ function init() { ,sv: 'Basaländring i %' ,bg: 'Промяна на базала с %' ,de: 'Basalratenänderung in %' + ,dk: 'Basal ændring i %' ,it: 'Variazione basale in %' ,nb: 'Basal endring i %' ,fi: 'Basaalimuutos prosenteissa' @@ -7010,6 +7064,7 @@ function init() { ,ro: 'Valoare bazală' ,sv: 'Basalvärde' ,de: 'Basalrate' + ,dk: 'Basalværdi' ,bg: 'Временен базал' ,it: 'Valore Basale' ,nb: 'Basalverdi' @@ -7027,6 +7082,7 @@ function init() { ,bg: 'Базална стойност' ,it: 'Valore Basale Assoluto' ,de: 'Absoluter Basalratenwert' + ,dk: 'Absolut basalværdi' ,nb: 'Absolutt basalverdi' ,ro: 'Valoare absolută bazală' ,sv: 'Absolut basalvärde' @@ -7043,6 +7099,7 @@ function init() { cs: 'Oznámení' ,bg: 'Известяване' ,de: 'Ankündigung' + ,dk: 'Meddelelse' ,ro: 'Anunț' ,el: 'Ανακοίνωση' ,sv: 'Avisering' @@ -7064,6 +7121,7 @@ function init() { ,ro: 'Se încarcă date bazală temporară' ,sv: 'Laddar temporär basaldata' ,de: 'Lade temporäre Basaldaten' + ,dk: 'Indlæser midlertidig basal data' ,nb: 'Laster verdier for midlertidig basal' ,fi: 'Lataan tilapäisten basaalien tietoja' ,bg: 'Зареждане на данни за временния базал' @@ -7082,6 +7140,7 @@ function init() { ,nb: 'Lagre før bytte til ny?' ,el: 'Αποθήκευση τρεχουσας εγγραφής πριν δημιουργήσουμε νέα?' ,de: 'Aktuelle Einträge speichern?' + ,dk: 'Gem aktuelle indgang før der skiftes til ny?' ,fi: 'Tallenna nykyinen merkintä ennen vaihtoa uuteen?' ,bg: 'Запази текущият запис преди да промениш новия ' ,pl: 'Zapisać bieżący rekord przed zamianą na nowy?' @@ -7099,6 +7158,7 @@ function init() { ,sv: 'Ny profil' ,el: 'Εναλλαγή προφίλ' ,de: 'Profil wechseln' + ,dk: 'Byt profil' ,nb: 'Bytt profil' ,fi: 'Vaihda profiilia' ,bg: 'Смяна на профил' @@ -7114,6 +7174,7 @@ function init() { ,'Profile' : { cs: 'Profil' ,de: 'Profil' + ,dk: 'Profil' ,el: 'Προφίλ' ,it: 'Profilo' ,ro: 'Profil' @@ -7132,6 +7193,7 @@ function init() { ,'General profile settings' : { cs: 'Obecná nastavení profilu' ,de: 'Allgemeine Profileinstellungen' + ,dk: 'Generelle profil indstillinger' ,el: 'Γενικές Ρυθμίσεις Προφίλ' ,ro: 'Setări generale profil' ,sv: 'Allmän profilinställning' @@ -7153,6 +7215,7 @@ function init() { ,sv: 'Titel' ,el: 'Τίτλος' ,de: 'Überschrift' + ,dk: 'Overskrift' ,nb: 'Tittel' ,fi: 'Otsikko' ,bg: 'Заглавие' @@ -7172,6 +7235,7 @@ function init() { ,el: 'Εγραφές Βάσης Δεδομένων' ,nb: 'Databaseverdier' ,de: 'Datenbankeinträge' + ,dk: 'Database indgange' ,fi: 'Tietokantamerkintöjä' ,bg: 'Записи в базата с данни' ,pl: 'Rekordy bazy danych' @@ -7190,6 +7254,7 @@ function init() { ,el: 'Προσθήκη νέας εγγραφής' ,nb: 'Legg til ny rad' ,de: 'Neuen Eintrag hinzufügen' + ,dk: 'Tilføj ny indgang' ,fi: 'Lisää uusi merkintä' ,bg: 'Добави нов запис' ,pl: 'Dodaj nowy rekord' @@ -7208,6 +7273,7 @@ function init() { ,el: 'Αφαίρεση εγγραφής' ,nb: 'Fjern denne raden' ,de: 'Diesen Eintrag löschen' + ,fk: 'Fjern denne indgang' ,fi: 'Poista tämä merkintä' ,bg: 'Премахни този запис' ,pl: 'Usuń ten rekord' @@ -7226,6 +7292,7 @@ function init() { ,sv: 'Kopiera denna händelse till ny' ,nb: 'Kopier til ny rad' ,de: 'Diesen Eintrag duplizieren' + ,dk: 'Dupliker denne indgang' ,fi: 'Kopioi tämä merkintä uudeksi' ,bg: 'Копирай този запис като нов' ,pl: 'Powiel ten rekord na nowy' @@ -7243,6 +7310,7 @@ function init() { ,sv: 'Händelse giltig från' ,el: 'Ισχύει από' ,de: 'Eintrag gültig ab' + ,dk: 'Indgang gyldig fra' ,nb: 'Rad gyldig fra' ,fi: 'Merkintä voimassa alkaen' ,bg: 'Записът е валиден от ' @@ -7261,6 +7329,7 @@ function init() { ,sv: 'Lagrad profil' ,el: 'Αποθηκευμένα προφίλ' ,de: 'Gesicherte Profile' + ,dk: 'Gemte profiler' ,nb: 'Lagrede profiler' ,fi: 'Tallennetut profiilit' ,bg: 'Запаметени профили' @@ -7276,6 +7345,7 @@ function init() { ,'Timezone' : { cs: 'Časová zóna' ,de: 'Zeitzone' + ,dk: 'Tidszone' ,ro: 'Fus orar' ,el: 'Ζώνη Ώρας' ,sv: 'Tidszon' @@ -7298,6 +7368,7 @@ function init() { ,sv: 'verkningstid för insulin (DIA)' ,nb: 'Insulin varighet' ,de: 'Dauer der Insulinaktivität (DIA)' + ,dk: 'Varighed af insulin aktivitet (DIA)' ,fi: 'Insuliinin vaikutusaika (DIA)' ,bg: 'Продължителност на инсулиновата активност DIA' ,pl: 'Czas trwania aktywnej insuliny (DIA)' @@ -7314,6 +7385,7 @@ function init() { ,ro: 'Reprezintă durata tipică pentru care insulina are efect. Este diferită la fiecare pacient și pentru fiecare tip de insulină' ,el: 'Αντιπροσωπευει την τυπική διάρκεια δράσης της χορηγηθείσας ινσουλίνης.' ,de: 'Entspricht der typischen Dauer in der das Insulin wirkt. Variiert je Patient und Insulintyp. Häufig 3-4 Stunden für die meisten Pumpeninsuline und die meisten Patienten. Manchmal auch Insulin-Wirkungsdauer genannt.' + ,dk: 'Representerer den typiske tid hvor insulinen virker. Varierer per patient og per insulin type. Typisk 3-4 timer for de fleste pumpe insulin og for de fleste patienter. Nogle gange kaldes dette også insulin-livs-tid.' ,sv: 'Beskriver under hur lång tid insulinet verkar. Varierar mellan patienter. Typisk varaktighet 3-4 timmar.' ,nb: 'Representerer typisk insulinvarighet. Varierer per pasient og per insulin type. Vanligvis 3-4 timer for de fleste typer insulin og de fleste pasientene. Noen ganger også kalt insulinlevetid.' ,fi: 'Kertoo insuliinin tyypillisen vaikutusajan. Vaihtelee potilaan ja insuliinin tyypin mukaan. Tyypillisesti 3-4 tuntia pumpuissa käytettävällä insuliinilla.' @@ -7334,6 +7406,7 @@ function init() { ,el: 'Αναλογία Ινσουλίνης/Υδατάνθρακα (I:C)' ,nb: 'IKH forhold' ,de: 'Insulin/Kohlenhydrate-Verhältnis (I:KH)' + ,dk: 'Insulin til kulhydrat forhold (I:C)' ,fi: 'Insuliiniannoksen hiilihydraattisuhde (I:HH)' ,bg: 'Съотношение инсулин/въглехидратите ICR I:C И:ВХ' ,pl: 'Współczynnik insulina/węglowodany (I:C)' @@ -7350,6 +7423,7 @@ function init() { ,ro: 'ore' ,el: 'ώρες' ,de: 'Stunden' + ,dk: 'timer' ,sv: 'timmar' ,nb: 'timer' ,fi: 'tuntia' @@ -7369,6 +7443,7 @@ function init() { ,sv: 'g/timme' ,nb: 'g/t' ,de: 'g/Std' + ,dk: 'g/time' ,fi: 'g/tunti' ,bg: 'гр/час' ,pl: 'g/godzine' @@ -8148,7 +8223,7 @@ function init() { ,pt: 'Carregando dados de OpenAPS de' ,ko: 'OpenAPS 데이터 로딩' ,it: 'Caricamento in corso dati OpenAPS' - ,nl: 'Open Aps gegevens opladen van' + ,nl: 'OpenAPS gegevens opladen van' ,zh_cn: '载入OpenAPS数据从' } ,'Loading profile switch data' : { @@ -8166,7 +8241,7 @@ function init() { ,pt: 'Carregando dados de troca de perfil' ,ko: '프로파일 변환 데이터 로딩' ,it: 'Caricamento in corso dati cambio profilo' - ,nl: 'Ophalen van profiel wissel data' + ,nl: 'Ophalen van data om profiel te wisselen' ,zh_cn: '载入配置文件交换数据' } ,'Profile is going to be saved in newer format used in Nightscout 0.9.0 and above and will not be usable in older versions anymore.\nAre you sure?' : { @@ -8250,12 +8325,11 @@ function init() { ,bg: 'Възраст на инсулина (ВИ)' ,ro: 'Vechimea insulinei' ,ru: 'инсулин проработал' - ,nl: 'Insuline leeftijd (IAGE)' ,ko: '인슐린 사용 기간' ,fi: 'Insuliinin ikä' ,pt: 'Idade da insulina' ,it: 'IAGE - Durata Insulina' - ,nl: 'Insuline ouderdom' + ,nl: 'Insuline ouderdom (IAGE)' ,zh_cn: '胰岛素使用时间（IAGE）' ,zh_tw: '胰島素使用時間（IAGE）' } @@ -8266,7 +8340,6 @@ function init() { ,el: 'Προσωρινός στόχος' ,sv: 'Tillfälligt mål' ,nb: 'Mildertidig mål' - ,de: 'Temporäres Ziel' ,bg: 'Временна граница' ,ro: 'Țintă temporară' ,ru: 'Временная цель' @@ -8415,7 +8488,7 @@ function init() { ,'Positive temp basal insulin:' : { cs: 'Pozitivní dočasný bazální inzulín:' ,bg: 'Положителен временен базален инсулин' - ,ro: 'Bazala temporară crescută:' + ,ro: 'Bazala temporară marită:' ,el: 'Θετική βασική ινσουλίνη' ,ru: 'Положит знач временн базал инс ' ,sv: 'Positiv tempbasal insulin:' @@ -8426,13 +8499,13 @@ function init() { ,pt: 'Insulina basal temporária positiva:' ,sk: 'Pozitívny dočasný bazálny inzulín:' ,it: 'Insulina basale temp positiva:' - ,nl: 'Verhoging tijd. basaal insuline' + ,nl: 'Extra tijdelijke basaal insuline' ,zh_cn: '实际临时基础率胰岛素' } ,'Negative temp basal insulin:' : { cs:'Negativní dočasný bazální inzulín:' ,bg: 'Отрицателен временен базален инсулин' - ,ro: 'Bazala temporară scăzută:' + ,ro: 'Bazala temporară micșorată:' ,el: 'Αρνητική βασική ινσουλίνη' ,ru: 'Отриц знач временн базал инс' ,sv: 'Negativ tempbasal för insulin:' @@ -8443,7 +8516,7 @@ function init() { ,pt: 'Insulina basal temporária negativa:' ,sk: 'Negatívny dočasný bazálny inzulín:' ,it: 'Insulina basale Temp negativa:' - ,nl: 'Verlaging tijd. basaal insuline' + ,nl: 'Negatieve tijdelijke basaal insuline' ,zh_cn: '其余临时基础率胰岛素' } ,'Total basal insulin:' : { @@ -8814,7 +8887,7 @@ function init() { ,sk: 'rola1, rola2' ,ko: '역할1, 역할2' ,it: 'ruolo1, ruolo2' - ,nl: 'rol1, rol 2' + ,nl: 'rol1, rol2' ,zh_cn: '角色1、角色2' } ,'Edit this subject' : { @@ -8884,7 +8957,7 @@ function init() { ,'hour ago' : { cs:'hodina zpět' ,bg: 'Преди час' - ,ro: 'oră trecut' + ,ro: 'oră în trecut' ,ru: 'час назад' ,sv: 'timme sedan' ,nb: 'time siden' @@ -8900,7 +8973,7 @@ function init() { ,'hours ago' : { cs:'hodin zpět' ,bg: 'Преди часове' - ,ro: 'ore trecute' + ,ro: 'ore în trecut' ,ru: 'часов назад' ,sv: 'timmar sedan' ,nb: 'timer siden' @@ -8997,7 +9070,7 @@ function init() { ,'Current Carb Ratio' : { cs:'Sacharidový poměr (I:C)' ,de: 'Aktuelles KH-Verhältnis' - ,ro: 'Report Insulină:Carbohidrați (ICR)' + ,ro: 'Raport Insulină:Carbohidrați (ICR)' ,ru: 'Актуальное соотношение инсулин:углеводы' ,sk: 'Aktuálny sacharidový pomer (I"C)' ,sv: 'Gällande kolhydratkvot' @@ -9584,7 +9657,7 @@ function init() { ,'aiming at' : { cs:'s cílem' ,de: 'angestrebt werden' - ,ro: 'se țintește la' + ,ro: 'ținta este' ,ru: 'цель на' ,bg: 'цел към' ,sv: 'önskad utgång' @@ -9703,7 +9776,7 @@ function init() { ,'Time to change cannula' : { cs:'Čas na výměnu setu' ,de: 'Es ist Zeit, die Kanüle zu wechseln' - ,ro: 'Este momentul să schimbați canula' + ,ro: 'Este vremea să schimbați canula' ,bg: 'Време за смяна на сет' ,ru: 'Пора заменить канюлю' ,sv: 'Dags att byta infusionsset' @@ -9733,7 +9806,7 @@ function init() { ,'Cannula age %1 hours' : { cs:'Stáří setu %1 hodin' ,de: 'Kanülen Alter %1 Stunden' - ,ro: 'Vechimea canulei %1 ore' + ,ro: 'Vechimea canulei în ore: %1' ,bg: 'Сетът е на %1 часове' ,ru: 'Возраст канюли %1 час' ,sv: 'Infusionsset tid %1 timmar' @@ -9823,7 +9896,7 @@ function init() { ,'Insulin reservoir change overdue!' : { cs:'Čas na výměnu zásobníku vypršel!' ,de: 'Ampullenwechsel überfällig!' - ,ro: 'Depășire termen de schimbare a rezervorului de insulină' + ,ro: 'Termenul de schimbare a rezervorului de insulină a fost depășit' ,bg: 'Смянатата на резервоара просрочена' ,ru: 'Срок замены тубы инсулина истек' ,sv: 'Insulinbytestid överskriden' @@ -10190,7 +10263,7 @@ function init() { ,ru: 'чтобы увидеть отчет, нажмите show/показать' ,fi: 'Nähdäksesi tämän raportin, paina NÄYTÄ tässä näkymässä' ,it: 'Per guardare questo report, premere SHOW all\'interno della finestra' - ,nl: 'Omd dit rapport te zien, druk op "Laat zien"' + ,nl: 'Om dit rapport te zien, druk op "Laat zien"' } ,'AR2 Forecast' : { cs: 'AR2 predikci' @@ -10234,7 +10307,7 @@ function init() { ,ru: 'OpenAPS вне сети' ,fi: 'OpenAPS poissa verkosta' ,it: 'OpenAPS disconnesso' - ,nl: 'OpenAps Offline' + ,nl: 'OpenAPS Offline' } ,'Profiles' : { cs: 'Profily' @@ -10250,14 +10323,14 @@ function init() { ,it: 'Tempo in fluttuazione' ,ro: 'Timp în fluctuație' ,ru: 'время флуктуаций' - ,nl: 'Tijd met bokkensprongen' + ,nl: 'Tijd met fluctuaties' } ,'Time in rapid fluctuation' : { fi: 'Aika nopeassa muutoksessa' ,it: 'Tempo in rapida fluttuazione' ,ro: 'Timp în fluctuație rapidă' ,ru: 'время быстрых флуктуаций' - ,nl: 'tijd met grote bokkensprongen' + ,nl: 'Tijd met grote fluctuaties' } ,'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: ' @@ -10278,7 +10351,7 @@ function init() { ,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: 'время флуктуаций и время быстрых флуктуаций означает % времени в рассматриваемый период в течение которого СК менялся относительно быстро или просто быстро. Более низкие значения предпочтительней' - ,nl: 'Tijd met bokkensprongen of grote bokkensprongen in % van de geevalueerde periode, waarbij de bloed glucose relatief snel wijzigde.Lagere waarden zijn beter.' + ,nl: 'Tijd met fluctuaties of grote fluctuaties in % van de geevalueerde periode, waarbij de bloed glucose relatief snel wijzigde.Lagere waarden zijn beter.' } , '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.' @@ -10323,7 +10396,7 @@ function init() { , el: 'slightly dropping' , en: 'slightly dropping' , es: 'slightly dropping' - , fi: 'slightly dropping' + , fi: 'laskee hitaasti' , fr: 'slightly dropping' , he: 'slightly dropping' , hr: 'slightly dropping' @@ -10332,7 +10405,7 @@ function init() { , nb: 'slightly dropping' , pl: 'slightly dropping' , pt: 'slightly dropping' - , ro: 'slightly dropping' + , ro: 'scădere ușoară' , ru: 'незначительное падение' , sk: 'slightly dropping' , sv: 'slightly dropping' @@ -10348,7 +10421,7 @@ function init() { , el: 'slightly rising' , en: 'slightly rising' , es: 'slightly rising' - , fi: 'slightly rising' + , fi: 'nousee hitaasti' , fr: 'slightly rising' , he: 'slightly rising' , hr: 'slightly rising' @@ -10357,7 +10430,7 @@ function init() { , nb: 'slightly rising' , pl: 'slightly rising' , pt: 'slightly rising' - , ro: 'slightly rising' + , ro: 'creștere ușoară' , ru: 'незначительный подъем' , sk: 'slightly rising' , sv: 'slightly rising' @@ -10373,7 +10446,7 @@ function init() { , el: 'holding' , en: 'holding' , es: 'holding' - , fi: 'holding' + , fi: 'tasainen' , fr: 'holding' , he: 'holding' , hr: 'holding' @@ -10382,7 +10455,7 @@ function init() { , nb: 'holding' , pl: 'holding' , pt: 'holding' - , ro: 'holding' + , ro: 'stabil' , ru: 'ровный' , sk: 'holding' , sv: 'holding' @@ -10398,7 +10471,7 @@ function init() { , el: 'rising' , en: 'rising' , es: 'rising' - , fi: 'rising' + , fi: 'nousussa' , fr: 'rising' , he: 'rising' , hr: 'rising' @@ -10407,7 +10480,7 @@ function init() { , nb: 'rising' , pl: 'rising' , pt: 'rising' - , ro: 'rising' + , ro: 'creștere' , ru: 'растет' , sk: 'rising' , sv: 'rising' @@ -10423,7 +10496,7 @@ function init() { , el: 'dropping' , en: 'dropping' , es: 'dropping' - , fi: 'dropping' + , fi: 'laskussa' , fr: 'dropping' , he: 'dropping' , hr: 'dropping' @@ -10432,7 +10505,7 @@ function init() { , nb: 'dropping' , pl: 'dropping' , pt: 'dropping' - , ro: 'dropping' + , ro: 'scădere' , ru: 'падает' , sk: 'dropping' , sv: 'dropping' @@ -10448,7 +10521,7 @@ function init() { , el: 'rapidly dropping' , en: 'rapidly dropping' , es: 'rapidly dropping' - , fi: 'rapidly dropping' + , fi: 'laskee nopeasti' , fr: 'rapidly dropping' , he: 'rapidly dropping' , hr: 'rapidly dropping' @@ -10457,7 +10530,7 @@ function init() { , nb: 'rapidly dropping' , pl: 'rapidly dropping' , pt: 'rapidly dropping' - , ro: 'rapidly dropping' + , ro: 'scădere bruscă' , ru: 'быстро падает' , sk: 'rapidly dropping' , sv: 'rapidly dropping' @@ -10473,7 +10546,7 @@ function init() { , el: 'rapidly rising' , en: 'rapidly rising' , es: 'rapidly rising' - , fi: 'rapidly rising' + , fi: 'nousee nopeasti' , fr: 'rapidly rising' , he: 'rapidly rising' , hr: 'rapidly rising' @@ -10482,7 +10555,7 @@ function init() { , nb: 'rapidly rising' , pl: 'rapidly rising' , pt: 'rapidly rising' - , ro: 'rapidly rising' + , ro: 'creștere rapidă' , ru: 'быстро растет' , sk: 'rapidly rising' , sv: 'rapidly rising' @@ -10498,7 +10571,7 @@ function init() { , el: '%1 and %2 as of %3.' , en: '%1 and %2 as of %3.' , es: '%1 and %2 as of %3.' - , fi: '%1 and %2 as of %3.' + , fi: '%1 ja %2 alkaen %3.' , fr: '%1 and %2 as of %3.' , he: '%1 and %2 as of %3.' , hr: '%1 and %2 as of %3.' @@ -10507,7 +10580,7 @@ function init() { , nb: '%1 and %2 as of %3.' , pl: '%1 and %2 as of %3.' , pt: '%1 and %2 as of %3.' - , ro: '%1 and %2 as of %3.' + , ro: '%1 și %2 din %3.' , nl: '%1 and %2 as of %3.' , ru: '%1 и %2 начиная с %3.' , sk: '%1 and %2 as of %3.' @@ -10523,7 +10596,7 @@ function init() { , el: '%1 current basal is %2 units per hour' , en: '%1 current basal is %2 units per hour' , es: '%1 current basal is %2 units per hour' - , fi: '%1 current basal is %2 units per hour' + , fi: '%1 nykyinen basaali on %2 yksikköä tunnissa' , fr: '%1 current basal is %2 units per hour' , he: '%1 current basal is %2 units per hour' , hr: '%1 current basal is %2 units per hour' @@ -10532,7 +10605,7 @@ function init() { , nb: '%1 current basal is %2 units per hour' , pl: '%1 current basal is %2 units per hour' , pt: '%1 current basal is %2 units per hour' - , ro: '%1 current basal is %2 units per hour' + , ro: '%1 bazala curentă este %2 unități pe oră' , ru: '%1 текущий базал %2 ед в час' , sk: '%1 current basal is %2 units per hour' , sv: '%1 current basal is %2 units per hour' @@ -10548,7 +10621,7 @@ function init() { , el: '%1 temp basal of %2 units per hour will end %3' , en: '%1 temp basal of %2 units per hour will end %3' , es: '%1 temp basal of %2 units per hour will end %3' - , fi: '%1 temp basal of %2 units per hour will end %3' + , fi: '%1 tilapäinen basaali on %2 tunnissa, päättyy %3' , fr: '%1 temp basal of %2 units per hour will end %3' , he: '%1 temp basal of %2 units per hour will end %3' , hr: '%1 temp basal of %2 units per hour will end %3' @@ -10557,7 +10630,7 @@ function init() { , nb: '%1 temp basal of %2 units per hour will end %3' , pl: '%1 temp basal of %2 units per hour will end %3' , pt: '%1 temp basal of %2 units per hour will end %3' - , ro: '%1 temp basal of %2 units per hour will end %3' + , ro: '%1 bazala temporară de %2 unități pe oră se va termina la %3' , ru: '%1 временный базал %2 ед в час закончится в %3' , sk: '%1 temp basal of %2 units per hour will end %3' , sv: '%1 temp basal of %2 units per hour will end %3' @@ -10573,7 +10646,7 @@ function init() { , el: 'and you have %1 insulin on board.' , en: 'and you have %1 insulin on board.' , es: 'and you have %1 insulin on board.' - , fi: 'and you have %1 insulin on board.' + , fi: 'ja sinulla on %1 aktivista insuliinia.' , fr: 'and you have %1 insulin on board.' , he: 'and you have %1 insulin on board.' , hr: 'and you have %1 insulin on board.' @@ -10582,7 +10655,7 @@ function init() { , nb: 'and you have %1 insulin on board.' , pl: 'and you have %1 insulin on board.' , pt: 'and you have %1 insulin on board.' - , ro: 'and you have %1 insulin on board.' + , ro: 'și mai aveți %1 insulină activă.' , ru: 'и вы имеете %1 инсулина в организме.' , sk: 'and you have %1 insulin on board.' , sv: 'and you have %1 insulin on board.' @@ -10598,7 +10671,7 @@ function init() { , el: 'You have %1 insulin on board' , en: 'You have %1 insulin on board' , es: 'You have %1 insulin on board' - , fi: 'You have %1 insulin on board' + , fi: 'Sinulla on %1 aktiivista insuliinia' , fr: 'You have %1 insulin on board' , he: 'You have %1 insulin on board' , hr: 'You have %1 insulin on board' @@ -10607,7 +10680,7 @@ function init() { , nb: 'You have %1 insulin on board' , pl: 'You have %1 insulin on board' , pt: 'You have %1 insulin on board' - , ro: 'You have %1 insulin on board' + , ro: 'Aveți %1 insulină activă' , ru: 'вы имеете %1 инсулина в организме' , sk: 'You have %1 insulin on board' , sv: 'You have %1 insulin on board' @@ -10623,7 +10696,7 @@ function init() { , el: '%1 units of' , en: '%1 units of' , es: '%1 units of' - , fi: '%1 units of' + , fi: '%1 yksikköä' , fr: '%1 units of' , he: '%1 units of' , hr: '%1 units of' @@ -10632,7 +10705,7 @@ function init() { , nb: '%1 units of' , pl: '%1 units of' , pt: '%1 units of' - , ro: '%1 units of' + , ro: '%1 unități' , ru: '%1 единиц' , sk: '%1 units of' , sv: '%1 units of' @@ -10647,7 +10720,7 @@ function init() { , el: 'Your' , en: 'Your' , es: 'Your' - , fi: 'Your' + , fi: 'Sinun' , fr: 'Your' , he: 'Your' , hr: 'Your' @@ -10656,7 +10729,7 @@ function init() { , nb: 'Your' , pl: 'Your' , pt: 'Your' - , ro: 'Your' + , ro: '' , ru: 'ваш' , sk: 'Your' , sv: 'Your' @@ -10671,7 +10744,7 @@ function init() { , el: '%1 has a ' , en: '%1 has a ' , es: '%1 has a ' - , fi: '%1 has a ' + , fi: '%1 on ' , fr: '%1 has a ' , he: '%1 has a ' , hr: '%1 has a ' @@ -10680,8 +10753,8 @@ function init() { , nb: '%1 has a ' , pl: '%1 has a ' , pt: '%1 has a ' - , ro: '%1 имеет ' - , ru: '%1 has a ' + , ro: '%1 are ' + , ru: '%1 имеет ' , sk: '%1 has a ' , sv: '%1 has a ' , zh_cn: '%1 has a ' @@ -10695,7 +10768,7 @@ function init() { , el: 'no' , en: 'no' , es: 'no' - , fi: 'no' + , fi: 'ei' , fr: 'no' , he: 'no' , hr: 'no' @@ -10704,7 +10777,7 @@ function init() { , nb: 'no' , pl: 'no' , pt: 'no' - , ro: 'no' + , ro: 'fără' , ru: 'нет' , sk: 'no' , sv: 'no' @@ -10714,14 +10787,26 @@ function init() { 'Fat [g]': { cs: 'Tuk [g]' ,de: 'Fett [g]' + ,fi: 'Rasva [g]' + ,ro: 'Grăsimi [g]' }, 'Protein [g]': { cs: 'Proteiny [g]' ,de: 'Proteine [g]' + ,fi: 'Proteiini [g]' + ,ro: 'Proteine [g]' + }, 'Energy [kJ]': { cs: 'Energie [kJ]' ,de: 'Energie [kJ]' + , fi: 'Energia [kJ]' + ,ro: 'Energie [g]' + } + , + 'Clock View': { + fi: 'Kellonäkymä' + ,ro: 'Vedere tip ceas' } }; diff --git a/lib/plugins/bgnow.js b/lib/plugins/bgnow.js index 2f9b39b5e82..512a23805c2 100644 --- a/lib/plugins/bgnow.js +++ b/lib/plugins/bgnow.js @@ -209,7 +209,7 @@ function init (ctx) { _.forEach(delta.previous.sgvs, function deviceAndValue(entry) { var device = utils.deviceName(entry.device); var deviceInfo = deviceInfos[device]; - if (deviceInfo) { + if (deviceInfo && deviceInfo.recent) { var deviceDelta = bgnow.calcDelta( { mills: deviceInfo.recent.mills , mean: deviceInfo.recent.mgdl} , { mills: entry.mills, mean: entry.mgdl} diff --git a/lib/plugins/loop.js b/lib/plugins/loop.js index ea7ebdb806f..bf2482cfe3c 100644 --- a/lib/plugins/loop.js +++ b/lib/plugins/loop.js @@ -186,6 +186,8 @@ function init(ctx) { valueParts = concatIOB(valueParts); valueParts = concatCOB(valueParts); + valueParts = concatEventualBG (valueParts); + valueParts = concatRecommendedBolus(valueParts); events.push({ time: moment(recommendedTempBasal.timestamp) @@ -257,6 +259,8 @@ function init(ctx) { valueParts = concatIOB(valueParts); valueParts = concatCOB(valueParts); + valueParts = concatEventualBG (valueParts); + valueParts = concatRecommendedBolus(valueParts); events.push({ time: prop.lastEnacted.moment @@ -292,6 +296,44 @@ function init(ctx) { return valueParts; } + function concatEventualBG (valueParts) { + if (prop.lastLoop && prop.lastLoop.predicted) { + var predictedBGvalues = prop.lastLoop.predicted.values; + var eventualBG = predictedBGvalues[predictedBGvalues.length-1]; + var maxBG = Math.max.apply(null,predictedBGvalues); + var minBG = Math.min.apply(null,predictedBGvalues); + var eventualBGscaled = sbx.settings.units === 'mmol' ? + sbx.roundBGToDisplayFormat(sbx.scaleMgdl(eventualBG)) : eventualBG; + var maxBGscaled = sbx.settings.units === 'mmol' ? + sbx.roundBGToDisplayFormat(sbx.scaleMgdl(maxBG)) : maxBG; + var minBGscaled = sbx.settings.units === 'mmol' ? + sbx.roundBGToDisplayFormat(sbx.scaleMgdl(minBG)) : minBG; + valueParts = valueParts.concat([ + ', Predicted Min-Max BG: ' + , minBGscaled + , '-' + , maxBGscaled + ,', Eventual BG: ' + , eventualBGscaled + ]); + } + + return valueParts; + } + + function concatRecommendedBolus (valueParts) { + if (prop.lastLoop && prop.lastLoop.recommendedBolus) { + var recommendedBolus = prop.lastLoop.recommendedBolus; + valueParts = valueParts.concat([ + ', Recommended Bolus: ' + , recommendedBolus + 'U' + ]); + } + + return valueParts; + } + + function getForecastPoints ( ) { var points = [ ]; @@ -337,7 +379,7 @@ function init(ctx) { addRecommendedTempBasal(); } - addRSSI(); + addRSSI(); var sorted = _.sortBy(events, function toMill(event) { return event.time.valueOf(); diff --git a/lib/profilefunctions.js b/lib/profilefunctions.js index b7f85537ac0..94120d72f67 100644 --- a/lib/profilefunctions.js +++ b/lib/profilefunctions.js @@ -350,14 +350,27 @@ function init (profileData) { for (var key in profile.data[0].store) { if (profile.data[0].store.hasOwnProperty(key) && key !== current) { + if (key.indexOf('@@@@@') < 0) profiles.push(key); } } } return profiles; }; - - + + // get original store without added profiles fro profileSwitches + profile.getProfileStore = function getProfileStore () { + var newprofiledata = _.clone(profile.data[0]); + for (var key in profile.data[0].store) { + if (profile.data[0].store.hasOwnProperty(key)) { + if (key.indexOf('@@@@@') < 0) + store[key] = profile.data[0].store[key]; + } + } + return store; + }; + + if (profileData) { profile.loadData(profileData); } // init treatments array profile.updateTreatments([], []); diff --git a/lib/report_plugins/daytoday.js b/lib/report_plugins/daytoday.js index 3f66a29de44..e7bcbe79a80 100644 --- a/lib/report_plugins/daytoday.js +++ b/lib/report_plugins/daytoday.js @@ -631,8 +631,80 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options) 'translate(' + (xScale2(treatment.mills) + padding.left + 10) + ',' + (padding.top+yInsulinScale(treatment.insulin)) + ')') .text(Number(treatment.insulin).toFixed(2)+'U'); } + + // process the rest + if (treatment.insulin || treatment.carbs || treatment.eventType == 'Temp Basal' || treatment.eventType == 'Combo Bolus') { + // ignore + } else if (treatment.eventType === 'Profile Switch') { + // profile switch + appendProfileSwitch(context, treatment); + if (treatment.duration && !treatment.cuttedby) { + appendProfileSwitch(context, { + cutting: treatment.profile + , profile: client.profilefunctions.activeProfileToTime(times.mins(treatment.duration).msecs + treatment.mills + 1) + , mills: times.mins(treatment.duration).msecs + treatment.mills + , end: true + }); + } + } else if (treatment.eventType === 'Exercise' && treatment.duration) { + context.append('rect') + .attr('x', xScale2(treatment.mills) + padding.left) + .attr('y', yScale2(client.utils.scaleMgdl(396)) + padding.top) + .attr('width', xScale2(treatment.mills + times.mins(treatment.duration).msecs) - xScale2(treatment.mills)) + .attr('height', yScale2(client.utils.scaleMgdl(360)) - yScale2(client.utils.scaleMgdl(396))) + .attr('stroke-width', 1) + .attr('opacity', .2) + .attr('stroke', 'white') + .attr('fill', 'Violet'); + context.append('text') + .style('font-size', '12px') + .style('font-weight', 'bold') + .attr('fill', 'Violet') + .attr('text-anchor', 'middle') + .attr('dy', '.35em') + .attr('y', yScale2(client.utils.scaleMgdl(378)) + padding.top) + .attr('x', xScale2(treatment.mills + times.mins(treatment.duration).msecs/2) + padding.left) + .text(treatment.notes); + } else if (treatment.eventType === 'Note' && treatment.duration) { + context.append('rect') + .attr('x', xScale2(treatment.mills) + padding.left) + .attr('y', yScale2(client.utils.scaleMgdl(360)) + padding.top) + .attr('width', xScale2(treatment.mills + times.mins(treatment.duration).msecs) - xScale2(treatment.mills)) + .attr('height', yScale2(client.utils.scaleMgdl(324)) - yScale2(client.utils.scaleMgdl(360))) + .attr('stroke-width', 1) + .attr('opacity', .2) + .attr('stroke', 'white') + .attr('fill', 'Salmon'); + context.append('text') + .style('font-size', '12px') + .style('font-weight', 'bold') + .attr('fill', 'Salmon') + .attr('text-anchor', 'middle') + .attr('dy', '.35em') + .attr('y', yScale2(client.utils.scaleMgdl(342)) + padding.top) + .attr('x', xScale2(treatment.mills + times.mins(treatment.duration).msecs/2) + padding.left) + .text(treatment.notes); + } else if (treatment.eventType === 'OpenAPS Offline' && treatment.duration) { + context.append('rect') + .attr('x', xScale2(treatment.mills) + padding.left) + .attr('y', yScale2(client.utils.scaleMgdl(324)) + padding.top) + .attr('width', xScale2(treatment.mills + times.mins(treatment.duration).msecs) - xScale2(treatment.mills)) + .attr('height', yScale2(client.utils.scaleMgdl(288)) - yScale2(client.utils.scaleMgdl(324))) + .attr('stroke-width', 1) + .attr('opacity', .2) + .attr('stroke', 'white') + .attr('fill', 'Brown'); + context.append('text') + .style('font-size', '12px') + .style('font-weight', 'bold') + .attr('fill', 'Brown') + .attr('text-anchor', 'middle') + .attr('dy', '.35em') + .attr('y', yScale2(client.utils.scaleMgdl(306)) + padding.top) + .attr('x', xScale2(treatment.mills + times.mins(treatment.duration).msecs/2) + padding.left) + .text(treatment.notes); + } else if (!treatment.duration) { // other treatments without duration - if (!treatment.insulin && !treatment.carbs && !treatment.duration && treatment.eventType !== 'Temp Basal' && treatment.eventType !== 'Profile Switch') { context.append('circle') .attr('cx', xScale2(treatment.mills) + padding.left) .attr('cy', yScale2(scaledTreatmentBG(treatment,data.sgv)) + padding.top) @@ -648,42 +720,28 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options) .attr('y', yScale2(scaledTreatmentBG(treatment,data.sgv)) + padding.top -10) .attr('x', xScale2(treatment.mills) + padding.left + 10) .text(translate(client.careportal.resolveEventName(treatment.eventType))); - } + } else if (treatment.duration) { // other treatments with duration - if (!treatment.insulin && !treatment.carbs && treatment.duration && treatment.eventType !== 'Temp Basal' && treatment.eventType !== 'Profile Switch' && treatment.eventType !== 'Combo Bolus') { context.append('rect') .attr('x', xScale2(treatment.mills) + padding.left) - .attr('y', 0 + padding.top) + .attr('y', yScale2(client.utils.scaleMgdl(432)) + padding.top) .attr('width', xScale2(treatment.mills + times.mins(treatment.duration).msecs) - xScale2(treatment.mills)) - .attr('height', chartHeight) - //.attr('rx', 5) - //.attr('ry', 5) + .attr('height', yScale2(client.utils.scaleMgdl(396)) - yScale2(client.utils.scaleMgdl(432))) .attr('stroke-width', 1) .attr('opacity', .2) .attr('stroke', 'white') - .attr('fill', treatment.eventType === 'Exercise' ? 'Violet' : (treatment.eventType === 'Note' ? 'Salmon' : 'black')); + .attr('fill', 'black'); context.append('text') .style('font-size', '12px') .style('font-weight', 'bold') - .attr('fill', treatment.eventType === 'Exercise' ? 'Violet' : (treatment.eventType === 'Note' ? 'Salmon' : 'black')) + .attr('fill', 'black') .attr('text-anchor', 'middle') .attr('dy', '.35em') - .attr('y', foodtexts * 15 + 10 + padding.top) + .attr('y', yScale2(client.utils.scaleMgdl(414)) + padding.top) .attr('x', xScale2(treatment.mills + times.mins(treatment.duration).msecs/2) + padding.left) .text(treatment.notes); - foodtexts = (foodtexts + 1) % 6; - } - // profile switch - if (treatment.eventType === 'Profile Switch') { - appendProfileSwitch(context, treatment); - if (treatment.duration && !treatment.cuttedby) { - appendProfileSwitch(context, { - cutting: treatment.profile - , profile: client.profilefunctions.activeProfileToTime(times.mins(treatment.duration).msecs + treatment.mills + 1) - , mills: times.mins(treatment.duration).msecs + treatment.mills - , end: true - }); - } + } else { + console.log("missed treatment", treatment); } }); diff --git a/lib/report_plugins/glucosedistribution.js b/lib/report_plugins/glucosedistribution.js index 7b0175a73ca..38521fa4eb9 100644 --- a/lib/report_plugins/glucosedistribution.js +++ b/lib/report_plugins/glucosedistribution.js @@ -35,7 +35,8 @@ glucosedistribution.html = function html(client) { translate('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.') + '

' + translate('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.')+ '

' + translate('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.')+ '

' + - translate('GVI and PGS are measures developed by Dexcom, detailed here.')+ + translate('Out of Range RMS is calculated by squaring the distance out of range for all glucose readings for the examined period, summing them, dividing by the count and taking the square root. This metric is similar to in-range percentage but weights readings far out of range higher. Lower values are better.')+ '

' + + translate('GVI and PGS are measures developed by Dexcom, detailed here.')+ '

' + translate('Filter by hours') + ':' + '
' + @@ -126,7 +127,8 @@ glucosedistribution.report = function report_glucosedistribution(datastorage, so $('#glucosedistribution-' + i).unbind('click').click(onClick); enabledHours[i] = $('#glucosedistribution-' + i).is(':checked'); } - console.log(enabledHours); + + //console.log(enabledHours); var result = {}; @@ -134,6 +136,17 @@ glucosedistribution.report = function report_glucosedistribution(datastorage, so var glucose_data = [data[0]]; + // data cleaning pass 0 - remove duplicates and sort + + var seen = {}; + data = data.filter(function(item) { + return seen.hasOwnProperty(item.displayTime) ? false : (seen[item.displayTime] = true); + }); + + data.sort(function(a,b){ + return a.displayTime.getTime()-b.displayTime.getTime(); + }); + // data cleaning pass 1 - add interpolated missing points for (var i = 0; i < data.length - 2; i++) { @@ -327,6 +340,8 @@ glucosedistribution.report = function report_glucosedistribution(datastorage, so var GVITotal = 0; var GVIIdeal = 0; + var RMSTotal = 0; + var usedRecords = 0; var glucoseTotal = 0; var deltaTotal = 0; @@ -362,7 +377,14 @@ glucosedistribution.report = function report_glucosedistribution(datastorage, so GVITotal += Math.sqrt(25 + Math.pow(delta, 2)); glucoseTotal += entry.bgValue; - + + if (entry.bgValue < options.targetLow) { + RMSTotal += Math.pow(options.targetLow - entry.bgValue, 2); + } + if (entry.bgValue > options.targetHigh) { + RMSTotal += Math.pow(entry.bgValue - options.targetHigh, 2); + } + } var GVIDelta = Math.floor(glucose_data[0].bgValue,glucose_data[glucose_data.length-1].bgValue); @@ -385,7 +407,9 @@ glucosedistribution.report = function report_glucosedistribution(datastorage, so var TDC = deltaTotal / days; var TDCHourly = TDC / 24.0; - + + var RMS = Math.sqrt(RMSTotal / events); + // console.log('TADC',TDC,'days',days); var timeInT1 = Math.round(100 * t1count / events).toFixed(1); @@ -399,12 +423,14 @@ glucosedistribution.report = function report_glucosedistribution(datastorage, so TDC = TDC / 18.0; TDCHourly = TDCHourly / 18.0; unitString = ' mmol/L'; + + RMS = Math.sqrt(RMSTotal / events) / 18; + } TDC = Math.round(TDC * 100) / 100; TDCHourly = Math.round(TDCHourly * 100) / 100; - var stabilitytable = $(''); var t1exp = '>5 mg/dl/5m'; @@ -420,7 +446,10 @@ glucosedistribution.report = function report_glucosedistribution(datastorage, so $('').appendTo(stabilitytable); $('').appendTo(stabilitytable); - + +// $('').appendTo(stabilitytable); +// $('').appendTo(stabilitytable); + stabilitytable.appendTo(stability); setTimeout(function() { diff --git a/lib/sandbox.js b/lib/sandbox.js index 0e031bec8f5..5dd7b63e4bc 100644 --- a/lib/sandbox.js +++ b/lib/sandbox.js @@ -51,7 +51,7 @@ function init ( ) { var profile = require('./profilefunctions')(); //Plugins will expect the right profile based on time - profile.loadData(ctx.ddata.profiles); + profile.loadData(_.cloneDeep(ctx.ddata.profiles)); profile.updateTreatments(ctx.ddata.profileTreatments, ctx.ddata.tempbasalTreatments, ctx.ddata.combobolusTreatments); sbx.data.profile = profile; delete sbx.data.profiles; diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 98a5abe98f4..75f0b09c9f4 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "Nightscout", - "version": "0.10.2-release-20171103", + "version": "0.10.3-dev-20171205", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -173,15 +173,6 @@ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" }, - "ascli": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", - "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", - "requires": { - "colour": "0.7.1", - "optjs": "3.2.2" - } - }, "asn1": { "version": "0.1.11", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz", @@ -220,6 +211,12 @@ "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=" }, + "async-limiter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", + "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", + "dev": true + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -751,6 +748,7 @@ "requires": { "anymatch": "1.3.0", "async-each": "1.0.1", + "fsevents": "1.1.3", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -1308,6 +1306,12 @@ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz", "integrity": "sha1-mWedO70EcVb81FDT0B7rkGhpHoM=" }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, "defined": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz", @@ -1636,16 +1640,6 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, - "escodegen": { - "version": "0.0.15", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-0.0.15.tgz", - "integrity": "sha1-/9qcsmtws098wZ8diHVlOa+1Q70=", - "dev": true, - "requires": { - "esprima": "1.0.2", - "source-map": "0.1.43" - } - }, "escope": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", @@ -1657,12 +1651,6 @@ "estraverse": "4.2.0" } }, - "esprima": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.2.tgz", - "integrity": "sha1-gDm/nOrE2dLBX2IyZPspK1UCzq8=", - "dev": true - }, "esrecurse": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", @@ -1858,6 +1846,11 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" + }, + "statuses": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" } } }, @@ -1947,6 +1940,12 @@ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, "fastparse": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", @@ -1966,9 +1965,9 @@ "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=" }, "filesize": { - "version": "3.5.10", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.10.tgz", - "integrity": "sha1-/I+iPdtO+eXgq24eZPZ5okpWdh8=", + "version": "3.5.11", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz", + "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==", "dev": true }, "fill-range": { @@ -2019,6 +2018,11 @@ "requires": { "ms": "2.0.0" } + }, + "statuses": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" } } }, @@ -2130,47 +2134,950 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz", "integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=", "requires": { - "async": "2.5.0", + "async": "2.6.0", "combined-stream": "1.0.5", "mime-types": "2.1.15" }, "dependencies": { "async": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "requires": { + "lodash": "4.17.4" + } + } + } + }, + "formidable": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz", + "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=", + "dev": true + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + }, + "from": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", + "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=" + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "fsevents": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz", + "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==", + "optional": true, + "requires": { + "nan": "2.8.0", + "node-pre-gyp": "0.6.39" + }, + "dependencies": { + "abbrev": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", + "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=", + "optional": true + }, + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "optional": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "aproba": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz", + "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=", + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", + "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "optional": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.2.9" + } + }, + "asn1": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", + "optional": true + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "optional": true + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "optional": true + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", + "optional": true + }, + "aws4": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", + "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", + "optional": true + }, + "balanced-match": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=" + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "requires": { + "inherits": "2.0.3" + } + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "requires": { + "hoek": "2.16.3" + } + }, + "brace-expansion": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", + "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=", + "requires": { + "balanced-match": "0.4.2", + "concat-map": "0.0.1" + } + }, + "buffer-shims": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", + "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=" + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "optional": true + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "combined-stream": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "requires": { + "delayed-stream": "1.0.0" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "requires": { + "boom": "2.10.1" + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "optional": true + } + } + }, + "debug": { + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "optional": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", + "optional": true + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "optional": true + }, + "detect-libc": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz", + "integrity": "sha1-ca1dIEvxempsqPRQxhRUBm70YeE=", + "optional": true + }, + "ecc-jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", + "optional": true + }, + "extsprintf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", + "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=" + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "optional": true + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "optional": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.15" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "fstream": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", + "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.1" + } + }, + "fstream-ignore": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", + "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=", + "optional": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "optional": true, + "requires": { + "aproba": "1.1.1", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "optional": true + } + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", + "optional": true + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "optional": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "optional": true + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "optional": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.0", + "sshpk": "1.13.0" + } + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ini": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", + "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "optional": true + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "optional": true + }, + "jodid25519": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", + "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=", + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "optional": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "optional": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "optional": true + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "optional": true + }, + "jsprim": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", + "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=", + "optional": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.0.2", + "json-schema": "0.2.3", + "verror": "1.3.6" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "optional": true + } + } + }, + "mime-db": { + "version": "1.27.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", + "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=" + }, + "mime-types": { + "version": "2.1.15", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", + "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", + "requires": { + "mime-db": "1.27.0" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "optional": true + }, + "node-pre-gyp": { + "version": "0.6.39", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz", + "integrity": "sha512-OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ==", + "optional": true, + "requires": { + "detect-libc": "1.0.2", + "hawk": "3.1.3", + "mkdirp": "0.5.1", + "nopt": "4.0.1", + "npmlog": "4.1.0", + "rc": "1.2.1", + "request": "2.81.0", + "rimraf": "2.6.1", + "semver": "5.3.0", + "tar": "2.2.1", + "tar-pack": "3.4.0" + } + }, + "nopt": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "optional": true, + "requires": { + "abbrev": "1.1.0", + "osenv": "0.1.4" + } + }, + "npmlog": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz", + "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==", + "optional": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "optional": true + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "optional": true + }, + "osenv": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", + "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", + "optional": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", + "optional": true + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "optional": true + }, + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", + "optional": true + }, + "rc": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", + "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", + "optional": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "optional": true + } + } + }, + "readable-stream": { + "version": "2.2.9", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz", + "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=", + "requires": { + "buffer-shims": "1.0.0", + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "1.0.1", + "util-deprecate": "1.0.2" + } + }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "optional": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.15", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.0.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.6.0", + "uuid": "3.0.1" + } + }, + "rimraf": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", + "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", + "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=" + }, + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "optional": true + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "requires": { + "hoek": "2.16.3" + } + }, + "sshpk": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz", + "integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=", + "optional": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jodid25519": "1.0.2", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "optional": true + } + } + }, + "string_decoder": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", + "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", + "requires": { + "safe-buffer": "5.0.1" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", + "optional": true + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "optional": true + }, + "tar": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-pack": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz", + "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=", + "optional": true, + "requires": { + "debug": "2.6.8", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.2.9", + "rimraf": "2.6.1", + "tar": "2.2.1", + "uid-number": "0.0.6" + } + }, + "tough-cookie": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", + "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", + "optional": true, + "requires": { + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "optional": true, "requires": { - "lodash": "4.17.4" + "safe-buffer": "5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "optional": true + }, + "uid-number": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz", + "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=", + "optional": true + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "uuid": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz", + "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=", + "optional": true + }, + "verror": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", + "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", + "optional": true, + "requires": { + "extsprintf": "1.0.2" + } + }, + "wide-align": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", + "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "optional": true, + "requires": { + "string-width": "1.0.2" } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" } } }, - "formidable": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz", - "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=", - "dev": true - }, - "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" - }, - "from": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", - "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=" - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -2252,6 +3159,12 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" }, + "graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "dev": true + }, "growl": { "version": "1.9.2", "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", @@ -2265,14 +3178,6 @@ "dev": true, "requires": { "duplexer": "0.1.1" - }, - "dependencies": { - "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", - "dev": true - } } }, "handlebars": { @@ -2282,8 +3187,8 @@ "dev": true, "requires": { "async": "1.5.2", - "optimist": "0.5.2", - "source-map": "0.1.43", + "optimist": "0.6.1", + "source-map": "0.4.4", "uglify-js": "2.8.29" }, "dependencies": { @@ -2293,6 +3198,25 @@ "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", "dev": true }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + } + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + }, "uglify-js": { "version": "2.8.29", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", @@ -2456,7 +3380,7 @@ "depd": "1.1.1", "inherits": "2.0.3", "setprototypeof": "1.0.3", - "statuses": "1.3.1" + "statuses": "1.4.0" } }, "http-signature": { @@ -2754,18 +3678,18 @@ "requires": { "abbrev": "1.0.9", "async": "1.5.2", - "escodegen": "0.0.15", - "esprima": "1.0.2", - "glob": "7.1.2", + "escodegen": "1.8.1", + "esprima": "2.7.3", + "glob": "5.0.15", "handlebars": "4.0.10", "js-yaml": "3.9.0", "mkdirp": "0.5.1", "nopt": "3.0.6", "once": "1.4.0", - "resolve": "0.3.1", - "supports-color": "2.0.0", + "resolve": "1.1.7", + "supports-color": "3.2.3", "which": "1.2.14", - "wordwrap": "0.0.3" + "wordwrap": "1.0.0" }, "dependencies": { "async": { @@ -2773,6 +3697,75 @@ "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", "dev": true + }, + "escodegen": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", + "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", + "dev": true, + "requires": { + "esprima": "2.7.3", + "estraverse": "1.9.3", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.2.0" + } + }, + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + }, + "estraverse": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", + "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", + "dev": true + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + }, + "source-map": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", + "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", + "dev": true, + "optional": true, + "requires": { + "amdefine": "1.0.1" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true } } }, @@ -2827,7 +3820,15 @@ "dev": true, "requires": { "argparse": "1.0.9", - "esprima": "1.0.2" + "esprima": "4.0.0" + }, + "dependencies": { + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true + } } }, "jsbn": { @@ -2849,7 +3850,7 @@ "content-type-parser": "1.0.1", "cssom": "0.3.2", "cssstyle": "0.2.37", - "escodegen": "0.0.15", + "escodegen": "1.9.0", "html-encoding-sniffer": "1.0.1", "nwmatcher": "1.4.1", "parse5": "3.0.2", @@ -2863,6 +3864,34 @@ "whatwg-encoding": "1.0.1", "whatwg-url": "6.1.0", "xml-name-validator": "2.0.1" + }, + "dependencies": { + "escodegen": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", + "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", + "dev": true, + "requires": { + "esprima": "3.1.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.5.7" + } + }, + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true, + "optional": true + } } }, "jsesc": { @@ -2995,6 +4024,16 @@ "invert-kv": "1.0.0" } }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, "load-json-file": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", @@ -3389,16 +4428,65 @@ "dev": true, "requires": { "browser-stdout": "1.3.0", - "commander": "2.11.0", - "debug": "2.6.7", + "commander": "2.9.0", + "debug": "2.2.0", "diff": "1.4.0", "escape-string-regexp": "1.0.5", - "glob": "7.1.2", + "glob": "7.0.5", "growl": "1.9.2", "json3": "3.3.2", "lodash.create": "3.1.1", "mkdirp": "0.5.1", - "supports-color": "2.0.0" + "supports-color": "3.1.2" + }, + "dependencies": { + "commander": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "dev": true, + "requires": { + "graceful-readlink": "1.0.1" + } + }, + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "dev": true, + "requires": { + "ms": "0.7.1" + } + }, + "glob": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", + "integrity": "sha1-tCAqaQmbu00pKnwblbZoK2fr3JU=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "dev": true + }, + "supports-color": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", + "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } } }, "moment": { @@ -3498,6 +4586,12 @@ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" }, + "nan": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", + "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=", + "optional": true + }, "nconf": { "version": "0.6.9", "resolved": "https://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz", @@ -3722,13 +4816,26 @@ "integrity": "sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=", "dev": true }, - "optimist": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.5.2.tgz", - "integrity": "sha1-hcjBRUszFeSniUfoV7HfAzRQv7w=", + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "wordwrap": "0.0.3" + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" + }, + "dependencies": { + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + } } }, "options": { @@ -4452,6 +5559,12 @@ "uniqs": "2.0.0" } }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, "prepend-http": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", @@ -4512,6 +5625,17 @@ "requires": { "ascli": "1.0.1", "bytebuffer": "3.1.1" + }, + "dependencies": { + "ascli": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", + "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", + "requires": { + "colour": "0.7.1", + "optjs": "3.2.2" + } + } } }, "proxy-addr": { @@ -4917,7 +6041,7 @@ "boom": "4.3.1", "cryptiles": "3.1.2", "hoek": "4.2.0", - "sntp": "2.0.2" + "sntp": "2.1.0" } }, "hoek": { @@ -4954,9 +6078,9 @@ "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" }, "sntp": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz", - "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", + "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", "requires": { "hoek": "4.2.0" } @@ -4999,16 +6123,6 @@ "tough-cookie": "2.3.2" } }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" - }, "require_optional": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", @@ -5018,11 +6132,15 @@ "semver": "5.4.1" } }, - "resolve": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz", - "integrity": "sha1-NMY0R8ZkxwWY0cmxJvxDsqJDEKQ=", - "dev": true + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" }, "resolve-from": { "version": "2.0.0", @@ -5141,6 +6259,11 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==" + }, + "statuses": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" } } }, @@ -5596,15 +6719,6 @@ "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==" }, - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "dev": true, - "requires": { - "amdefine": "1.0.1" - } - }, "spdx-correct": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", @@ -5669,9 +6783,9 @@ "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" }, "statuses": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", - "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", + "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" }, "stealthy-require": { "version": "1.1.1", @@ -5720,6 +6834,14 @@ "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -5749,14 +6871,6 @@ } } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "5.1.1" - } - }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", @@ -5805,7 +6919,7 @@ "integrity": "sha1-cDUpoHFOV+EjlZ3e+84ZOy5Q0RU=", "dev": true, "requires": { - "component-emitter": "1.1.2", + "component-emitter": "1.2.1", "cookiejar": "2.1.1", "debug": "2.6.7", "extend": "3.0.1", @@ -5823,6 +6937,12 @@ "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", "dev": true }, + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, "form-data": { "version": "1.0.0-rc4", "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz", @@ -5980,6 +7100,15 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "optional": true }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2" + } + }, "type-is": { "version": "1.6.15", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", @@ -5990,9 +7119,9 @@ } }, "uglify-js": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.6.tgz", - "integrity": "sha512-/rseyxEKEVMBo8279lqpoJgD6C/i/CIi+9TJDvWmb+Xo6mqMKwjA8Io3IMHlcXQzj99feR6zrN8m3wqqvm/nYA==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.8.tgz", + "integrity": "sha512-1lnTkrJWw6LJ7n43ZyYVXx0eN2PQh0c3Inb0nY/vj5fNfwykXQFif2kvNgm/Bf0ClLA8R6SKaMHFzo9io4Q+vg==", "requires": { "commander": "2.11.0", "source-map": "0.6.1" @@ -6209,11 +7338,11 @@ "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz", "integrity": "sha512-5ZXLWWsMqHKFr5y0N3Eo5IIisxeEeRAajNq4mELb/WELOR7srdbQk2N5XiyNy2A/AgvlR3AmeBCZJW8lHrolbw==", "requires": { - "acorn": "5.1.2", + "acorn": "5.2.1", "acorn-dynamic-import": "2.0.2", "ajv": "5.3.0", "ajv-keywords": "2.1.0", - "async": "2.5.0", + "async": "2.6.0", "enhanced-resolve": "3.4.1", "escope": "3.6.0", "interpret": "1.0.3", @@ -6234,14 +7363,14 @@ }, "dependencies": { "acorn": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz", - "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz", + "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==" }, "async": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "requires": { "lodash": "4.17.4" } @@ -6267,34 +7396,28 @@ } }, "webpack-bundle-analyzer": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.0.tgz", - "integrity": "sha1-tYvDTMMLJ//brz0AvyerpvopxuM=", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.1.tgz", + "integrity": "sha512-a+UcvlsXvCmclNgfThT8PVyuJKd029By7CxkYEbNNCfs0Lqj9gagjkdv3S3MBvCIKBaUGYs8l4UpiVI0bFoh2Q==", "dev": true, "requires": { - "acorn": "5.1.1", + "acorn": "5.2.1", "chalk": "1.1.3", "commander": "2.11.0", "ejs": "2.5.7", "express": "4.16.2", - "filesize": "3.5.10", + "filesize": "3.5.11", "gzip-size": "3.0.0", "lodash": "4.17.4", "mkdirp": "0.5.1", "opener": "1.4.3", - "ws": "2.3.1" + "ws": "3.3.1" }, "dependencies": { "acorn": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz", - "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==", - "dev": true - }, - "safe-buffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", - "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz", + "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==", "dev": true }, "ultron": { @@ -6304,12 +7427,13 @@ "dev": true }, "ws": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz", - "integrity": "sha1-a5Sz5EfLajY/eF6vlK9jWejoHIA=", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.1.tgz", + "integrity": "sha512-8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A==", "dev": true, "requires": { - "safe-buffer": "5.0.1", + "async-limiter": "1.0.0", + "safe-buffer": "5.1.1", "ultron": "1.1.0" } } diff --git a/package.json b/package.json index 250d10c98f7..4a9dc335515 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Nightscout", - "version": "0.10.2-release-20171103", + "version": "0.10.3-dev-20171205", "description": "Nightscout acts as a web-based CGM (Continuous Glucose Montinor) to allow multiple caregivers to remotely view a patients glucose data in realtime.", "license": "AGPL-3.0", "author": "Nightscout Team", @@ -47,7 +47,8 @@ } }, "engines": { - "node": "8.9.0" + "node": "8.9.x", + "npm": "5.2.0 || 5.3.0 || 5.0.3" }, "dependencies": { "ajv": "^5.3.0", @@ -100,7 +101,7 @@ "sugar": "^1.5.0", "sync-exec": "^0.6.2", "traverse": "^0.6.6", - "uglify-js": "^3.1.6", + "uglify-js": "^3.1.8", "uuid": "^3.1.0", "webpack": "^3.8.1" }, @@ -111,6 +112,6 @@ "mocha": "~3.1.2", "should": "~11.1.1", "supertest": "~2.0.0", - "webpack-bundle-analyzer": "^2.9.0" + "webpack-bundle-analyzer": "^2.9.1" } } diff --git a/static/profile/js/profileeditor.js b/static/profile/js/profileeditor.js index 3ff7435e0e8..bcb26425414 100644 --- a/static/profile/js/profileeditor.js +++ b/static/profile/js/profileeditor.js @@ -88,7 +88,7 @@ records.push(defaultprofile); } client.profilefunctions.loadData(records); // do a conversion if needed - mongorecords = client.profilefunctions.data; + mongorecords = _.cloneDeep(client.profilefunctions.data); // create new profile to be edited from last record if (mongorecords.length) { _.each(mongorecords, function eachMongoProfile (mongoprofile) { diff --git a/static/report/js/report.js b/static/report/js/report.js index 60d70af1620..ba637365dcb 100644 --- a/static/report/js/report.js +++ b/static/report/js/report.js @@ -446,7 +446,7 @@ if (options.order === report_plugins.consts.ORDER_NEWESTONTOP) { sorteddaystoshow.reverse(); } - loadProfileSwitch(function loadProfileSwitchCallback() { + loadProfileSwitch(from, function loadProfileSwitchCallback() { loadProfiles(function loadProfilesCallback() { $('#info > b').html('' + translate('Rendering') + ' ...'); window.setTimeout(function () { @@ -629,6 +629,8 @@ } function loadTreatmentData() { + if (!datastorage.profileSwitchTreatments) + datastorage.profileSwitchTreatments = []; $('#info-' + day).html(''+translate('Loading treatments data of')+' '+day+' ...'); var tquery = '?find[created_at][$gte]='+new Date(from).toISOString()+'&find[created_at][$lt]='+new Date(to).toISOString(); return $.ajax('/api/v1/treatments.json'+tquery, { @@ -649,6 +651,11 @@ data.tempbasalTreatments = data.treatments.filter(function filterTempBasals(t) { return t.eventType === 'Temp Basal'; }); + // filter profile switch treatments + var profileSwitch = data.treatments.filter(function filterProfileSwitch(t) { + return t.eventType === 'Profile Switch'; + }); + datastorage.profileSwitchTreatments = datastorage.profileSwitchTreatments.concat(profileSwitch); } }); } @@ -682,9 +689,9 @@ }); } - function loadProfileSwitch(callback) { + function loadProfileSwitch(from, callback) { $('#info > b').html(''+translate('Loading profile switch data') + ' ...'); - var tquery = '?find[eventType]=Profile Switch'; + var tquery = '?find[eventType]=Profile Switch' + '&find[created_at][$lte]=' + new Date(from).toISOString() + '&count=1'; $.ajax('/api/v1/treatments.json'+tquery, { headers: client.headers() , success: function (xhr) { @@ -693,7 +700,9 @@ treatment.mills = timestamp.getTime(); return treatment; }); - datastorage.profileSwitchTreatments = treatmentData.slice(); + if (!datastorage.profileSwitchTreatments) + datastorage.profileSwitchTreatments = []; + datastorage.profileSwitchTreatments = datastorage.profileSwitchTreatments.concat(treatmentData); datastorage.profileSwitchTreatments.sort(function(a, b) { return a.mills - b.mills; }); } }).done(function () { diff --git a/tests/loop.test.js b/tests/loop.test.js index 77795b3aec1..78580470430 100644 --- a/tests/loop.test.js +++ b/tests/loop.test.js @@ -121,7 +121,7 @@ describe('loop', function ( ) { options.value.should.equal('1m ago'); var first = _.first(options.info); first.label.should.equal('1m ago'); - first.value.should.equal('Temp Basal Started 0.88U/hour for 30m, IOB: 0.17U'); + first.value.should.equal('Temp Basal Started 0.88U/hour for 30m, IOB: 0.17U, Predicted Min-Max BG: 147-149, Eventual BG: 147'); } , addForecastPoints: function mockAddForecastPoints (points) { points.length.should.equal(6); diff --git a/views/bgclock.html b/views/bgclock.html index 0657c9e94c6..183a5bb829f 100644 --- a/views/bgclock.html +++ b/views/bgclock.html @@ -6,6 +6,7 @@
' + translate('Mean Hourly Change') + 'GVIPGS
' + TDCHourly + unitString + '' + GVI + '' + PGS + '
Out of Range RMS
' + Math.round(RMS * 100) / 100 + unitString + '