Project

General

Profile

« Previous | Next » 

Revision 53563

Linking:
Add claim information property in properties file
add show recent and claim information url in my manage component
Statistics:
add ORP, minor css changes
CSS:
apply css corrections after the facelift css added
update wellcome page

View differences:

modules/uoa-admin-portal/branches/project-cli/src/app/app.component.html
3 3

  
4 4
<div  id="wrapper" class="uk-section uk-margin-top uk-padding-remove-bottom">
5 5
  <div class="uk-grid" uk-height-viewport="expand: true">
6
    <div *ngIf="communityId && communityId!=''" id="sidebar" class="uk-width-1-5 uk-light sidebar">
6
    <div *ngIf="communityId && communityId!=''" id="sidebar" class="uk-width-1-5 uk-light sidebar uk-margin-top uk-margin-left">
7 7
      <ul class="uk-nav uk-nav-default sidebar">
8 8
        <li class="uk-nav-header uk-parent">
9 9

  
......
185 185

  
186 186
    </div>
187 187

  
188
  <div class="uk-width-expand uk-container uk-margin-top uk-margin-medium-bottom">
188
  <div class="uk-width-expand uk-container uk-margin-large-top uk-margin-medium-bottom">
189 189

  
190 190
  <!-- <div class="uk-width-expand"> -->
191 191
    <router-outlet></router-outlet>
modules/uoa-admin-portal/branches/project-cli/src/app/dashboard.component.html
2 2
    <div id="content">
3 3

  
4 4
        <div class="content-wrapper">
5
            <div class="uk-child-width-1-3@m uk-grid-small uk-grid-match uk-grid" uk-grid="">
5
            <div class="uk-child-width-1-3@m uk-grid-small uk-grid-match uk-grid uk-margin-top" uk-grid="">
6 6
                  <div *ngIf="communityId != 'openaire'" class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m uk-first-column">
7 7
                      <h3 class="uk-card-title">
8 8
                        <span class="uk-margin-small-right uk-icon" uk-icon="album"></span>
modules/uoa-admin-portal/branches/project-cli/src/app/pages/stats/stats.component.ts
73 73
        this.statisticsSum = null;
74 74
        this.statisticsDisplay = null;
75 75
        this.contentService.getCommunityStatistics(this.properties.statisticsAPIURL, this.communityId).subscribe(
76
            stats => this.statisticsSum = stats,
76
            stats => {
77

  
78
              this.statisticsSum = stats;
79
              if(stats["other"]){ //hack because in stats API the entity name is "other" while in admin API is "orp". This component uses also "orp" name
80
                this.statisticsSum["orp"]=stats["other"];
81
              }
82
            },
77 83
            error => {
78 84
                //this.loadingMessage = '';
79 85
                //this.errorMessage = 'Failed to retrieve statistics for the chosen community!';
......
173 179
            softwareGraph: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comOASoft","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"bestlicense","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"order":"d","yaxisheaders":[""],"fieldsheaders":[""],"in":[],"filters":[],"having":[],"incfilters":[],"inchaving":[],"title":"Software by access mode","subtitle":"","xaxistitle":"","nulls":true}&w=70%&h=70%`),
174 180
            softwareProjectcolumn: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectSoft","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Software"],"fieldsheaders":["software"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"Software per project","subtitle":"","xaxistitle":"Project"}&w=70%&h=90%`),
175 181
            softwareProjectpie: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectSoft","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":[""],"fieldsheaders":["software"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"Software per project","subtitle":"","xaxistitle":"Project"}&w=91%&h=90%`),
176
            softwareProjecttable: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}gtable.php?com=query&data={"query":"comProjectSoft","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Software"],"fieldsheaders":["Software"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=90%&h=83%`)
182
            softwareProjecttable: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}gtable.php?com=query&data={"query":"comProjectSoft","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Software"],"fieldsheaders":["Software"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=90%&h=83%`),
183

  
184
            orpTimeline: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comTimelineOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Other Research products"],"fieldsheaders":["Other Research products"],"in":[{"f":0,"text":"Yearly"}],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"Other Research products through the years","subtitle":"","xaxistitle":"Year"}&w=70%&h=83%`),
185
            orpGraph: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comOAOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"bestlicense","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"order":"d","yaxisheaders":[""],"fieldsheaders":[""],"in":[],"filters":[],"having":[],"incfilters":[],"inchaving":[],"title":"Other Research products by access mode","subtitle":"","xaxistitle":"","nulls":true}&w=70%&h=70%`),
186
            orpProjectcolumn: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Other Research products"],"fieldsheaders":["Other Research products"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"Other Research products per project","subtitle":"","xaxistitle":"Project"}&w=70%&h=90%`),
187
            orpProjectpie: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":[""],"fieldsheaders":["Other Research products"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"Other Research products per project","subtitle":"","xaxistitle":"Project"}&w=91%&h=90%`),
188
            orpProjecttable: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}gtable.php?com=query&data={"query":"comProjectOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Other Research products"],"fieldsheaders":["Other Research products"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=90%&h=83%`)
177 189
        };
178 190
    }
179 191

  
modules/uoa-admin-portal/branches/project-cli/src/app/pages/wellcome/wellcome.component.ts
9 9
     <div class="uk-width-1-1">
10 10
        <div class="uk-position-relative">
11 11
           <div class="uk-container uk-margin-medium">
12
              <div class="tm-header-placeholder uk-margin-medium" style="height: 84px;"></div>
12
              <div class="tm-header-placeholder uk-margin-medium" style=""></div>
13 13
              <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
14
                <div class="uk-width-1-1@m uk-first-column uk-light">
15
                   <p class="uk-margin-large uk-text-center uk-h1 uk-scrollspy-inview" style="" uk-scrollspy-class="">
16
                      Research Community Administration Dashboard
17
                   </p>
18
                   <p class="uk-text-center uk-h3 uk-scrollspy-inview" style="" uk-scrollspy-class="">
19
                      Are you a community manager? Configure your Research Community Dashboard
20
                   </p>
14

  
15
                <div class="uk-width-1-1@m uk-first-column">
16
                   <h1 class="uk-text-left uk-heading-hero uk-text-primary uk-scrollspy-inview uk-animation-slide-top" uk-scrollspy-class="" style="">
17
                      Research Community <br>Administration Dashboard
18
                   </h1>
19
                   <h2 class="uk-text-left uk-scrollspy-inview uk-animation-slide-top" uk-scrollspy-class="" style="">
20
                      Are you a community manager?<br> Configure your Research Community Dashboard
21
                   </h2>
21 22
                </div>
23

  
22 24
              </div>
23 25
           </div>
24 26

  
modules/uoa-admin-portal/branches/project-cli/src/app/pages/claims/claims.component.ts
1 1

  
2 2
import { Component, ViewChild, OnInit } from '@angular/core';
3 3
import { ActivatedRoute } from '@angular/router';
4
import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
5

  
4 6
@Component({
5 7
    selector: 'claims',
6
    template: `    <claims-admin fetchBy="Context" [fetchId]=communityPid [isConnect]="true">
8
    template: `    <claims-admin fetchBy="Context" [fetchId]=communityPid [isConnect]="true" [claimsInfoURL]=claimsInfoURL [moreClaimsURL]="'https://beta.'+communityPid+'.openaire.eu/participate/claim'">
7 9
    </claims-admin>`,
8 10
})
9 11

  
10 12
export class ClaimsComponent implements OnInit {
11 13

  
12 14
    communityPid:string;
15
    claimsInfoURL:string;
16

  
13 17
    ngOnInit() {
14 18

  
15 19
            this.route.queryParams.subscribe(params => {
16 20
              this.communityPid = params['communityId'];
17 21

  
18 22
             });
19

  
23
             this.route.data.subscribe((data: { envSpecific: EnvProperties }) => {
24
                    this.claimsInfoURL = data.envSpecific.claimsInformationLink;
25
                    console.log(this.claimsInfoURL);
26
            });
20 27
    }
21 28

  
22 29
    constructor(private route: ActivatedRoute) {}
23 30

  
24

  
25

  
26 31
}
modules/uoa-admin-portal/branches/project-cli/src/assets/css/connect-custom.css
1
:root {
2

  
3
--portal-main-color: #222080;
4
/* --portal-main-contrast: #2E2E2E;  */
5
--portal-main-contrast: white;
6
--portal-dark-color: #4687E6;
7

  
8
--openaire-main-color: #313179;
9

  
10
--explore-portal-color: #D95F2D;
11
--provide-portal-color: #37C7E9;
12
--monitor-portal-color: #9ABB55;
13
--connect-portal-color: #EBB13E;
14
--develop-portal-color: #DA65AB;
15

  
16
--explore-portal-lower-tone: #a0462c;
17
--provide-portal-lower-tone: #3A8FA3;
18
--monitor-portal-lower-tone: #7c9144;
19
--connect-portal-lower-tone: #b48536;
20
--develop-portal-lower-tone: #9f4e7e;
21
}
1 22
.tm-toolbar .uk-subnav-line .custom-connect-li, .tm-toolbar .uk-subnav-line .custom-connect-admin-li {
2 23
   display: block;
3 24
  background:#DEAF50 !important; color:#fff !important;
......
21 42

  
22 43
.red_background_color:hover {
23 44
  background-color: #FF3030;
45
  border-color: #FF3030;
46
  color: #767779 !important;
24 47
}
25 48

  
26 49
.green_color {
......
29 52

  
30 53
.green_background_color:hover {
31 54
  background-color: lightgreen;
55
  border-color: lightgreen;
56
  color: #767779 !important;
32 57
}
33 58

  
34 59
.wellcomePage{
......
43 68
 box-shadow:0 6px 50px rgba(0,0,0,0.05)
44 69
}
45 70

  
71

  
46 72
.connect-admin-menu{
47
  background-color: #05007A !important;
73
  background-color:  var(--portal-main-color); !important;
48 74
}
49 75

  
50 76
.connect-admin-menu .uk-navbar-nav > li > a{
modules/uoa-admin-portal/branches/project-cli/src/assets/env-properties.json
96 96
  "searchLinkToAdvancedSoftware" : "/search/advanced/software",
97 97
  "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
98 98
  "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
99
  "searchLinkToAdvancedPeople" : "/search/advanced/people"
99
  "searchLinkToAdvancedPeople" : "/search/advanced/people",
100

  
101
  "lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows",
102
  "showLastIndexInformationLink" : false,
103

  
104
  "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
105
  "claimsInformationLink": "https://www.openaire.eu/linking-beta"
100 106
}
modules/uoa-admin-portal/branches/project-cli/connect-admin-production-properties.json
2 2
  "enablePiwikTrack" : false,
3 3
  "enableHelper" : true,
4 4
  "useCache" : true,
5
  "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
6
  "framesAPIURL" : "https://beta.openaire.eu/stats3/",
5
  "metricsAPIURL" : "https://services.openaire.eu/usagestats/",
6
  "framesAPIURL" : "https://www.openaire.eu/stats3/",
7 7
  "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
8
  "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
9
  "claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/",
8
  "statisticsFrameAPIURL":"https://www.openaire.eu/stats/",
9
  "claimsAPIURL" : "https://services.openaire.eu/claims/rest/claimsService/",
10 10
  "searchAPIURLLAst"     : "https://services.openaire.eu/search/v2/api/",
11 11
  "searchResourcesAPIURL"     : "https://services.openaire.eu/search/v2/api/resources",
12 12
  "csvAPIURL" : "https://services.openaire.eu/search/v2/api/reports",
......
30 30
  "vocabulariesAPI" :"https://services.openaire.eu/provision/mvc/vocabularies/",
31 31

  
32 32
  "piwikBaseUrl" :" https://analytics.openaire.eu/piwik.php?idsite=6",
33
  "loginUrl" :"https://beta.services.openaire.eu/admin-user-management/openid_connect_login",
33
  "loginUrl" :"https://services.openaire.eu/admin-user-management/openid_connect_login",
34 34

  
35 35
  "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
36 36

  
......
45 45

  
46 46
  "cacheUrl" :"https://explore.openaire.eu/cache/get?url=",
47 47

  
48
  "adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools/",
48
  "adminToolsAPIURL" :"https://services.openaire.eu/uoa-admin-tools/",
49 49

  
50 50
  "adminToolsCommunity" :"openaire",
51 51

  

Also available in: Unified diff