From ed973ec3a39e44d4aa7333d11b2cb5d182d53bbd Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 6 Feb 2014 12:18:25 +0200 Subject: [PATCH] dev. tasks panel. --- .../layouts/Account/relationships.json | 2 +- .../Resources/layouts/Case/relationships.json | 2 +- .../layouts/Contact/relationships.json | 2 +- .../Resources/layouts/Lead/relationships.json | 2 +- .../layouts/Opportunity/relationships.json | 2 +- .../Resources/metadata/entityDefs/Task.json | 2 +- .../Resources/metadata/viewDefs/Account.json | 5 ++++ .../Crm/Resources/metadata/viewDefs/Case.json | 5 ++++ .../Resources/metadata/viewDefs/Contact.json | 5 ++++ .../Crm/Resources/metadata/viewDefs/Lead.json | 5 ++++ .../metadata/viewDefs/Opportunity.json | 5 ++++ .../Espo/Modules/Crm/SelectManagers/Task.php | 25 +++++++++++++++++++ 12 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 application/Espo/Modules/Crm/SelectManagers/Task.php diff --git a/application/Espo/Modules/Crm/Resources/layouts/Account/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Account/relationships.json index d3efe41050..60176b2578 100644 --- a/application/Espo/Modules/Crm/Resources/layouts/Account/relationships.json +++ b/application/Espo/Modules/Crm/Resources/layouts/Account/relationships.json @@ -1 +1 @@ -["contacts","opportunities","tasks","cases"] \ No newline at end of file +["contacts","opportunities","cases"] diff --git a/application/Espo/Modules/Crm/Resources/layouts/Case/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Case/relationships.json index 4d40cfc6ca..fe51488c70 100644 --- a/application/Espo/Modules/Crm/Resources/layouts/Case/relationships.json +++ b/application/Espo/Modules/Crm/Resources/layouts/Case/relationships.json @@ -1 +1 @@ -["tasks"] \ No newline at end of file +[] diff --git a/application/Espo/Modules/Crm/Resources/layouts/Contact/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Contact/relationships.json index e0b907ace1..ffe13eca56 100644 --- a/application/Espo/Modules/Crm/Resources/layouts/Contact/relationships.json +++ b/application/Espo/Modules/Crm/Resources/layouts/Contact/relationships.json @@ -1 +1 @@ -["opportunities","tasks","cases"] \ No newline at end of file +["opportunities","cases"] diff --git a/application/Espo/Modules/Crm/Resources/layouts/Lead/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Lead/relationships.json index 4d40cfc6ca..fe51488c70 100644 --- a/application/Espo/Modules/Crm/Resources/layouts/Lead/relationships.json +++ b/application/Espo/Modules/Crm/Resources/layouts/Lead/relationships.json @@ -1 +1 @@ -["tasks"] \ No newline at end of file +[] diff --git a/application/Espo/Modules/Crm/Resources/layouts/Opportunity/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Opportunity/relationships.json index 12b3dadf50..5ac715fdac 100644 --- a/application/Espo/Modules/Crm/Resources/layouts/Opportunity/relationships.json +++ b/application/Espo/Modules/Crm/Resources/layouts/Opportunity/relationships.json @@ -1 +1 @@ -["contacts","tasks"] \ No newline at end of file +["contacts"] diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json index b7fdab172d..f77f2d2343 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json +++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json @@ -83,6 +83,6 @@ "collection": { "sortBy": "createdAt", "asc": false, - "boolFilters": ["onlyMy"] + "boolFilters": ["onlyMy", "active"] } } diff --git a/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Account.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Account.json index 672e2da473..3a15b2d346 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Account.json +++ b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Account.json @@ -10,6 +10,11 @@ "name":"history", "label":"History", "view":"Crm:Record.Panels.History" + }, + { + "name":"tasks", + "label":"Tasks", + "view":"Crm:Record.Panels.Tasks" } ] }, diff --git a/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Case.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Case.json index 75450d6d96..194a0085ae 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Case.json +++ b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Case.json @@ -14,6 +14,11 @@ "name":"history", "label":"History", "view":"Crm:Record.Panels.History" + }, + { + "name":"tasks", + "label":"Tasks", + "view":"Crm:Record.Panels.Tasks" } ] } diff --git a/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Contact.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Contact.json index 390c5e8255..ee15878f86 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Contact.json +++ b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Contact.json @@ -13,6 +13,11 @@ "name":"history", "label":"History", "view":"Crm:Record.Panels.History" + }, + { + "name":"tasks", + "label":"Tasks", + "view":"Crm:Record.Panels.Tasks" } ] } diff --git a/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Lead.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Lead.json index 24b30b678a..2f5400314b 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Lead.json +++ b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Lead.json @@ -16,6 +16,11 @@ "name":"history", "label":"History", "view":"Crm:Record.Panels.History" + }, + { + "name":"tasks", + "label":"Tasks", + "view":"Crm:Record.Panels.Tasks" } ] } diff --git a/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Opportunity.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Opportunity.json index b70cee56d3..ffc3204271 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Opportunity.json +++ b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Opportunity.json @@ -13,6 +13,11 @@ "name":"history", "label":"History", "view":"Crm:Record.Panels.History" + }, + { + "name":"tasks", + "label":"Tasks", + "view":"Crm:Record.Panels.Tasks" } ] } diff --git a/application/Espo/Modules/Crm/SelectManagers/Task.php b/application/Espo/Modules/Crm/SelectManagers/Task.php new file mode 100644 index 0000000000..956a618163 --- /dev/null +++ b/application/Espo/Modules/Crm/SelectManagers/Task.php @@ -0,0 +1,25 @@ + 'notIn', + 'field' => 'status', + 'value' => array('Completed', 'Canceled'), + ); + } + + protected function getBoolFilterWhereInactive() + { + return array( + 'type' => 'in', + 'field' => 'status', + 'value' => array('Completed', 'Canceled'), + ); + } + +}