/modules/uoa-services-portal/trunk/portal-2/src/app/landingPages/organization/organization.component.ts - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 48790

Added by Konstantina Galouni almost 7 years ago

Variables and functions in components of landing pages are set correctly to private or public (those which are used in templates are public) | Project landing: links to advanced search in tabs fixed | Landing Pages: responsive tabs: some spaces added for button in small view - sizes changed for views

     })
     export class OrganizationComponent {
         public organizationInfo: OrganizationInfo;
         public organizationId: string;
         organizationInfo: OrganizationInfo;
         //private metrics: string;
         private organizationId: string;
         private projectsNum: number = 0;
         private fundersSet: Set<string>;
         private emptyFundersSet: boolean = true;
         // Message variables
         public warningMessage = "";
         public errorMessage = "";
         public showLoading: boolean = true;
         // CSV variables
         public downloadURLAPI: string;
         public csvProjectParamsHead: string;
         public csvPublicationParamsHead: string;
         public csvParamsTail: string;
         sub: any;
         piwiksub: any;
         // Active tab variable for responsiveness
         public activeTab: string = "Publications";
         public reloadDataproviders: boolean = true;
         public projectsClicked: boolean = false;
         // Variables for publications, projects, dataproviders tabs
         public fetchPublications: FetchPublications;
         public linkToSearchPublications: string = "";
         public fetchProjects: FetchProjects;
         public fetchDataproviders : FetchDataproviders;
         public linkToSearchDataproviders:string = "";
         //public projectFunders:string[] = [];
         // Variables for projects query (query results only if projects tab is clicked)
         public projectsClicked: boolean = false;
         @ViewChild (SearchingProjectsTabComponent) searchingProjectsTabComponent : SearchingProjectsTabComponent ;
         public projectFunders:string[] = [];
         public routerHelper:RouterHelper = new RouterHelper();
         @ViewChild (ModalLoading) loading : ModalLoading ;
         // Alert box when CSV: Project Publications for a funder is requested
         @ViewChild('AlertModalApplyAll') alertApplyAll;
         // Alert box when something is wrong with CSV requests
         @ViewChild('AlertModalCsvError') alertCsvError;
         public funder: string;
         public funderId: string;
         public count: number;
         public routerHelper:RouterHelper = new RouterHelper();
         public errorCodes:ErrorCodes = new ErrorCodes();
         //private projectsNum: number = 0;
         //private fundersSet: Set<string>;
         //private emptyFundersSet: boolean = true;
         // Request results for content providers only the one time (first time tab is clicked)
         private reloadDataproviders: boolean = true;
         // Helper variables to specify funder in downloadPublicationsFile function
         private funder: string;
         private funderId: string;
         private funderCountPublications: number;
         sub: any;
         piwiksub: any;
         constructor (private element: ElementRef,
                      private _organizationService: OrganizationService,
                      private _piwikService:PiwikService,
-...
         ngOnDestroy() {
           this.sub.unsubscribe();
           if(this.piwiksub){
       this.piwiksub.unsubscribe();
+    }
             this.piwiksub.unsubscribe();
+          }
+        }
         private getOrganizationInfo ()  {
-...
            );
+        }
     */
     /*
         private handleClick(funder: string) {
              if(this.emptyFundersSet) {
                  this.fundersSet.clear();
-...
                  console.info(funder+" funder added");
+             }
+         }
     */
          //private getProjectsData(key: string): any {
              //return this.projectsData;
          //}
-...
+           }
+         }
          private searchDataprovidersInit() {
          public searchDataprovidersInit() {
              if(this.reloadDataproviders && this.fetchDataproviders.searchUtils.totalResults > 0) {
                  this.searchDataproviders();
+             }
+         }
          downloadFile(url:string){
          public downloadFile(url:string){
            console.log("Downloading file: "+ url);
            this.openLoading();
-...
                () => console.log('Completed file download.'));
+         }
          downloadPublicationsFile(funder: string, funderId:string, count:number){
          private downloadPublicationsFile(funder: string, funderId:string, count:number){
            console.log("Downloading publications file");
            this.openLoading();
-...
           //           error => console.log("Error getting number of publications for project."));
             // }//);
+        }
         updateDescription(description:string){
         private updateDescription(description:string){
           this._meta.updateMeta("description", description);
           this._meta.updateProperty("og:description", description);
+        }
         updateTitle(title:string){
         private updateTitle(title:string){
           var _prefix ="OpenAIRE | ";
           var _title = _prefix + ((title.length> 50 ) ?title.substring(0,50):title);
           this._meta.setTitle(_title );
           this._meta.updateProperty("og:title",_title);
+        }
         updateUrl(url:string){
         private updateUrl(url:string){
           this._meta.updateProperty("og:url", url);
+        }
         public openLoading(){
         private openLoading(){
           if(this.loading){
             this.loading.open();
+          }
+        }
         public closeLoading(){
         private closeLoading(){
           if(this.loading){
             this.loading.close();
+          }
+        }
         public setMessageLoading(message: string){
         private setMessageLoading(message: string){
           if(this.loading){
             this.loading.message = message;
+          }
+        }
         confirmOpenApplyAll(funder: string, funderId:string, count:number){
         public confirmOpenApplyAll(funder: string, funderId:string, funderCountPublications:number){
           this.alertApplyAll.cancelButton = true;
           this.alertApplyAll.okButton = true;
           this.alertApplyAll.alertTitle = "CSV FILE";
-...
           this.funder = funder;
           this.funderId = funderId;
           this.count = count;
           this.funderCountPublications = funderCountPublications;
+        }
         confirmCloseApplyAll(data){
              this.downloadPublicationsFile(this.funder, this.funderId, this.count);
         public confirmCloseApplyAll(data){
              this.downloadPublicationsFile(this.funder, this.funderId, this.funderCountPublications);
+        }
         confirmOpenCsvError(){
         public confirmOpenCsvError(){
           this.alertCsvError.cancelButton = false;
           this.alertCsvError.okButton = true;
           this.alertCsvError.alertTitle = "ERROR DOWNLOADING CSV FILE";

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 48790

Added by Konstantina Galouni almost 7 years ago