deferred filter

2016-11-29 11:19:32 +02:00
parent 3f5dab0680
commit eeaaaf7af1
14 changed files with 28 additions and 9 deletions
@@ -39,6 +39,7 @@
  "presetFilters": {
    "actual": "Aktuell",
    "completed": "Abgeschlossen",
+    "deferred": "Zurückgestellt",
    "todays": "Heutige",
    "overdue": "Überfällig"
  }
@@ -40,6 +40,7 @@
    "presetFilters": {
        "actual": "Actual",
        "completed": "Completed",
+        "deferred": "Deferred",
        "todays": "Today's",
        "overdue": "Overdue"
    }
@@ -39,6 +39,7 @@
  "presetFilters": {
    "actual": "Actuales",
    "completed": "Completado",
+    "deferred": "Diferido",
    "todays": "De Hoy",
    "overdue": "Atrazadas"
  }
@@ -37,6 +37,7 @@
        "actual": "En cours",
        "completed": "Terminés",
        "todays": "Aujourd'hui",
+        "deferred": "Reporté",
        "overdue": "En retard"
    }
 }
@@ -40,6 +40,7 @@
    "actual": "Sebenarnya",
    "completed": "Lengkap",
    "todays": "hari ini",
+    "deferred": "Tangguhan",
    "overdue": "Terlambat"
  }
 }
@@ -40,6 +40,7 @@
    "actual": "Attuale",
    "completed": "Completato",
    "todays": "Di Oggi",
+    "deferred": "Prorogare",
    "overdue": "In RItardo"
  }
 }
@@ -22,8 +22,7 @@
            "Not Started": "Niet Gestart",
            "Started": "Gestart",
            "Completed": "Voltooid",
-            "Canceled": "Geannuleerd",
-            "Deferred": "Deferred"
+            "Canceled": "Geannuleerd"
        },
        "priority" : {
            "Low": "Laag",
@@ -39,6 +39,7 @@
  "presetFilters": {
    "actual": "Bieżący",
    "completed": "Ukończone",
+    "deferred": "Opóźniony",
    "todays": "Dzisiaj",
    "overdue": "Przegrzane"
  }
@@ -34,6 +34,7 @@
 		"actual": "Atual",
 		"completed": "Completa",
 		"todays": "Hoje",
+        "deferred": "Adiada",
 		"overdue": "Atrasada"
 	}
 }
@@ -40,6 +40,7 @@
    "actual": "Актуальные",
    "completed": "Завершенные",
    "todays": "На сегодня",
+    "deferred": "Отложенные",
    "overdue": "Просроченные"
  }
 }
@@ -37,9 +37,10 @@
        "Complete": "Завершити"
    },
    "presetFilters": {
-        "actual": "Актуально",
-        "completed": "Завершено",
-        "todays": "Сьогоднішнє",
-        "overdue": "Прострочено"
+        "actual": "Актуальні",
+        "completed": "Завершені",
+        "todays": "Сьогоднішні",
+        "deferred": "Відстрочені",
+        "overdue": "Прострочені"
    }
 }
@@ -55,6 +55,9 @@
      {
         "name":"overdue",
         "style": "danger"
+      },
+      {
+         "name":"deferred"
      }
   ],
   "boolFilterList": ["onlyMy"]
@@ -43,7 +43,7 @@
                "bool": {
                    "onlyMy": true
                },
-                "primary": "actualNotDeferred"
+                "primary": "actualStartingNotInPast"
            }
        },
        "layout": [
@@ -44,11 +44,18 @@ class Task extends \Espo\Core\SelectManagers\Base
    protected function filterActual(&$result)
    {
        $result['whereClause'][] = array(
-            'status!=' => ['Completed', 'Canceled']
+            'status!=' => ['Completed', 'Canceled', 'Deferred']
        );
    }

-    protected function filterActualNotDeferred(&$result)
+    protected function filterDeferred(&$result)
+    {
+        $result['whereClause'][] = array(
+            'status=' => 'Deferred'
+        );
+    }
+
+    protected function filterActualStartingNotInPast(&$result)
    {
        $result['whereClause'][] = array(
            array(