diff --git a/src/app/app.component.ts b/src/app/app.component.ts index c3c92b66..e7335e6b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -2,12 +2,12 @@ import {Component, Directive, ElementRef, Renderer} from '@angular/core'; import {RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated'; import {Http} from '@angular/http'; import {SearchComponent} from './search/search.component'; -import {ClaimComponent} from './claim/claim.component'; -import {ClaimsComponent} from './claims/claims.component'; +import {ClaimComponent} from './claimPages/claim/claim.component'; +import {ClaimsAdminComponent} from './claimPages/claims/claimsAdmin.component'; import {HomeComponent} from './home/home.component'; -//import {Demo} from './home/demo.component'; -import {LinkingComponent} from './linking/linking.component'; -import {LinkingHomeComponent} from './linking/linkingHome.component'; +import {LinkingComponent} from './claimPages/linking/linking.component'; +import {LinkingHomeComponent} from './claimPages/linking/linkingHome.component'; +import {MyClaimsComponent} from './claimPages/myClaims/myClaims.component'; import 'rxjs/Rx'; @@ -45,9 +45,10 @@ import 'rxjs/Rx';
  • Claims
  • Linking
  • Home
    • +
  • My claims
    • - + @@ -56,7 +57,6 @@ import 'rxjs/Rx'; - ` }) @@ -64,19 +64,25 @@ import 'rxjs/Rx'; { path: '/', component: HomeComponent, name: 'Home', useAsDefault: true }, { path: '/home', component: HomeComponent, name: 'Home' }, // { path: '/demo', component: Demo, name: 'Demo' }, - { path: '/claims', component: ClaimsComponent, name: 'Claims' }, + { path: '/claims', component: ClaimsAdminComponent, name: 'Claims' }, { path: '/claim', component: ClaimComponent, name: 'Claim' }, { path: '/search', component: SearchComponent, name: 'Search' }, - { path: '/linking', component: LinkingComponent, name: 'Linking' } + // { path: '/upload', component: BasicProgressbar, name: 'Upload' }, + { path: '/linking', component: LinkingComponent, name: 'Linking' }, + { path: '/my-claims', component: MyClaimsComponent, name: 'MyClaims' } ]) export class App { name: string = 'Angular 2'; data = {}; server; + constructor(public http: Http ) { console.info('App constructor'); + } + + ngOnInit() { console.info('App init'); setTimeout(() => { diff --git a/src/app/claimPages/bulkClaim/bulkLinking.component.ts b/src/app/claimPages/bulkClaim/bulkLinking.component.ts new file mode 100644 index 00000000..a572591b --- /dev/null +++ b/src/app/claimPages/bulkClaim/bulkLinking.component.ts @@ -0,0 +1,178 @@ +import {Component, Input} from '@angular/core'; +import {JSONP_PROVIDERS} from '@angular/http'; +import {Observable} from 'rxjs/Observable'; +import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated'; + +// import {ClaimsComponent} from '../claims/claims.component'; + + +@Component({ + selector: 'linking', + directives: [ROUTER_DIRECTIVES ], + template: ` +
    +
    +

    Bulk Claim Linking

    +
    + +
    +
      +
    1. ProjectProject
      2. +
    2. ContextContext
      3. +
    3. SoftwareSoftware
      4. +
    4. Research ResultResearch Result
      5. +
    5. LinkLink
      6. +
    + +
    +
    + +
    + +
    + +
    + +
    +
    +

    TODO software

    +
    +
    + +
    +
    +
    + +
    +
    +
    + + +
    + + +
    +
    + + +` + +}) +//[(ngModel)]="date" +export class LinkingComponent { + constructor ( private _router: Router ) { + } + sourceType:string; + targetType:string; + step:number = 1; + contexts=[]; + projects=[]; + publications=[]; + datasets=[]; + show = "home"; + searchType="publication"; //publication or dataset + date='8-6-2016'; + keyword: string = ""; + linkType:string ="project"; // link type (selected in home page) : project, context, software, etc + ngOnInit() { + + } + next(){ + + if((this.show == 'project' || this.show == 'context' || this.show == 'software')){ + this.show='result'; + }else if((this.show == 'result' && this.keyword == '')||(this.show == 'dataset' || this.show == 'publication')){ + this.show='claim'; + // }else if(this.show == 'result' ){ + // if(this.searchType == 'publication' ){ + // this.show="publication"; + // }else{ + // this.show="dataset"; + // } + } + } + prev(){ + if(this.show == 'result'){ + this.show = this.linkType; + // if(this.linkType == 'project'){ + // this.show='project'; + // }else if(this.linkType == 'context'){ + // this.show='context'; + // }else if(this.linkType == 'software'){ + // this.show='software'; + // }else{ + // this.show='home'; + // + // } + }else if(this.show == 'context' || this.show == 'project' || this.show == 'software' ){ + this.show='home'; + // }else if(this.show == 'dataset' || this.show == 'publication'){ + // this.show='result'; + } else if(this.show == 'claim'){ + this.show='result'; + } + } + goto(term: string) { + this._router.navigate( ['Search', { keyword: term }] ); + } + + search() { + if(this.searchType == 'publication' ){ + this.show="publication"; + }else{ + this.show="dataset"; + } + + } + + sourceTypeChange($event) { + this.sourceType=$event.value; + console.log($event.value); + } + targetTypeChange($event) { + this.targetType=$event.value; + console.log($event.value); + } + contextsChange($event) { + this.contexts=$event.value; + console.log($event.value); + } + publicationsChange($event) { + this.publications=$event.value; + } + datasetsChange($event) { + this.datasets=$event.value; + } + projectsChange($event) { + this.projects=$event.value; + } + typeChanged(type:string) { + this.searchType = type; + } + linkTypeChange($event) { + this.linkType =$event.value; + this.show=$event.value; + + } + showChange($event) { + this.show=$event.value; + this.showChangedType($event.value); + + + } + showChangedType(type:string) { + this.show=type; + if(this.show == 'project' || this.show == 'context' || this.show == 'software'){ + this.linkType = this.show; + } + + + } +} diff --git a/src/app/claim/claim.component.html b/src/app/claimPages/claim/claim.component.html similarity index 100% rename from src/app/claim/claim.component.html rename to src/app/claimPages/claim/claim.component.html diff --git a/src/app/claim/claim.component.ts b/src/app/claimPages/claim/claim.component.ts similarity index 81% rename from src/app/claim/claim.component.ts rename to src/app/claimPages/claim/claim.component.ts index 8aa52d9c..f8cc6706 100644 --- a/src/app/claim/claim.component.ts +++ b/src/app/claimPages/claim/claim.component.ts @@ -3,12 +3,12 @@ import {JSONP_PROVIDERS} from '@angular/http'; import {Observable} from 'rxjs/Observable'; import { RouteParams, ROUTER_DIRECTIVES} from '@angular/router-deprecated'; -import {ClaimsService} from '../services/claims.service'; -import {Claim} from '../entities/claim'; +import {ClaimsService} from '../../services/claims.service'; +import {Claim} from '../../entities/claim'; @Component({ selector: 'claim', - templateUrl: 'src/app/claim/claim.component.html', + templateUrl: 'src/app/claimPages/claim/claim.component.html', providers:[ ClaimsService, JSONP_PROVIDERS, ...ROUTER_DIRECTIVES] }) diff --git a/src/app/claims/claims.component.html b/src/app/claimPages/claims/claims.component.html similarity index 59% rename from src/app/claims/claims.component.html rename to src/app/claimPages/claims/claims.component.html index 19f9c6ac..5035f830 100644 --- a/src/app/claims/claims.component.html +++ b/src/app/claimPages/claims/claims.component.html @@ -1,7 +1,5 @@
    -
    -

    Claims Administration

    -
    + - + +
    @@ -52,36 +44,46 @@