Merge pull request #4144 from MaximilianKrambach/dateSort

sort by date in motion

client/src/app/core/services/sort-list.service.ts

@@ -241,7 +241,11 @@ export abstract class SortListService<V extends BaseViewModel> {
                         const b = secondProperty();
                         return a.localeCompare(b, lang);
                     case 'object':
+                        if (firstProperty instanceof Date) {
+                            return firstProperty > secondProperty ? 1 : -1;
+                        } else {
                             return firstProperty.toString().localeCompare(secondProperty.toString(), lang);
+                        }
                     case 'undefined':
                         return 1;
                     default:

client/src/app/shared/models/motions/motion.ts

@@ -41,6 +41,8 @@ export class Motion extends AgendaBaseModel {
     public log_messages: MotionLog[];
     public weight: number;
     public sort_parent_id: number;
+    public created: string;
+    public last_modified: string;
 
     public constructor(input?: any) {
         super('motions/motion', 'Motion', input);

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

@@ -220,6 +220,26 @@ export class ViewMotion extends BaseViewModel {
         return this._attachments ? this._attachments : null;
     }
 
+    /**
+     * @returns the creation date as Date object
+     */
+    public get creationDate(): Date {
+        if (!this.motion || !this.motion.created) {
+            return null;
+        }
+        return new Date(this.motion.created);
+    }
+
+    /**
+     * @returns the date of the last change as Date object, null if empty
+     */
+    public get lastChangeDate(): Date {
+        if (!this.motion || !this.motion.last_modified) {
+            return null;
+        }
+        return new Date(this.motion.last_modified);
+    }
+
     /**
      * Gets the comments' section ids of a motion. Used in filter by motionComment
      *

client/src/app/site/motions/services/motion-sort-list.service.ts

@@ -17,10 +17,9 @@ export class MotionSortListService extends SortListService<ViewMotion> {
             { property: 'submitters' },
             { property: 'category' },
             { property: 'motion_block_id', label: 'Motion block' },
-            { property: 'state' }
+            { property: 'state' },
-            // choices from 2.3:
+            { property: 'creationDate', label: 'Creation date' },
-            // TODO creation date
+            { property: 'lastChangeDate', label: 'Last modified' }
-            // TODO last modified
         ]
     };
     protected name = 'Motion';

openslides/motions/views.py

@@ -576,7 +576,7 @@ class MotionViewSet(ModelViewSet):
 
         # Save motion.
         motion.save(
-            update_fields=["state", "identifier", "identifier_number"],
+            update_fields=["state", "identifier", "identifier_number", "last_modified"],
             skip_autoupdate=True,
         )
         message = f"The state of the motion was set to {motion.state.name}."
@@ -648,7 +648,7 @@ class MotionViewSet(ModelViewSet):
             motion.set_state(state_id)
 
             # Save motion.
-            motion.save(update_fields=["state"], skip_autoupdate=True)
+            motion.save(update_fields=["state", "last_modified"], skip_autoupdate=True)
 
             # Write the log message.
             motion.write_log(
@@ -708,7 +708,7 @@ class MotionViewSet(ModelViewSet):
             motion.recommendation = None
 
         # Save motion.
-        motion.save(update_fields=["recommendation"], skip_autoupdate=True)
+        motion.save(update_fields=["recommendation", "last_modified"], skip_autoupdate=True)
         label = (
             motion.recommendation.recommendation_label
             if motion.recommendation
@@ -794,7 +794,7 @@ class MotionViewSet(ModelViewSet):
                 motion.set_recommendation(recommendation_state_id)
 
             # Save motion.
-            motion.save(update_fields=["recommendation"], skip_autoupdate=True)
+            motion.save(update_fields=["recommendation", "last_modified"], skip_autoupdate=True)
             label = (
                 motion.recommendation.recommendation_label
                 if motion.recommendation
@@ -842,6 +842,7 @@ class MotionViewSet(ModelViewSet):
                 "identifier",
                 "identifier_number",
                 "state_extension",
+                "last_modified",
             ],
             skip_autoupdate=True,
         )