/ - Diff - D-Net - D-Net project tracking tool

     import{SearchDataprovidersComponent} from './searchDataproviders.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchDataprovidersComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: SearchDataprovidersComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder]  }
         ])
+      ]

     import{SearchDatasetsComponent} from './searchDatasets.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchDatasetsComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: SearchDatasetsComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder]  }
         ])
+      ]

     import {DataProvidersServiceModule} from '../services/dataProvidersService.module';
     import {OrganizationServiceModule} from '../services/organizationService.module';
     import {SearchResultsModule } from '../searchPages/searchUtils/searchResults.module';
     import {PiwikServiceModule} from '../utils/piwik/piwikService.module';
      @NgModule({
       imports: [
         CommonModule, FormsModule,
-...
         EntitiesAutocompleteModule,
         DataProvidersServiceModule,
         OrganizationServiceModule,
         SearchResultsModule
         SearchResultsModule,
         PiwikServiceModule
       ],
       declarations: [
         DepositComponent,

     import {DepositDatasetsResultsRoutingModule} from './depositDatasetsResults-routing.module';
     import {DepoditModule} from '../deposit.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
-...
       exports: [
         DepositDatasetsResultComponent,
        ],
       providers:    [FreeGuard
       providers:    [FreeGuard,PreviousRouteRecorder
+      ]
     })
     export class DepositDatasetsResultsModule { }

     import {DepositPublicationsResultRoutingModule} from './depositPublicationsResult-routing.module';
     import {DepoditModule} from '../deposit.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
-...
       exports: [
         DepositPublicationsResultComponent,
        ],
       providers:    [FreeGuard
       providers:    [FreeGuard,PreviousRouteRecorder
+      ]
     })
     export class DepositPublicationsResultsModule { }

     import {DepoditModule} from '../deposit.module';
     import {IFrameModule} from '../../utils/iframe.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
-...
       exports: [
         DepositPublicationsComponent,
        ],
       providers:    [FreeGuard
       providers:    [FreeGuard,PreviousRouteRecorder
+      ]
     })
     export class DepositPublicationsModule { }

     import { NgModule } from '@angular/core';
     import { RouterModule } from '@angular/router';
     import {PreviousRouteRecorder} from'../../utils/piwik/previousRouteRecorder.guard';
     import { DepositDatasetsResultComponent } from './depositDatasetsResult.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: DepositDatasetsResultComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: DepositDatasetsResultComponent, canActivate: [FreeGuard] ,canDeactivate: [PreviousRouteRecorder]  }
         ])
+      ]

     import {DepositDatasetsRoutingModule} from './depositDatasets-routing.module';
     import {DepoditModule} from '../deposit.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule,
-...
       exports: [
         DepositDatasetsComponent,
        ],
       providers:    [FreeGuard
       providers:    [FreeGuard,PreviousRouteRecorder
+      ]
     })
     export class DepositDatasetsModule { }

     import { Meta} from '../../angular2-meta';
     import {RouterHelper} from '../utils/routerHelper.class';
     import {PiwikService} from '../utils/piwik/piwik.service';
     @Component({
         selector: 'deposit-result',
-...
         public status: number;
         public errorCodes:ErrorCodes = new ErrorCodes();
         sub: any;
         sub: any; piwiksub: any;
         subDataproviders: any;
         public routerHelper:RouterHelper = new RouterHelper();
-...
         constructor (private _router: Router,
             private  route: ActivatedRoute,
             private _searchDataprovidersService: SearchDataprovidersService,
             private _organizationService: OrganizationService, private _meta: Meta) {
             private _organizationService: OrganizationService, private _meta: Meta, private _piwikService:PiwikService) {
                 this.zenodo = OpenaireProperties.getZenodoURL();
                 this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService);
-...
                 this.updateTitle("Deposit "+this.requestFor);
                 this.updateDescription("Openaire,  repositories, open access,  data provider, compatibility, organization, deposit "+ this.requestFor);
                 this.updateUrl(OpenaireProperties.getBaseLink()+this._router.url);
                 this.piwiksub = this._piwikService.trackView("Deposit "+this.requestFor).subscribe();
+            }
             updateDescription(description:string){
               this._meta.updateMeta("description", description);
-...
         ngOnDestroy() {
           this.sub.unsubscribe();
           if(this.piwiksub){
       this.piwiksub.unsubscribe();
+    }
           if(this.subDataproviders != undefined) {
               this.subDataproviders.unsubscribe();
+          }

     import { NgModule } from '@angular/core';
     import { RouterModule } from '@angular/router';
     import {PreviousRouteRecorder} from'../../utils/piwik/previousRouteRecorder.guard';
     import { DepositPublicationsComponent } from './depositPublications.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
           { path: '', component: DepositPublicationsComponent, canActivate: [FreeGuard]  }
           { path: '', component: DepositPublicationsComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder]   }
         ])
+      ]

     import { Injectable } from '@angular/core';
     import { CanDeactivate, Router} from '@angular/router';
     import {Observable}       from 'rxjs/Observable';
     @Injectable() // do not forget to register this class as a provider
     export class PreviousRouteRecorder implements CanDeactivate<any> {
       constructor(private router: Router) {
+      }
       canDeactivate(component: any): Observable<boolean> | boolean {
         if (typeof localStorage !== 'undefined') {
           console.log("In PreviousRouteRecorder : "+this.router.url );
           localStorage.setItem('previousRoute', this.router.url);
+        }
         return true;
+      }
+    }

     import {Injectable} from '@angular/core';
     import {Http, Response, Headers, RequestOptions, URLSearchParams} from '@angular/http';
     import {Observable}     from 'rxjs/Observable';
     import 'rxjs/add/observable/of';
     import 'rxjs/add/operator/do';
     import 'rxjs/add/operator/share';
     import {Location} from '@angular/common';
     import {OpenaireProperties} from '../properties/openaireProperties';
     import {StringUtils} from '../string-utils.class';
     @Injectable()
     export class PiwikService {
         private piwikbaseUrl:string = "";
         constructor(private http: Http, private location: Location ) {}
         trackView (title):any {
           var ua = this.getUserAgent();
           var referrer = this.getReferrer();
           if(typeof location !== 'undefined'){
                 var url = OpenaireProperties.getPiwikBaseURL()+"&rec=1&url="+StringUtils.URIEncode(location.href)+"&action_name="+StringUtils.URIEncode(title)+
                 ((ua != null && ua.length > 0)?('&ua='+StringUtils.URIEncode(ua)):'')+
                 ((referrer != null && referrer.length > 0)?('&urlref='+StringUtils.URIEncode(referrer)):'');
                 console.log("Piwik - trackDownload: " + url);
                 return this.http.get( url);
                               // .do(request => console.info("Piwik request completed" ));
+          }
+        }
         trackDownload (downloadURL):any {
           var ua = this.getUserAgent();
           var referrer = this.getReferrer();
           var url = OpenaireProperties.getPiwikBaseURL()+"&rec=1&url="+StringUtils.URIEncode(downloadURL)+"&download="+StringUtils.URIEncode(downloadURL)+
           ((ua != null && ua.length > 0)?('&ua='+StringUtils.URIEncode(ua)):'')+
           ((referrer != null && referrer.length > 0)?('&urlref='+StringUtils.URIEncode(referrer)):'');
           console.log("Piwik - trackDownload: "+url);
           return this.http.get( url)
                         .do(request => console.info("Piwik request completed" ));
+        }
         private getUserAgent(){
           if (typeof navigator !== 'undefined') {
             console.log("navigator.userAgent:" + navigator.userAgent);
             return navigator.userAgent;
           }else{
             return null;
+          }
+        }
         private getReferrer(){
           var referrer = "";
           if (typeof document !== 'undefined') {
             console.log("document.referrer:" + document.referrer);
             referrer = document.referrer;
+          }
           if((referrer == null || referrer.length == 0)&&typeof localStorage !== 'undefined'){
               referrer =localStorage.getItem('previousRoute');
+           }
            return referrer;
+        }
         parse(data:any){
+        }
+    }

     import { NgModule }            from '@angular/core';
     import { CommonModule }        from '@angular/common';
     import { FormsModule }         from '@angular/forms';
     import {PiwikService} from './piwik.service';
     @NgModule({
       imports: [
         CommonModule, FormsModule,
       ],
       declarations: [
       ],
       providers: [ PiwikService ],
       exports: [
+        ]
     })
     export class PiwikServiceModule{ }

         private static vocabulariesAPI ="https://beta.services.openaire.eu/provision/mvc/vocabularies/";
         private static piwikBaseUrl =" https://analytics.openaire.eu/piwik.php?idsite=6";
         private static enablePiwikTrack:boolean = false;
         private static loginUrl ="http://mpagasas.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/openid_connect_login";
         private static loginUrl_pm ="https://beta.services.openaire.eu/uoa-user-management/openid_connect_login";
-...
           }else{
             return this.uploadService;
+          }
             // return this.uploadService;
+        }
         //vocabularies API
         public static getVocabulariesAPI():string{
             return this.vocabulariesAPI;
+        }
         public static getPiwikBaseURL():string{
             return this.piwikBaseUrl;
+        }
         public static isPiwikTrackEnabled():boolean{
             return this.enablePiwikTrack;
+        }
         public static getLoginURL():string{
           if(this.productionMode){
             return this.loginUrl_pm;

     import {SearchFormModule} from  '../searchUtils/searchForm.module';
     //import {SearchFilterModalModule} from '../searchUtils/searchFilterModal.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PiwikServiceModule} from '../../utils/piwik/piwikService.module';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule, RouterModule,
         DataProvidersServiceModule, DatasetsServiceModule, ProjectsServiceModule,
         PublicationsServiceModule, OrganizationsServiceModule,
         BrowseEntitiesModule, SearchFormModule, SearchResultsModule, MainSearchRoutingModule//, SearchFilterModalModule
         BrowseEntitiesModule, SearchFormModule, SearchResultsModule, MainSearchRoutingModule, PiwikServiceModule//, SearchFilterModalModule
       ],
       declarations: [
         SearchComponent
        ],
       providers:[FreeGuard
       providers:[FreeGuard, PreviousRouteRecorder
         ],
       exports: [
         SearchComponent

     import{SearchComponent} from './search.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchComponent, canActivate: [FreeGuard] }
          	{ path: '', component: SearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
         ])
+      ]

     import {RouterHelper} from '../../utils/routerHelper.class';
     import {NumberUtils} from '../../utils/number-utils.class';
     import {RefineFieldResultsService} from '../../services/refineFieldResults.service';
     import {PiwikService} from '../../utils/piwik/piwik.service';
     @Component({
       changeDetection: ChangeDetectionStrategy.Default,
-...
+         `
     })
     export class SearchComponent {
       public sub: any;
       public sub: any; piwiksub: any;
       public subfunders: any;
       public reloadPublications: boolean;
       public reloadDatasets: boolean;
-...
           private _searchDatasetsService: SearchDatasetsService,
           private _searchOrganizationsService: SearchOrganizationsService,
           private _refineFieldResultsService:RefineFieldResultsService,
           private location: Location, private _meta: Meta ) {
         this.fetchPublications = new FetchPublications(this._searchPublicationsService);
         this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService);
         this.fetchProjects = new FetchProjects(this._searchProjectsService);
         this.fetchDatasets = new FetchDatasets( this._searchDatasetsService);
         this.fetchOrganizations = new FetchOrganizations( this._searchOrganizationsService);
           private location: Location, private _meta: Meta,private _piwikService:PiwikService ) {
               this.fetchPublications = new FetchPublications(this._searchPublicationsService);
               this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService);
               this.fetchProjects = new FetchProjects(this._searchProjectsService);
               this.fetchDatasets = new FetchDatasets( this._searchDatasetsService);
               this.fetchOrganizations = new FetchOrganizations( this._searchOrganizationsService);
         var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
         var title = "Search publications, datasets, projects... | OpenAIRE";
         var url = OpenaireProperties.getBaseLink()+this._router.url;
         this._meta.setTitle(title);
         this._meta.updateMeta("description", description);
         this._meta.updateProperty("og:description", description);
         this._meta.updateProperty("og:title", title);
         this._meta.updateProperty("og:url", url);
         this.getNumbers();
               var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
               var title = "Search publications, datasets, projects... | OpenAIRE";
               var url = OpenaireProperties.getBaseLink()+this._router.url;
               this._meta.setTitle(title);
               this._meta.updateMeta("description", description);
               this._meta.updateProperty("og:description", description);
               this._meta.updateProperty("og:title", title);
               this._meta.updateProperty("og:url", url);
               this.getNumbers();
               if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
                 this.piwiksub = this._piwikService.trackView("Search publications, datasets, projects... | OpenAIRE").subscribe();
+              }
+      }
-...
       public ngOnDestroy() {
         this.sub.unsubscribe();
         this.subfunders.unsubscribe();
         if(this.piwiksub){
       this.piwiksub.unsubscribe();
+    }
         if(this.keyword !=null && this.keyword.length > 0){
             if(this.subPub){
               this.subPub.unsubscribe();

     import { NgModule } from '@angular/core';
     import { RouterModule } from '@angular/router';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     import{AdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: AdvancedSearchDataProvidersComponent, canActivate: [FreeGuard] }
          	{ path: '', component: AdvancedSearchDataProvidersComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] }
         ])
+      ]

     import{AdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: AdvancedSearchOrganizationsComponent , canActivate: [FreeGuard]}
          	{ path: '', component: AdvancedSearchOrganizationsComponent , canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder]}
         ])
+      ]

     import{AdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: AdvancedSearchDatasetsComponent, canActivate: [FreeGuard] }
          	{ path: '', component: AdvancedSearchDatasetsComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] }
         ])
+      ]

     import{AdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: AdvancedSearchProjectsComponent, canActivate: [FreeGuard] }
          	{ path: '', component: AdvancedSearchProjectsComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] }
         ])
+      ]

     import{AdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: AdvancedSearchPublicationsComponent, canActivate: [FreeGuard] }
          	{ path: '', component: AdvancedSearchPublicationsComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] }
         ])
+      ]

     import {Component, Input, ViewChild, Output, EventEmitter,ElementRef} from '@angular/core';
     import {Observable}       from 'rxjs/Observable';
     import {Location} from '@angular/common';
     import {  Router} from '@angular/router';
     import { Filter, Value} from './searchHelperClasses.class';
     import {SearchResult}     from '../../utils/entities/searchResult';
     import {SearchFields} from '../../utils/properties/searchFields';
-...
     import {SearchFilterModalComponent} from './searchFilterModal.component';
     import {OpenaireProperties} from '../../utils/properties/openaireProperties';
     import { ErrorCodes} from '../../utils/properties/openaireProperties';
     import {PiwikService} from '../../utils/piwik/piwik.service';
     @Component({
-...
       @Input() disableForms: boolean = false;
       @Input() tableView: boolean = false;
       @Input() searchFormClass: string = "searchForm";
       @ViewChild (ModalLoading) loading : ModalLoading ;
       public fieldIdsMap;//:  { [key:string]:{ name:string, operator:string, type:string, indexField:string, equalityOperator:string  }};
       private searchFieldsHelper:SearchFields = new SearchFields();
       private queryParameters: Map<string, string>  = new Map<string,string>();
       private baseURLWithParameters:string = '';
       private sub: any;
       private sub: any; piwiksub: any;
       public countFilters= 0;
       public urlParam: string;
       public parameterNames:string[] =[];
-...
       //@ViewChild (SearchFilterModalComponent) searchFilterModal : SearchFilterModalComponent ;
       public currentFilter: Filter;
       constructor (private location: Location , private _meta: Meta,private element: ElementRef) {
       constructor (private location: Location , private _meta: Meta,private element: ElementRef,private _piwikService:PiwikService, private router: Router) {
+       }
       ngOnInit() {
-...
             if(typeof window !== 'undefined') {
               this.updateUrl(OpenaireProperties.getBaseLink()+location.pathname);
+            }
             if(typeof document !== 'undefined' && OpenaireProperties.isPiwikTrackEnabled()){
               this.piwiksub = this._piwikService.trackView(this.pageTitle).subscribe();
+            }
             // console.info(this.entityType + "   " + this.urlParam + this.type);
+      }
       ngAfterViewChecked(){
+      }
       ngOnDestroy() {
         if(this.piwiksub){
           this.piwiksub.unsubscribe();
+        }
+      }
       toggleModal($event) {
         this.currentFilter = $event.value;
         //this.searchFilterModal.open();
-...
       */
       public updateBaseUrlWithParameters(filters:Filter[]){
         this.baseURLWithParameters = this.baseUrl + this.createUrlParameters(filters,false);
+      }
       /*
+      *
-...
         var indexQuery = this.createIndexQueryParameters(this.filters);
         this.location.go(location.pathname,urlParameters);
     /* Code For Piwik*/
         if (typeof localStorage !== 'undefined') {
           console.log("In PreviousRouteRecorder : "+this.router.url );
           localStorage.setItem('previousRoute', this.router.url);
+        }
         if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
           this.piwiksub = this._piwikService.trackView(this.pageTitle).subscribe();
+        }
         /* End Piwik Code */
         this.queryChange.emit({
             value: queryParameters,
             index:indexQuery

     import { ErrorCodes} from '../../utils/properties/openaireProperties';
     import {OpenaireProperties} from '../../utils/properties/openaireProperties';
     import {ContentProvidersDatatablePipe} from '../../utils/pipes/contentProvidersDatatable.pipe';
     import {PiwikService} from '../../utils/piwik/piwik.service';
     @Component({
         selector: 'search-page-table',
-...
       @ViewChild (SearchFilterModalComponent) searchFilterModal : SearchFilterModalComponent ;
       public currentFilter: Filter;
       public errorCodes:ErrorCodes = new ErrorCodes();
       constructor (private location: Location , private _meta: Meta) {
       piwiksub: any;
       constructor (private location: Location , private _meta: Meta, private _piwikService:PiwikService) {
+       }
       ngOnInit() {
-...
             if(typeof window !== 'undefined') {
               this.updateUrl(OpenaireProperties.getBaseLink()+location.pathname);
+            }
             if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
               this.piwiksub = this._piwikService.trackView(this.pageTitle).subscribe();
+            }
+      }
       ngOnDestroy() {
          if(this.piwiksub){
       this.piwiksub.unsubscribe();
+    }
+      }
       public sortByOrganization = (dataprovider: any) => {
         if(dataprovider.organizations && dataprovider.organizations.length > 0) {
           return dataprovider.organizations[0].name.toUpperCase();

     import{SearchPagingModule} from './searchPaging.module';
     import {AdvancedSearchFormModule} from '../searchUtils/advancedSearchForm.module';
     import {PiwikServiceModule} from '../../utils/piwik/piwikService.module';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule,  RouterModule, SearchResultsModule, LoadingModalModule, ReportsServiceModule, SearchPagingModule, AdvancedSearchFormModule, SearchDownloadModule
         CommonModule, FormsModule,  RouterModule, SearchResultsModule, LoadingModalModule, ReportsServiceModule, SearchPagingModule, AdvancedSearchFormModule, SearchDownloadModule, PiwikServiceModule
       ],
       declarations: [
         AdvancedSearchPageComponent,
     ],
       providers:[
         PreviousRouteRecorder
       ],
       exports: [
         AdvancedSearchPageComponent,

     import{SearchPagingModule} from './searchPaging.module';
     import {SearchDownloadModule} from './searchDownload.module';
     import {ModalModule} from '../../utils/modal/modal.module';
     import {PiwikServiceModule} from '../../utils/piwik/piwikService.module';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule,RouterModule,  SearchFormModule, SearchResultsModule,
         /*DatasourceTableViewModule,*/ LoadingModalModule, ReportsServiceModule,
         SearchPagingModule, SearchDownloadModule, ModalModule, SearchFilterModule
         LoadingModalModule, ReportsServiceModule,
         SearchPagingModule, SearchDownloadModule, ModalModule, SearchFilterModule, PiwikServiceModule
       ],
       declarations: [
         SearchPageComponent//,
         //SearchFilterComponent,
         //SearchFilterModalComponent
+        ,
         SearchPageComponent
     ],
       providers:[
         PreviousRouteRecorder
       ],
       exports: [
         SearchPageComponent//,
         //SearchFilterComponent,
         //SearchFilterModalComponent
         SearchPageComponent
+        ]
     })
     export class SearchPageModule { }

     import {Component, Input, ViewChild, Output, EventEmitter} from '@angular/core';
     import {Observable}       from 'rxjs/Observable';
     import {Location} from '@angular/common';
     import {  Router} from '@angular/router';
     import {Filter, Value,AdvancedField} from '../searchUtils/searchHelperClasses.class';
     import {SearchResult}     from '../../utils/entities/searchResult';
     import {SearchFields} from '../../utils/properties/searchFields';
-...
     import {StringUtils, Dates} from '../../utils/string-utils.class';
     import { Meta} from '../../../angular2-meta';
     import {OpenaireProperties} from '../../utils/properties/openaireProperties';
     import {PiwikService} from '../../utils/piwik/piwik.service';
     @Component({
         selector: 'advanced-search-page',
-...
       @Input() csvPath: string;
       @Input() simpleSearchLink: string = "";
       @Input() disableForms:boolean = false;
       piwiksub: any;
       public parameterNames:string[] =[];
       public parameterValues:string[] =[];
-...
       public baseURLWithParameters:string = '';
       @Output() queryChange  = new EventEmitter();
       constructor (private location: Location, private _meta: Meta) {
       constructor (private location: Location, private _meta: Meta, private _piwikService:PiwikService, private router: Router) {
+       }
       ngOnInit() {
-...
           this.searchUtils.baseUrl = "/" + this.searchUtils.baseUrl;
          this.updateBaseUrlWithParameters();
          this.defineUrlParam();
          if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
            this.piwiksub = this._piwikService.trackView(this.pageTitle).subscribe();
+         }
+      }
       ngOnDestroy() {
         if(this.piwiksub){
       this.piwiksub.unsubscribe();
+    }
+      }
       updateDescription(description:string){
         this._meta.updateMeta("description", description);
         this._meta.updateProperty("og:description", description);
-...
         this.queryChange.emit({
             value: queryParameters
         });
         /* Code For Piwik*/
             if (typeof localStorage !== 'undefined') {
               console.log("In PreviousRouteRecorder : "+this.router.url );
               localStorage.setItem('previousRoute', this.router.url);
+            }
             if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
               this.piwiksub = this._piwikService.trackView(this.pageTitle).subscribe();
+            }
             /* End Piwik Code */
+      }
       queryChanged($event) {

     import {DataTableModule} from "angular2-datatable";
     import {ContentProvidersDatatablePipe} from '../../utils/pipes/contentProvidersDatatable.pipe';
     import {PiwikServiceModule} from '../../utils/piwik/piwikService.module';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule,RouterModule,  SearchFormModule, SearchResultsModule, /*DatasourceTableViewModule,*/ LoadingModalModule,
         ReportsServiceModule, SearchPagingModule, SearchDownloadModule, ModalModule, PagingModule, DataTableModule, SearchFilterModule
         ReportsServiceModule, SearchPagingModule, SearchDownloadModule, ModalModule, PagingModule, DataTableModule, SearchFilterModule, PiwikServiceModule
       ],
       declarations: [
         SearchPageTableViewComponent//,
-...
     ],
       providers:[
         PreviousRouteRecorder
       ],
       exports: [
         SearchPageTableViewComponent//,

     import{SearchEntityRegistriesTableComponent} from './entityRegistriesTable.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchEntityRegistriesTableComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: SearchEntityRegistriesTableComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder]  }
         ])
+      ]

     import{SearchJournalsComponent} from './journals.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchJournalsComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: SearchJournalsComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder]  }
         ])
+      ]

     import{SearchJournalsTableComponent} from './journalsTable.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchJournalsTableComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: SearchJournalsTableComponent, canActivate: [FreeGuard] , canDeactivate: [PreviousRouteRecorder] }
         ])
+      ]

     // import{ClaimServiceModule} from '../claim-utils/service/claimsService.module';
     import {DisplayClaimsModule} from '../claim-utils/displayClaims/displayClaims.module';
     import { AdminLoginGuard} from'../../login/adminLoginGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
-...
         DisplayClaimsModule
       ],
         providers:[AdminLoginGuard],
         providers:[AdminLoginGuard, PreviousRouteRecorder],
       declarations: [
         ClaimsAdminComponent
+      ]

     import { AdminLoginGuard} from'../../login/adminLoginGuard.guard';
     import { ClaimsAdminComponent } from './claimsAdmin.component';
     import {PreviousRouteRecorder} from'../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
           { path: '', component: ClaimsAdminComponent, canActivate: [AdminLoginGuard]},
           { path: '', component: ClaimsAdminComponent, canActivate: [AdminLoginGuard],canDeactivate: [PreviousRouteRecorder]},
         ])
+      ]

     import{SearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchCompatibleDataprovidersComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: SearchCompatibleDataprovidersComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder]  }
         ])
+      ]

     import{SearchEntityRegistriesComponent} from './entityRegistries.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchEntityRegistriesComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: SearchEntityRegistriesComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder]  }
         ])
+      ]

     import{SearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: SearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard] , canDeactivate: [PreviousRouteRecorder] }
         ])
+      ]

     import{SearchPublicationsComponent} from './searchPublications.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchPublicationsComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: SearchPublicationsComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder]  }
         ])
+      ]

     import{SearchOrganizationsComponent} from './searchOrganizations.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchOrganizationsComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: SearchOrganizationsComponent, canActivate: [FreeGuard] , canDeactivate: [PreviousRouteRecorder] }
         ])
+      ]

     import{SearchProjectsComponent} from './searchProjects.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchProjectsComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: SearchProjectsComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder]  }
         ])
+      ]

     import { DepositBySubjectResultComponent } from './depositBySubjectResult.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from'../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: DepositBySubjectResultComponent, canActivate: [FreeGuard]  }
          	{ path: '', component: DepositBySubjectResultComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder]   }
         ])
+      ]

     import { Meta} from '../../../angular2-meta';
     import {RouterHelper} from '../../utils/routerHelper.class';
     import {PiwikService} from '../../utils/piwik/piwik.service';
     @Component({
         selector: 'deposit-by-subject-result',
-...
         sub: any;
         subDataproviders: any;
         piwiksub: any;
         public fetchDataproviders : FetchDataproviders;
         public routerHelper:RouterHelper = new RouterHelper();
-...
         constructor (private _router: Router,
             private  route: ActivatedRoute,
             private _searchDataprovidersService: SearchDataprovidersService,  private _meta: Meta) {
             private _searchDataprovidersService: SearchDataprovidersService,  private _meta: Meta, private _piwikService:PiwikService) {
                 this.zenodo = OpenaireProperties.getZenodoURL();
                 this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService);
-...
                 this.updateTitle("Deposit "+this.requestFor);
                 this.updateDescription("Openaire,  repositories, open access,  data provider, compatibility, organization, deposit "+ this.requestFor);
                 this.updateUrl(OpenaireProperties.getBaseLink()+this._router.url);
                 if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
                   this.piwiksub = this._piwikService.trackView("Deposit "+this.requestFor).subscribe();
+                }
+            }
             updateDescription(description:string){
               this._meta.updateMeta("description", description);
-...
                 this.searchDataproviders();
             });
+        }
         totalPages(): number {
             let totalPages:any = this.fetchDataproviders.searchUtils.totalResults/(this.fetchDataproviders.searchUtils.size);
             if(!(Number.isInteger(totalPages))) {
-...
           if(this.subDataproviders != undefined) {
               this.subDataproviders.unsubscribe();
+          }
           if(this.piwiksub){
       this.piwiksub.unsubscribe();
+    }
+        }
         public searchDataproviders() {

     import {DepositBySubjectResultsRoutingModule} from './depositBySubjectResult-routing.module';
     import {DepoditModule} from '../deposit.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     import {PagingModule } from '../../utils/paging.module';
     import {DataProvidersServiceModule} from '../../services/dataProvidersService.module';
     import {SearchResultsModule } from '../../searchPages/searchUtils/searchResults.module';
     @NgModule({
       imports: [
         CommonModule, FormsModule,
-...
       exports: [
         DepositBySubjectResultComponent,
        ],
       providers:    [FreeGuard  ]
       providers:    [FreeGuard,PreviousRouteRecorder  ]
     })
     export class DepositBySubjectResultsModule { }

     import { NgModule } from '@angular/core';
     import { RouterModule } from '@angular/router';
     import {PreviousRouteRecorder} from'../../utils/piwik/previousRouteRecorder.guard';
     import { DepositPublicationsResultComponent } from './depositPublicationsResult.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
           { path: '', component: DepositPublicationsResultComponent, canActivate: [FreeGuard]  }
           { path: '', component: DepositPublicationsResultComponent, canActivate: [FreeGuard]  ,canDeactivate: [PreviousRouteRecorder] }
         ])
+      ]

     import { Router } from '@angular/router';
     import {OpenaireProperties, ErrorCodes} from '../utils/properties/openaireProperties';
     import { Meta} from '../../angular2-meta';
     import {PiwikService} from '../utils/piwik/piwik.service';
     @Component({
-...
         public errorCodes:ErrorCodes = new ErrorCodes();
         public selectedId: string = "";
         public warningMessage: string = "";
         piwiksub:any;
         constructor (private _router: Router, private _meta: Meta) {
         constructor (private _router: Router, private _meta: Meta, private _piwikService:PiwikService) {
             this.openAccess = OpenaireProperties.getOpenAccess();
             this.openAccessRepo = OpenaireProperties.getOpenAccessRepo();
-...
             this.updateTitle("Deposit "+this.requestFor);
             this.updateDescription("Openaire,  repositories, open access,  data provider, compatibility, organization, deposit "+ this.requestFor);
             this.updateUrl(OpenaireProperties.getBaseLink()+this._router.url);
             this.piwiksub = this._piwikService.trackView("Deposit "+this.requestFor).subscribe();
+        }
         ngOnDestroy() {
           if(this.piwiksub){
       this.piwiksub.unsubscribe();
+    }
+        }
         updateDescription(description:string){
           this._meta.updateMeta("description", description);
           this._meta.updateProperty("og:description", description);

     import {PagingModule} from '../../utils/paging.module';
     import {ClaimsDatatablePipe} from '../../utils/pipes/claimsDatatable.pipe';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
-...
       ],
       providers:[
         ClaimsByTokenService,
         LoginGuard
         LoginGuard, PreviousRouteRecorder
       ],
       declarations: [
         ClaimsByTokenComponent, ClaimsDatatablePipe

     import { RouterModule } from '@angular/router';
     import { LoginGuard} from'../../login/loginGuard.guard';
     import { ClaimsByTokenComponent } from './claimsByToken.component';
     import {PreviousRouteRecorder} from'../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
           { path: '', component: ClaimsByTokenComponent, canActivate: [LoginGuard]}
           { path: '', component: ClaimsByTokenComponent, canActivate: [LoginGuard],canDeactivate: [PreviousRouteRecorder]}
         ])
+      ]

     import { LoginGuard} from'../../login/loginGuard.guard';
     import { DirectLinkingComponent } from './directLinking.component';
     import {PreviousRouteRecorder} from'../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
           { path: '', component: DirectLinkingComponent, canActivate: [LoginGuard]},
           { path: '', component: DirectLinkingComponent, canActivate: [LoginGuard], canDeactivate: [PreviousRouteRecorder]},
         ])
+      ]

     import { LoginGuard} from'../../login/loginGuard.guard';
     import { MyClaimsComponent } from './myClaims.component';
     import {PreviousRouteRecorder} from'../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
           { path: '', component: MyClaimsComponent, canActivate: [LoginGuard]},
           { path: '', component: MyClaimsComponent, canActivate: [LoginGuard], canDeactivate: [PreviousRouteRecorder]},
         ])
+      ]

     import { RouterModule } from '@angular/router';
     import { ErrorPageComponent } from './errorPage.component';
     import {PreviousRouteRecorder} from'../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
           { path: 'error', component: ErrorPageComponent},
           { path: '**', component: ErrorPageComponent},
           { path: 'error', component: ErrorPageComponent,canDeactivate: [PreviousRouteRecorder] },
           { path: '**', component: ErrorPageComponent,canDeactivate: [PreviousRouteRecorder] },
         ])
+      ]

     import { DatasetComponent } from './dataset.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from'../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
      imports: [
       RouterModule.forChild([
         { path: '', component: DatasetComponent, canActivate: [FreeGuard] }
         { path: '', component: DatasetComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] }
       ])
+    ]
     })

     import { OrganizationComponent } from './organization.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     import {PreviousRouteRecorder} from'../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
      imports: [
       RouterModule.forChild([
         { path: '', component: OrganizationComponent, canActivate: [FreeGuard] }
         { path: '', component: OrganizationComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] }
       ])
+    ]
     })

     import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openaireProperties';
     import { Meta} from '../../../angular2-meta';
     import {PiwikService} from '../../utils/piwik/piwik.service';
     @Component({
         selector: 'project',
-...
       public errorMessage = "";
       public showLoading: boolean = true;
       sub: any;
       sub: any;piwiksub: any;
       public activeTab: string = "Publications";
       public reloadDatasets: boolean = true;
-...
       constructor ( private element: ElementRef,
                     private _projectService: ProjectService,
                     private _piwikService:PiwikService,
                     private  route: ActivatedRoute,
                     private _searchPublicationsService: SearchPublicationsService,
                     private _searchDatasetsService: SearchDatasetsService,
-...
         this.sub =  this.route.queryParams.subscribe(params => {
             this.metricsClicked = false;
             this.statsClicked = false;
             this.fetchPublications = new FetchPublications( this._searchPublicationsService);
             this.fetchDatasets = new FetchDatasets(this._searchDatasetsService);
-...
       ngOnDestroy() {
         this.sub.unsubscribe();
         if(this.piwiksub){
       this.piwiksub.unsubscribe();
+    }
+      }
       createClipboard() {
-...
+              }
               this.updateTitle(this.projectName);
               this.updateDescription("project, funding, open access, publications, datasets, "+this.projectName+ ","+this.projectInfo.funder);
               if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
                 this.piwiksub = this._piwikService.trackView(this.projectName).subscribe();
+              }
               this.project= { funderId: "", funderName: this.projectInfo.funder, projectId: this.projectId, projectName: this.projectInfo.title, projectAcronym: this.projectInfo.acronym, startDate: this.projectInfo.startDate, endDate: this.projectInfo.endDate };
               this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"projRepoViews","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["column"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';

modules/uoa-services-portal/trunk/portal-2/src/app/sharedComponents/sharedComponents.module.ts
11	11	import {UserMiniComponent} from '../login/userMini.component';
12	12
13	13
	14
14	15	@NgModule({
15	16	imports: [
16	17	CommonModule, FormsModule,

     import {PublicationsServiceModule} from '../../services/publicationsService.module';
     import {DatasetsServiceModule} from '../../services/datasetsService.module';
     import {LoginGuard} from'../../login/loginGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
-...
       ],
       providers:[LoginGuard],
       providers:[LoginGuard, PreviousRouteRecorder],
       declarations: [
         DirectLinkingComponent
       ], exports:[DirectLinkingComponent]

     // import{ClaimServiceModule} from '../claim-utils/service/claimsService.module';
     import {DisplayClaimsModule} from '../claim-utils/displayClaims/displayClaims.module';
     import {LoginGuard} from'../../login/loginGuard.guard';
     import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
     @NgModule({
       imports: [
-...
         DisplayClaimsModule
       ],

Project

General

Profile

D-Net

Revision 48631

Added by Argiro Kokogiannaki over 7 years ago