Project

General

Profile

« Previous | Next » 

Revision 59183

[Monitor Dashboard|Trunk]

Apply initial changes according to the latest mocks
Filters:
hide filter icon when filter panel is open
show an overlay film when at least one active filter cannot be applied to a chart
when a filter is already applied by default to a chart (with multiple queries) with different value --> change the chart color to one with lower opacity

View differences:

monitor.component.ts
52 52
  public routerHelper: RouterHelper = new RouterHelper();
53 53
  filters:Filter[] = [];
54 54
  queryParams = {};
55
  periodFilter:RangeFilter = { title: "Period",  filterId: "year", originalFilterIdFrom: null, originalFilterIdTo: null, selectedFromValue: null, selectedToValue: null, selectedFromAndToValues: ""};
55
  periodFilter:RangeFilter = { title: "Time range",  filterId: "year", originalFilterIdFrom: null, originalFilterIdTo: null, selectedFromValue: null, selectedToValue: null, selectedFromAndToValues: ""};
56 56
  privateStakeholder = false;
57 57
  public keyword: FormControl;
58 58
  constructor(
......
220 220
  countSelectedFilters():number{
221 221
    let count = 0;
222 222
    if(this.periodFilter.selectedFromAndToValues.length > 0){
223
      count++;
223
      count+=2;
224 224
    }
225 225
    for(let filter of this.filters) {
226 226
      count +=filter.countSelectedValues;
......
244 244
  }
245 245

  
246 246
  private setView(params: Params) {
247
    this.loading = false;
247 248
    if (params['topic']) {
248 249
      this.activeTopic = this.stakeholder.topics.find(topic => topic.alias === decodeURIComponent(params['topic']) && this.isPublicOrIsMember(topic.isPublic) && topic.isActive);
249 250
      if (this.activeTopic) {

Also available in: Unified diff