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

     import {Component} from '@angular/core';
     import {Router} from '@angular/router';
     import {Observable}       from 'rxjs/Observable';
     import {Location} from '@angular/common';
     @Component({
         selector: 'home',
         template:`
         <div class="uk-margin-top">
           <div class="page-header">
               <h1>Openaire Search</h1>
           </div>
           <div>
             <form class="uk-form">
                    <input #term type="text" class="uk-form-medium  uk-width-1-2" placeholder="Search for..."  name="keyword" >
                      <button class="uk-button" type="submit" (click)="searchTerm(term.value)" >Search</button>
               </form>
           </div>
         </div>
+    `
      })
     export class HomeComponent {
       constructor ( private _router: Router, private location: Location) {
+      }
       ngOnInit() {
+    }
       searchTerm(term: string) {
             window.location.href="/search/find?keyword="+term;
+      }
+    }

     import { NgModule}            from '@angular/core';
     import { CommonModule }        from '@angular/common';
     import { FormsModule }         from '@angular/forms';
     import {HomeComponent} from './home.component';
     import { HomeRoutingModule } from './home-routing.module';
     @NgModule({
       imports: [
         CommonModule, FormsModule,
         HomeRoutingModule
       ],
       declarations: [
     HomeComponent
     ],
       exports: [
         HomeComponent
+        ]
     })
     export class HomeModule { }

     import { NgModule } from '@angular/core';
     import { RouterModule } from '@angular/router';
     import {HomeComponent} from './home.component';
     @NgModule({
       imports: [
         RouterModule.forChild([
           { path: 'home', component: HomeComponent },
         ])
+      ]
     })
     export class HomeRoutingModule { }

modules/uoa-services-portal/trunk/portal-2/src/app/utils/entities/user.ts
1		export class User {
2		email:string;
3		username: string;
4		id: string;
5		fullname: string;
6		}

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

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

     import {DatasetsServiceModule} from '../../services/datasetsService.module';
     import {SearchFormModule} from  '../searchUtils/searchForm.module';
     import {SearchPageModule} from '../searchUtils/searchPage.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule,
-...
       declarations: [
         SearchDatasetsComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         SearchDatasetsComponent

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

modules/uoa-services-portal/trunk/portal-2/src/app/deposit/depositResult.component.ts
114	114	private route: ActivatedRoute,
115	115	private _searchDataprovidersService: SearchDataprovidersService,
116	116	private _organizationService: OrganizationService, private _meta: Meta) {
117		console.info("depositResult constructor");
118	117
119	118	this.zenodo = OpenaireProperties.getZenodoURL();
120	119	this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService);

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

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

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

     import { DepositDatasetsComponent } from './depositDatasets.component';
     import { DepositDatasetsResultComponent } from './depositDatasetsResult.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: DepositDatasetsComponent }
          	{ path: '', component: DepositDatasetsComponent, canActivate: [FreeGuard]  }
         ])
+      ]

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

modules/uoa-services-portal/trunk/portal-2/src/app/utils/exportCSV.class.ts
55	55	linkname: string = "Download CSV";
56	56
57	57	constructor () {
58		console.info('export constructor');
59	58	}
60	59
61	60	ngOnInit() {

         private static metricsAPIURL = "http://vatopedi.di.uoa.gr:8080/stats/";
         private static framesAPIURL = "http://vatopedi.di.uoa.gr/stats2/";
         private static loginAPIURL = "http://mpagasas.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/api/users/authenticate?username=";
         private static loginAPIURL = "http://mpagasas.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/api/users/authenticates";
         // public claimsAPIURL      = "http://rudie.di.uoa.gr:8080/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/"
         private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/";

modules/uoa-services-portal/trunk/portal-2/src/app/utils/showDataProviders.component.ts
59	59	"organizations": {"name": string, "url": string}[]}[];
60	60
61	61	constructor () {
62		console.info('showDataProviders constructor');
63	62	}
64	63
65	64	ngOnInit() {}

     import {PeopleServiceModule} from '../../services/peopleService.module';
     import {BrowseEntitiesModule} from '../searchUtils/browseEntities.module';
     import {SearchFormModule} from  '../searchUtils/searchForm.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
-...
       declarations: [
         SearchComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         SearchComponent

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

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

     import {PublicationsServiceModule} from '../../services/publicationsService.module';
      import {AdvancedSearchPageModule} from '../searchUtils/advancedSearchPage.module';
      import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
-...
       declarations: [
         AdvancedSearchPublicationsComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         AdvancedSearchPublicationsComponent

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

     import {DataProvidersServiceModule} from '../../services/dataProvidersService.module';
      import {AdvancedSearchPageModule} from '../searchUtils/advancedSearchPage.module';
      import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
-...
       declarations: [
         AdvancedSearchDataProvidersComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         AdvancedSearchDataProvidersComponent

     import {DatasetsServiceModule} from '../../services/datasetsService.module';
      import {AdvancedSearchPageModule} from '../searchUtils/advancedSearchPage.module';
      import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
-...
       declarations: [
         AdvancedSearchDatasetsComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         AdvancedSearchDatasetsComponent

     import { RouterModule } from '@angular/router';
     import{AdvancedSearchPeopleComponent} from './advancedSearchPeople.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: AdvancedSearchPeopleComponent }
          	{ path: '', component: AdvancedSearchPeopleComponent, canActivate: [FreeGuard] }
         ])
+      ]

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

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

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

     import {PeopleServiceModule} from '../../services/peopleService.module';
      import {AdvancedSearchPageModule} from '../searchUtils/advancedSearchPage.module';
      import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
-...
       declarations: [
         AdvancedSearchPeopleComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         AdvancedSearchPeopleComponent

     import {OrganizationsServiceModule} from '../../services/organizationsService.module';
      import {AdvancedSearchPageModule} from '../searchUtils/advancedSearchPage.module';
      import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
-...
       declarations: [
         AdvancedSearchOrganizationsComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         AdvancedSearchOrganizationsComponent

     import {ProjectsServiceModule} from '../../services/projectsService.module';
      import {AdvancedSearchPageModule} from '../searchUtils/advancedSearchPage.module';
      import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
-...
       declarations: [
         AdvancedSearchProjectsComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         AdvancedSearchProjectsComponent

     import {DataProvidersServiceModule} from '../../services/dataProvidersService.module';
     import {SearchFormModule} from  '../searchUtils/searchForm.module';
     import {SearchPageModule} from '../searchUtils/searchPage.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule,
-...
       declarations: [
         SearchCompatibleDataprovidersComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         SearchCompatibleDataprovidersComponent

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

     import {DataProvidersServiceModule} from '../../services/dataProvidersService.module';
     import {SearchFormModule} from  '../searchUtils/searchForm.module';
     import {SearchPageModule} from '../searchUtils/searchPage.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule,
-...
       declarations: [
         SearchEntityRegistriesComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         SearchEntityRegistriesComponent

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

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

     import {PeopleServiceModule} from '../../services/peopleService.module';
     import {SearchFormModule} from  '../searchUtils/searchForm.module';
     import {SearchPageModule} from '../searchUtils/searchPage.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule,
-...
       declarations: [
         SearchPeopleComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         SearchPeopleComponent

     import {OrganizationsServiceModule} from '../../services/organizationsService.module';
     import {SearchFormModule} from  '../searchUtils/searchForm.module';
     import {SearchPageModule} from '../searchUtils/searchPage.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule,
-...
       declarations: [
         SearchOrganizationsComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         SearchOrganizationsComponent

     import {ProjectsServiceModule} from '../../services/projectsService.module';
     import {SearchFormModule} from  '../searchUtils/searchForm.module';
     import {SearchPageModule} from '../searchUtils/searchPage.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule,
-...
       declarations: [
         SearchProjectsComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         SearchProjectsComponent

     import {PublicationsServiceModule} from '../../services/publicationsService.module';
     import {SearchFormModule} from  '../searchUtils/searchForm.module';
     import {SearchPageModule} from '../searchUtils/searchPage.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule,
-...
       declarations: [
         SearchPublicationsComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         SearchPublicationsComponent

     import {DataProvidersServiceModule} from '../../services/dataProvidersService.module';
     import {SearchFormModule} from  '../searchUtils/searchForm.module';
     import {SearchPageModule} from '../searchUtils/searchPage.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         CommonModule, FormsModule,
-...
       declarations: [
         SearchDataprovidersComponent
        ],
       providers:[
       providers:[FreeGuard
         ],
       exports: [
         SearchDataprovidersComponent

     import { RouterModule } from '@angular/router';
     import{SearchPeopleComponent} from './searchPeople.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
         RouterModule.forChild([
          	{ path: '', component: SearchPeopleComponent }
          	{ path: '', component: SearchPeopleComponent, canActivate: [FreeGuard]  }
         ])
+      ]

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

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

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

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

                      <span class="dropdown">
                        <select   [(ngModel)]="authorId" name="select_author"  >authorIds
                           <option *ngFor=" let item of authorIds let i = index"   [value]="authorIds[i]" (click)="getOrcidResultsById(i)" >{{authorGivenNames[i]}} {{authorFamilyNames[i]}} : {{item}} </option>
                        <select   [(ngModel)]="authorId" name="select_author" (ngModelChange)="getOrcidResultsById(authorId)"  >authorIds
                           <option *ngFor=" let item of authorIds let i = index"   [value]="authorIds[i]">{{authorGivenNames[i]}} {{authorFamilyNames[i]}} : {{item}} </option> <!-- (click)="getOrcidResultsById(i)" -->
                        </select>
                      </span>

     @Component({
         selector: 'claims-admin',
         template: `
         <div *ngIf="user" class="container">
         <div class="container">
           <div class="page-header">
               <h1> Claims Administrator </h1>
           </div>
           <div>
             <div class="uk-text-right"><a  routerLink="/participate/claim">Add more Links?</a></div>
             <displayClaims enableDelete="false" myClaims="false" isAdim="true"></displayClaims>
             <displayClaims [enableDelete]=false [myClaims]=false [isAdmin]=true></displayClaims>
           </div>
         </div>
         <div *ngIf="!user" class="container">
           TODO login
         </div>
         `,
     })
-...
       constructor ( ) {
+      }
     user:string="argirok@di.uoa.gr";
       ngOnInit() {
+      }
+    }

     import {ClaimsService} from '../service/claims.service';
     import {ModalLoading} from '../../../utils/modal/loading.component';
     import {AlertModal} from '../../../utils/modal/alert';
     import {Session} from '../../../login/utils/helper.class';
     @Component({
-...
       ngOnInit() {
          this.sub = this.route.queryParams.subscribe(params => {
           if( this.myClaims == 'true' ){
           if( this.myClaims){
               this.fetchBy = "User";
               this.fetchId = Session.getUserEmail();
           }else{
             this.fetchBy = params['fetchBy'];
             this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All';
             this.fetchId = params['fetchId'];
             this.fetchId=this.fetchId?this.fetchId:'';
             this.fetchId = this.fetchId?this.fetchId:'';
+          }
-...
           this.getClaims();
         });
         // this.sub = this.route.params.subscribe(params => {
         //   console.info(this.isAdmin+"  "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId);
         //   if( this.myClaims == 'true' ){
         //     console.info("Is myclaims");
         //       this.fetchBy = "User";
         //   }else{
         //     console.info("Is admin");
         //
         //     console.info(this.isAdmin);
         //
         //     this.fetchBy = params['fetchBy'];
         //     this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All';
         //     this.fetchId = params['fetchId'];
         //     console.info("Fetch by:"+this.fetchBy+"Fetch id:"+this.fetchId);
         //     this.fetchId=this.fetchId?this.fetchId:'';
         //
         //   }
         //
         //   console.info(this.isAdmin+"  "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId);
         //   let page = (params['page']=== undefined)?1:+params['page'];
         //   let size = (params['size']=== undefined)?10:+params['size'];
         //
         //   this.keyword = (params['keyword']?params['keyword']:"");
         //   this.inputkeyword = this.keyword;
         //   this.page = ( page <= 0 ) ? 1 : page;
         //   this.size = ( size <= 0 ) ? 10 : size;
         //   this.entityTypes = []//(params['types']?params['types']:[]);
         //   this.setTypes(params['types']); // check the appropriate checkboxes
         //   this.setSortby(params['sort']);
         //   this.getClaims();
         //   console.info("params: "+params['page']+"   page "+page +" this.page: "+this.page );
         // });
+      }
       ngOnDestroy() {
         this.sub.unsubscribe();
+      }
         sub: any;
       //string because comes as input from component directive
       @Input() enableDelete: string = 'false';
       @Input() myClaims: string= 'false' ;
       @Input() isAdmin:string = 'false';
       @Input() enableDelete: boolean = false;
       @Input() myClaims: boolean= false ;
       @Input() isAdmin:boolean = false;
       page : number;
       size:number;
       sizes = [10,20,30,50];
-...
         this.getClaims();
+      }
       getParameters(){
         let params={ page: this.page, size: this.size, types: this.entityTypes, fetchBy: this.fetchBy, fetchId:this.fetchId, keyword : this.keyword, sort: this.getSortby()  };
         var params = {}
         if(this.myClaims){
            params={ page: this.page, size: this.size, types: this.entityTypes, keyword : this.keyword, sort: this.getSortby()  };
         }else{
           params={ page: this.page, size: this.size, types: this.entityTypes, fetchBy: this.fetchBy, fetchId:this.fetchId, keyword : this.keyword, sort: this.getSortby()  };
+        }
         return params;
+      }
       getParametersString(){
         var params='';
         params+=(this.page==1?"":(params.length>0?'&':'')+"page="+this.page);
-...
+        }
         params+=(types.length>0)?"types="+types:"";
         if(this.isAdmin === 'true'){
         if(this.isAdmin ){
           params+=(this.fetchBy=='All'?"":(params.length>0?'&':'')+"fetchBy="+this.fetchBy);
           params+=(this.fetchId==''?"":(params.length>0?'&':'')+"fetchId="+this.fetchId);
+        }
-...
            this.entityTypes.push('context');
+         }
         //  if(this.publicationCB  == true && this.datasetCB  == true && this.contextCB  == true && this.projectCB  == true ){
         //    this.entityTypes="";
         //  }else{
         //    this.entityTypes = "";
         //    if(this.publicationCB == true){
         //      this.entityTypes = "publication";
         //    }
         //    if(this.datasetCB  == true){
         //      this.entityTypes += (this.entityTypes.length > 0?",":"")+"dataset";
         //    }
         //    if(this.contextCB  == true){
         //      this.entityTypes += (this.entityTypes.length > 0?",":"")+"context";
         //    }
         //    if(this.projectCB  == true){
         //      this.entityTypes += (this.entityTypes.length > 0?",":"")+"project";
         //    }
         //  }
         //  console.debug("Type changed: "+this.entityTypes+"   "+this.publicationCB+ this.datasetCB + this.contextCB  + this.projectCB);
          this.goTo();
+       }
        setTypes(types:string){

           this.authorGivenNames, this.authorFamilyNames).subscribe(
             data => {
               if(data != null && data == true) {
                 this.getOrcidResultsById(0);
                 this.getOrcidResultsByIndex(0);
+              }
               this.orcidStatus = this.errorCodes.NONE;
-...
             this.authorGivenNames, this.authorFamilyNames).subscribe(
               data => {
                 if(data != null && data == true) {
                   this.getOrcidResultsById(0);
                   this.getOrcidResultsByIndex(0);
                 }else{
                   this.orcidStatus = this.errorCodes.ERROR;
+                }
-...
+          }
           private    getOrcidResultsById (index:number) {
           private    getOrcidResultsByIndex (index:number) {
             if(this.authorIds.length > index) {
               this.orcidStatus = this.errorCodes.LOADING;
               let id = this.authorIds[index];
               this.authorGivenName = this.authorGivenNames[index];
               this.authorFamilyName = this.authorFamilyNames[index];
               this.getOrcidResultsById(id);
+            }
+          }
           private    getOrcidResultsById (id:string) {
               var index = this.authorIds.indexOf(id);
               this.authorGivenName = this.authorGivenNames[index];
               this.authorFamilyName = this.authorFamilyNames[index];
               this.authorId = id;
               console.info("getOrcidResultsById: "+id);
               this._searchOrcidService.searchOrcidPublications(id).subscribe(
-...
+                }
               );
+            }
+          }
     /*

                             </div>
                             <!-- Crossref -->
                             <span *ngIf="pub.result.publisher" class="uk-article-meta">Publisher: {{pub.result.publisher}}</span><span *ngIf="pub.date"  class="uk-article-meta" >({{pub.date.substring(0,4)}})</span>
                             <div *ngIf="pub.result.author && pub.result.author.length > 0" class="uk-article-meta">Authors: <span *ngFor="let author of pub.result.author  let i = index">{{author.family}} {{author.given}}{{(i < (pub.result.author.length-1))?"; ":""}}</span></div>
                             <div *ngIf="pub.result.editor && pub.result.editor.length" class="uk-article-meta">Editors: <span *ngFor="let author of pub.result.editor  let i = index">{{author.family}} {{author.given}}{{(i < (pub.result.editor.length-1))?"; ":""}}</span></div>
                             <div *ngIf="pub.result.author && pub.result.author.length > 0" class="uk-article-meta">Authors: <span *ngFor="let author of pub.result.author.slice(0,10)  let i = index">{{author.family}} {{author.given}}{{(i < (pub.result.author.slice(0,10).length-1))?"; ":""}}</span></div>
                             <div *ngIf="pub.result.editor && pub.result.editor.length" class="uk-article-meta">Editors: <span *ngFor="let author of pub.result.editor.slice(0,10)  let i = index">{{author.family}} {{author.given}}{{(i < (pub.result.editor.slice(0,10).length-1))?"; ":""}}</span></div>
                             <!-- Openaire -->
                             <div *ngIf="pub.result.authors && pub.result.authors.length >0 " class="uk-article-meta">Authors: <span *ngFor="let author of pub.result.authors let i = index">{{author.name}}{{(i < (pub.result.authors.length-1))?"; ":""}}</span></div>
                             <div *ngIf="pub.result.authors && pub.result.authors.length >0 " class="uk-article-meta">Authors: <span *ngFor="let author of pub.result.authors.slice(0,10) let i = index">{{author.name}}{{(i < (pub.result.authors.slice(0,10).length-1))?"; ":""}}</span></div>
                             <!-- Orcid -->
                             <span  *ngIf="pub.result['journal-title'] && pub.result['journal-title'].value " class="uk-article-meta">Journal: {{pub.result['journal-title'].value}}</span>
                             <div *ngIf="pub.result.contributors && pub.result.contributors.length > 0" class="uk-article-meta">Authors: <span *ngFor="let author of pub.result.contributors let i = index">{{author}}{{(i < (pub.result.contributors.length-1))?"; ":""}}</span></div>
                             <div *ngIf="pub.result.contributors && pub.result.contributors.length > 0" class="uk-article-meta">Authors: <span *ngFor="let author of pub.result.contributors.slice(0,10) let i = index">{{author}}{{(i < (pub.result.contributors.slice(0,10).length-1))?"; ":""}}</span></div>
                             <!-- Datacite -->
                            <div *ngIf="pub.result.creator" class="uk-article-meta">Authors: <span *ngFor="let author of pub.result.creator let i = index">{{author}}{{(i < (pub.result.creator.length-1))?"; ":""}}</span></div>
                            <div *ngIf="pub.result.creator" class="uk-article-meta">Authors: <span *ngFor="let author of pub.result.creator.slice(0,10) let i = index">{{author}}{{(i < (pub.result.creator.slice(0,10).length-1))?"; ":""}}</span></div>
     <br>****sliced***<br>
                         </div>
                         <div *ngIf="showAccessRights  && pub.source != 'openaire' "  class = "uk-width-3-10">
                           <span *ngIf="showAccessRights  && pub.source != 'openaire' " class="dropdown">

     import { Injectable } from '@angular/core';
     import { Router,CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
     import {Observable}       from 'rxjs/Observable';
     import {Session} from './utils/helper.class';
     @Injectable()
     export class LoginGuard implements CanActivate {
-...
       constructor(private router: Router) {}
       canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
         console.log("AAA inside the LoginGuard!")
         var user;
         var loggedIn = false;
         if( typeof localStorage !== 'undefined') {
             if(localStorage.getItem("user")) {
                  user = JSON.parse(localStorage.getItem("user"));
                  loggedIn = true;
+            }
         var errorCode = 1;
         if(Session.isLoggedIn()){
           loggedIn = true;
           if(!Session.isValidAndRemove()){
             loggedIn = false;
             errorCode = 3;
+          }
         }else{
           errorCode = 1;
+        }
         if(!loggedIn){
           this.router.navigate(['/user-info'], { queryParams: { "errorCode": 1, "redirectUrl":  state.url } });
           this.router.navigate(['/user-info'], { queryParams: { "errorCode": errorCode, "redirectUrl":  state.url } });
           return false;
         }else{
           return true;

                          (showChange)="showChange($event)"   > </claim-selected-projects>
                 </div>
                 <claim-selected-results *ngIf=" linkTo =='result'  " title="with other Research Results"   [results]="results"    [showSearch]="show=='claim'? false: true"  [showAccessRights]="show=='claim'? true: false"
                                 bulkMode=false>
                                 [bulkMode]=false>
                 </claim-selected-results>
         </div>

     export class User {
         email:string;
         username: string;
         id: string;
         fullname: string;
         expirationDate: number;
         role:string;
         jwt:string;
+    }
     export class Session{
       public static setUser(user:User): User {
           localStorage.setItem("user", JSON.stringify(user));
           return user;
+      }
       public static removeUser() {
         if(Session.isLoggedIn()){
             localStorage.removeItem("user");
+        }
+      }
       public static getUser():User {
         if(Session.isLoggedIn()){
             return JSON.parse(localStorage.getItem("user"));
         }else{
           return null;
+        }
+      }
       public static isLoggedIn(): boolean {
           var loggedIn:boolean = false;
           var user:User = null;
         if( typeof localStorage !== 'undefined') {
             if(localStorage.getItem("user")) {
               user = JSON.parse(localStorage.getItem("user"));
                 if(user && user.id){
                   loggedIn = true;
                 }else{
                   loggedIn = false;
+                }
               }else{
                   loggedIn = false;
+              }
           }else{
               loggedIn = false;
+          }
           return loggedIn;
+      }
       public static getUserJwt():string {
           if(Session.isLoggedIn()){
               return Session.getUser().jwt;
           }else{
             return null;
+          }
+      }
       public static getUserEmail():string {
           if(Session.isLoggedIn()){
               return Session.getUser().email;
           }else{
             return null;
+          }
+      }
       public static isAdminUser():boolean {
           if(Session.isLoggedIn()){
               return (Session.getUser().role == '2');
+          }
+      }
       public static isUserValid() {
         if(Session.isLoggedIn()){
             var expires = Session.getUser().expirationDate;
             var now = new Date().getTime() / 1000;
             console.log(" is still valid ? "+(now < expires)  + " now is:"+now + "expires at:"+expires);
             return now < expires;
+        }
         return false;
+      }
       public static isValidAndRemove() {
         if(Session.isLoggedIn()){
             if(!Session.isUserValid()){
               Session.removeUser();
               return false;
+            }
+        }
         return true;
+      }
+    }
     export  class MyJWT{
       private static validateJWTFormat(data){
         if(data == null || (data.indexOf(".") !=-1 && data.split('.').length != 3)){
           return false;
+        }
         return true;
+      }
       private static getPayload(data){
         var payload = data.split('.')[1];
         return atob(payload);
+      }
       public static parseUserInfo(data: any): User {
           if(this.validateJWTFormat(data)){
             var info = JSON.parse(this.getPayload(data));
+          }
           var user: User = new User();
           user.username = info.sub;
           user.email = info.email;
           user.id = info.userId;
           user.fullname = info.fullname;
           user.role = info.role;
           user.jwt = data;
           user.expirationDate = info.exp;
           localStorage.setItem("user", JSON.stringify(user));
           return user;
+      }
+    }

     import { Injectable } from '@angular/core';
     import { Router,CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
     import {Observable}       from 'rxjs/Observable';
     import {Session} from './utils/helper.class';
     @Injectable()
     export class AdminLoginGuard implements CanActivate {
       constructor(private router: Router) {}
       canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
         console.log("AAA inside the AdminLoginGuard!")
         var user;
         var loggedIn = false;
         var isAdmin = false;
         var errorCode = 1;
         if( typeof localStorage !== 'undefined') {
             if(localStorage.getItem("user")) {
                  loggedIn = true;
                  user = JSON.parse(localStorage.getItem("user"));
                  if(user.role == 2){
                    isAdmin = true;
+               }
         if(Session.isLoggedIn()){
           loggedIn = true;
           if(!Session.isValidAndRemove()){
             loggedIn = false;
             errorCode = 3;
           }else {
             isAdmin = Session.isAdminUser();
             if(!isAdmin){
               errorCode = 2;
+            }
+          }
         }else{
           errorCode =1;
+        }
         if(!loggedIn){
           this.router.navigate(['/user-info'], { queryParams: { "errorCode": 1, "redirectUrl":  state.url } });
           this.router.navigate(['/user-info'], { queryParams: { "errorCode": errorCode, "redirectUrl":  state.url } });
           return false;
         }else if(!isAdmin){
             this.router.navigate(['/user-info'], { queryParams: { "errorCode": 2, "redirectUrl":  state.url } });
             this.router.navigate(['/user-info'], { queryParams: { "errorCode": errorCode, "redirectUrl":  state.url } });
             return false;
           }else{
           return true;

     import { RouterModule } from '@angular/router';
     import { DataProviderComponent } from './dataProvider.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
      imports: [
       RouterModule.forChild([
         { path: '', component: DataProviderComponent }
         { path: '', component: DataProviderComponent, canActivate: [FreeGuard] }
       ])
+    ]
     })

     import {HtmlProjectReportService} from './htmlProjectReport.service';
     import {HtmlProjectReportComponent} from './htmlProjectReport.component';
     import { HtmlProjectReportRoutingModule } from './htmlProjectReport-routing.module';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
       imports: [
-...
       HtmlProjectReportComponent
       ],
       providers:[
         HtmlProjectReportService,CacheService
         HtmlProjectReportService,CacheService, FreeGuard
        ],
       exports: [
       HtmlProjectReportComponent

modules/uoa-services-portal/trunk/portal-2/src/app/landingPages/organization/organization.component.ts
64	64	private _searchPublicationsService: SearchPublicationsService,
65	65	private _searchProjectsService: SearchProjectsService, private _meta: Meta) {
66	66
67		console.info('organization constructor');
68	67	this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService);
69	68	}
70	69

     import { RouterModule } from '@angular/router';
     import { PersonComponent } from './person.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
      imports: [
       RouterModule.forChild([
         { path: '', component: PersonComponent }
         { path: '', component: PersonComponent, canActivate: [FreeGuard] }
       ])
+    ]
     })

     import { RouterModule } from '@angular/router';
     import { PublicationComponent } from './publication.component';
     import {FreeGuard} from'../../login/freeGuard.guard';
     @NgModule({
      imports: [
       RouterModule.forChild([
         { path: '', component: PublicationComponent }
         { path: '', component: PublicationComponent, canActivate: [FreeGuard] }
       ])
+    ]
     })

modules/uoa-services-portal/trunk/portal-2/src/app/claims/linking/insertClaim/insertClaim.component.ts
5	5	import {ModalLoading} from '../../../utils/modal/loading.component';
6	6	import {AlertModal} from '../../../utils/modal/alert';
7	7	import {Md5} from 'ts-md5/dist/md5';
8
	8	import {Session} from '../../../login/utils/helper.class';

Project

General

Profile

D-Net

Revision 46792

Added by Argiro Kokogiannaki over 7 years ago