Project

General

Profile

« Previous | Next » 

Revision 59024

[Monitor Dashboard | Trunk]: Generate alias fix / char

View differences:

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/monitor/monitor.component.html
1 1
<div class=" stakeholderPage">
2 2
  <div id="header_main" class=" light_header">
3 3
    <nav class="uk-navbar">
4
      <div  *ngIf="stakeholder" class="uk-navbar-left">
4
      <div *ngIf="stakeholder" class="uk-navbar-left">
5 5
        <a class="uk-logo uk-navbar-item ng-star-inserted uk-link uk-margin-left "
6 6
           [routerLink]="'/'+stakeholder.alias"
7 7
           routerlinkactive="uk-link">
......
10 10
        </a>
11 11
        <ul class="uk-navbar-nav user_actions uk-padding uk-padding-remove-vertical  uk-padding-remove-right">
12 12
          <li>
13
            <div class="uk-text-capitalize uk-h4 uk-margin-remove" >
13
            <div class="uk-text-capitalize uk-h4 uk-margin-remove">
14 14
              <!--<span class="uk-visible@m">
15 15
                {{'OpenAIRE Monitor '+(stakeholder.type == 'ri'?'Research Initiative':stakeholder.type)+
16 16
              ' - '  }}</span>-->
......
28 28
        <ul *ngIf="!privateStakeholder"
29 29
            class="uk-navbar-nav user_actions uk-padding uk-padding-remove-vertical  uk-padding-remove-right">
30 30
          <li title="It is comming soon. Stay tuned!">
31
            <a class="login"  [routerLink]="(isAdmin()?['/admin']:null)" >
31
            <a class="login" [routerLink]="(isAdmin()?['/admin']:null)">
32 32
              Manage
33 33
            </a>
34 34

  
......
40 40
                       [user]="user" [dashboard]="true"
41 41
                       [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl
42 42
                       [cookieDomain]=properties.cookieDomain
43
                       [userMenuItems]=userMenuItems >
43
                       [userMenuItems]=userMenuItems>
44 44
            </user-mini>
45 45
          </li>
46 46
        </ul>
......
57 57
    <div id="page_content">
58 58
      <div  class="uk-navbar-container uk-sticky uk-sticky-fixed" style="top: 70px; position:
59 59
      fixed; width: 100%">
60
        <nav class=" " >
61
          <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="">
62
            <ul *ngIf="activeTopic && activeTopic.categories.length > 1"
63
                class="categoriesTabs uk-tab uk-padding uk-padding-remove-bottom uk-padding-remove-left uk-margin-remove">
64
              <ng-template ngFor [ngForOf]="activeTopic.categories" let-category let-i="index">
65
                <li *ngIf="isPublicOrIsMember(category.isPublic) && category.isActive"
66
                    [ngClass]="(category.alias === activeCategory.alias)?'uk-active':''">
67
                  <a (click)="navigateTo(stakeholder.alias,activeTopic.alias, category.alias)"
68
                     class="uk-margin-remove-bottom uk-h4"
69
                  ><span>{{category.name}}</span></a>
70
                </li>
71
              </ng-template>
72
            </ul>
73
          </div>
74
        </nav>
75
      </div>
76
      <div id="page_content_inner" class="uk-margin-large-top">
77
        <div class="uk-margin-top">
60
      <nav class=" ">
61
        <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="">
62
          <ul *ngIf="activeTopic && activeTopic.categories.length > 1"
63
              class="categoriesTabs uk-tab uk-padding uk-padding-remove-bottom uk-padding-remove-left uk-margin-remove">
64
            <ng-template ngFor [ngForOf]="activeTopic.categories" let-category let-i="index">
65
              <li *ngIf="isPublicOrIsMember(category.isPublic) && category.isActive"
66
                  [ngClass]="(category.alias === activeCategory.alias)?'uk-active':''">
67
                <a (click)="navigateTo(stakeholder.alias,activeTopic.alias, category.alias)"
68
                   class="uk-margin-remove-bottom uk-h4"
69
                ><span>{{category.name}}</span></a>
70
              </li>
71
            </ng-template>
72
          </ul>
73
        </div>
74
      </nav>
75
    </div>
76
    <div id="page_content_inner" class="uk-margin-large-top">
77
      <div class="uk-margin-top">
78 78
        <ul *ngIf="activeCategory && activeCategory.subCategories.length > 1" class="uk-tab subCategoriesTabs">
79 79
          <ng-template ngFor [ngForOf]="activeCategory.subCategories" let-subCategory let-i="index">
80 80
            <li *ngIf="isPublicOrIsMember(subCategory.isPublic) && subCategory.isActive"
......
96 96
                       [(ngModel)]="endYear">
97 97
                <button class="uk-button uk-button-primary" (click)="setIndicators()">Apply</button>
98 98
          </div>-->
99
          <div *ngIf="privateStakeholder">
100
            <div class="uk-text-center uk-height-medium">
101
              <div  class="uk-h3 "><i  ><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="black" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg></i>
102
                Private data</div>
103
              <div  class="uk-text-large "></div>
99
        <div *ngIf="privateStakeholder">
100
          <div class="uk-text-center uk-height-medium">
101
            <div class="uk-h3 "><i>
102
              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="black" width="24px" height="24px">
103
                <path d="M0 0h24v24H0z" fill="none"/>
104
                <path
105
                    d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/>
106
              </svg>
107
            </i>
108
              Private data
104 109
            </div>
110
            <div class="uk-text-large "></div>
105 111
          </div>
112
        </div>
106 113
        <div
107
          *ngIf="(activeSubCategory && (activeSubCategory.charts.length == 0 ||
114
            *ngIf="(activeSubCategory && (activeSubCategory.charts.length == 0 ||
108 115
          (activeSubCategory.charts.length == 1 && activeSubCategory.charts[0].indicators.length == 0)))
109 116
          &&  ((activeSubCategory &&
110 117
        activeSubCategory.description &&
111 118
        activeSubCategory.description.length > 0) ||
112 119
          (activeCategory && activeCategory.description && activeCategory.description.length > 0) ||
113 120
          (activeTopic && activeTopic.description && activeTopic.description.length > 0))"
114
          class="uk-text-center">
121
            class="uk-text-center">
115 122
          <div class="uk-h5 uk-height-small uk-margin-large-top uk-margin-xlarge-right  uk-margin-xlarge-left">
116 123
            {{activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description
117
            : (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description :
118
              (activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}}
124
              : (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description :
125
                  (activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}}
119 126
          </div>
120 127

  
121 128
        </div>
......
125 132
                      (activeSubCategory.numbers.length == 0 || (activeSubCategory.numbers.length == 1 && activeSubCategory.numbers[0].indicators.length == 0))
126 133
                      &&
127 134
                      (activeSubCategory.charts.length == 0 || (activeSubCategory.charts.length == 1 && activeSubCategory.charts[0].indicators.length == 0))
128
                    ) || !activeTopic || !activeCategory || !activeSubCategory)" >
135
                    ) || !activeTopic || !activeCategory || !activeSubCategory)">
129 136
          <div class=" uk-text-center">
130 137
            <div class="uk-h3">
131 138
              No indicators available yet. Stay tuned!
......
154 161
          </ng-template>
155 162
        </div>
156 163
        <div *ngIf="activeSubCategory"
157
             >
158
          <div *ngFor="let chart of activeSubCategory.charts; let i = index;"  class="uk-grid uk-grid-medium uk-margin-bottom uk-flex uk-flex-bottom "
164
        >
165
          <div *ngFor="let chart of activeSubCategory.charts; let i = index;"
166
               class="uk-grid uk-grid-medium uk-margin-bottom uk-flex uk-flex-bottom "
159 167
               uk-height-match="target: div > div > .chartTitle">
160 168

  
161 169
            <h3 *ngIf="chart.title && chart.title.length > 0" class="uk-width-1-1 uk-margin-top">{{chart.title}}</h3>
162 170
            <ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
163
              <div *ngIf="indicator.isActive && isPublicOrIsMember(indicator.isPublic) && chartsActiveType.get(i + '-' + j)"
164
                   [class.uk-width-1-3@m]="indicator.width === 'small'"
165
                   [class.uk-width-1-2@m]="indicator.width === 'medium'"
166
                   [class.uk-width-1-1]="indicator.width === 'large'" class="uk-margin-bottom">
171
              <div
172
                  *ngIf="indicator.isActive && isPublicOrIsMember(indicator.isPublic) && chartsActiveType.get(i + '-' + j)"
173
                  [class.uk-width-1-3@m]="indicator.width === 'small'"
174
                  [class.uk-width-1-2@m]="indicator.width === 'medium'"
175
                  [class.uk-width-1-1]="indicator.width === 'large'" class="uk-margin-bottom">
167 176
                <div class="indicatorBox">
168 177
                  <h4 class="uk-margin-bottom chartTitle uk-flex uk-flex-bottom ">
169 178
                    <div>{{indicator.name + " "}}</div>
170 179
                  </h4>
171
                  <div class="md-card" ><!--[attr.uk-tooltip]="indicator.description">-->
180
                  <div class="md-card"><!--[attr.uk-tooltip]="indicator.description">-->
172 181
                    <div class="md-card-content uk-text-center">
173 182
                      <div *ngIf="indicator.indicatorPaths.length > 1" class="uk-button-group">
174 183
                        <button *ngFor="let indicatorPath of indicator.indicatorPaths;"
......
195 204
          </div>
196 205
        </div>
197 206
      </div>
198
        <div *ngIf="stakeholder" class="uk-margin-xlarge-top">
199
            <bottom *ngIf="properties"  [darkBackground]="false"
200
                [centered]="true" [properties]="properties" [showMenuItems]="true" ></bottom>
201
        </div>
207
      <div *ngIf="stakeholder" class="uk-margin-xlarge-top">
208
        <bottom *ngIf="properties" [darkBackground]="false"
209
                [centered]="true" [properties]="properties" [showMenuItems]="true"></bottom>
202 210
      </div>
203 211
    </div>
212
  </div>
204 213
  <!--<div *ngIf="stakeholder" id="style_switcher" title="This functionality is comming soon. Stay tuned!">
205 214
    <div id="style_switcher_toggle">
206 215
    <a *ngIf="isAdmin() " [routerLink]="['/admin', this.stakeholder.alias]" >
......
210 219
    </div>
211 220
  </div>-->
212 221

  
213
  <div *ngIf="stakeholder && !privateStakeholder"   id="style_switcher" class="filters_switcher"
222
  <div *ngIf="stakeholder && !privateStakeholder" id="style_switcher" class="filters_switcher"
214 223
       title="It is comming soon. Stay tuned!">
215 224
    <div id="style_switcher_toggle">
216 225
      <i class="  uk-text-muted">
217 226
        <svg style="margin-top: 6px;" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24"
218 227
             viewBox="0 0 24 24"
219
             fill="white" width="24px" height="24px"><g><path d="M0,0h24 M24,24H0" fill="none"/><path d="M4.25,5.61C6.57,8.59,10,13,10,13v5c0,1.1,0.9,2,2,2h0c1.1,0,2-0.9,2-2v-5c0,0,3.43-4.41,5.75-7.39 C20.26,4.95,19.79,4,18.95,4H5.04C4.21,4,3.74,4.95,4.25,5.61z"/><path d="M0,0h24v24H0V0z" fill="none"/></g></svg>
228
             fill="white" width="24px" height="24px">
229
          <g>
230
            <path d="M0,0h24 M24,24H0" fill="none"/>
231
            <path
232
                d="M4.25,5.61C6.57,8.59,10,13,10,13v5c0,1.1,0.9,2,2,2h0c1.1,0,2-0.9,2-2v-5c0,0,3.43-4.41,5.75-7.39 C20.26,4.95,19.79,4,18.95,4H5.04C4.21,4,3.74,4.95,4.25,5.61z"/>
233
            <path d="M0,0h24v24H0V0z" fill="none"/>
234
          </g>
235
        </svg>
220 236
      </i>
221 237
    </div>
222 238
  </div>
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/utils/indicator-utils.ts
134 134
      return null;
135 135
    }
136 136
  }
137

  
138
  // TODO need to be fixed
137
  
139 138
  generateAlias(name: string): string {
140 139
    let alias = name.toLowerCase();
141
    while (alias.includes(' / ') || alias.includes(' ')) {
140
    while (alias.includes('/') || alias.includes(' ')) {
142 141
      alias = alias.replace(' / ', '-');
142
      alias = alias.replace('/', '-');
143 143
      alias = alias.replace(' ', '-');
144 144
    }
145 145
    return alias;

Also available in: Unified diff