Skip to content

Commit 31aff9e

Browse files
committed
Replace color scheme for soproc
1 parent c2f818d commit 31aff9e

File tree

1 file changed

+22
-23
lines changed

1 file changed

+22
-23
lines changed

projects/budgetkey/src/app/item/items/item-soproc/item-social-service-gov-unit/item-social-service-gov-unit.component.ts

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,17 @@ export class ItemSocialServiceGovUnitComponent implements OnInit, AfterViewInit
3838
{title: 'מודל תמחור', id: 'pricing_model', tooltip: 'האם נקבע מראש תעריף לאספקת השירות או שעל המציעים להגיש הצעת מחיר או מודל משולב'},
3939
];
4040
COLORS = [
41-
// '#AB6701',
42-
'#87cefa',
43-
'#ff9900',
44-
'#6661d1',
45-
'#aba001',
46-
'#F03824',
47-
'#D6D018',
48-
'#4372E0',
49-
'#2ABF56',
50-
'#a74ad9',
51-
'#526223',
52-
'#68788c',
41+
'#9FD4AE',
42+
'#38B264',
43+
'#187388',
44+
'#8FD6E8',
45+
'#CC81AF',
46+
'#9D7EAF',
47+
'#643C6A',
48+
'#7285B7',
49+
'#B6AE86',
50+
'#CC8A57',
51+
'#444444'
5352
];
5453

5554
public parameters: any = {
@@ -211,7 +210,7 @@ export class ItemSocialServiceGovUnitComponent implements OnInit, AfterViewInit
211210
scheme[l[i]] = parseInt(i) + 4;
212211
}
213212
}
214-
scheme['אחר'] = 9;
213+
scheme['אחר'] = 10;
215214
this.colorscheme.next(scheme);
216215
this.colorscheme.complete();
217216
});
@@ -377,18 +376,18 @@ export class ItemSocialServiceGovUnitComponent implements OnInit, AfterViewInit
377376
} else if (scheme.hasOwnProperty(`${this.levelKey}|${d.name}`)) {
378377
color = this.COLORS[scheme[`${this.levelKey}|${d.name}`]];
379378
}
380-
if (color) {
381-
d.marker = {
382-
color: color,
383-
opacity: 1,
384-
line: {
385-
color: color,
386-
opacity: 1,
387-
}
388-
};
389-
} else {
379+
if (!color) {
390380
console.log('MISSING VALUE', d.name)
381+
color = this.COLORS[this.COLORS.length - 1];
391382
}
383+
d.marker = {
384+
color: color,
385+
opacity: 1,
386+
line: {
387+
color: color,
388+
opacity: 1,
389+
}
390+
};
392391
}
393392
this.charts[ct.id] = {layout, data, downloadHeaders: ct.downloadHeaders, query: query, title: ct.title};
394393
});

0 commit comments

Comments
 (0)