put cal records at the end of the patientData array, and don't check …

…them in is_different

lib/websocket.js

@@ -260,8 +260,8 @@ function loadData() {
         //TODO: need to consider when data being sent has less than the 2 day minimum
 
         // consolidate and send the data to the client
-        var shouldEmit = is_different(actual, predicted, mbg, cal, treatment, errorCode, profile);
-        patientData = [actual, predicted, mbg, cal, treatment, errorCode, profile];
+        var shouldEmit = is_different(actual, predicted, mbg, treatment, errorCode, profile, cal);
+        patientData = [actual, predicted, mbg, treatment, errorCode, profile, cal];
         console.log('patientData', patientData.length);
         if (shouldEmit) {
           emitData( );
@@ -283,23 +283,21 @@ function loadData() {
         }
     }
 }
-  function is_different (actual, predicted, mbg, cal, treatment, errorCode) {
+  function is_different (actual, predicted, mbg, treatment, errorCode) {
     if (patientData && patientData.length < 3) {
       return true;
     }
     var old =  {
         actual: patientData[0].slice(-1).pop( )
       , predicted: patientData[1].slice(-1).pop( )
       , mbg: patientData[2].slice(-1).pop( )
-      , cal: patientData[3].slice(-1).pop( )
-      , treatment: patientData[4].slice(-1).pop( )
-      , errorCode: patientData.length >= 6 ? patientData[5] : 0
+      , treatment: patientData[3].slice(-1).pop( )
+      , errorCode: patientData.length >= 5 ? patientData[4] : 0
     };
     var last = {
         actual: actual.slice(-1).pop( )
       , predicted: predicted.slice(-1).pop( )
       , mbg: mbg.slice(-1).pop( )
-      , cal: cal.slice(-1).pop( )
       , treatment: treatment.slice(-1).pop( )
       , errorCode: errorCode
     };