From f0a5a0a948e55facd5595ea542030d6ea65555c9 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Tue, 2 Jul 2013 09:18:40 +0000 Subject: [PATCH] Completed the move of dashboards from separate definition files (e.g. overview.xml) into data model files (8 dashboards were concerned on the model 2.x, 6 for the model 1.x) SVN:trunk[2786] --- .../datamodel.itop-change-mgmt.xml | 41 ++++++- .../1.x/itop-change-mgmt-1.0.0/overview.xml | 41 ------- .../datamodel.itop-incident-mgmt.xml | 41 ++++++- .../incident-dashboard.xml | 41 ------- .../datamodel.itop-problem-mgmt.xml | 42 +++++++- .../1.x/itop-problem-mgmt-1.0.0/overview.xml | 43 -------- .../datamodel.itop-request-mgmt.xml | 41 ++++++- .../request-dashboard.xml | 41 ------- .../datamodel.itop-service-mgmt.xml | 27 ++++- .../1.x/itop-service-mgmt-1.0.0/overview.xml | 27 ----- .../datamodel.itop-welcome-itil.xml | 100 ++++++++++++++++++ .../main.itop-welcome-itil.php | 5 - .../module.itop-welcome-itil.php | 1 + .../1.x/itop-welcome-itil/welcome_menu.xml | 86 --------------- .../datamodel.itop-change-mgmt-itil.xml | 55 +++++++++- .../2.x/itop-change-mgmt-itil/overview.xml | 57 ---------- .../datamodel.itop-change-mgmt.xml | 55 +++++++++- datamodels/2.x/itop-change-mgmt/overview.xml | 56 ---------- .../datamodel.itop-incident-mgmt-itil.xml | 62 ++++++++++- .../2.x/itop-incident-mgmt-itil/overview.xml | 64 ----------- .../datamodel.itop-problem-mgmt.xml | 42 +++++++- datamodels/2.x/itop-problem-mgmt/overview.xml | 42 -------- .../datamodel.itop-request-mgmt-itil.xml | 79 +++++++++++++- .../2.x/itop-request-mgmt-itil/overview.xml | 86 --------------- .../datamodel.itop-request-mgmt.xml | 79 +++++++++++++- datamodels/2.x/itop-request-mgmt/overview.xml | 79 -------------- .../datamodel.itop-service-mgmt-provider.xml | 27 ++++- .../itop-service-mgmt-provider/overview.xml | 27 ----- .../datamodel.itop-service-mgmt.xml | 27 ++++- datamodels/2.x/itop-service-mgmt/overview.xml | 27 ----- 30 files changed, 706 insertions(+), 735 deletions(-) delete mode 100644 datamodels/1.x/itop-change-mgmt-1.0.0/overview.xml delete mode 100644 datamodels/1.x/itop-incident-mgmt-1.0.0/incident-dashboard.xml delete mode 100644 datamodels/1.x/itop-problem-mgmt-1.0.0/overview.xml delete mode 100644 datamodels/1.x/itop-request-mgmt-1.0.0/request-dashboard.xml delete mode 100644 datamodels/1.x/itop-service-mgmt-1.0.0/overview.xml create mode 100644 datamodels/1.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml delete mode 100644 datamodels/1.x/itop-welcome-itil/welcome_menu.xml delete mode 100644 datamodels/2.x/itop-change-mgmt-itil/overview.xml delete mode 100755 datamodels/2.x/itop-change-mgmt/overview.xml delete mode 100755 datamodels/2.x/itop-incident-mgmt-itil/overview.xml delete mode 100755 datamodels/2.x/itop-problem-mgmt/overview.xml delete mode 100755 datamodels/2.x/itop-request-mgmt-itil/overview.xml delete mode 100755 datamodels/2.x/itop-request-mgmt/overview.xml delete mode 100644 datamodels/2.x/itop-service-mgmt-provider/overview.xml delete mode 100644 datamodels/2.x/itop-service-mgmt/overview.xml diff --git a/datamodels/1.x/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml b/datamodels/1.x/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml index f0fdbdd26d..b86ccd87db 100644 --- a/datamodels/1.x/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml +++ b/datamodels/1.x/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml @@ -5292,7 +5292,46 @@ 0 ChangeManagement - overview.xml + + DashboardLayoutTwoCols + + + + 0 + + + 0 + UI-ChangeManagementOverview-ChangeByType + SELECT Change + finalclass + + + + + + 1 + + + 0 + UI-ChangeManagementOverview-ChangeUnassigned + SELECT Change WHERE status = 'new' + false + + + + + 2 + + + 0 + UI-ChangeManagementOverview-ChangeWithOutage + SELECT Change WHERE outage = 'yes' + false + + + + + 1 diff --git a/datamodels/1.x/itop-change-mgmt-1.0.0/overview.xml b/datamodels/1.x/itop-change-mgmt-1.0.0/overview.xml deleted file mode 100644 index 4194ec0e67..0000000000 --- a/datamodels/1.x/itop-change-mgmt-1.0.0/overview.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - DashboardLayoutTwoCols - - - - 0 - - - 0 - UI-ChangeManagementOverview-ChangeByType - SELECT Change - finalclass - - - - - - 1 - - - 0 - UI-ChangeManagementOverview-ChangeUnassigned - SELECT Change WHERE status = 'new' - false - - - - - 2 - - - 0 - UI-ChangeManagementOverview-ChangeWithOutage - SELECT Change WHERE outage = 'yes' - false - - - - - diff --git a/datamodels/1.x/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml b/datamodels/1.x/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml index a27d8c1f6c..bc39b46a29 100644 --- a/datamodels/1.x/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml +++ b/datamodels/1.x/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml @@ -1133,7 +1133,46 @@ 0 IncidentManagement - incident-dashboard.xml + + UI:IncidentMgmtMenuOverview:Title + DashboardLayoutTwoCols + + + 0 + + + 0 + UI-IncidentManagementOverview-IncidentByService + SELECT Incident + service_id + + + + + + 1 + + + 0 + UI-IncidentManagementOverview-IncidentByPriority + SELECT Incident + priority + + + + + + 2 + + + 0 + UI-IncidentManagementOverview-IncidentUnassigned + SELECT Incident WHERE status IN ("new", "escalated_tto") + + + + + 1 diff --git a/datamodels/1.x/itop-incident-mgmt-1.0.0/incident-dashboard.xml b/datamodels/1.x/itop-incident-mgmt-1.0.0/incident-dashboard.xml deleted file mode 100644 index e5234761c1..0000000000 --- a/datamodels/1.x/itop-incident-mgmt-1.0.0/incident-dashboard.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - UI:IncidentMgmtMenuOverview:Title - DashboardLayoutTwoCols - - - 0 - - - 0 - UI-IncidentManagementOverview-IncidentByService - SELECT Incident - service_id - - - - - - 1 - - - 0 - UI-IncidentManagementOverview-IncidentByPriority - SELECT Incident - priority - - - - - - 2 - - - 0 - UI-IncidentManagementOverview-IncidentUnassigned - SELECT Incident WHERE status IN ("new", "escalated_tto") - - - - - diff --git a/datamodels/1.x/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml b/datamodels/1.x/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml index 2b651cb960..3c6a022303 100644 --- a/datamodels/1.x/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml +++ b/datamodels/1.x/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml @@ -751,7 +751,47 @@ 0 ProblemManagement - overview.xml + + DashboardLayoutTwoCols + + + + 0 + + + 0 + UI-ProblemManagementOverview-ProblemByService + SELECT Problem + service_id + + + + + + 1 + + + 0 + UI-ProblemManagementOverview-ProblemByPriority + SELECT Problem + priority + + + + + + 2 + + + 0 + UI-ProblemManagementOverview-ProblemUnassigned + SELECT Problem WHERE status IN ("new") + true + + + + + 1 diff --git a/datamodels/1.x/itop-problem-mgmt-1.0.0/overview.xml b/datamodels/1.x/itop-problem-mgmt-1.0.0/overview.xml deleted file mode 100644 index a6923665fe..0000000000 --- a/datamodels/1.x/itop-problem-mgmt-1.0.0/overview.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - DashboardLayoutTwoCols - - - - 0 - - - 0 - UI-ProblemManagementOverview-ProblemByService - SELECT Problem - service_id - - - - - - 1 - - - 0 - UI-ProblemManagementOverview-ProblemByPriority - SELECT Problem - priority - - - - - - 2 - - - 0 - UI-ProblemManagementOverview-ProblemUnassigned - SELECT Problem WHERE status IN ("new") - true - - - - - - diff --git a/datamodels/1.x/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml b/datamodels/1.x/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml index 0c4690fdf6..5b4a89ccb9 100644 --- a/datamodels/1.x/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml +++ b/datamodels/1.x/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml @@ -1093,7 +1093,46 @@ 0 RequestManagement - request-dashboard.xml + + UI:RequestMgmtMenuOverview:Title + DashboardLayoutTwoCols + + + 0 + + + 0 + UI-RequestManagementOverview-RequestByService + SELECT UserRequest + service_id + + + + + + 1 + + + 0 + UI-RequestManagementOverview-RequestByPriority + SELECT UserRequest + priority + + + + + + 2 + + + 0 + UI-RequestManagementOverview-RequestUnassigned + SELECT UserRequest WHERE status IN ("new", "escalated_tto") + + + + + 1 diff --git a/datamodels/1.x/itop-request-mgmt-1.0.0/request-dashboard.xml b/datamodels/1.x/itop-request-mgmt-1.0.0/request-dashboard.xml deleted file mode 100644 index 2785132716..0000000000 --- a/datamodels/1.x/itop-request-mgmt-1.0.0/request-dashboard.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - UI:RequestMgmtMenuOverview:Title - DashboardLayoutTwoCols - - - 0 - - - 0 - UI-RequestManagementOverview-RequestByService - SELECT UserRequest - service_id - - - - - - 1 - - - 0 - UI-RequestManagementOverview-RequestByPriority - SELECT UserRequest - priority - - - - - - 2 - - - 0 - UI-RequestManagementOverview-RequestUnassigned - SELECT UserRequest WHERE status IN ("new", "escalated_tto") - - - - - diff --git a/datamodels/1.x/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml b/datamodels/1.x/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml index 75996d17d9..cce192889b 100644 --- a/datamodels/1.x/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml +++ b/datamodels/1.x/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml @@ -2034,7 +2034,32 @@ 0 ServiceManagement - overview.xml + + UI:ServiceMgmtMenuOverview:Title + DashboardLayoutTwoCols + + + 1 + + + 1 + UI-ServiceManagementOverview-CustomerContractToRenew + SELECT CustomerContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) + + + + + 2 + + + 1 + UI-ServiceManagementOverview-ProviderContractToRenew + SELECT ProviderContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) + + + + + 1 diff --git a/datamodels/1.x/itop-service-mgmt-1.0.0/overview.xml b/datamodels/1.x/itop-service-mgmt-1.0.0/overview.xml deleted file mode 100644 index 22ca007ad0..0000000000 --- a/datamodels/1.x/itop-service-mgmt-1.0.0/overview.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - UI:ServiceMgmtMenuOverview:Title - DashboardLayoutTwoCols - - - 1 - - - 1 - UI-ServiceManagementOverview-CustomerContractToRenew - SELECT CustomerContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) - - - - - 2 - - - 1 - UI-ServiceManagementOverview-ProviderContractToRenew - SELECT ProviderContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) - - - - - diff --git a/datamodels/1.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml b/datamodels/1.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml new file mode 100644 index 0000000000..ed684bfab2 --- /dev/null +++ b/datamodels/1.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml @@ -0,0 +1,100 @@ + + + + + 10 + + + 10 + WelcomeMenu + + DashboardLayoutOneCol + + + + 0 + + + 0 + UI:ConfigurationManagementMenu + itop-config-mgmt-1.0.0/images/database.png + UI:WelcomeMenu:AllConfigItems + SELECT FunctionalCI + status + implementation,production,obsolete + + + 1 + BusinessProcess + + + 2 + Contact + + + 3 + Location + + + 4 + Server + + + 5 + DatabaseInstance + + + 6 + NetworkDevice + + + + + 0 + + + 0 + Menu:RequestManagement + itop-request-mgmt-1.0.0/images/user-request-deadline.png + UI:WelcomeMenu:AllOpenRequests + SELECT UserRequest WHERE status != "closed" + status + new,assigned,escalated_tto,escalated_ttr,resolved + + + 1 + UI:WelcomeMenu:MyCalls + SELECT UserRequest AS i WHERE i.caller_id = :current_contact_id AND status NOT IN ("closed", "resolved") + true + + + + + 0 + + + 0 + Menu:IncidentManagement + itop-incident-mgmt-1.0.0/images/incident-escalated.png + UI:WelcomeMenu:OpenIncidents + SELECT Incident WHERE status != "closed" + status + new,assigned,escalated_tto,escalated_ttr,resolved + + + 1 + UI:WelcomeMenu:MyIncidents + SELECT Incident AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved") + true + + + + + + + + 20 + WelcomeMenu + + + diff --git a/datamodels/1.x/itop-welcome-itil/main.itop-welcome-itil.php b/datamodels/1.x/itop-welcome-itil/main.itop-welcome-itil.php index 7aaabbc8bb..a9d1d964b7 100644 --- a/datamodels/1.x/itop-welcome-itil/main.itop-welcome-itil.php +++ b/datamodels/1.x/itop-welcome-itil/main.itop-welcome-itil.php @@ -44,11 +44,6 @@ class ItopWelcome extends ModuleHandlerAPI { public static function OnMenuCreation() { - $oWelcomeMenu = new MenuGroup('WelcomeMenu', 10 /* fRank */); - new DashboardMenuNode('WelcomeMenuPage', dirname(__FILE__).'/welcome_menu.xml', $oWelcomeMenu->GetIndex() /* oParent */, 10 /* fRank */); - - new ShortcutContainerMenuNode('MyShortcuts', $oWelcomeMenu->GetIndex(), 20 /* fRank */); - $oToolsMenu = new MenuGroup('DataAdministration', 70 /* fRank */, 'Organization', UR_ACTION_MODIFY, UR_ALLOWED_YES|UR_ALLOWED_DEPENDS); new WebPageMenuNode('CSVImportMenu', utils::GetAbsoluteUrlAppRoot().'pages/csvimport.php', $oToolsMenu->GetIndex(), 1 /* fRank */); diff --git a/datamodels/1.x/itop-welcome-itil/module.itop-welcome-itil.php b/datamodels/1.x/itop-welcome-itil/module.itop-welcome-itil.php index cba522d6e2..4026e58b0e 100644 --- a/datamodels/1.x/itop-welcome-itil/module.itop-welcome-itil.php +++ b/datamodels/1.x/itop-welcome-itil/module.itop-welcome-itil.php @@ -22,6 +22,7 @@ SetupWebPage::AddModule( // 'datamodel' => array( 'main.itop-welcome-itil.php', + 'model.itop-welcome-itil.php', ), 'webservice' => array( //'webservices.itop-welcome-itil.php', diff --git a/datamodels/1.x/itop-welcome-itil/welcome_menu.xml b/datamodels/1.x/itop-welcome-itil/welcome_menu.xml deleted file mode 100644 index 9815df0ef0..0000000000 --- a/datamodels/1.x/itop-welcome-itil/welcome_menu.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - DashboardLayoutOneCol - - - - 0 - - - 0 - UI:ConfigurationManagementMenu - itop-config-mgmt-1.0.0/images/database.png - UI:WelcomeMenu:AllConfigItems - SELECT FunctionalCI - status - implementation,production,obsolete - - - 1 - BusinessProcess - - - 2 - Contact - - - 3 - Location - - - 4 - Server - - - 5 - DatabaseInstance - - - 6 - NetworkDevice - - - - - 0 - - - 0 - Menu:RequestManagement - itop-request-mgmt-1.0.0/images/user-request-deadline.png - UI:WelcomeMenu:AllOpenRequests - SELECT UserRequest WHERE status != "closed" - status - new,assigned,escalated_tto,escalated_ttr,resolved - - - 1 - UI:WelcomeMenu:MyCalls - SELECT UserRequest AS i WHERE i.caller_id = :current_contact_id AND status NOT IN ("closed", "resolved") - true - - - - - 0 - - - 0 - Menu:IncidentManagement - itop-incident-mgmt-1.0.0/images/incident-escalated.png - UI:WelcomeMenu:OpenIncidents - SELECT Incident WHERE status != "closed" - status - new,assigned,escalated_tto,escalated_ttr,resolved - - - 1 - UI:WelcomeMenu:MyIncidents - SELECT Incident AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved") - true - - - - - - diff --git a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml index 9178db6029..c4896a08f3 100755 --- a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml +++ b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml @@ -5435,7 +5435,60 @@ 0 ChangeManagement - overview.xml + + DashboardLayoutTwoCols + UI:ChangeMgmtMenuOverview:Title + + + 0 + + + 0 + UI-ChangeManagementOverview-ChangeByCategory-last-7-days + SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) + finalclass + + + + + + 1 + + + 0 + UI-ChangeManagementOverview-Last-7-days + SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) + start_date:day_of_month + + + + + + 2 + + + 0 + UI-ChangeManagementOverview-ChangeByDomain-last-7-days + SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) + finalclass + + + + + + 3 + + + 0 + UI-ChangeManagementOverview-ChangeByStatus-last-7-days + SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) + status + + + + + + 1 diff --git a/datamodels/2.x/itop-change-mgmt-itil/overview.xml b/datamodels/2.x/itop-change-mgmt-itil/overview.xml deleted file mode 100644 index 81da1d3f84..0000000000 --- a/datamodels/2.x/itop-change-mgmt-itil/overview.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - DashboardLayoutTwoCols - UI:ChangeMgmtMenuOverview:Title - - - 0 - - - 0 - UI-ChangeManagementOverview-ChangeByCategory-last-7-days - SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) - finalclass - - - - - - 1 - - - 0 - UI-ChangeManagementOverview-Last-7-days - SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) - start_date:day_of_month - - - - - - 2 - - - 0 - UI-ChangeManagementOverview-ChangeByDomain-last-7-days - SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) - finalclass - - - - - - 3 - - - 0 - UI-ChangeManagementOverview-ChangeByStatus-last-7-days - SELECT Change WHERE creation_date > DATE_SUB(NOW(), - INTERVAL 7 DAY) - status - - - - - - - diff --git a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml index 4e9af2a85c..ac2e42cb84 100755 --- a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml +++ b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml @@ -880,7 +880,60 @@ 0 ChangeManagement - overview.xml + + DashboardLayoutTwoCols + UI:ChangeMgmtMenuOverview:Title + + + 0 + + + 0 + UI-ChangeManagementOverview-ChangeByCategory-last-7-days + SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) + category + + + + + + 1 + + + 0 + UI-ChangeManagementOverview-Last-7-days + SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) + start_date:day_of_month + + + + + + 2 + + + 0 + UI-ChangeManagementOverview-ChangeByDomain-last-7-days + SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) + finalclass + + + + + + 3 + + + 0 + UI-ChangeManagementOverview-ChangeByStatus-last-7-days + SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) + status + + + + + + 1 diff --git a/datamodels/2.x/itop-change-mgmt/overview.xml b/datamodels/2.x/itop-change-mgmt/overview.xml deleted file mode 100755 index effb2477ae..0000000000 --- a/datamodels/2.x/itop-change-mgmt/overview.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - DashboardLayoutTwoCols - UI:ChangeMgmtMenuOverview:Title - - - 0 - - - 0 - UI-ChangeManagementOverview-ChangeByCategory-last-7-days - SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) - category - - - - - - 1 - - - 0 - UI-ChangeManagementOverview-Last-7-days - SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) - start_date:day_of_month - - - - - - 2 - - - 0 - UI-ChangeManagementOverview-ChangeByDomain-last-7-days - SELECT Change WHERE creation_date > DATE_SUB(NOW(), INTERVAL 7 DAY) - finalclass - - - - - - 3 - - - 0 - UI-ChangeManagementOverview-ChangeByStatus-last-7-days - SELECT Change WHERE creation_date > DATE_SUB(NOW(), - INTERVAL 7 DAY) - status - - - - - - diff --git a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml index c856b6409d..85ade8214d 100755 --- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml +++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml @@ -1956,7 +1956,67 @@ 0 IncidentManagement - overview.xml + + DashboardLayoutTwoCols + UI:IncidentMgmtMenuOverview:Title + + + 0 + + + UI-IncidentManagementOverview-IncidentByPriority-last-14-days + SELECT Incident WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date + priority + + + + + + 1 + + + UI-IncidentManagementOverview-Last-14-days + SELECT Incident WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date + start_date:day_of_month + + + + + + 2 + + + UI-IncidentManagementOverview-OpenIncidentByStatus + SELECT Incident WHERE status NOT IN ('closed','rejected') + status + + + + + + 3 + + + UI-IncidentManagementOverview-OpenIncidentByAgent + SELECT Incident WHERE status NOT IN ('closed','rejected') + agent_id + + + + + + 4 + + + UI-IncidentManagementOverview-OpenIncidentByCustomer + SELECT Incident WHERE status NOT IN ('closed','rejected') + org_id + + + + + + 1 diff --git a/datamodels/2.x/itop-incident-mgmt-itil/overview.xml b/datamodels/2.x/itop-incident-mgmt-itil/overview.xml deleted file mode 100755 index be17eb2e2e..0000000000 --- a/datamodels/2.x/itop-incident-mgmt-itil/overview.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - DashboardLayoutTwoCols - UI:IncidentMgmtMenuOverview:Title - - - 0 - - - UI-IncidentManagementOverview-IncidentByPriority-last-14-days - SELECT Incident WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date - priority - - - - - - 1 - - - UI-IncidentManagementOverview-Last-14-days - SELECT Incident WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date - start_date:day_of_month - - - - - - 2 - - - UI-IncidentManagementOverview-OpenIncidentByStatus - SELECT Incident WHERE status NOT IN - ('closed','rejected') - status - - - - - - 3 - - - UI-IncidentManagementOverview-OpenIncidentByAgent - SELECT Incident WHERE status NOT IN - ('closed','rejected') - agent_id - - - - - - 4 - - - UI-IncidentManagementOverview-OpenIncidentByCustomer - SELECT Incident WHERE status NOT IN ('closed','rejected') - org_id - - - - - - diff --git a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml index 3ceef0add7..56b2154abf 100755 --- a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml +++ b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml @@ -738,7 +738,47 @@ 0 ProblemManagement - overview.xml + + DashboardLayoutTwoCols + UI:ProblemMgmtMenuOverview:Title + + + 0 + + + 0 + UI-ProblemManagementOverview-ProblemByService + SELECT Problem + service_id + + + + + + 1 + + + 0 + UI-ProblemManagementOverview-ProblemByPriority + SELECT Problem + priority + + + + + + 2 + + + 0 + UI-ProblemManagementOverview-ProblemUnassigned + SELECT Problem WHERE status IN ("new") + false + + + + + 1 diff --git a/datamodels/2.x/itop-problem-mgmt/overview.xml b/datamodels/2.x/itop-problem-mgmt/overview.xml deleted file mode 100755 index 3603f043c0..0000000000 --- a/datamodels/2.x/itop-problem-mgmt/overview.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - DashboardLayoutTwoCols - UI:ProblemMgmtMenuOverview:Title - - - 0 - - - 0 - UI-ProblemManagementOverview-ProblemByService - SELECT Problem - service_id - - - - - - 1 - - - 0 - UI-ProblemManagementOverview-ProblemByPriority - SELECT Problem - priority - - - - - - 2 - - - 0 - UI-ProblemManagementOverview-ProblemUnassigned - SELECT Problem WHERE status IN ("new") - false - - - - - diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml index 1ac1c01fdf..41dea47569 100755 --- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml +++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml @@ -2303,7 +2303,84 @@ 0 RequestManagement - overview.xml + + DashboardLayoutTwoCols + UI:RequestMgmtMenuOverview:Title + + + 0 + + + 0 + UI-RequestManagementOverview-RequestByType-last-14-days + SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date + request_type + + + + + + 1 + + + 0 + UI-RequestManagementOverview-Last-14-days + SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date + start_date:day_of_month + + + + + + 2 + + + 0 + UI-RequestManagementOverview-OpenRequestByStatus + SELECT UserRequest WHERE status NOT IN ('closed','rejected') + status + + + + + + 3 + + + 0 + UI-RequestManagementOverview-OpenRequestByAgent + SELECT UserRequest WHERE status NOT IN ('closed','rejected') + agent_id + + + + + + 4 + + + 0 + UI-RequestManagementOverview-OpenRequestByType + SELECT UserRequest WHERE status NOT IN ('closed','rejected') + finalclass + + + + + + 5 + + + 0 + UI-RequestManagementOverview-OpenRequestByCustomer + SELECT UserRequest WHERE status NOT IN ('closed','rejected') + org_id + + + + + + 1 diff --git a/datamodels/2.x/itop-request-mgmt-itil/overview.xml b/datamodels/2.x/itop-request-mgmt-itil/overview.xml deleted file mode 100755 index 07fb623378..0000000000 --- a/datamodels/2.x/itop-request-mgmt-itil/overview.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - DashboardLayoutTwoCols - UI:RequestMgmtMenuOverview:Title - - - 0 - - - 0 - UI-RequestManagementOverview-RequestByType-last-14-days - SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 - DAY) < start_date - request_type - - - - - - 1 - - - 0 - UI-RequestManagementOverview-Last-14-days - SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 - DAY) - < start_date - start_date:day_of_month - - - - - - 2 - - - 0 - UI-RequestManagementOverview-OpenRequestByStatus - SELECT UserRequest WHERE status NOT IN - ('closed','rejected') - status - - - - - - 3 - - - 0 - UI-RequestManagementOverview-OpenRequestByAgent - SELECT UserRequest WHERE status NOT IN - ('closed','rejected') - agent_id - - - - - - 4 - - - 0 - UI-RequestManagementOverview-OpenRequestByType - SELECT UserRequest WHERE status NOT IN - ('closed','rejected') - finalclass - - - - - - 5 - - - 0 - UI-RequestManagementOverview-OpenRequestByCustomer - SELECT UserRequest WHERE status NOT IN - ('closed','rejected') - org_id - - - - - - diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml index 86b5f867c3..a18c4fb9cf 100755 --- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml +++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml @@ -2285,7 +2285,84 @@ 0 RequestManagement - overview.xml + + DashboardLayoutTwoCols + UI:RequestMgmtMenuOverview:Title + + + 0 + + + 0 + UI-RequestManagementOverview-RequestByType-last-14-days + SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date + request_type + + + + + + 1 + + + 0 + UI-RequestManagementOverview-Last-14-days + SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date + start_date:day_of_month + + + + + + 2 + + + 0 + UI-RequestManagementOverview-OpenRequestByStatus + SELECT UserRequest WHERE status NOT IN ('closed','rejected') + status + + + + + + 3 + + + 0 + UI-RequestManagementOverview-OpenRequestByAgent + SELECT UserRequest WHERE status NOT IN ('closed','rejected') + agent_id + + + + + + 4 + + + 0 + UI-RequestManagementOverview-OpenRequestByType + SELECT UserRequest WHERE status NOT IN ('closed','rejected') + finalclass + + + + + + 5 + + + 0 + UI-RequestManagementOverview-OpenRequestByCustomer + SELECT UserRequest WHERE status NOT IN ('closed','rejected') + org_id + + + + + + 1 diff --git a/datamodels/2.x/itop-request-mgmt/overview.xml b/datamodels/2.x/itop-request-mgmt/overview.xml deleted file mode 100755 index 0cb5502754..0000000000 --- a/datamodels/2.x/itop-request-mgmt/overview.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - DashboardLayoutTwoCols - UI:RequestMgmtMenuOverview:Title - - - 0 - - - 0 - UI-RequestManagementOverview-RequestByType-last-14-days - SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date - request_type - - - - - - 1 - - - 0 - UI-RequestManagementOverview-Last-14-days - SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date - start_date:day_of_month - - - - - - 2 - - - 0 - UI-RequestManagementOverview-OpenRequestByStatus - SELECT UserRequest WHERE status NOT IN ('closed','rejected') - status - - - - - - 3 - - - 0 - UI-RequestManagementOverview-OpenRequestByAgent - SELECT UserRequest WHERE status NOT IN ('closed','rejected') - agent_id - - - - - - 4 - - - 0 - UI-RequestManagementOverview-OpenRequestByType - SELECT UserRequest WHERE status NOT IN ('closed','rejected') - finalclass - - - - - - 5 - - - 0 - UI-RequestManagementOverview-OpenRequestByCustomer - SELECT UserRequest WHERE status NOT IN ('closed','rejected') - org_id - - - - - - diff --git a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml index ae9e27c865..52c5936c38 100755 --- a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml +++ b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml @@ -2286,7 +2286,32 @@ 0 ServiceManagement - overview.xml + + UI:ServiceMgmtMenuOverview:Title + DashboardLayoutTwoCols + + + 1 + + + 1 + UI-ServiceManagementOverview-CustomerContractToRenew + SELECT CustomerContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) + + + + + 2 + + + 1 + UI-ServiceManagementOverview-ProviderContractToRenew + SELECT ProviderContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) + + + + + 1 diff --git a/datamodels/2.x/itop-service-mgmt-provider/overview.xml b/datamodels/2.x/itop-service-mgmt-provider/overview.xml deleted file mode 100644 index 22ca007ad0..0000000000 --- a/datamodels/2.x/itop-service-mgmt-provider/overview.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - UI:ServiceMgmtMenuOverview:Title - DashboardLayoutTwoCols - - - 1 - - - 1 - UI-ServiceManagementOverview-CustomerContractToRenew - SELECT CustomerContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) - - - - - 2 - - - 1 - UI-ServiceManagementOverview-ProviderContractToRenew - SELECT ProviderContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) - - - - - diff --git a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml index 88ed693656..f13a12d5a1 100755 --- a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml +++ b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml @@ -2280,7 +2280,32 @@ 0 ServiceManagement - overview.xml + + UI:ServiceMgmtMenuOverview:Title + DashboardLayoutTwoCols + + + 1 + + + 1 + UI-ServiceManagementOverview-CustomerContractToRenew + SELECT CustomerContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) + + + + + 2 + + + 1 + UI-ServiceManagementOverview-ProviderContractToRenew + SELECT ProviderContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) + + + + + 1 diff --git a/datamodels/2.x/itop-service-mgmt/overview.xml b/datamodels/2.x/itop-service-mgmt/overview.xml deleted file mode 100644 index 22ca007ad0..0000000000 --- a/datamodels/2.x/itop-service-mgmt/overview.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - UI:ServiceMgmtMenuOverview:Title - DashboardLayoutTwoCols - - - 1 - - - 1 - UI-ServiceManagementOverview-CustomerContractToRenew - SELECT CustomerContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) - - - - - 2 - - - 1 - UI-ServiceManagementOverview-ProviderContractToRenew - SELECT ProviderContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) - - - - -