Bugfix

mean-app/dist/main.bundle.js

@@ -955,7 +955,7 @@ module.exports = ""
 /***/ 674:
 /***/ (function(module, exports) {
 
-module.exports = "<div class=\"container\">\r\n\r\n  <nav class=\"navbar navbar-default\">\r\n    <div class=\"container-fluid\">\r\n      <div class=\"navbar-header\">\r\n        <button type=\"button\" class=\"navbar-toggle collapsed\" data-toggle=\"collapse\" data-target=\"#navbar\" aria-expanded=\"false\" aria-controls=\"navbar\">\r\n          <span class=\"sr-only\">Toggle navigation</span>\r\n          <span class=\"icon-bar\"></span>\r\n          <span class=\"icon-bar\"></span>\r\n          <span class=\"icon-bar\"></span>\r\n        </button>\r\n        <a class=\"navbar-brand\">Energiemeter</a>\r\n      </div>\r\n      <div id=\"navbar\" class=\"navbar-collapse collapse\">\r\n        <ul class=\"nav navbar-nav\">\r\n          <li routerLink=\"/dashboard\" routerLinkActive=\"active\"><a routerLink=\"/dashboard\" routerLinkActive=\"active\">Dashboard</a></li>\r\n          <li routerLink=\"/device\" routerLinkActive=\"active\"><a routerLink=\"/device\" routerLinkActive=\"active\">Device</a></li>\r\n          <li routerLink=\"/picker\" routerLinkActive=\"active\"><a routerLink=\"/picker\" routerLinkActive=\"active\">Picker</a></li>\r\n        </ul>\r\n      </div><!--/.nav-collapse -->\r\n    </div><!--/.container-fluid -->\r\n  </nav>\r\n\r\n  \r\n  <router-outlet></router-outlet>\r\n  \r\n</div>\r\n"
+module.exports = "<div class=\"container\">\r\n\r\n  <nav class=\"navbar navbar-default\">\r\n    <div class=\"container-fluid\">\r\n      <div class=\"navbar-header\">\r\n        <button type=\"button\" class=\"navbar-toggle collapsed\" data-toggle=\"collapse\" data-target=\"#navbar\" aria-expanded=\"false\" aria-controls=\"navbar\">\r\n          <span class=\"sr-only\">Toggle navigation</span>\r\n          <span class=\"icon-bar\"></span>\r\n          <span class=\"icon-bar\"></span>\r\n          <span class=\"icon-bar\"></span>\r\n        </button>\r\n        <a class=\"navbar-brand\">Energiemeter</a>\r\n      </div>\r\n      <div id=\"navbar\" class=\"navbar-collapse collapse\">\r\n        <ul class=\"nav navbar-nav\">\r\n          <li routerLink=\"/dashboard\" routerLinkActive=\"active\"><a routerLink=\"/dashboard\" routerLinkActive=\"active\">Dashboard</a></li>\r\n          <li routerLink=\"/device\" routerLinkActive=\"active\"><a routerLink=\"/device\" routerLinkActive=\"active\">Device</a></li>\r\n          <li routerLink=\"/picker\" routerLinkActive=\"active\"><a routerLink=\"/picker\" routerLinkActive=\"active\">Picker</a></li>\r\n        </ul>\r\n      </div><!--/.nav-collapse -->\r\n    </div><!--/.container-fluid -->\r\n  </nav>\r\n\r\n  <router-outlet></router-outlet>\r\n\r\n</div>\r\n"
 
 /***/ }),
 
@@ -997,7 +997,7 @@ module.exports = "<div style=\"display: block;\">\r\n  <canvas baseChart width=\
 /***/ 680:
 /***/ (function(module, exports) {
 
-module.exports = "<div class=\"row\">\r\n\r\n    <div class=\"col-md-12\">\r\n      <div class=\"page-header\">\r\n        <h1>Energiemeter <small>Picker</small></h1>\r\n      </div>\r\n    </div>\r\n\r\n  </div>\r\n\r\n<div class=\"row\">\r\n\r\n  <form #form=\"ngForm\" (ngSubmit)=\"onSubmit(form.value)\">\r\n\r\n    <div class=\"col-md-4\">\r\n\r\n      <div class=\"form-group\">  \r\n        <label>Meter</label>  \r\n        <select name=\"meter\" class=\"form-control\" required ngModel>\r\n        \t<option value=\"4530303035303031353538313833363134\">Martijn</option>\r\n        \t<option value=\"4530303235303030303636383733323136\">Kenneth</option>\r\n        </select>\r\n      </div>\r\n\r\n    </div>\r\n\r\n    <div class=\"col-md-4\">\r\n\r\n      <div class=\"form-group\">  \r\n        <label>Data type</label>  \r\n        <select name=\"datatype\" class=\"form-control\" required ngModel>\r\n        \t<optgroup label=\"Huidig\">\r\n            \t<option value=\"HOV\">Huidig opgenomen vermogen</option>\r\n            \t<option value=\"HTV\">Huidig teruggeleverd vermogen</option>\r\n            </optgroup>\r\n        \t<optgroup label=\"Tarief 1\">\r\n            \t<option value=\"TOE1\">Totaal opgenomen energie</option>\r\n            \t<option value=\"TTE1\">Totaal teruggeleverde energie</option>\r\n            </optgroup>\r\n            <optgroup label=\"Tarief 2\">\r\n            \t<option value=\"TOE2\">Totaal opgenomen energie</option>\r\n            \t<option value=\"TTE2\">Totaal teruggeleverde energie</option>\r\n            </optgroup>\r\n        </select>\r\n      </div>\r\n\r\n    </div>\r\n\r\n    <div class=\"col-md-4\">\r\n\r\n      <div class=\"form-group\">  \r\n        <label>Groupering</label>  \r\n        <select name=\"group\" class=\"form-control\" required ngModel>\r\n        \t<option value=\"minute\">Minuut</option>\r\n        \t<option value=\"hour\">Uur</option>\r\n        \t<option value=\"day\">Dag</option>\r\n        \t<option value=\"month\">Maand</option>\r\n        \t<option value=\"year\">Jaar</option>\r\n        </select>\r\n      </div>\r\n\r\n    </div>\r\n\r\n    <div class=\"col-md-6\">\r\n\r\n      <div class=\"form-group\">\r\n      \t<label>Startdatum</label>\r\n      \t<input type=\"date\" name=\"date1\" class=\"form-control\" required ngModel>\r\n      </div>\r\n\r\n    </div>\r\n\r\n    <div class=\"col-md-6\">\r\n\r\n      <div class=\"form-group\">\r\n      \t<label>Einddatum</label>\r\n      \t<input type=\"date\" name=\"date2\" class=\"form-control\" required ngModel>\r\n      </div>\r\n\r\n    </div>\r\n\r\n    <div class=\"col-md-12\">\r\n\r\n      <input type=\"submit\" class=\"btn btn-primary\" value=\"Update\" />\r\n\r\n    </div>\r\n\r\n    </div>\r\n\r\n  </form>\r\n\r\n</div>\r\n\r\n<div class=\"row\">\r\n\r\n  <span *ngIf=\"loaded\">\r\n\r\n  \t<div class=\"col-md-12\">\r\n      <br>\r\n  \t\t<line-chart [label]=\"label\" [data]=\"data\"></line-chart>\r\n  \t</div>\r\n\r\n  </span>\r\n</div>"
+module.exports = "<div class=\"row\">\r\n\r\n    <div class=\"col-md-12\">\r\n      <div class=\"page-header\">\r\n        <h1>Energiemeter <small>Picker</small></h1>\r\n      </div>\r\n    </div>\r\n\r\n</div>\r\n\r\n<div class=\"row\">\r\n\r\n  <form #form=\"ngForm\" (ngSubmit)=\"onSubmit(form.value)\">\r\n\r\n    <div class=\"col-md-4\">\r\n\r\n      <div class=\"form-group\">  \r\n        <label>Meter</label>  \r\n        <select name=\"meter\" class=\"form-control\" required ngModel>\r\n        \t<option value=\"4530303035303031353538313833363134\">Martijn</option>\r\n        \t<option value=\"4530303235303030303636383733323136\">Kenneth</option>\r\n        </select>\r\n      </div>\r\n\r\n    </div>\r\n\r\n    <div class=\"col-md-4\">\r\n\r\n      <div class=\"form-group\">  \r\n        <label>Data type</label>  \r\n        <select name=\"datatype\" class=\"form-control\" required ngModel>\r\n        \t<optgroup label=\"Huidig\">\r\n            \t<option value=\"HOV\">Huidig opgenomen vermogen</option>\r\n            \t<option value=\"HTV\">Huidig teruggeleverd vermogen</option>\r\n            </optgroup>\r\n        \t<optgroup label=\"Tarief 1\">\r\n            \t<option value=\"TOE1\">Totaal opgenomen energie</option>\r\n            \t<option value=\"TTE1\">Totaal teruggeleverde energie</option>\r\n            </optgroup>\r\n            <optgroup label=\"Tarief 2\">\r\n            \t<option value=\"TOE2\">Totaal opgenomen energie</option>\r\n            \t<option value=\"TTE2\">Totaal teruggeleverde energie</option>\r\n            </optgroup>\r\n        </select>\r\n      </div>\r\n\r\n    </div>\r\n\r\n    <div class=\"col-md-4\">\r\n\r\n      <div class=\"form-group\">  \r\n        <label>Groupering</label>  \r\n        <select name=\"group\" class=\"form-control\" required ngModel>\r\n        \t<option value=\"minute\">Minuut</option>\r\n        \t<option value=\"hour\">Uur</option>\r\n        \t<option value=\"day\">Dag</option>\r\n        \t<option value=\"month\">Maand</option>\r\n        \t<option value=\"year\">Jaar</option>\r\n        </select>\r\n      </div>\r\n\r\n    </div>\r\n\r\n    <div class=\"col-md-6\">\r\n\r\n      <div class=\"form-group\">\r\n      \t<label>Startdatum</label>\r\n      \t<input type=\"date\" name=\"date1\" class=\"form-control\" required ngModel>\r\n      </div>\r\n\r\n    </div>\r\n\r\n    <div class=\"col-md-6\">\r\n\r\n      <div class=\"form-group\">\r\n      \t<label>Einddatum</label>\r\n      \t<input type=\"date\" name=\"date2\" class=\"form-control\" required ngModel>\r\n      </div>\r\n\r\n    </div>\r\n\r\n    <div class=\"col-md-12\">\r\n\r\n      <input type=\"submit\" class=\"btn btn-primary\" value=\"Update\" />\r\n\r\n    </div>\r\n\r\n  </form>\r\n\r\n</div>\r\n\r\n\r\n<div class=\"row\">\r\n\r\n  <span *ngIf=\"loaded\">\r\n\r\n  \t<div class=\"col-md-12\">\r\n      <br>\r\n  \t\t<line-chart [label]=\"label\" [data]=\"data\"></line-chart>\r\n  \t</div>\r\n\r\n  </span>\r\n</div>"
 
 /***/ }),
 

mean-app/src/app/app.component.html

@@ -21,7 +21,6 @@
     </div><!--/.container-fluid -->
   </nav>
 
-  
   <router-outlet></router-outlet>
-  
+
 </div>

mean-app/src/app/picker.component.html

@@ -6,7 +6,7 @@
       </div>
     </div>
 
-  </div>
+</div>
 
 <div class="row">
 
@@ -85,12 +85,11 @@
 
     </div>
 
-    </div>
-
   </form>
 
 </div>
 
+
 <div class="row">
 
   <span *ngIf="loaded">