Commit 190f668b authored by Jie Yuan's avatar Jie Yuan
Browse files

currently set the eosc site from sitesource = gocdb

parent 08d2f65d

src/app/dashboard/fulltable/fulltable.component.ts

+11 −3
Original line number Diff line number Diff line
@@ -59,9 +59,13 @@ export class FulltableComponent implements OnInit , DoCheck, AfterViewInit{ 
      this.currentServiceSource = 'dpmt';

      sessionStorage.setItem('currentServiceSource',this.currentServiceSource);

      sessionStorage.setItem('currentSourceInfo','dpmt');

    } else {

    } else if (source === 'dpmt'){

      this.currentServiceSource = source;

      sessionStorage.setItem('currentSourceInfo',source);

  } else

   {

      this.currentServiceSource = source;

      sessionStorage.setItem('currentSourceInfo','gocdb');

    }

    

    const stmp = 'JsonSiteList' + this.currentServiceSource.toUpperCase();
@@ -264,8 +268,10 @@ export class FulltableComponent implements OnInit , DoCheck, AfterViewInit{ 
  

    sessionStorage.setItem('preSitePage', 'Service')

    sessionStorage.setItem('currentServiceSource',source);

    if (source === 'dpmt' || source === 'gocdb') {

    if (source === 'dpmt' ) {

      sessionStorage.setItem('currentSourceInfo',source);

    } else {

      sessionStorage.setItem('currentSourceInfo','gocdb');

    }

    //sessionStorage.setItem('currentSiteShortSource', 'dpmt');
@@ -278,8 +284,10 @@ export class FulltableComponent implements OnInit , DoCheck, AfterViewInit{ 
  

    sessionStorage.setItem('preSitePage', 'Site')

    sessionStorage.setItem('currentSiteShortSource',source);

    if (source === 'dpmt' || source === 'gocdb') {

    if (source === 'dpmt' ) {

      sessionStorage.setItem('currentSourceInfo',source);

    } else {

      sessionStorage.setItem('currentSourceInfo','gocdb');

    }

    //sessionStorage.setItem('currentSiteShortSource', 'dpmt');

    this.router.navigate(['/dashboard'], { relativeTo: this.route });

src/app/dashboard/table/table.component.ts

+12 −5
Original line number Diff line number Diff line
@@ -61,9 +61,12 @@ export class TableComponent implements OnInit, DoCheck,AfterViewInit { 
      this.currentSiteSource = 'dpmt';

      sessionStorage.setItem('currentSiteShortSource',this.currentSiteSource);

      sessionStorage.setItem('currentSourceInfo','dpmt');

    } else {

    } else if (stmp === 'dpmt'){

      this.currentSiteSource = stmp;

      sessionStorage.setItem('currentSourceInfo',stmp);

    } else {

      this.currentSiteSource = stmp;

      sessionStorage.setItem('currentSourceInfo','gocdb');

    }

   

    const tmp = 'JsonSiteShortList' + this.currentSiteSource.toUpperCase();
@@ -251,8 +254,10 @@ public onClickSite(source: string) { 


  sessionStorage.setItem('preSitePage', 'Site')

  sessionStorage.setItem('currentSiteShortSource',source);

  if(source === 'dpmt' || source === 'gocdb') {

  if(source === 'dpmt' ) {

    sessionStorage.setItem('currentSourceInfo',source);

  }else {

    sessionStorage.setItem('currentSourceInfo','gocdb');

 }

  //sessionStorage.setItem('currentSiteShortSource', 'dpmt');

 // this.router.navigate(['/dashboard'], { relativeTo: this.route });
@@ -266,8 +271,10 @@ public onClickService(source: string) { 


  sessionStorage.setItem('preSitePage', 'Service')

  sessionStorage.setItem('currentServiceSource',source);

  if (source === 'dpmt' || 'gocdb') {

  if (source === 'dpmt' ) {

    sessionStorage.setItem('currentSourceInfo',source);

  } else {

    sessionStorage.setItem('currentSourceInfo','gocdb');

 }

  //sessionStorage.setItem('currentSiteShortSource', 'dpmt');

  this.router.navigate(['/dashboard/fullTableComponent'], { relativeTo: this.route });