Feature/3710 flagging journals

cms/sass/base/_palette.scss

@@ -7,6 +7,8 @@ $mid-grey:          #A9A7A5;
 $light-grey:        #F6F4F4;
 $white:             #FFF;
 
+$disabled:          #5c595626;
+
 // Primary
 $sanguine:          #982E0A;
 $grapefruit:        #FD5A3B;
@@ -35,6 +37,6 @@ $bronze:            #A77044;
 
   --dark-green:     #3A5959;
   --mid-green:      #47A178;
-  --light-greeen:   #A3C386;
+  --light-green:   #A3C386;
   --yellow:         #F9D950;
 }

cms/sass/base/_spacing.scss

@@ -5,6 +5,7 @@
 $spacing-01: 0.1875rem;
 $spacing-02: 0.375rem;
 $spacing-03: 0.75rem;
+$spacing-03--negative: -.75rem;
 $spacing-04: 1.5rem;
 $spacing-05: 3rem;
 $spacing-06: 6rem;

cms/sass/base/_utils.scss

@@ -158,6 +158,12 @@
   justify-content: flex-end;
 }
 
+.flex-start {
+  display: flex;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+
 .flex-col {
   display: flex;
   flex-direction: column;

cms/sass/components/_removable-fields.scss

@@ -7,7 +7,7 @@
     @include unstyled-list;
   }
 
-  label {
+  label.hiddenLabel {
     @extend .sr-only; // a11y-friendly, can’t add class to the form itself
   }
 }

cms/sass/layout/_editorial-panel.scss

@@ -1,34 +1,104 @@
 .editorial-panel {
-  margin-top: 0;
-
-  .form__question {
-    select, textarea, input {
-      width: 100%;
+    .flag--resolved {
+        position: relative;
+        opacity: 0.2; /* Set opacity of entire div */
     }
-  }
 
-  hr {
-    margin: $spacing-02;
-  }
+    .flag--resolved::before {
+        content: "RESOLVED"; /* The word to display as the stamp */
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%) rotate(-45deg); /* Center and rotate the text */
+        font-size: 3em; /* Adjust the size of the stamp */
+        color: rgba(0, 0, 0, 0.5); /* Light black color for the stamp */
+        z-index: 10; /* Place the stamp behind the button */
+        pointer-events: none; /* Ensure the stamp doesn't interfere with interactions */
+        opacity: 0.6; /* Make the stamp slightly transparent */
+        letter-spacing: 0.2em; /* Adjust the spacing between letters for the stamp */
+        font-weight: bold;
+    }
+    .editorial-panel__content {
+        .form__question.editorial-panel__question {
+            padding: 0 !important;
+            .editorial-panel__question-header {
+                padding: .5rem;
+                align-items: flex-start;
+                label, p {
+                    margin: 0;
+                }
+            }
+            .editorial-panel__legend {
+                    display: flex;
+                    align-items: center;
+                    gap: .5rem;
+                    padding: 0 .5rem;
+                    margin-bottom: .375rem;
+            }
+            .editorial-panel__questions-content {
+                .form-inputs--container {
+                    &:has(input[type="hidden"]) {
 
-  @media (min-width: 992px) {
-    position: -webkit-sticky;
-    position: sticky;
-    top: 100px;
+                    }
+                    &:has(label) {
+                        label {
+                            font-size: .75rem;
+                            margin-bottom: 0;
+                            margin-left: .5rem;
+                            .form__question--optional {
+                                font-size: .75rem;
+                            }
+                        }
+                    }
+                    &:has(svg) {
+                        position: relative;
+                        width:100%;
+                        svg {
+                            position: absolute;
+                            left: .5rem;
+                            top:50%;
+                            transform: translateY(-25%);
+                            z-index: 1;
+                        }
+                        .select2-choice {
+                            .select2-chosen {
+                                padding-left: calc(.5rem + 20px);
+                            }
+                        }
+                    }
+                    input {
+                        white-space: nowrap;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                    }
 
-    &__wrapper {
-      display: flex;
-      flex-direction: column;
-      max-height: calc(100vh - 75px - 1.5rem - 25px); //(full viewport)-(nav height)-(top padding)-(bottom padding)
-    }
+                    span.spanPretendingToBeInput {
+                        display: block;
+                        &:has(svg) {
+                            display: flex;
+                            align-items: flex-start;
+                            gap: .5rem;
+                        }
+                        background-color: $disabled;
+                        width: 100%;
+                        padding: 0.5rem;
+                        margin-bottom: .375rem;
+                        font-style: italic;
 
-    &__content {
-      flex: 1;
-      overflow-y: scroll;
+                        span {
+                            white-space: normal;
+                        }
+                    }
 
-      select, textarea, input {
-        display: block;
-      }
+                    input:disabled ~ label {
+                        display: none;
+                    }
+                }
+                [class^="control_buttons_div"] {
+                    padding-left: .5rem;
+                    padding-right: .5rem;
+                }
+            }
+        }
     }
-  }
-}
+}

portality/bll/services/todo.py

@@ -17,7 +17,7 @@ def group_stats(self, group_id):
         eg = models.EditorGroup.pull(group_id)
         stats = {"editor_group": eg.data}
 
-        #~~-> Account:Model ~~
+        # ~~-> Account:Model ~~
         stats["editors"] = {}
         editors = [eg.editor] + eg.associates
         for editor in editors:
@@ -43,7 +43,8 @@ def group_stats(self, group_id):
                     stats["by_editor"][bucket["key"]]["update_requests"] = b["doc_count"]
                     stats["total"]["update_requests"] += b["doc_count"]
 
-        unassigned_buckets = resp.get("aggregations", {}).get("unassigned", {}).get("application_type", {}).get("buckets", [])
+        unassigned_buckets = resp.get("aggregations", {}).get("unassigned", {}).get("application_type", {}).get(
+            "buckets", [])
         stats["unassigned"] = {"applications": 0, "update_requests": 0}
         for ub in unassigned_buckets:
             if ub["key"] == constants.APPLICATION_TYPE_NEW_APPLICATION:
@@ -123,7 +124,7 @@ def user_finished_historical_counts(self, account, year=None):
 
         return count
 
-    def top_todo(self, account, size=25, new_applications=True, update_requests=True, on_hold=True):
+    def top_todo(self, account, size=25, new_applications=True, update_requests=True, flag=True, on_hold=True):
         """
         Returns the top number of todo items for a given user
 
@@ -179,6 +180,12 @@ def top_todo(self, account, size=25, new_applications=True, update_requests=True
                     TodoRules.associate_start_pending(account.id, size),
                     TodoRules.associate_all_applications(account.id, size)
                 ])
+        # if flagged filter is on than all types of records are displayed and the ownership is not taken into consideration
+        if flag:
+            queries.extend([
+                TodoRules.urgent_flags(account.id, size),
+                TodoRules.regular_flags(account.id, size)
+            ])
 
         todos = []
         for aid, q, sort, boost in queries:
@@ -225,6 +232,7 @@ def _rationalise_todos(self, todos, size):
 
 
 class TodoRules(object):
+
     @classmethod
     def maned_stalled(cls, size, maned_of):
         sort_date = "created_date"
@@ -335,7 +343,6 @@ def maned_last_month_update_requests(cls, size, maned_of):
                     constants.APPLICATION_STATUS_ACCEPTED,
                     constants.APPLICATION_STATUS_REJECTED
                 ])
-                # TodoQuery.exists("admin.editor")
             ],
             sort=sort_date,
             size=size
@@ -358,7 +365,6 @@ def maned_new_update_requests(cls, size, maned_of):
                     constants.APPLICATION_STATUS_ACCEPTED,
                     constants.APPLICATION_STATUS_REJECTED
                 ])
-                # TodoQuery.exists("admin.editor")
             ],
             sort=sort_date,
             size=size
@@ -539,6 +545,34 @@ def associate_all_applications(cls, acc_id, size):
         )
         return constants.TODO_ASSOCIATE_ALL_APPLICATIONS, all, sort_field, -1
 
+    @classmethod
+    def urgent_flags(cls, acc_id, size):
+        sort_field = "most_urgent_flag_deadline"
+        all = TodoQuery(
+            musts=[
+                TodoQuery.flagged_to_me(acc_id),
+                TodoQuery.urgent_flags()
+            ],
+            sort=sort_field,
+            size=size
+        )
+        return constants.TODO_URGENT_FLAGS, all, sort_field, -1
+
+    @classmethod
+    def regular_flags(cls, acc_id, size):
+        sort_field = "most_urgent_flag_deadline"
+        all = TodoQuery(
+            musts=[
+                TodoQuery.flagged_to_me(acc_id)
+            ],
+            must_nots=[
+                TodoQuery.urgent_flags()
+            ],
+            sort=sort_field,
+            size=size
+        )
+        return constants.TODO_REGULAR_FLAGS, all, sort_field, -1
+
 
 class TodoQuery(object):
     """
@@ -660,6 +694,35 @@ def editor(cls, acc_id):
             }
         }
 
+    @classmethod
+    def flagged_to_me(cls, acc_id):
+        return {
+            "terms": {
+                "index.flag_assignees": [acc_id]
+            }
+        }
+
+    @classmethod
+    def urgent_flags(cls):
+        return {
+            "range": {
+                "index.most_urgent_flag_deadline": {
+                    "gte": "now",
+                    "lte": "now+7d/d"
+                }
+            }
+        }
+
+    @classmethod
+    def flags_with_nonurgent_deadline(cls):
+        return {
+            "range": {
+                "index.most_urgent_flag_deadline": {
+                    "gt": "now+7d/d"
+                }
+            }
+        }
+
 
 class GroupStatsQuery():
     """

portality/constants.py

@@ -43,6 +43,7 @@
 LINK_TYPE_FULLTEXT = "fulltext"
 
 # ~~-> Todo:Service~~
+TODO_ASSIGNED_TO_ME = "todo_assigned_to_me"
 TODO_MANED_STALLED = "todo_maned_stalled"
 TODO_MANED_FOLLOW_UP_OLD = "todo_maned_follow_up_old"
 TODO_MANED_READY = "todo_maned_ready"
@@ -60,6 +61,8 @@
 TODO_ASSOCIATE_FOLLOW_UP_OLD = "todo_associate_follow_up_old"
 TODO_ASSOCIATE_START_PENDING = "todo_associate_start_pending"
 TODO_ASSOCIATE_ALL_APPLICATIONS = "todo_associate_all_applications"
+TODO_URGENT_FLAGS = "todo_urgent_flags"
+TODO_REGULAR_FLAGS = "todo_regular_flags"
 
 EVENT_ACCOUNT_CREATED = "account:created"
 EVENT_ACCOUNT_PASSWORD_RESET = "account:password_reset"

portality/core.py

@@ -329,4 +329,4 @@ def build_statics(app):
 
 
 app = create_app()
-es_connection = create_es_connection(app)
+es_connection = create_es_connection(app)