Преглед на файлове

♻️ rename year-graph service to discs-chart-base

Step #4 towards isolated components
jmacura преди 3 години
родител
ревизия
69c624d8eb

+ 2 - 2
src/app/discs-chart/disc.component.ts

@@ -2,8 +2,8 @@ import {AfterViewInit, Component, Input, OnInit} from '@angular/core';
 
 import {select} from 'd3';
 
+import {DiscsChartBaseService} from './discs-chart-base.service';
 import {SdmDihService} from '../sdm-dih.service';
-import {YearGraphService} from './year-graph.service';
 
 /**
  * Universal component representing one disc in any disc-chart
@@ -51,7 +51,7 @@ export class DiscComponent implements OnInit, AfterViewInit {
 
   constructor(
     public sdmDihService: SdmDihService,
-    public yearGraphService: YearGraphService
+    public yearGraphService: DiscsChartBaseService
   ) {}
 
   ngOnInit(): void {

+ 1 - 1
src/app/discs-chart/year-graph.service.ts → src/app/discs-chart/discs-chart-base.service.ts

@@ -4,7 +4,7 @@ import {Subject} from 'rxjs';
 import {SdmDihService} from '../sdm-dih.service';
 
 @Injectable({providedIn: 'root'})
-export class YearGraphService {
+export class DiscsChartBaseService {
   graphRefreshes: Subject<{region?: string; domain?: string}> = new Subject();
   selectedYear = '';
   constructor(public sdmDihService: SdmDihService) {

+ 2 - 2
src/app/discs-chart/factor-year-graph/factor-year-disc.component.ts

@@ -1,8 +1,8 @@
 import {Component} from '@angular/core';
 
 import {DiscComponent} from '../disc.component';
+import {DiscsChartBaseService} from '../discs-chart-base.service';
 import {SdmDihService} from '../../sdm-dih.service';
-import {YearGraphService} from '../year-graph.service';
 
 @Component({
   selector: 'factor-year-disc',
@@ -11,7 +11,7 @@ import {YearGraphService} from '../year-graph.service';
 export class FactorYearDiscComponent extends DiscComponent {
   constructor(
     public sdmDihService: SdmDihService,
-    public yearGraphService: YearGraphService
+    public yearGraphService: DiscsChartBaseService
   ) {
     super(sdmDihService, yearGraphService);
   }

+ 2 - 2
src/app/discs-chart/factor-year-graph/factor-year-graph.component.ts

@@ -1,7 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 
+import {DiscsChartBaseService} from '../discs-chart-base.service';
 import {SdmDihService} from '../../sdm-dih.service';
-import {YearGraphService} from '../year-graph.service';
 
 @Component({
   selector: 'factor-year-graph',
@@ -11,7 +11,7 @@ import {YearGraphService} from '../year-graph.service';
 export class FactorYearGraphComponent implements OnInit {
   constructor(
     public sdmDihService: SdmDihService,
-    public yearGraphService: YearGraphService
+    public yearGraphService: DiscsChartBaseService
   ) {}
 
   ngOnInit() {

+ 2 - 2
src/app/discs-chart/scenario-factor-year-graph/scenario-factor-year-disc.component.ts

@@ -1,8 +1,8 @@
 import {Component} from '@angular/core';
 
 import {DiscComponent} from '../disc.component';
+import {DiscsChartBaseService} from '../discs-chart-base.service';
 import {SdmDihService} from '../../sdm-dih.service';
-import {YearGraphService} from '../year-graph.service';
 
 @Component({
   selector: 'scenario-factor-year-disc',
@@ -11,7 +11,7 @@ import {YearGraphService} from '../year-graph.service';
 export class ScenarioFactorYearDiscComponent extends DiscComponent {
   constructor(
     public sdmDihService: SdmDihService,
-    public yearGraphService: YearGraphService
+    public yearGraphService: DiscsChartBaseService
   ) {
     super(sdmDihService, yearGraphService);
   }

+ 2 - 2
src/app/discs-chart/scenario-factor-year-graph/scenario-factor-year-graph.component.ts

@@ -1,8 +1,8 @@
 import {Component, OnInit} from '@angular/core';
 
 import domain2scenario from '../../../assets/data/domain-scenario.json';
+import {DiscsChartBaseService} from '../discs-chart-base.service';
 import {SdmDihService} from '../../sdm-dih.service';
-import {YearGraphService} from '../year-graph.service';
 
 @Component({
   selector: 'scenario-factor-year-graph',
@@ -16,7 +16,7 @@ export class ScenarioFactorYearGraphComponent implements OnInit {
 
   constructor(
     public sdmDihService: SdmDihService,
-    public yearGraphService: YearGraphService
+    public yearGraphService: DiscsChartBaseService
   ) {}
 
   ngOnInit() {

+ 2 - 2
src/app/discs-chart/year-graph/year-disc.component.ts

@@ -1,8 +1,8 @@
 import {Component} from '@angular/core';
 
 import {DiscComponent} from '../disc.component';
+import {DiscsChartBaseService} from '../discs-chart-base.service';
 import {SdmDihService} from '../../sdm-dih.service';
-import {YearGraphService} from '../year-graph.service';
 
 @Component({
   selector: 'year-disc',
@@ -11,7 +11,7 @@ import {YearGraphService} from '../year-graph.service';
 export class YearDiscComponent extends DiscComponent {
   constructor(
     public sdmDihService: SdmDihService,
-    public yearGraphService: YearGraphService
+    public yearGraphService: DiscsChartBaseService
   ) {
     super(sdmDihService, yearGraphService);
   }

+ 2 - 2
src/app/discs-chart/year-graph/year-graph.component.ts

@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 
+import {DiscsChartBaseService} from '../discs-chart-base.service';
 import {SdmDihService} from '../../sdm-dih.service';
-import {YearGraphService} from '../year-graph.service';
 
 @Component({
   selector: 'year-graph',
@@ -11,7 +11,7 @@ import {YearGraphService} from '../year-graph.service';
 export class YearGraphComponent {
   constructor(
     public sdmDihService: SdmDihService,
-    public yearGraphService: YearGraphService
+    public yearGraphService: DiscsChartBaseService
   ) {}
 
   animateGraphs() {