소스 검색

Load datasets from service

Return init() into adjuster.service
Load datasets from the web service again
jmacura 5 년 전
부모
커밋
cfc5ced848
2개의 변경된 파일7개의 추가작업 그리고 10개의 파일을 삭제
  1. 1 1
      src/adjuster/adjuster.directive.html
  2. 6 9
      src/adjuster/adjuster.service.js

+ 1 - 1
src/adjuster/adjuster.directive.html

@@ -15,7 +15,7 @@
       <div ng-repeat="factor in PraAdjusterService.factors">
         <div class="d-flex flex-row">
           <div class="p-2 flex-grow-1">
-            <label>{{factor.factor}}</label>
+            <label>{{factor.name}}</label>
           </div>
           <div class="p-2">{{(factor.weight * 100).toFixed(0)}}&nbsp;%</div>
         </div>

+ 6 - 9
src/adjuster/adjuster.service.js

@@ -15,7 +15,7 @@ export class AdjusterService {
         : 'https://publish.lesprojekt.cz/nodejs/';
     this.factors = factors;
     this.clusters = [];
-    this.apply();
+    this.init();
   }
 
   apply() {
@@ -73,20 +73,17 @@ export class AdjusterService {
     this.HsUtilsService.debounce(f, 300)();
   }
 
-  /*init() {
+  init() {
     this.$http({
       url: this.serviceBaseUrl + 'datasets',
     }).then((response) => {
       this.factors = response.data.map((dataset) => {
-        return {factor: dataset.Factor, weight: 1, datasets: []};
+        return {name: dataset.Factor, weight: 1, datasets: []};
       });
-      this.factors = this.HsUtilsService.removeDuplicates(
-        this.factors,
-        'factor'
-      );
+      this.factors = this.HsUtilsService.removeDuplicates(this.factors, 'name');
       this.factors.forEach((factor) => {
         factor.datasets = response.data
-          .filter((ds) => ds.Factor === factor.factor)
+          .filter((ds) => ds.Factor === factor.name)
           .map((ds) => {
             return {
               name: ds.Name,
@@ -96,5 +93,5 @@ export class AdjusterService {
       });
       this.apply();
     });
-  }*/
+  }
 }