-
Notifications
You must be signed in to change notification settings - Fork 98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Using only-parameters for surveys #1378
Open
Angamanga
wants to merge
8
commits into
development
Choose a base branch
from
USH-1512
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
148b24b
Using only-parameters for adding a post
Angamanga a7678d4
Using only-parameter for filter-bar for surveys
Angamanga 057ce5f
Using only-parameters for survey-settings
Angamanga 896bfac
Merge branch 'development' into USH-1512
Angamanga f1c1f5c
Using only-parameters for data-import
Angamanga af5cfd5
Merge branch 'USH-1512' of github.com:ushahidi/platform-client-mzima …
Angamanga ed4c948
moving strings to helper-file
Angamanga bcb00f3
Merge branch 'development' into USH-1512
Angamanga File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 26 additions & 19 deletions
45
apps/web-mzima-client/src/app/post/add-post-modal/add-post-modal.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,37 @@ | ||
import { Component } from '@angular/core'; | ||
import { SurveysService, SurveyItem, generalHelpers } from '@mzima-client/sdk'; | ||
|
||
import { Component, OnInit } from '@angular/core'; | ||
import { SurveysService, generalHelpers } from '@mzima-client/sdk'; | ||
import { Observable, of } from 'rxjs'; | ||
@Component({ | ||
selector: 'app-add-post-modal', | ||
templateUrl: './add-post-modal.component.html', | ||
styleUrls: ['./add-post-modal.component.scss'], | ||
}) | ||
export class AddPostModalComponent { | ||
public types: SurveyItem[]; | ||
export class AddPostModalComponent implements OnInit { | ||
public surveys: Observable<any>; | ||
|
||
constructor(private surveysService: SurveysService) {} | ||
ngOnInit() { | ||
this.getSurveys(); | ||
} | ||
|
||
constructor(private surveysService: SurveysService) { | ||
this.getPostAllowedTypes(); | ||
private getSurveys(): void { | ||
this.surveysService | ||
.getSurveys('', { only: 'name,color,everyone_can_create,can_create' }) | ||
.subscribe(({ results }) => { | ||
let surveys = this.mapVisibility(results); | ||
surveys = surveys.filter((survey: any) => survey.visible === true); | ||
this.surveys = of(surveys); | ||
}); | ||
} | ||
|
||
private getPostAllowedTypes(): void { | ||
this.surveysService.get().subscribe({ | ||
next: (types) => { | ||
this.types = types.results || []; | ||
this.types.map((el) => { | ||
el.visible = | ||
el.everyone_can_create || | ||
el.can_create.includes( | ||
localStorage.getItem(`${generalHelpers.CONST.LOCAL_STORAGE_PREFIX}role`), | ||
); | ||
}); | ||
}, | ||
private mapVisibility(surveys: any) { | ||
return surveys.map((el: any) => { | ||
el.visible = | ||
el.everyone_can_create || | ||
el.can_create.includes( | ||
localStorage.getItem(`${generalHelpers.CONST.LOCAL_STORAGE_PREFIX}role`), | ||
); | ||
return el; | ||
}); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe the string literal should be in a constant file?