Fix for 'Active basal - NS Care Portal' status line

README.md

@@ -1,3 +1,17 @@
+## About this fork and me (andyrozman/urchin-cgm)
+
+I am Android APS user and I have been using this watchface for a while now... I created very nice configuration which displays
+all data I need. One of the lines I use is 'Active basal - NS Care Portal', which was actually implemented little bit wrong. It worked 
+great for absolute values, but not for percent ones. This change fixes exactly that. So if you use TBR as percent, and use 'Active basal' 
+status line, then this fix is for you. 
+
+Here is link to compiled watchface [pbw file](https://raw.githubusercontent.com/andyrozman/urchin-cgm/master/release/urchin-cgm.pbw), so that you don't need to do it by yourself (it's little bit of hassle to make build work, since 
+original Pebble site is no longer there, but you can use Rebble service instead).  
+
+
+
+## Watchface
+
 A Pebble watchface to view data from a continuous glucose monitor in graph format, like this:
 
 ![Screenshot](http://i.imgur.com/xefGk6A.png)

src/js/constants.json

@@ -1,5 +1,5 @@
 {
-   "VERSION" : "0.0.14",
+   "VERSION" : "0.0.15",
 
    "DEBUG": false,
    "DEV_CONFIG_URL": "",

src/js/data.js

@@ -331,12 +331,18 @@ var data = function(c, maxSGVCount) {
       if (treatments.length && treatments[0]['duration']) {
         var start = new Date(treatments[0]['created_at']);
         var rate;
-        if (treatments[0]['percent'] && parseFloat(treatments[0]['percent']) === 0) {
+        var ratePercent;
+        var rateType;
+        if (treatments[0]['percent']) {
           rate = 0;
+          ratePercent = treatments[0]['percent'];
+          rateType = 'percent';
         } else {
           rate = parseFloat(treatments[0]['absolute']);
+          ratePercent = null;
+          rateType = 'absolute';
         }
-        return {start: start, rate: rate, duration: parseFloat(treatments[0]['duration'])};
+        return {start: start, rate: rate, duration: parseFloat(treatments[0]['duration']), rate_percent: ratePercent, rate_type : rateType };
       } else {
         return undefined;
       }
@@ -365,14 +371,25 @@ var data = function(c, maxSGVCount) {
       if (profileBasal === undefined && tempBasal === undefined) {
         return {text: '-'};
       } else if (tempBasal !== undefined && Date.now() - tempBasal.start < tempBasal.duration * 60 * 1000) {
-        var diff = tempBasal.rate - profileBasal;
-        return {
-          text: _roundBasal(tempBasal.rate) + 'U/h ' + (diff >= 0 ? '+' : '') + _roundBasal(diff),
-          recency: Math.round((new Date() - tempBasal.start) / 1000),
-        };
+
+          if (tempBasal.rate_type == 'percent') {
+              var percent = 100 + tempBasal.rate_percent;
+              var value = profileBasal * (percent / 100);
+              return {
+                  text: percent + '% (' + _roundBasal(value) + ' U/h)',
+                  recency: Math.round((new Date() - tempBasal.start) / 1000),
+              };
+          } else {
+              var diff = tempBasal.rate - profileBasal;
+              return {
+                  text: _roundBasal(tempBasal.rate) + ' U/h ' + (diff >= 0 ? '+' : '') + _roundBasal(diff),
+                  recency: Math.round((new Date() - tempBasal.start) / 1000),
+              };
+          }
+
       } else {
         return {
-          text: _roundBasal(profileBasal) + 'U/h',
+          text: _roundBasal(profileBasal) + ' U/h',
           recency: 0
         };
       }