Fixes from today's meeting

Author: phorward

deploy/index.yaml

@@ -26,6 +26,18 @@ indexes:
   - direction: desc
     name: creationdate
 
+- kind: todo
+  properties:
+  - name: category
+  - name: creationdate
+    direction: desc
+
+- kind: todo
+  properties:
+  - name: user.dest.__key__
+  - name: creationdate
+    direction: desc
+
 - kind: viur-emails
   properties:
   - name: isSend

deploy/modules/todo.py

@@ -1,5 +1,5 @@
 from viur.core.prototypes import List
-from viur.core import exposed, skey, access
+from viur.core import current, utils, exposed, skey, access
 from viur.core.skeleton import RelSkel as ActionSkel  # TODO: ActionSkel
 from viur.core.bones import *
 
@@ -11,24 +11,36 @@ class Todo(List):
             "creationdate",
             "lastname",
             "firstname",
+            "phone",
+            "message",
             "user",
-            "subject",
         ),
-        "actions": ["assign"],
-        "customActions": {
-            "assign": {
-                "name": "Zuweisen",  # button name
-                "access": ["todo-edit", "root"],  # Who may trigger?
-                "icon": "person-plus-fill",  # button icon
-                "variant": "success",  # button color
-                "outline": True,  # button outline style
-                "action": "action",  # ActionSkel
-                "url": "/{{module}}/assign",  # actionSkel initial url
-                "enabled": 'True',  # regel wann button aktiv "TRUE" === immer
-                "show_label": True,  # button ohne label
-                "target": "popup",  # popup, tab
-            },
-        }
+        # LIVE (3)
+        "views": [
+            {
+                "icon": "chat-dots-fill",  # LIVE (4)
+                "name": "Service - Neu",
+                "filter": {
+                    "category": "service",
+                    "status": "new",
+                },
+                "actions": ["assign"],
+                "customActions": {  # LIVE(5)
+                    "assign": {
+                        "name": "Zuweisen",  # button name
+                        "access": ["todo-edit", "root"],  # Who may trigger?
+                        "icon": "person-plus-fill",  # button icon
+                        "variant": "success",  # button color
+                        "outline": True,  # button outline style
+                        "action": "action",  # ActionSkel
+                        "url": "/{{module}}/assign",  # actionSkel initial url
+                        "enabled": 'True',  # regel wann button aktiv "TRUE" === immer
+                        "show_label": True,  # button ohne label
+                        "target": "popup",  # popup, tab
+                    },
+                },
+            }
+        ]
     }
 
     default_order = {
@@ -65,7 +77,7 @@ class TodoAssignSkel(ActionSkel):
                 descr="Todos",
                 multiple=True,
                 required=True,
-                format="$(dest.lastname) - $(dest.subject)",
+                format="$(dest.lastname) - $(dest.message)",
                 refKeys={
                     "lastname",
                     "subject",
@@ -79,6 +91,10 @@ class TodoAssignSkel(ActionSkel):
 
         action_skel = TodoAssignSkel()
 
+        if selected_keys := current.request.get().context.get("viur_selected_keys"):
+            for key in selected_keys:
+                action_skel.setBoneValue("todo", key, append=True)
+
         if not kwargs or not action_skel.fromClient(kwargs):
             # TODO: Provide generic render action skel
             return self.render.edit(action_skel, "assign")
@@ -88,12 +104,23 @@ class TodoAssignSkel(ActionSkel):
         for todo in action_skel["todo"]:
             skel = self.editSkel()
             skel.fromDB(todo["dest"]["key"])
+            skel["status"] = "open"
             skel.setBoneValue("user", action_skel["user"]["dest"]["key"])
             skel.toDB()
 
         # TODO: Provide generic render action success
         return self.render.editSuccess(action_skel, "assignSuccess")
 
+    def listFilter(self, query):
+        if query := super().listFilter(query):
+            if not utils.string.is_prefix(self.render.kind, "json.vi"):
+                cuser = current.user.get()
+                query.mergeExternalFilter({
+                    "user.dest.key": cuser["key"],
+                })
+
+        return query
+
 
 Todo.html = True
 Todo.json = True

deploy/modules/user.py

@@ -17,3 +17,6 @@ class User(User):
             "orderby": "lastname",
         },
     }
+
+
+User.json = True

deploy/skeletons/todo.py

@@ -8,6 +8,7 @@ class TodoSkel(skeleton.Skeleton):
         "add": ["subject"],
     }
 
+    # FIXME: viur-core
     creationdate = DateBone(
         descr="Erstellt am",
         readOnly=True,
@@ -25,25 +26,24 @@ class TodoSkel(skeleton.Skeleton):
         required=True,
     )
 
-    phone = PhoneBone(
-        descr="Telefon",
-        default_country_code="+49",
-    )
-
     category = SelectBone(
-        descr="Kategorie",
+        descr="Thema",
         defaultValue="question",
         required=True,
         values={
-            "question": "Anfrage",
+            "question": "Frage",
             "billing": "Abrechnung",
             "service": "Service",
         },
     )
 
-    subject = StringBone(
-        descr="Thema",
-        required=True,
+    # LIVE (1)
+    phone = PhoneBone(
+        descr="Telefon",
+        default_country_code="+49",
+        params={
+            "visibleIf": """ category == "service" """  # LIVE(2)
+        }
     )
 
     message = TextBone(
@@ -57,7 +57,8 @@ class TodoSkel(skeleton.Skeleton):
         required=True,
         defaultValue="open",
         values={
-            "open": "Offen",
+            "new": "Neu",
+            "open": "Zugewiesen",
             "pending": "In Bearbeitung",
             "closed": "Geschlossen",
         },