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

« Previous | Next »

Revision 58421

Added by Konstantina Galouni about 4 years ago

[Trunk | Connect]:
1. communities.component.ts & contentPage.component.ts & shareInZenodo.component.ts & helper-test.component.ts & organizationsPage.component.ts &
learn-how.component.ts & learn-in-depth.component.ts & my-communities.component.ts:
"properties" as first parameter in methods of helper.service.ts.
2. contact.component.ts & curators.component.ts & invite.component.ts:
a. "properties" as first parameter in methods of helper.service.ts
b. create request path in service (email.service.ts, curator.service.ts).
3. htmlPage.component.ts & htmlPage.service.ts: "properties" as first parameter in methods of htmlPage.service.ts.
4. customization.component.ts: create request path in service (layout.service.ts).
5. subscribe.component.ts: create request path in service (subscribe.service.ts).

modules/uoa-connect-portal/trunk/src/app/my-communities/my-communities.component.ts
88	88	}
89	89
90	90	private getPageContents() {
91		this.helper.getPageHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	91	this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
92	92	this.pageContents = contents;
93	93	})
94	94	}
95	95
96	96	private getDivContents() {
97		this.helper.getDivHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	97	this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
98	98	this.divContents = contents;
99	99	})
100	100	}

     export class HtmlPageService {
         constructor(private http: HttpClient) {}
         getHtmlContent (router: string, properties:EnvProperties, communityId:string ):any {
         getHtmlContent (properties:EnvProperties, communityId:string, page_route: string):any {
             //console.info("get router html content for : "+router);
             let url = properties.adminToolsAPIURL + '/htmlpagecontent?community='+communityId+'&page='+router;
             let url = properties.adminToolsAPIURL + '/htmlpagecontent?community='+communityId+'&page='+page_route;
             return this.http.get<Array<any>>((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url);
                         //.map(res => <Array<any>> res.json());

                         this.communityId = this.properties.adminToolsCommunity;
+                      }
                       if(location){
                         this.sub = this._service.getHtmlContent(location.pathname, this.properties, this.communityId).subscribe(
                         this.sub = this._service.getHtmlContent(this.properties, this.communityId, location.pathname).subscribe(
                           data => {
                             if(data.length > 0) {
                               this.content = data[0].content;

modules/uoa-connect-portal/trunk/src/app/htmlPages/organizations/organizationsPage.component.ts
57	57	}
58	58
59	59	private getPageContents() {
60		this.helper.getPageHelpContents(this._router.url, this.properties, this.communityId).subscribe(contents => {
	60	this.helper.getPageHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {
61	61	this.pageContents = contents;
62	62	})
63	63	}
64	64
65	65	private getDivContents() {
66		this.helper.getDivHelpContents(this._router.url, this.properties, this.communityId).subscribe(contents => {
	66	this.helper.getDivHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {
67	67	this.divContents = contents;
68	68	})
69	69	}

+        }
         private getPageContents() {
             this.helper.getPageHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
             this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
                 this.pageContents = contents;
             })
+        }
         private getDivContents() {
             this.helper.getDivHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
             this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
                 this.divContents = contents;
             })
+        }
-...
         private sendMail(admins: any) {
             this.showLoading = true;
             this._emailService.contact(this.properties.adminToolsAPIURL + '/contact',
             this._emailService.contact(this.properties,
                 Composer.composeEmailForNewCommunity(this.contactForm.value, admins),
                 this.contactForm.value.recaptcha).subscribe(
                 res => {

modules/uoa-connect-portal/trunk/src/app/helper-test/helper-test.component.ts
29	29	}
30	30
31	31	private getPageContents() {
32		this.helper.getPageHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	32	this.helper.getPageHelpContents(this.properties, "connect", this._router.url).subscribe(contents => {
33	33	this.pageContents = contents;
34	34	})
35	35	}

modules/uoa-connect-portal/trunk/src/app/communities/communities.component.ts
80	80	}
81	81
82	82	private getPageContents() {
83		this.helper.getPageHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	83	this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
84	84	this.pageContents = contents;
85	85	})
86	86	}
87	87
88	88	private getDivContents() {
89		this.helper.getDivHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	89	this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
90	90	this.divContents = contents;
91	91	})
92	92	}

modules/uoa-connect-portal/trunk/src/app/learn-how/learn-how.component.ts
161	161	}
162	162
163	163	private getPageContents() {
164		this.helper.getPageHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	164	this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
165	165	this.pageContents = contents;
166	166	})
167	167	}
168	168
169	169	private getDivContents() {
170		this.helper.getDivHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	170	this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
171	171	this.divContents = contents;
172	172	})
173	173	}

modules/uoa-connect-portal/trunk/src/app/learn-how/learnInDepth/learn-in-depth.component.ts
245	245	}
246	246
247	247	private getPageContents() {
248		this.helper.getPageHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	248	this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
249	249	this.pageContents = contents;
250	250	})
251	251	}
252	252
253	253	private getDivContents() {
254		this.helper.getDivHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	254	this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
255	255	this.divContents = contents;
256	256	})
257	257	}

         } else {
           this.loading = true;
           this.showLoginAlert = false;
           this._subscribeService.subscribeToCommunity(this.communityId, email, this.properties.adminToolsAPIURL).subscribe(
           this._subscribeService.subscribeToCommunity(this.properties, this.communityId, email).subscribe(
             res => {
               this.loading = false;
               if (res.status && res.status != 200) {
-...
                   this.subscribeEvent.emit({
                     value: "ok"
                   });
                   this._emailService.sendEmail(this.properties.adminToolsAPIURL + "/notifyForNewSubscribers/" + this.communityId, Composer.composeEmailToInformManagers(this.community.title, this.communityId, this.community.managers, email)).subscribe(
                   this._emailService.notifyForNewManagers(this.properties, this.communityId, Composer.composeEmailToInformManagers(this.community.title, this.communityId, this.community.managers, email)).subscribe(
                     res => {
                       //console.log("The email has been sent successfully!")
                     },
-...
         } else {
           this.loading = true;
           //this.properties.adminToolsAPIURL
           this._subscribeService.unSubscribeToCommunity(this.communityId, email, this.properties.adminToolsAPIURL).subscribe(
           this._subscribeService.unSubscribeToCommunity(this.properties, this.communityId, email).subscribe(
             res => {
               this.loading = false;
               if (res.status && res.status != 200) {

+      }
       private getPageContents() {
         this.helper.getPageHelpContents(this._router.url, this.properties, this.communityId).subscribe(contents => {
         this.helper.getPageHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {
           this.pageContents = contents;
         })
+      }
       private getDivContents() {
         this.helper.getDivHelpContents(this._router.url, this.properties, this.communityId).subscribe(contents => {
         this.helper.getDivHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {
           this.divContents = contents;
         })
+      }
-...
           if (this.validateEmails()) {
             this.composeEmail();
             this._emailService.sendEmail(this.properties.adminToolsAPIURL + "/sendMail/", this.email).subscribe(
             this._emailService.sendEmail(this.properties, this.email).subscribe(
               res => {
                 this.status = this.errorCodes.DONE;
                 //console.log("Emails Sent: ",res);

                 this.layout = JSON.parse(StringUtils.URIDecode(params['layout']));
                 this.buildCss();
               }else{
                 this._layoutService.getLayout(this.communityId, this.properties.adminToolsAPIURL+"/community/").subscribe(
                 this._layoutService.getLayout(this.properties, this.communityId).subscribe(
                   layout => {
                     this.layout = layout;
                     if(!layout){

           this.downloadUrl = this.properties.utilsService + '/download/';
           if(!this.longView) {
             let emails = this.managers.join();
             this.curatorsService.getCurators(this.properties,
               this.properties.adminToolsAPIURL + '/curator?emails=' + emails).subscribe(curators => {
             this.curatorsService.getCurators(this.properties, emails).subscribe(curators => {
               this.curators = curators;
               for(let i = 0; i < this.curators.length; i++) {
                 this.showMore[i]= false;
-...
                 this.properties.communityAPI + this.communityId).subscribe(community => {
                   this.managers = community[0].managers;
                   let emails = this.managers.join();
                   this.curatorsService.getCurators(this.properties,
                     this.properties.adminToolsAPIURL + '/curator?emails=' + emails).subscribe(curators => {
                   this.curatorsService.getCurators(this.properties, emails).subscribe(curators => {
                     this.curators = curators;
                     for(let i = 0; i < this.curators.length; i++) {
                       this.showMore[i]= false;
-...
+      }
       private getPageContents() {
         this.helper.getPageHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
         this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
           this.pageContents = contents;
         })
+      }
       private getDivContents() {
         this.helper.getDivHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
         this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
           this.divContents = contents;
         })
+      }

modules/uoa-connect-portal/trunk/src/app/deposit/zenodo/shareInZenodo.component.ts
162	162	}
163	163
164	164	private getPageContents() {
165		this.helper.getPageHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	165	this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
166	166	this.pageContents = contents;
167	167	})
168	168	}
169	169
170	170	private getDivContents() {
171		this.helper.getDivHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	171	this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
172	172	this.divContents = contents;
173	173	})
174	174	}

modules/uoa-connect-portal/trunk/src/app/content/contentPage.component.ts
68	68	}
69	69
70	70	private getPageContents() {
71		this.helper.getPageHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	71	this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
72	72	this.pageContents = contents;
73	73	})
74	74	}
75	75
76	76	private getDivContents() {
77		this.helper.getDivHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => {
	77	this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
78	78	this.divContents = contents;
79	79	})
80	80	}

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 58421

Added by Konstantina Galouni about 4 years ago