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 735967e48f..1aff83dd79 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 @@ -2773,38 +2773,149 @@ public function PrefillSearchForm(&$aContextParam) 10 ServiceManagement - UI-ServiceCatalogMenu-Title DashboardLayoutTwoCols + UI-ServiceCatalogMenu-Title + + false + 300 + + + 0 + + + 0 + UI-ServiceCatalogMenu-Title + + + + 1 + ServiceFamily + + + 2 + Service + + + 3 + ServiceSubcategory + + + 4 + SLA + + + 5 + SLT + + + 6 + Class:DeliveryModel + SELECT DeliveryModel + true + + + 1 - + 0 - UI-ServiceCatalogMenu-RecentRequestByService - - service_id - - count - - - attribute - desc + UI-ServiceCatalogMenu-NotInPortal + + + + 1 + Class:Service + /icons8-service.svg + UI-ServiceCatalogMenu-ObsoleteNotInPortal + SELECT Service + status + implementation,obsolete,production + + + 2 + Class:ServiceSubcategory + /icons8-services.svg + UI-ServiceCatalogMenu-ObsoleteNotInPortal + SELECT ServiceSubcategory + status + implementation,obsolete,production + + + 3 + UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal + SELECT Service WHERE servicefamily_id=0 + false 2 - + 0 + UI-ServiceCatalogMenu-SLTBySLA + SELECT lnkSLAToSLT + sla_id + + count + + + attribute + desc + + + + + 3 + + + 0 + UI-ServiceCatalogMenu-ContractByService + SELECT lnkCustomerContractToService AS lnk JOIN CustomerContract AS cc ON lnk.customercontract_id=cc.id WHERE cc.status != 'obsolete' + service_id + + count + + + attribute + desc + + + + + 4 + + + 0 + UI-ServiceCatalogMenu-ContractBySLA + SELECT lnkCustomerContractToService AS lnk JOIN CustomerContract AS cc ON lnk.customercontract_id=cc.id WHERE cc.status != 'obsolete' + sla_id + + count + + + attribute + desc + + + + + 5 + + + 0 + UI-ServiceCatalogMenu-UnusedService + SELECT Service WHERE status='production' AND id NOT IN (SELECT Service AS s JOIN lnkCustomerContractToService AS lnk ON lnk.service_id= s.id JOIN CustomerContract AS cc ON lnk.customercontract_id = cc.id WHERE cc.status != 'obsolete') + + false - 2.5 ServiceCatalog @@ -2846,7 +2957,7 @@ public function PrefillSearchForm(&$aContextParam) ServiceManagement UI-RulesAndWorkflow-Title - DashboardLayoutTwoCols + DashboardLayoutOneCol 0 diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php index 110462654b..7579d9375a 100644 --- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php +++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php @@ -45,27 +45,31 @@ Dict::Add('EN US', 'English', 'English', [ 'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less than 30 days', 'Menu:ProviderContract' => 'Provider contracts', - 'Menu:ProviderContract+' => 'Provider contracts', + 'Menu:ProviderContract+' => 'What your company buys', 'Menu:CustomerContract' => 'Customer contracts', - 'Menu:CustomerContract+' => 'Customer contracts', + 'Menu:CustomerContract+' => 'Who is buying the services', 'Menu:ServiceSubcategory' => 'Service subcategories', - 'Menu:ServiceSubcategory+' => 'Service subcategories', + 'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy', 'Menu:Service' => 'Services', - 'Menu:Service+' => 'Services', - 'Menu:ServiceElement' => 'Sevice elements', - 'Menu:ServiceElement+' => 'Sevice elements', + 'Menu:Service+' => 'Second level in service hierarchy', 'Menu:SLA' => 'SLAs', 'Menu:SLA+' => 'Service Level Agreements', 'Menu:SLT' => 'SLTs', 'Menu:SLT+' => 'Service Level Targets', 'Menu:DeliveryModel' => 'Delivery models', - 'Menu:DeliveryModel+' => 'Delivery models', + 'Menu:DeliveryModel+' => 'Teams handling tickets', 'Menu:ServiceFamily' => 'Service families', - 'Menu:ServiceFamily+' => 'Service families', + 'Menu:ServiceFamily+' => 'Top level in service hierarchy', 'Menu:ServiceCatalog' => 'Service catalog', - 'Menu:ServiceCatalog+' => 'Service catalog', + 'Menu:ServiceCatalog+' => 'Define the service elements of your offering', 'UI-ServiceCatalogMenu-Title' => 'Service catalog', - 'UI-ServiceCatalogMenu-RecentRequestByService' => 'Recent requests by service', + 'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal', + 'UI-ServiceCatalogMenu-ObsoleteNotInPortal' => 'Obsolete are hidden in User Portal', + 'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers', + 'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal', + 'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA', + 'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service', + 'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA', 'Menu:RulesAndWorkflow' => 'Rules and workflow', 'Menu:RulesAndWorkflow+' => 'Automation rules and workflow', 'UI-RulesAndWorkflow-Title' => 'Rules and workflow', diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php index 5060a28890..e36399ccc8 100644 --- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php +++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php @@ -19,27 +19,31 @@ Dict::Add('FR FR', 'French', 'Français', [ 'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats, par état', 'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins d\'un mois', 'Menu:ProviderContract' => 'Contrats fournisseurs', - 'Menu:ProviderContract+' => 'Contrats fournisseurs', + 'Menu:ProviderContract+' => 'Ce que votre société achète', 'Menu:CustomerContract' => 'Contrats clients', - 'Menu:CustomerContract+' => 'Contrats clients', + 'Menu:CustomerContract+' => 'Souscriptions à des services', 'Menu:ServiceSubcategory' => 'Sous catégories de service', - 'Menu:ServiceSubcategory+' => 'Sous catégories de service', + 'Menu:ServiceSubcategory+' => 'Dernier niveau dans la hiérarchie des services', 'Menu:Service' => 'Services', - 'Menu:Service+' => 'Services', - 'Menu:ServiceElement' => 'Eléments de service', - 'Menu:ServiceElement+' => 'Eléments de service', + 'Menu:Service+' => 'Second niveau dans la hiérarchie des services', 'Menu:SLA' => 'SLAs', 'Menu:SLA+' => 'Accords de niveau de service (SLA)', 'Menu:SLT' => 'SLTs', 'Menu:SLT+' => 'Objectifs de niveau de service (SLT)', 'Menu:DeliveryModel' => 'Modèles de support', - 'Menu:DeliveryModel+' => 'Modèles de support', + 'Menu:DeliveryModel+' => 'Les équipes gérant les tickets', 'Menu:ServiceFamily' => 'Familles de service', - 'Menu:ServiceFamily+' => 'Familles de service', + 'Menu:ServiceFamily+' => 'Plus haut niveau dans la hiérarchie des services', 'Menu:ServiceCatalog' => 'Catalogue de services', - 'Menu:ServiceCatalog+' => '', + 'Menu:ServiceCatalog+' => 'Définir les éléments des offres de service', 'UI-ServiceCatalogMenu-Title' => 'Catalogue de services', - 'UI-ServiceCatalogMenu-RecentRequestByService' => 'Demandes récentes groupées par service', + 'UI-ServiceCatalogMenu-ObsoleteNotInPortal' => 'Les obsolètes sont invisibles dans le portail utilisateur', + 'UI-ServiceCatalogMenu-UnusedService' => 'Services en production sans contrat client', + 'UI-ServiceCatalogMenu-NotInPortal' => 'Non affichés dans le portail utilisateur', + 'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal', + 'UI-ServiceCatalogMenu-SLTBySLA' => 'Nombre de SLTs par SLA', + 'UI-ServiceCatalogMenu-ContractByService' => 'Nombre de contrats clients utilisant ce service', + 'UI-ServiceCatalogMenu-ContractBySLA' => 'Nombre de contrats clients utilisant ce SLA', 'Menu:RulesAndWorkflow' => 'Règles d\'automatisation', 'Menu:RulesAndWorkflow+' => '', 'UI-RulesAndWorkflow-Title' => 'Règles d\'automatisation', @@ -51,7 +55,6 @@ Elles sont incluses dans les produits Professionels, mais pas dans la version co 'Contract:cost' => 'Coûts', ]); - // // Class: Organization // 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 555332ab3f..a0a4d23fc0 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 @@ -2752,31 +2752,143 @@ public function PrefillSearchForm(&$aContextParam) 10 ServiceManagement - UI-ServiceCatalogMenu-Title DashboardLayoutTwoCols + UI-ServiceCatalogMenu-Title + + false + 300 + + + 0 + + + 0 + UI-ServiceCatalogMenu-Title + + + + 1 + ServiceFamily + + + 2 + Service + + + 3 + ServiceSubcategory + + + 4 + SLA + + + 5 + SLT + + + 6 + Class:DeliveryModel + SELECT DeliveryModel + true + + + 1 - + 0 - UI-ServiceCatalogMenu-RecentRequestByService - - service_id - - count - - - attribute - desc + UI-ServiceCatalogMenu-NotInPortal + + + + 1 + Class:Service + /icons8-service.svg + UI-ServiceCatalogMenu-ObsoleteNotInPortal + SELECT Service + status + implementation,obsolete,production + + + 2 + Class:ServiceSubcategory + /icons8-services.svg + UI-ServiceCatalogMenu-ObsoleteNotInPortal + SELECT ServiceSubcategory + status + implementation,obsolete,production + + + 3 + UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal + SELECT Service WHERE servicefamily_id=0 + false 2 - + 0 + UI-ServiceCatalogMenu-SLTBySLA + SELECT lnkSLAToSLT + sla_id + + count + + + attribute + desc + + + + + 3 + + + 0 + UI-ServiceCatalogMenu-ContractByService + SELECT lnkCustomerContractToService AS lnk JOIN CustomerContract AS cc ON lnk.customercontract_id=cc.id WHERE cc.status != 'obsolete' + service_id + + count + + + attribute + desc + + + + + 4 + + + 0 + UI-ServiceCatalogMenu-ContractBySLA + SELECT lnkCustomerContractToService AS lnk JOIN CustomerContract AS cc ON lnk.customercontract_id=cc.id WHERE cc.status != 'obsolete' + sla_id + + count + + + attribute + desc + + + + + 5 + + + 0 + UI-ServiceCatalogMenu-UnusedService + SELECT Service WHERE status='production' AND id NOT IN (SELECT Service AS s JOIN lnkCustomerContractToService AS lnk ON lnk.service_id= s.id JOIN CustomerContract AS cc ON lnk.customercontract_id = cc.id WHERE cc.status != 'obsolete') + + false @@ -2824,7 +2936,7 @@ public function PrefillSearchForm(&$aContextParam) ServiceManagement UI-RulesAndWorkflow-Title - DashboardLayoutTwoCols + DashboardLayoutOneCol 0 diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php index 14f42109e4..7d20152ce7 100644 --- a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php +++ b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php @@ -32,8 +32,9 @@ // Class:/Stimulus: // Class:/Stimulus:+ +// // Menu, fieldsets, UI, messages translations - +// Dict::Add('EN US', 'English', 'English', [ 'Menu:ServiceManagement' => 'Service management', 'Menu:ServiceManagement+' => 'Service management overview', @@ -42,28 +43,33 @@ Dict::Add('EN US', 'English', 'English', [ 'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracts by service level', 'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracts by status', 'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less than 30 days', + 'Menu:ProviderContract' => 'Provider contracts', - 'Menu:ProviderContract+' => 'Provider contracts', + 'Menu:ProviderContract+' => 'What your company buys', 'Menu:CustomerContract' => 'Customer contracts', - 'Menu:CustomerContract+' => 'Customer contracts', + 'Menu:CustomerContract+' => 'Services subscriptions', 'Menu:ServiceSubcategory' => 'Service subcategories', - 'Menu:ServiceSubcategory+' => 'Service subcategories', + 'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy', 'Menu:Service' => 'Services', - 'Menu:Service+' => 'Services', - 'Menu:ServiceElement' => 'Sevice elements', - 'Menu:ServiceElement+' => 'Sevice elements', + 'Menu:Service+' => 'Second level in service hierarchy', 'Menu:SLA' => 'SLAs', 'Menu:SLA+' => 'Service Level Agreements', 'Menu:SLT' => 'SLTs', 'Menu:SLT+' => 'Service Level Targets', 'Menu:DeliveryModel' => 'Delivery models', - 'Menu:DeliveryModel+' => 'Delivery models', + 'Menu:DeliveryModel+' => 'Teams handling tickets', 'Menu:ServiceFamily' => 'Service families', - 'Menu:ServiceFamily+' => 'Service families', + 'Menu:ServiceFamily+' => 'Top level in service hierarchy', 'Menu:ServiceCatalog' => 'Service catalog', - 'Menu:ServiceCatalog+' => 'Service catalog', + 'Menu:ServiceCatalog+' => 'Define the service elements of your offering', 'UI-ServiceCatalogMenu-Title' => 'Service catalog', - 'UI-ServiceCatalogMenu-RecentRequestByService' => 'Recent requests by service', + 'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal', + 'UI-ServiceCatalogMenu-ObsoleteNotInPortal' => 'Obsolete are hidden in User Portal', + 'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers', + 'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal', + 'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA', + 'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service', + 'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA', 'Menu:RulesAndWorkflow' => 'Rules and workflow', 'Menu:RulesAndWorkflow+' => 'Automation rules and workflow', 'UI-RulesAndWorkflow-Title' => 'Rules and workflow', diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php index 88e0de39b1..79517d277a 100644 --- a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php +++ b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php @@ -19,27 +19,31 @@ Dict::Add('FR FR', 'French', 'Français', [ 'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats, par état', 'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins d\'un mois', 'Menu:ProviderContract' => 'Contrats fournisseurs', - 'Menu:ProviderContract+' => 'Contrats fournisseurs', + 'Menu:ProviderContract+' => 'Ce que votre société achète', 'Menu:CustomerContract' => 'Contrats clients', - 'Menu:CustomerContract+' => 'Contrats clients', + 'Menu:CustomerContract+' => 'Souscriptions à des services', 'Menu:ServiceSubcategory' => 'Sous catégories de service', - 'Menu:ServiceSubcategory+' => 'Sous catégories de service', + 'Menu:ServiceSubcategory+' => 'Dernier niveau dans la hiérarchie des services', 'Menu:Service' => 'Services', - 'Menu:Service+' => 'Services', - 'Menu:ServiceElement' => 'Eléments de service', - 'Menu:ServiceElement+' => 'Eléments de service', + 'Menu:Service+' => 'Second niveau dans la hiérarchie des services', 'Menu:SLA' => 'SLAs', 'Menu:SLA+' => 'Accords de niveau de service (SLA)', 'Menu:SLT' => 'SLTs', 'Menu:SLT+' => 'Objectifs de niveau de service (SLT)', 'Menu:DeliveryModel' => 'Modèles de support', - 'Menu:DeliveryModel+' => 'Modèles de support', + 'Menu:DeliveryModel+' => 'Les équipes gérant les tickets', 'Menu:ServiceFamily' => 'Familles de service', - 'Menu:ServiceFamily+' => 'Familles de service', + 'Menu:ServiceFamily+' => 'Plus haut niveau dans la hiérarchie des services', 'Menu:ServiceCatalog' => 'Catalogue de services', - 'Menu:ServiceCatalog+' => '', + 'Menu:ServiceCatalog+' => 'Définir les éléments des offres de service', 'UI-ServiceCatalogMenu-Title' => 'Catalogue de services', - 'UI-ServiceCatalogMenu-RecentRequestByService' => 'Demandes récentes groupées par service', + 'UI-ServiceCatalogMenu-ObsoleteNotInPortal' => 'Les obsolètes sont invisibles dans le portail utilisateur', + 'UI-ServiceCatalogMenu-UnusedService' => 'Services en production sans contrat client', + 'UI-ServiceCatalogMenu-NotInPortal' => 'Non affichés dans le portail utilisateur', + 'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal', + 'UI-ServiceCatalogMenu-SLTBySLA' => 'Nombre de SLTs par SLA', + 'UI-ServiceCatalogMenu-ContractByService' => 'Nombre de contrats clients utilisant ce service', + 'UI-ServiceCatalogMenu-ContractBySLA' => 'Nombre de contrats clients utilisant ce SLA', 'Menu:RulesAndWorkflow' => 'Règles d\'automatisation', 'Menu:RulesAndWorkflow+' => '', 'UI-RulesAndWorkflow-Title' => 'Règles d\'automatisation',