From 1dd8562dfc381f9a19439e1f5aae6d89d4919e9d Mon Sep 17 00:00:00 2001
From: Sean Engelhardt <sean.f.t.engelhardt@gmail.com>
Date: Thu, 4 Apr 2019 14:52:47 +0200
Subject: [PATCH] Show sequential number in motion list

Shows the sequential number (ID) in motion list
---
 client/src/app/site/base/list-view-base.ts                | 6 ++++++
 .../components/motion-detail/motion-detail.component.html | 6 +++---
 .../components/motion-detail/motion-detail.component.ts   | 2 +-
 .../components/motion-list/motion-list.component.html     | 5 +++++
 .../components/motion-list/motion-list.component.ts       | 8 +++++++-
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/client/src/app/site/base/list-view-base.ts b/client/src/app/site/base/list-view-base.ts
index 04a23b42a..89bcddc6f 100644
--- a/client/src/app/site/base/list-view-base.ts
+++ b/client/src/app/site/base/list-view-base.ts
@@ -163,6 +163,12 @@ export abstract class ListViewBaseComponent<V extends BaseViewModel, M extends B
         this.dataSource.paginator = this.paginator;
     }
 
+    /**
+     * Central search/filter function. Can be extended and overwritten by a filterPredicate.
+     * Functions for that are usually called 'setFulltextFilter'
+     *
+     * @param event the string to search for
+     */
     public searchFilter(event: string): void {
         this.dataSource.filter = event;
     }
diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
index dcba80c95..a0b570012 100644
--- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
+++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
@@ -683,18 +683,18 @@
             ></os-search-value-selector>
         </div>
 
-        <div class="extra-data" *osPerms="'motion.can_manage'">
+        <div class="extra-data">
             <!-- Attachments -->
             <div *ngIf="motion.hasAttachments() || editMotion" class="content-field">
                 <div *ngIf="!editMotion">
                     <h3>{{ 'Attachments' | translate }}<mat-icon>attach_file</mat-icon></h3>
                     <mat-list dense>
                         <mat-list-item *ngFor="let file of motion.attachments">
-                            <a [routerLink]="" (click)="onClickAttacment(file)">{{ file.title }}</a>
+                            <a [routerLink]="" (click)="onClickAttachment(file)">{{ file.title }}</a>
                         </mat-list-item>
                     </mat-list>
                 </div>
-                <div *ngIf="editMotion" class="shortened-selector">
+                <div *osPerms="'motions.can_manage';and:editMotion" class="shortened-selector">
                     <os-search-value-selector
                         class="selector"
                         ngDefaultControl
diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
index 14ce9e3d8..585277499 100644
--- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
+++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
@@ -1294,7 +1294,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
      *
      * @param attachment the selected file
      */
-    public onClickAttacment(attachment: Mediafile): void {
+    public onClickAttachment(attachment: Mediafile): void {
         window.open(attachment.downloadUrl);
     }
 
diff --git a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html
index 9d51933d6..57e6660d2 100644
--- a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html
+++ b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html
@@ -75,6 +75,11 @@
                     <!-- submitters line -->
                     <div class="submitters-line ellipsis-overflow" *ngIf="motion.submitters.length">
                         <span translate>by</span> {{ motion.submitters }}
+                        <span *osPerms="'motions.can_manage'">
+                            &middot;
+                            <span translate>Sequential number</span>
+                            {{ motion.id }}
+                        </span>
                     </div>
                     <!-- state line-->
                     <div class="ellipsis-overflow white">
diff --git a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts
index aa35c6401..d1eeb5c76 100644
--- a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts
+++ b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts
@@ -295,7 +295,7 @@ export class MotionListComponent extends ListViewBaseComponent<ViewMotion, Motio
 
     /**
      * Overwrites the dataSource's string filter with a case-insensitive search
-     * in the identifier, title, state, recommendations, submitters and motion blocks
+     * in the identifier, title, state, recommendations, submitters, motion blocks and id
      */
     private setFulltextFilter(): void {
         this.dataSource.filterPredicate = (data, filter) => {
@@ -332,6 +332,12 @@ export class MotionListComponent extends ListViewBaseComponent<ViewMotion, Motio
             if (data.identifier && data.identifier.toLowerCase().includes(filter)) {
                 return true;
             }
+
+            const dataid = '' + data.id;
+            if (dataid.includes(filter)) {
+                return true;
+            }
+
             return false;
         };
     }