From d17ad04b6c75759d2f3e12484bcf9fb05c1be079 Mon Sep 17 00:00:00 2001
From: Sean Engelhardt <sean.f.t.engelhardt@gmail.com>
Date: Mon, 9 Dec 2019 14:24:05 +0100
Subject: [PATCH] Add more motion filter options

Adds a motion filter option for motions which have no
amendments and are no amendments
---
 client/src/app/site/motions/models/view-motion.ts     | 11 +++++------
 client/src/app/site/motions/motions.constants.ts      |  3 ++-
 .../motions/services/motion-filter-list.service.ts    |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/src/app/site/motions/models/view-motion.ts b/client/src/app/site/motions/models/view-motion.ts
index 9a96be103..0d2e7e4b2 100644
--- a/client/src/app/site/motions/models/view-motion.ts
+++ b/client/src/app/site/motions/models/view-motion.ts
@@ -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;
         }
     }
 
diff --git a/client/src/app/site/motions/motions.constants.ts b/client/src/app/site/motions/motions.constants.ts
index 79c822e11..5f3f9f18b 100644
--- a/client/src/app/site/motions/motions.constants.ts
+++ b/client/src/app/site/motions/motions.constants.ts
@@ -55,7 +55,8 @@ export enum ChangeRecoMode {
 
 export enum AmendmentType {
     Amendment = 1,
-    Parent
+    Parent,
+    Lead
 }
 
 export const verboseChangeRecoMode = {
diff --git a/client/src/app/site/motions/services/motion-filter-list.service.ts b/client/src/app/site/motions/services/motion-filter-list.service.ts
index 7f0840a27..0c432ac0c 100644
--- a/client/src/app/site/motions/services/motion-filter-list.service.ts
+++ b/client/src/app/site/motions/services/motion-filter-list.service.ts
@@ -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') }
         ]
     };