ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5157 from tsiegleauq/no-amendment 

Add more motion filter options
This commit is contained in:
Emanuel Schütze 2019-12-09 15:44:07 +01:00 committed by GitHub
parent 72bd971f0b d17ad04b6c
commit 53ebbabc9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/app/site/motions/models/view-motion.ts
View File

@ -165,14 +165,13 @@ export class ViewMotion extends BaseViewModelWithAgendaItemAndListOfSpeakers<Mot
/** /**
* Determine if the motion has parents, is a parent or neither * Determine if the motion has parents, is a parent or neither
*/ */
public get amendmentType(): number { public get amendmentType(): AmendmentType {
if (this.hasAmendments) { if (this.hasParent) {
return AmendmentType.Parent;
} else if (this.hasParent) {
return AmendmentType.Amendment; return AmendmentType.Amendment;
} else if (this.hasAmendments) {
return AmendmentType.Parent;
} else { } else {
// not any amendment return AmendmentType.Lead;
return 0;
} }
} }

3
client/src/app/site/motions/motions.constants.ts
View File

@ -55,7 +55,8 @@ export enum ChangeRecoMode {
export enum AmendmentType { export enum AmendmentType {
Amendment = 1, Amendment = 1,
Parent Parent,
Lead
} }
export const verboseChangeRecoMode = { export const verboseChangeRecoMode = {

3
client/src/app/site/motions/services/motion-filter-list.service.ts
View File

@ -104,7 +104,8 @@ export class MotionFilterListService extends BaseFilterListService<ViewMotion> {
label: 'Amendment', label: 'Amendment',
options: [ options: [
{ condition: AmendmentType.Amendment, label: this.translate.instant('Is amendment') }, { condition: AmendmentType.Amendment, label: this.translate.instant('Is amendment') },
{ condition: AmendmentType.Parent, label: this.translate.instant('Has amendments') } { condition: AmendmentType.Parent, label: this.translate.instant('Has amendments') },
{ condition: AmendmentType.Lead, label: this.translate.instant('Is no amendment and has no amendments') }
] ]
}; };