Merge pull request #5157 from tsiegleauq/no-amendment
Add more motion filter options
This commit is contained in:
commit
53ebbabc9b
@ -165,14 +165,13 @@ export class ViewMotion extends BaseViewModelWithAgendaItemAndListOfSpeakers<Mot
|
||||
/**
|
||||
* Determine if the motion has parents, is a parent or neither
|
||||
*/
|
||||
public get amendmentType(): number {
|
||||
if (this.hasAmendments) {
|
||||
return AmendmentType.Parent;
|
||||
} else if (this.hasParent) {
|
||||
public get amendmentType(): AmendmentType {
|
||||
if (this.hasParent) {
|
||||
return AmendmentType.Amendment;
|
||||
} else if (this.hasAmendments) {
|
||||
return AmendmentType.Parent;
|
||||
} else {
|
||||
// not any amendment
|
||||
return 0;
|
||||
return AmendmentType.Lead;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -55,7 +55,8 @@ export enum ChangeRecoMode {
|
||||
|
||||
export enum AmendmentType {
|
||||
Amendment = 1,
|
||||
Parent
|
||||
Parent,
|
||||
Lead
|
||||
}
|
||||
|
||||
export const verboseChangeRecoMode = {
|
||||
|
@ -104,7 +104,8 @@ export class MotionFilterListService extends BaseFilterListService<ViewMotion> {
|
||||
label: 'Amendment',
|
||||
options: [
|
||||
{ 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') }
|
||||
]
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user