/modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/topic/indicators.component.ts - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 57706

Added by Konstantinos Triantafyllou over 4 years ago

[Monitor Dashboard]: Merge create and edit modals. Rename SidebarService to LayoutService and add hasSidebar on it

     import {AfterViewInit, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild} from "@angular/core";
     import {SideBarService} from "../library/sharedComponents/sidebar/sideBar.service";
     import {Indicator, IndicatorPath, Stakeholder} from "../utils/entities/stakeholder";
     import {IndicatorUtils, Option} from "../utils/indicator-utils";
     import {FormArray, FormBuilder, FormControl, FormGroup, Validators} from "@angular/forms";
-...
     import {StakeholderService} from "../services/stakeholder.service";
     import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties";
     import {Subscriber} from "rxjs";
     import {LayoutService} from "../library/sharedComponents/sidebar/layout.service";
     declare var UIkit;
-...
       public stakeholder: Stakeholder = null;
       public indicatorUtils: IndicatorUtils = new IndicatorUtils();
       public indicatorFb: FormGroup;
       public editIndicatorFb: FormGroup;
       /**
        * Editable indicator
        */
-...
        */
       public grid: boolean = true;
       private subscriptions: any[] = [];
       @ViewChild('createIndicatorModal') createIndicatorModal: AlertModal;
       @ViewChild('editIndicatorModal') editIndicatorModal: AlertModal;
       @ViewChild('deleteIndicatorModal') deleteIndicatorModal: AlertModal;
       constructor(private sideBarService: SideBarService,
       constructor(private layoutService: LayoutService,
                   private stakeholderService: StakeholderService,
                   private statisticsService: StatisticsService,
                   private fb: FormBuilder,
-...
       public toggleOpen(event = null) {
         if (!event) {
           this.sideBarService.setOpen(!this.open);
           this.layoutService.setOpen(!this.open);
         } else if (event && event['value'] === true) {
           this.sideBarService.setOpen(false);
           this.layoutService.setOpen(false);
+        }
+      }
-...
+      }
       get open(): boolean {
         return this.sideBarService.open;
         return this.layoutService.open;
+      }
       get canNumbersReorder(): boolean {
-...
+      }
       public get indicatorPaths(): FormArray {
         return this.editIndicatorFb.get('indicatorPaths') as FormArray;
         return this.indicatorFb.get('indicatorPaths') as FormArray;
+      }
       public getParameters(index: number): FormArray {
-...
+      }
       public createIndicatorOpen() {
         this.indicator = null;
         this.indicatorFb = this.fb.group({
           id: this.fb.control(null),
           name: this.fb.control('', Validators.required),
           description: this.fb.control(''),
           isPublic: this.fb.control(false),
           isActive: this.fb.control(false),
           urls: this.fb.array([]),
           width: this.fb.control('small', Validators.required),
           urls: this.fb.array([]),
         });
         this.addUrl();
         this.createIndicatorModal.alertTitle = 'Create a new chart Indicator';
         this.createIndicatorModal.cancelButtonText = 'Cancel';
         this.createIndicatorModal.okButtonText = 'Create';
         this.createIndicatorModal.okButtonLeft = false;
         this.createIndicatorModal.alertMessage = false;
         this.createIndicatorModal.open();
         this.editIndicatorModal.alertTitle = 'Create a new chart Indicator';
         this.editIndicatorModal.cancelButtonText = 'Cancel';
         this.editIndicatorModal.okButtonText = 'Create';
         this.editIndicatorModal.okButtonLeft = false;
         this.editIndicatorModal.alertMessage = false;
         this.editIndicatorModal.stayOpen = true;
         this.editIndicatorModal.open();
+      }
       public createIndicator() {
-...
           this.indicatorFb.value.description,
           'chart',
           this.indicatorFb.value.width,
           false,
           false,
           this.indicatorFb.value.isActive,
           this.indicatorFb.value.isPublic,
           []
         );
         this.indicatorFb.value.urls.forEach(url => {
-...
             parameters: parameters
           }));
         });
         this.editIndicatorFb = this.fb.group({
         this.indicatorFb = this.fb.group({
           id: this.fb.control(this.indicator._id),
           name: this.fb.control(this.indicator.name, Validators.required),
           description: this.fb.control(this.indicator.description),
-...
           indicatorPaths: indicatorPaths,
           width: this.fb.control(this.indicator.width, Validators.required),
         });
         this.editIndicatorModal.cancelButtonText = 'Cancel';
         this.editIndicatorModal.okButtonText = 'Save Changes';
         this.editIndicatorModal.okButtonLeft = false;
         this.editIndicatorModal.alertMessage = false;
         this.editIndicatorModal.open();
         setTimeout(() => {
           this.indicator.indicatorPaths.forEach(indicatorPath => {
             indicatorPath.safeResourceUrl = this.getUrlByStakeHolder(indicatorPath)
           });
         }, (index === -1)?500:0);
         if(index === -1) {
           this.editIndicatorModal.okButtonText = 'Save';
           this.editIndicatorModal.stayOpen = false;
         } else {
           this.editIndicatorModal.cancelButtonText = 'Cancel';
           this.editIndicatorModal.okButtonText = 'Save Changes';
           this.editIndicatorModal.okButtonLeft = false;
           this.editIndicatorModal.alertMessage = false;
           this.editIndicatorModal.open();
+        }
         this.indicator.indicatorPaths.forEach(indicatorPath => {
           indicatorPath.safeResourceUrl = this.getUrlByStakeHolder(indicatorPath)
         });
+      }
       saveIndicator() {
         this.indicator = this.indicatorUtils.generateIndicatorByForm(this.editIndicatorFb.value, this.indicator.indicatorPaths);
         let path = [
           this.stakeholder._id,
           this.stakeholder.topics[this.topicIndex]._id,
           this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex]._id,
           this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].subCategories[this.subcategoryIndex]._id
         ];
         this.stakeholderService.saveElement(this.properties.monitorServiceAPIURL, this.indicator, path).subscribe(indicator => {
           if (this.index !== -1) {
             this.charts[this.index] = indicator;
           } else {
             this.charts.push(indicator);
+          }
           this.filterCharts();
           this.stakeholderService.setStakeholder(this.stakeholder);
         });
         if(this.indicator) {
           this.indicator = this.indicatorUtils.generateIndicatorByForm(this.indicatorFb.value, this.indicator.indicatorPaths);
           let path = [
             this.stakeholder._id,
             this.stakeholder.topics[this.topicIndex]._id,
             this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex]._id,
             this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].subCategories[this.subcategoryIndex]._id
           ];
           this.stakeholderService.saveElement(this.properties.monitorServiceAPIURL, this.indicator, path).subscribe(indicator => {
             if (this.index !== -1) {
               this.charts[this.index] = indicator;
             } else {
               this.charts.push(indicator);
+            }
             this.filterCharts();
             this.stakeholderService.setStakeholder(this.stakeholder);
             this.indicatorFb = null;
           }, error => {
             this.indicatorFb = null;
           });
         } else {
           this.createIndicator();
+        }
+      }
       reorderIndicators(type: string, indicatorIds: string[]) {
-...
+      }
       refreshIndicator(index: number) {
         this.indicator = this.indicatorUtils.generateIndicatorByForm(this.editIndicatorFb.value, this.indicator.indicatorPaths);
         this.indicator = this.indicatorUtils.generateIndicatorByForm(this.indicatorFb.value, this.indicator.indicatorPaths);
         this.indicator.indicatorPaths.forEach(indicatorPath => {
           indicatorPath.safeResourceUrl = this.getUrlByStakeHolder(indicatorPath)
         });

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 57706

Added by Konstantinos Triantafyllou over 4 years ago