Quick fix for import indicators
This commit is contained in:
parent
4ed0890bb9
commit
9b494fcf5a
|
@ -98,6 +98,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
@ViewChild('deleteNotify', {static: true}) deleteNotify: NotifyFormComponent;
|
||||
|
||||
public isFullscreen: boolean = false;
|
||||
|
||||
@HostListener('fullscreenchange', ['$event'])
|
||||
@HostListener('webkitfullscreenchange', ['$event'])
|
||||
@HostListener('mozfullscreenchange', ['$event'])
|
||||
|
@ -105,6 +106,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
screenChange(event) {
|
||||
this.isFullscreen = !this.isFullscreen;
|
||||
}
|
||||
|
||||
/**
|
||||
* Subscriptions
|
||||
**/
|
||||
|
@ -280,7 +282,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
urls.forEach((indexes, pair) => {
|
||||
let parsed = JSON.parse(pair);
|
||||
let response = this.numberResponses.get(pair);
|
||||
if(response) {
|
||||
if (response) {
|
||||
this.calculateResults(response, indexes);
|
||||
} else {
|
||||
this.numberSubscription.push(this.statisticsService.getNumbers(this.statisticsService.getSourceType(parsed[0]), parsed[1]).subscribe(response => {
|
||||
|
@ -812,7 +814,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
pos: 'bottom-right'
|
||||
});
|
||||
this.editing = false;
|
||||
if(this.indicator.type === "chart") {
|
||||
if (this.indicator.type === "chart") {
|
||||
this.editChartModal.cancel();
|
||||
} else {
|
||||
this.editNumberModal.cancel();
|
||||
|
@ -825,7 +827,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
pos: 'bottom-right'
|
||||
});
|
||||
this.editing = false;
|
||||
if(this.indicator.type === "chart") {
|
||||
if (this.indicator.type === "chart") {
|
||||
this.editChartModal.cancel();
|
||||
} else {
|
||||
this.editNumberModal.cancel();
|
||||
|
@ -886,7 +888,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
NotificationHandler.rise('Indicators have been <b>imported</b> successfully!');
|
||||
}, error => {
|
||||
this.chartIndicatorFb = null;
|
||||
NotificationHandler.rise(error.error.message, 'danger');
|
||||
NotificationHandler.rise('An error has occurred. Please try again later', 'danger');
|
||||
this.editing = false;
|
||||
this.importLoading = false;
|
||||
}));
|
||||
|
@ -1046,7 +1048,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
}
|
||||
|
||||
saveSection(focused: boolean, sectionControl: AbstractControl, index: number, type: IndicatorType = "chart") {
|
||||
if(!focused && sectionControl.dirty) {
|
||||
if (!focused && sectionControl.dirty) {
|
||||
this.editing = true;
|
||||
let path = [
|
||||
this.stakeholder._id,
|
||||
|
@ -1207,18 +1209,18 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
let noValidParams = 0;
|
||||
let duplicates = 0;
|
||||
for (let chart of charts) {
|
||||
if(!chart['sectionIndex']){
|
||||
chart['sectionIndex'] = chart['type'] == 'chart'?1:0;
|
||||
if (!chart['sectionIndex']) {
|
||||
chart['sectionIndex'] = chart['type'] == 'chart' ? 1 : 0;
|
||||
}
|
||||
if(!sectionsToSave[chart['sectionIndex']]){
|
||||
let sectionToSave = new Section(chart['sectionType']?chart['sectionType']:chart['type'], chart['sectionTitle']);
|
||||
if (!sectionsToSave[chart['sectionIndex']]) {
|
||||
let sectionToSave = new Section(chart['sectionType'] ? chart['sectionType'] : chart['type'], chart['sectionTitle']);
|
||||
sectionToSave.indicators = [];
|
||||
sectionsToSave[chart['sectionIndex']] = sectionToSave;
|
||||
}
|
||||
let exists = false;
|
||||
let indicatorPath;
|
||||
// validate indicators' schema from file
|
||||
let invalid_file_message = "";
|
||||
let invalid_file_message;
|
||||
if (!chart.type) {
|
||||
invalid_file_message = "No indicator type is specified. Type should be chart or number.";
|
||||
} else if (chart.type != "chart" && chart.type != "number") {
|
||||
|
@ -1270,7 +1272,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
if (!exists) {
|
||||
let i: Indicator = new Indicator(chart.name, chart.description, chart.additionalDescription, chart.type, chart.width, chart.height, "RESTRICTED", [indicatorPath]);
|
||||
sectionsToSave[chart['sectionIndex']].indicators.push(i);
|
||||
countIndicators ++ ;
|
||||
countIndicators++;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1294,7 +1296,8 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
});
|
||||
this.editing = false;
|
||||
this.importLoading = false;
|
||||
} else if (sectionsToSave.length > 0 && countIndicators >0) {
|
||||
} else if (sectionsToSave.length > 0 && countIndicators > 0) {
|
||||
sectionsToSave = sectionsToSave.filter(section => !!section);
|
||||
this.saveIndicators(sectionsToSave)
|
||||
}
|
||||
if (sectionsToSave.length == 0 || countIndicators == 0) {
|
||||
|
@ -1321,14 +1324,14 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
"description": indicator.description, "additionalDescription": indicator.additionalDescription,
|
||||
"visibility": indicator.visibility, "width": indicator.width, "height": indicator.height,
|
||||
"url": this.statisticsService.getNumberUrl(indicatorPath.source, this.indicatorUtils.getFullUrl(this.stakeholder, indicatorPath)),
|
||||
"sectionTitle" : section.title,
|
||||
"sectionTitle": section.title,
|
||||
"sectionType": section.type,
|
||||
"sectionIndex": index
|
||||
};
|
||||
indexIndicator++;
|
||||
});
|
||||
});
|
||||
index ++ ;
|
||||
index++;
|
||||
});
|
||||
|
||||
this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].subCategories[subcategoryIndex].charts.forEach(section => {
|
||||
|
@ -1339,14 +1342,14 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
"description": indicator.description, "additionalDescription": indicator.additionalDescription,
|
||||
"visibility": indicator.visibility, "width": indicator.width, "height": indicator.height,
|
||||
"url": this.getUrlByStakeHolder(indicatorPath),
|
||||
"sectionTitle" : section.title,
|
||||
"sectionTitle": section.title,
|
||||
"sectionType": section.type,
|
||||
"sectionIndex": index
|
||||
};
|
||||
indexIndicator++;
|
||||
});
|
||||
});
|
||||
index ++ ;
|
||||
index++;
|
||||
|
||||
});
|
||||
|
||||
|
@ -1459,7 +1462,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
|||
document.body.appendChild(tempBox);
|
||||
tempBox.focus();
|
||||
tempBox.select();
|
||||
tempBox.setSelectionRange(0,99999);
|
||||
tempBox.setSelectionRange(0, 99999);
|
||||
document.execCommand('copy');
|
||||
document.body.removeChild(tempBox);
|
||||
NotificationHandler.rise('Copied to clipboard');
|
||||
|
|
Loading…
Reference in New Issue