Merge branch 'develop'

src/main/ui/static/analysis/settle_tasks.js

@@ -104,7 +104,9 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                     task.idle = true;
                     task.processing = false;
                     task.processed = false;
-                    $scope.editingTask = task;
+                    if (!task.plan) {
+                        $scope.editingTask = task;
+                    }
                     $scope.currentTasks.push(task);
                 })
             };

src/main/ui/static/analysis/templates/settle_tasks_index.html

@@ -81,10 +81,15 @@
         <div class="box box-info" ng-if="!progress.processing && editingTask!=null">
             <div class="box-header">Editing Task:{{editingTask.remark}}</div>
             <div class="box-body">
-                <div class="form-group">
-                    <label class="control-label">Settle Date</label>
-                    <div class="form-control-static" ng-bind="editingTask.settle_date"></div>
+                <div class="form-horizontal">
+                    <div class="form-group">
+                        <label class="control-label col-xs-2">Settle Date</label>
+                        <div class="col-xs-10">
+                            <div class="form-control-static col-xs-10" ng-bind="editingTask.settle_date"></div>
+                        </div>
+                    </div>
                 </div>
+
                 <button ng-disabled="processing" type="button" class="btn btn-success"
                         ng-click="openBatchAddMerchantsDialog()">Add Merchants
                 </button>