MaDgIK
/
monitor
13
0
Fork 0
Code Issues Pull Requests Projects Releases 15 Wiki Activity

[Trunk | Monitor]: 

1. contact.component.ts & monitor.component.ts: "properties" as first parameter in methods of helper.service.ts.
2. home.component.ts & learn-how.component.ts & learn-in-depth.component.ts: "properties" as first parameter in methods of helper.service.ts | in methods of helper.service.ts check communityId "monitor".
3. searchFunders.component.ts: "Filter" entity has changed - replace field: "valueIsUnique: false" with "filterType: "checkbox".
4. invite.component.ts:
	a. "properties" as first parameter in methods of helper.service.ts
	b. create request path in service email.service.ts
5. subscribe.component.ts: Do not reveal users' (subscribers') emails:
	a. Use new methods "isSubscribedToCommunity()", "subscribeToCommunity", "unSubscribeToCommunity" without email parameter (subscribe.service). 
	b. Use new method "notifyForNewManagers()" when more appropriate than "sendEmail()".


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@58688 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Konstantina Galouni 2020-05-13 08:41:02 +00:00
parent 34b4e4d550
commit d0fba5ce46
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/contact/contact.component.ts
View File

@ -65,13 +65,13 @@ export class ContactComponent implements OnInit {
} }
private getPageContents() { private getPageContents() {
this.helper.getPageHelpContents(this._router.url, this.properties, 'monitor').subscribe(contents => { this.helper.getPageHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
this.pageContents = contents; this.pageContents = contents;
}) })
} }
private getDivContents() { private getDivContents() {
this.helper.getDivHelpContents(this._router.url, this.properties, 'monitor').subscribe(contents => { this.helper.getDivHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
this.divContents = contents; this.divContents = contents;
}) })
} }

2
src/app/funders/searchFunders.component.ts
View File

@ -386,7 +386,7 @@ export class SearchFundersComponent {
let value: Value = {name: value_names[i][j], id: value_original_ids[i][j], number:0, selected:false}; let value: Value = {name: value_names[i][j], id: value_original_ids[i][j], number:0, selected:false};
values.push(value); values.push(value);
} }
let filter: Filter = {title: filter_names[i], filterId: filter_ids[i], originalFilterId: filter_original_ids[i], values : values, countSelectedValues:0, "filterOperator": 'or', valueIsExact: true , valueIsUnique: false}; let filter: Filter = {title: filter_names[i], filterId: filter_ids[i], originalFilterId: filter_original_ids[i], values : values, countSelectedValues:0, "filterOperator": 'or', valueIsExact: true , filterType: "checkbox"};
filters.push(filter); filters.push(filter);
} }
return filters; return filters;

4
src/app/home/home.component.ts
View File

@ -93,13 +93,13 @@ export class HomeComponent {
} }
private getPageContents() { private getPageContents() {
this.helper.getPageHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => { this.helper.getPageHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
this.pageContents = contents; this.pageContents = contents;
}) })
} }
private getDivContents() { private getDivContents() {
this.helper.getDivHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => { this.helper.getDivHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
this.divContents = contents; this.divContents = contents;
}) })
} }

4
src/app/learn-how/learn-how.component.ts
View File

@ -188,13 +188,13 @@ export class LearnHowComponent {
} }
private getPageContents() { private getPageContents() {
this.helper.getPageHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => { this.helper.getPageHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
this.pageContents = contents; this.pageContents = contents;
}) })
} }
private getDivContents() { private getDivContents() {
this.helper.getDivHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => { this.helper.getDivHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
this.divContents = contents; this.divContents = contents;
}) })
} }

4
src/app/learn-how/learnInDepth/learn-in-depth.component.ts
View File

@ -245,13 +245,13 @@ export class LearnInDepthComponent {
} }
private getPageContents() { private getPageContents() {
this.helper.getPageHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => { this.helper.getPageHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
this.pageContents = contents; this.pageContents = contents;
}) })
} }
private getDivContents() { private getDivContents() {
this.helper.getDivHelpContents(this._router.url, this.properties, 'connect').subscribe(contents => { this.helper.getDivHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
this.divContents = contents; this.divContents = contents;
}) })
} }

4
src/app/monitor/monitor.component.ts
View File

@ -90,13 +90,13 @@ export class MonitorComponent {
} }
private getPageContents() { private getPageContents() {
this.helper.getPageHelpContents(this._router.url, this.properties, 'monitor').subscribe(contents => { this.helper.getPageHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
this.pageContents = contents; this.pageContents = contents;
}) })
} }
private getDivContents() { private getDivContents() {
this.helper.getDivHelpContents(this._router.url, this.properties, 'monitor').subscribe(contents => { this.helper.getDivHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
this.divContents = contents; this.divContents = contents;
}) })
} }

6
src/app/utils/subscribe/invite/invite.component.ts
View File

@ -156,13 +156,13 @@ export class InviteComponent implements OnInit {
} }
private getPageContents() { 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; this.pageContents = contents;
}) })
} }
private getDivContents() { 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; this.divContents = contents;
}) })
} }
@ -178,7 +178,7 @@ export class InviteComponent implements OnInit {
if (this.validateEmails()) { if (this.validateEmails()) {
this.composeEmail(); this.composeEmail();
this._emailService.sendEmail(this.properties.adminToolsAPIURL + "/sendMail/", this.email).subscribe( this._emailService.sendEmail(this.properties, this.email).subscribe(
res => { res => {
this.status = this.errorCodes.DONE; this.status = this.errorCodes.DONE;
//console.log("Emails Sent: ",res); //console.log("Emails Sent: ",res);

8
src/app/utils/subscribe/subscribe.component.ts
View File

@ -77,7 +77,7 @@ export class SubscribeComponent {
this.subscribed = false; this.subscribed = false;
} else { } else {
if (this.communityId) { if (this.communityId) {
this._subscribeService.isSubscribedToCommunity(this.properties, this.communityId, email).subscribe( this._subscribeService.isSubscribedToCommunity(this.properties, this.communityId).subscribe(
res => { res => {
this.subscribed = res; this.subscribed = res;
if (this.subscribed) { if (this.subscribed) {
@ -133,7 +133,7 @@ export class SubscribeComponent {
} else { } else {
this.loading = true; this.loading = true;
this.showLoginAlert = false; this.showLoginAlert = false;
this._subscribeService.subscribeToCommunity(this.communityId, email, this.properties.adminToolsAPIURL).subscribe( this._subscribeService.subscribeToCommunity(this.properties.adminToolsAPIURL, this.communityId).subscribe(
res => { res => {
this.loading = false; this.loading = false;
if (res.status && res.status != 200) { if (res.status && res.status != 200) {
@ -152,7 +152,7 @@ export class SubscribeComponent {
this.subscribeEvent.emit({ this.subscribeEvent.emit({
value: "ok" 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, this.properties.adminPortalURL)).subscribe(
res => { res => {
//console.log("The email has been sent successfully!") //console.log("The email has been sent successfully!")
}, },
@ -188,7 +188,7 @@ export class SubscribeComponent {
} else { } else {
this.loading = true; this.loading = true;
//this.properties.adminToolsAPIURL //this.properties.adminToolsAPIURL
this._subscribeService.unSubscribeToCommunity(this.communityId, email, this.properties.adminToolsAPIURL).subscribe( this._subscribeService.unSubscribeToCommunity(this.properties, this.communityId).subscribe(
res => { res => {
this.loading = false; this.loading = false;
if (res.status && res.status != 200) { if (res.status && res.status != 200) {