dbfmeal

araczkowski · Mar 8, 2017 · 01a943c · 01a943c
1 parent 47d73ad
commit 01a943c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/app/scripts/main.js b/app/scripts/main.js
@@ -531,7 +531,7 @@
 
         }
 
-        function _changeBasedOn(basedon) {
+        function _changeBasedOn(basedon, dbfmeal) {
             //
             _setBasedOn(basedon);
             // set meal
@@ -540,6 +540,10 @@
             })
             if (basedon === 'PLAN') {
                 m.attr('data-fmeal', m.attr('data-meal'));
+            } else if (basedon === 'REAL') {
+                m.attr('data-fmeal', m.attr('data-rmeal'));
+            } else if (basedon === 'USER') {
+                m.attr('data-fmeal', dbfmeal);
             }
             if ($(m).hasClass('mealOff')) {
                 _mealOff(true);
@@ -990,11 +994,16 @@
             _setWidth();
         };
 
-        this.setBasedOn = function(newbasedon) {
+        this.setBasedOn = function(newbasedon, dbfmeal) {
             if (newbasedon !== 'PLAN' && newbasedon !== 'REAL' && newbasedon !== 'USER') {
                 return;
             }
-            _changeBasedOn(newbasedon);
+            if (newbasedon !== 'USER') {
+                _changeBasedOn(newbasedon);
+            } else {
+                // the dbfmeal is set only in case of USER mode
+                _changeBasedOn(newbasedon, dbfmeal);
+            }
         };
 
         this.getOption = function(option) {

diff --git a/app/testBlocks13h.json b/app/testBlocks13h.json
@@ -141,7 +141,7 @@
         "excused": "Y"
     }],
     "meal": "1",
-    "rmeal": "0",
+    "rmeal": "1",
     "fmeal": "0",
-    "basedon": "REAL"
+    "basedon": "USER"
 }
diff --git a/dist/index.html b/dist/index.html
@@ -3,7 +3,7 @@
     }
     i.AddIcon > svg{
       height: 1em;
-    }</style><body style="margin-top: 2em"><div id=bipSchedule_parent style="float:left; display: inline-block"></div><script src=scripts/adf78aaf.vendor.js></script><script src=scripts/6231b7d0.main.js></script><script>var clickB;
+    }</style><body style="margin-top: 2em"><div id=bipSchedule_parent style="float:left; display: inline-block"></div><script src=scripts/adf78aaf.vendor.js></script><script src=scripts/c7e32e29.main.js></script><script>var clickB;
     // test url
     //http://localhost:3000/?params={"options":{"min":360,"max":1140,"mode":"real"},"schedule":{"blocks":[{"id":1,"start":480,"value":60,"planned":"1","real":"1"}],"meal":"1","rmeal":"1"}}