refactor code and format edit window

Author: mbehlendorf

src/main/chart/chartController.js

@@ -6,8 +6,6 @@ angular.module('adf.widget.redmine')
     var vm = this;
     vm.config = config;
 
-    var generatedData = chartData;
-
     var options = {
       scales: {
         yAxes: [
@@ -43,8 +41,7 @@ angular.module('adf.widget.redmine')
     };
 
     vm.chart = {
-      labels: generatedData.dates,
-      data: generatedData.values,
+      data: chartData,
       series: [],
       class: "chart-line",
       options: options

src/main/chart/edit/edit.html

@@ -1,8 +1,5 @@
 <form role="form">
 
-  <div class="form-group">
-    <label for="project">Filter</label>
-  </div>
   <div class="form-group">
     <label for="project">Project</label>
     <select name="project" id="project" class="form-control" ng-model="vm.config.project" ng-change="vm.checkUpdates()" ng-required="true">
@@ -18,41 +15,46 @@
     </select>
   </p>
 
-  <div class="input-group" ng-if="vm.config.filterWithVersion" ng-init="vm.updateVersions()"">
+  <div ng-if="vm.config.filterWithVersion">
     <label for="version">Fixed Version</label>
-    <select name="version" id="version" class="form-control" ng-model="vm.config.version" ng-change="vm.updateVersionEnd()">
+    <p class="input-group" ng-init="vm.updateVersions()">
+      <select name="version" id="version" class="form-control" ng-model="vm.config.version" ng-change="vm.updateVersionEnd()">
       <option ng-repeat="version in vm.versions | orderBy: 'name'" value="{{version}}">{{version.name}}</option>
     </select>
-    <span class="input-group-btn">
+      <span class="input-group-btn">
         <button class="btn btn-default" ng-click="vm.config.filterWithVersion=false" type="button">
           <i class="glyphicon glyphicon-remove"></i>
         </button>
       </span>
+    </p>
   </div>
 
-  <div class="input-group" ng-if="vm.config.filterWithAssigned">
+  <div ng-if="vm.config.filterWithAssigned">
     <label for="assgined_to_id">Assigned To</label>
-    <span class="glyphicon glyphicon-info-sign" uib-tooltip="Get issues which are assigned to the given user ID.
-    <me> can be used instead an ID to fetch all issues from the logged in user. Leave empty if you want to see all issues."></span>
-    <input name="assigned_to_id" id="assgined_to_id" class="form-control" ng-model="config.assigned_to_id">
-    </input>
-<span class="input-group-btn">
+    <span class="glyphicon glyphicon-info-sign" uib-tooltip="Get issues which are assigned to the given user ID. <me> can be used instead an ID to fetch all issues from the logged in user. Leave empty if you want to see all issues."></span>
+    <div class="input-group">
+      <input name="assigned_to_id" id="assgined_to_id" class="form-control" ng-model="config.assigned_to_id">
+      </input>
+      <span class="input-group-btn">
         <button class="btn btn-default" ng-click="vm.config.filterWithAssigned=false" type="button">
           <i class="glyphicon glyphicon-remove"></i>
         </button>
       </span>
+    </div>
   </div>
 
-  <div class="input-group" ng-if="vm.config.filterWithTracker" ng-init="vm.updateTracker()"">
+  <div ng-if="vm.config.filterWithTracker">
     <label for="tacker">Tracker</label>
-    <select name="tracker" id="tracker" class="form-control" ng-model="vm.config.tracker">
+    <div class="input-group" ng-init="vm.updateTracker()">
+      <select name="tracker" id="tracker" class="form-control" ng-model="vm.config.tracker">
       <option ng-repeat="tracker in vm.trackers | orderBy: 'name'" value="{{tracker}}">{{tracker.name}}</option>
     </select>
-    <span class="input-group-btn">
+      <span class="input-group-btn">
         <button class="btn btn-default" ng-click="vm.config.filterWithTracker=false" type="button">
           <i class="glyphicon glyphicon-remove"></i>
         </button>
       </span>
+    </div>
   </div>
 
   <div class="form-group">
@@ -71,7 +73,7 @@
     </p>
     <p class="input-group">
       <input class="form-control" datepicker-options="vm.dateOptions" is-open="vm.popup2.opened" ng-model="vm.config.timespan.toDateTime"
-        placeholder="to" show-button-bar="false" type="text" uib-datepicker-popup="{{format}}" ng-required="true"/>
+        placeholder="to" show-button-bar="false" type="text" uib-datepicker-popup="{{format}}" ng-required="true" />
       <span class="input-group-btn">
         <button class="btn btn-default" ng-click="vm.open2()" type="button">
           <i class="glyphicon glyphicon-calendar"></i>

src/main/chart/edit/editChartController.js

@@ -84,7 +84,7 @@ angular.module('adf.widget.redmine')
     function toggleMin() {
       vm.inlineOptions.minDate = vm.inlineOptions.minDate ? null : new Date();
       vm.dateOptions.minDate = vm.inlineOptions.minDate;
-    };
+    }
 
     function updateVersions() {
       if (vm.config.project) {
@@ -96,19 +96,19 @@ angular.module('adf.widget.redmine')
           vm.versions = versions;
         });
       }
-    };
+    }
 
     function checkUpdates() {
       if (vm.config.filterWithVersion) {
         vm.updateVersions();
       }
-    };
+    }
 
     function updateVersionEnd() {
       vm.config.timespan.toDateTime = new Date(angular.fromJson(vm.config.version).due_date);
       var date = new Date(vm.config.timespan.toDateTime);
       vm.config.timespan.fromDateTime = date.setDate(date.getDate() - 14);
-    };
+    }
 
     function updateTracker() {
       redmineService.getTrackers().then(function (trackers) {

src/main/chart/view.html

@@ -1,9 +1,6 @@
- <div class="alert alert-info" ng-if="!vm.chart">
-    Please configure the widget
-  </div>
-  <div ng-if="vm.chart">
-    <canvas id="line" class="chart chart-line"
-            chart-data="vm.chart.data"
-            chart-series="vm.chart.series" chart-options="vm.chart.options">
-    </canvas>
-  </div>
+<div class="alert alert-info" ng-if="!vm.chart">
+  Please configure the widget
+</div>
+<div ng-if="vm.chart">
+  <canvas id="line" class="chart chart-line" chart-data="vm.chart.data" chart-series="vm.chart.series" chart-options="vm.chart.options"></canvas>
+</div>