Project

General

Profile

« Previous | Next » 

Revision 57757

Add logo files for demo funders
-make changes to monitor component according to the mocks
-StakeHolder model:
--add logoUrl
--add recommenderFor in subCategory and Indicator level (for demo)
-StakeHolderCreator(for demo):
--add h2020 & fp7 charts & categories
-
use recommenderfor in order to indicators and subcategories to a stakeholder
-monitor-css: add doubleheader custom css and stakeholderPage

View differences:

monitor.component.html
1 1
<!--disable_transitions -->
2
<div class="sidebar_main_swipe  header_full"  [class.sidebar_main_active]="open">
3
  <div id="header_main">
4
    <nav class="uk-light">
5
        <div class="main_logo_top">
6
          <div *ngIf="stakeholder && stakeholder.index_name" class="">
7
            <div class="uk-text-bold">{{stakeholder.index_name}}</div>
8
<!--            <div>Monitor Dashboard</div>-->
2
<div class="double-header stakeholderPage">
3
  <div class="">
4
    <div id="header_menu" class="uk-width-1-1">
5
      <nav class="uk-navbar">
6
        <div class="uk-navbar-left">
7
          <a *ngIf="stakeholder" class="uk-logo uk-navbar-item ng-star-inserted uk-link uk-margin-small-top"
8
             routerlink="/"
9
             routerlinkactive="uk-link" href="/">
10
            <img *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl" class="uk-responsive-height">
11
            <div *ngIf="!stakeholder.logoUrl">
12
              {{stakeholder.index_name}}
13
            </div>
14
          </a>
15
          <div class="uk-margin-large-left uk-width-medium ng-star-inserted">
16
            <div class="">
17
              <form class="uk-search uk-search-default uk-width-1-1  ">
18
                <a
19
                  class="uk-search-icon-flip uk-icon uk-search-icon" routerlinkactive="uk-link" uk-search-icon=""
20
                >
21
                  <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"
22
                       data-svg="search-icon">
23
                    <circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle>
24
                    <path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path>
25
                  </svg>
26
                </a><input aria-describedby="sizing-addon2" class="uk-search-input "
27
                           name="keyword" type="search" placeholder="Search for..."></form>
28
            </div>
9 29
          </div>
10 30
        </div>
11
      <a id="sidebar_main_toggle" (click)="toggleOpen()" class="sSwitch sSwitch_left">
12
        <span class="sSwitchIcon"></span>
13
      </a>
14
      <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-navbar-center">
15
        <ul class="uk-navbar-nav">
16
          <ng-template ngFor [ngForOf]="stakeholder.topics" let-topic let-i="index">
17
            <li *ngIf="topic.isPublic && topic.isActive"
18
                [ngClass]="(topic.alias === activeTopic.alias)?'uk-active':''">
19
              <a (click)="navigateTo(stakeholder.alias, topic.alias)">{{topic.name}}</a>
31

  
32
        <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-navbar-right uk-margin-right">
33
          <ul class="uk-navbar-nav">
34
            <li class="uk-active">
35
              <a class="uk-margin-remove-bottom "><span>Monitor</span></a>
20 36
            </li>
21
          </ng-template>
22
        </ul>
23
      </div>
24
    </nav>
37
            <li>
38
              <a class="uk-margin-remove-bottom ">Search</a>
39
            </li>
40
            <li>
41
              <a class="uk-margin-remove-bottom ">Help</a>
42
            </li>
43

  
44
          </ul>
45
        </div>
46
      </nav>
47
    </div>
25 48
  </div>
26
  <dashboard-sidebar *ngIf="sideBar && stakeholder" [items]="sideBar.items" [name]="stakeholder.index_name"></dashboard-sidebar>
27
  <div *ngIf="activeSubCategory"
28
       id="page_content" click-outside-or-esc targetId="page_content" [escClose]="false" (clickOutside)="toggleOpen($event)">
29
    <div id="page_content_inner">
30
<!--      <div>
31
        Filters
32
        <input class="uk-input uk-form-width-medium" placeholder="Funding Stream" type="text" name="fund_level_0"
33
               [(ngModel)]="fundingL0">
49
  <div class="sidebar_main_swipe  header_full" [class.sidebar_main_active]="open">
50
    <div id="header_main">
51
      <nav class="uk-light">
52
        <div class="main_logo_top">
53
          <div *ngIf="stakeholder && stakeholder.index_name" class=" ">
54
            <div class="uk-text-bold uk-h4 uk-margin-remove-bottom">{{stakeholder.index_name}}</div>
55
            <div class="uk-h5 uk-margin-remove">Monitor Dashboard</div>
56
          </div>
57
        </div>
58
        <a id="sidebar_main_toggle" (click)="toggleOpen()" class="sSwitch sSwitch_left uk-margin-left">
59
          <span class="sSwitchIcon"></span>
60
        </a>
61
        <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-navbar-center">
62
          <ul class="uk-navbar-nav">
63
            <ng-template ngFor [ngForOf]="stakeholder.topics" let-topic let-i="index">
64
              <li *ngIf="topic.isPublic && topic.isActive"
65
                  [ngClass]="(topic.alias === activeTopic.alias)?'uk-active':''">
66
                <a (click)="navigateTo(stakeholder.alias, topic.alias)" class="uk-margin-remove-bottom uk-h4"
67
                ><span>{{topic.name}}</span></a>
68
              </li>
69
            </ng-template>
70
          </ul>
71
        </div>
72
      </nav>
73
    </div>
74
    <dashboard-sidebar *ngIf="sideBar && stakeholder" [items]="sideBar.items" [name]="stakeholder.index_name"
75
                       [showHeader]=false
76
    ></dashboard-sidebar>
77
    <div *ngIf="activeSubCategory"
78
         id="page_content" click-outside-or-esc targetId="page_content" [escClose]="false"
79
         (clickOutside)="toggleOpen($event)">
80
      <div id="page_content_inner">
81
        <!--      <div>
82
                Filters
83
                <input class="uk-input uk-form-width-medium" placeholder="Funding Stream" type="text" name="fund_level_0"
84
                       [(ngModel)]="fundingL0">
34 85

  
35
      <input class="uk-input uk-form-width-medium" placeholder="Start year" type="text" name="start_year"
36
             [(ngModel)]="startYear">
37
        <input class="uk-input uk-form-width-medium" placeholder="End year" type="text" name="end_year"
38
               [(ngModel)]="endYear">
39
        <button class="uk-button uk-button-primary" (click)="setIndicators()">Apply</button>
40
  </div>-->
41
      <h5 class="uk-margin uk-margin-top uk-text-bold">Indicators</h5>
42
      <div class="uk-grid uk-grid-medium uk-margin-bottom" uk-height-match="target: div > h6">
43
        <ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
44
          <div *ngIf="number.isActive && number.isPublic"
45
               [class.uk-width-1-3@m]="number.width === 'small'"
46
               [class.uk-width-1-2@m]="number.width === 'medium'"
47
               [class.uk-width-1-1]="number.width === 'large'">
48
            <div class="md-card"
49
                 [attr.uk-tooltip]="number.description">
50
              <div class="md-card-content">
51
                <span class="uk-text-muted uk-text-small uk-margin-bottom">{{number.name}}</span>
52
                <h2 *ngIf="numberResults.get(i)" class="uk-margin-remove">
53
                  <span>{{numberResults.get(i) | number}}</span>
54
                </h2>
86
              <input class="uk-input uk-form-width-medium" placeholder="Start year" type="text" name="start_year"
87
                     [(ngModel)]="startYear">
88
                <input class="uk-input uk-form-width-medium" placeholder="End year" type="text" name="end_year"
89
                       [(ngModel)]="endYear">
90
                <button class="uk-button uk-button-primary" (click)="setIndicators()">Apply</button>
91
          </div>-->
92
        <h4 class="uk-margin uk-margin-top uk-text-bold">Indicators</h4>
93
        <div class="uk-grid uk-grid-medium uk-margin-bottom" uk-height-match="target: div > h6">
94
          <ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
95
            <div *ngIf="number.isActive && number.isPublic"
96
                 [class.uk-width-1-3@m]="number.width === 'small'"
97
                 [class.uk-width-1-2@m]="number.width === 'medium'"
98
                 [class.uk-width-1-1]="number.width === 'large'">
99
              <div class="md-card"
100
                   [attr.uk-tooltip]="number.description">
101
                <div class="md-card-content">
102
                  <span class="uk-text-muted uk-margin-bottom">{{number.name}}</span>
103
                  <h2 *ngIf="numberResults.get(i)" class="uk-margin-remove">
104
                    <span>{{numberResults.get(i) | number}}</span>
105
                  </h2>
106
                </div>
55 107
              </div>
56 108
            </div>
57
          </div>
58
        </ng-template>
59
      </div>
60
      <div class="uk-grid uk-grid-medium uk-margin-bottom" uk-height-match="target: div > div > h5">
61
        <ng-template ngFor [ngForOf]="activeSubCategory.charts" let-chart let-i="index">
62
          <div *ngIf="chart.isActive && chart.isPublic && chartsActiveType.get(i)"
63
               [class.uk-width-1-3@m]="chart.width === 'small'"
64
               [class.uk-width-1-2@m]="chart.width === 'medium'"
65
               [class.uk-width-1-1]="chart.width === 'large'">
66
            <div>
67
              <h5 class="uk-margin-bottom uk-margin-top">{{chart.name}}</h5>
68
              <div class="md-card"
69
                   [attr.uk-tooltip]="chart.description">
70
                <div class="md-card-content uk-text-center">
71
                  <div *ngIf="chart.indicatorPaths.length > 1" class="uk-button-group">
72
                    <button *ngFor="let indicatorPath of chart.indicatorPaths;"
73
                            class="uk-button"
74
                            (click)="setActiveChart(i, indicatorPath.type)"
75
                            [class.uk-button-secondary]="chartsActiveType.get(i).url === indicatorPath.url">
76
                      {{indicatorPath.type}}
77
                    </button>
109
          </ng-template>
110
        </div>
111
        <div class="uk-grid uk-grid-medium uk-margin-bottom" uk-height-match="target: div > div > h5">
112
          <ng-template ngFor [ngForOf]="activeSubCategory.charts" let-chart let-i="index">
113
            <div *ngIf="chart.isActive && chart.isPublic && chartsActiveType.get(i)"
114
                 [class.uk-width-1-3@m]="chart.width === 'small'"
115
                 [class.uk-width-1-2@m]="chart.width === 'medium'"
116
                 [class.uk-width-1-1]="chart.width === 'large'">
117
              <div>
118
                <h5 class="uk-margin-bottom uk-margin-top">{{chart.name}}</h5>
119
                <div class="md-card"
120
                     [attr.uk-tooltip]="chart.description">
121
                  <div class="md-card-content uk-text-center">
122
                    <div *ngIf="chart.indicatorPaths.length > 1" class="uk-button-group">
123
                      <button *ngFor="let indicatorPath of chart.indicatorPaths;"
124
                              class="uk-button"
125
                              (click)="setActiveChart(i, indicatorPath.type)"
126
                              [class.uk-button-secondary]="chartsActiveType.get(i).url === indicatorPath.url">
127
                        {{indicatorPath.type}}
128
                      </button>
129
                    </div>
130
                    <iframe *ngIf="chartsActiveType.get(i).source !== 'fake'"
131
                            [src]="chartsActiveType.get(i).safeResourceUrl"
132
                            class="uk-width-1-1 uk-height-medium"></iframe>
133
                    <!--                    {{chartsActiveType.get(i).safeResourceUrl}}-->
134
                    <img *ngIf="chartsActiveType.get(i).source === 'fake'"
135
                         [src]="chartsActiveType.get(i).safeResourceUrl"
136
                         class="uk-width-1-1 uk-height-medium">
78 137
                  </div>
79
                  <iframe *ngIf="chartsActiveType.get(i).source !== 'fake'"
80
                          [src]="chartsActiveType.get(i).safeResourceUrl"
81
                          class="uk-width-1-1 uk-height-medium"></iframe>
82
                  <img *ngIf="chartsActiveType.get(i).source === 'fake'"
83
                       [src]="chartsActiveType.get(i).safeResourceUrl"
84
                       class="uk-width-1-1 uk-height-medium">
85 138
                </div>
86 139
              </div>
87 140
            </div>
88
          </div>
89
        </ng-template>
141
          </ng-template>
142
        </div>
90 143
      </div>
91 144
    </div>
92 145
  </div>

Also available in: Unified diff