composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 02:28:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°6331 - Add Service tab in Provider Contract and add fieldsets

Browse Source
This commit is contained in:
vdumas
2023-05-24 13:06:12 +02:00
parent 0508608e78
commit 906ad70156
6 changed files with 282 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
View File

@@ -279,6 +279,9 @@ public function PrefillSearchForm(&$aContextParam)
<item id="provider_id">
<rank>30</rank>
</item>
<item id="status">
<rank>40</rank>
</item>
</items>
</default_search>
<search>
@@ -457,50 +460,74 @@ public function PrefillSearchForm(&$aContextParam)
<presentation>
<details>
<items>
<item id="name">
<item id="col:col1">
<rank>10</rank>
<items>
<item id="fieldset:Contract:baseinfo">
<rank>10</rank>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="org_id">
<rank>20</rank>
</item>
<item id="provider_id">
<rank>30</rank>
</item>
<item id="contracttype_id">
<rank>40</rank>
</item>
<item id="description">
<rank>50</rank>
</item>
</items>
</item>
</items>
</item>
<item id="org_id">
<item id="col:col2">
<rank>20</rank>
<items>
<item id="fieldset:Contract:moreinfo">
<rank>10</rank>
<items>
<item id="status">
<rank>10</rank>
</item>
<item id="start_date">
<rank>20</rank>
</item>
<item id="end_date">
<rank>30</rank>
</item>
</items>
</item>
<item id="fieldset:Contract:cost">
<items>
<item id="cost">
<rank>40</rank>
</item>
<item id="cost_currency">
<rank>50</rank>
</item>
<item id="cost_unit">
<rank>60</rank>
</item>
<item id="billing_frequency">
<rank>70</rank>
</item>
</items>
</item>
</items>
</item>
<item id="contacts_list">
<rank>30</rank>
</item>
<item id="documents_list">
<rank>40</rank>
</item>
<item id="description">
<rank>50</rank>
</item>
<item id="start_date">
<rank>60</rank>
</item>
<item id="end_date">
<rank>70</rank>
</item>
<item id="cost">
<rank>80</rank>
</item>
<item id="cost_currency">
<rank>90</rank>
</item>
<item id="billing_frequency">
<rank>100</rank>
</item>
<item id="cost_unit">
<item id="documents_list">
<rank>110</rank>
</item>
<item id="provider_id">
<rank>120</rank>
</item>
<item id="status">
<rank>130</rank>
</item>
<item id="contracttype_id">
<rank>140</rank>
</item>
<item id="services_list">
<rank>150</rank>
<rank>140</rank>
</item>
<item id="functionalcis_list">
<rank>160</rank>
@@ -626,57 +653,81 @@ public function PrefillSearchForm(&$aContextParam)
<presentation>
<details>
<items>
<item id="name">
<item id="col:col1">
<rank>10</rank>
<items>
<item id="fieldset:Contract:baseinfo">
<rank>10</rank>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="org_id">
<rank>20</rank>
</item>
<item id="provider_id">
<rank>30</rank>
</item>
<item id="contracttype_id">
<rank>40</rank>
</item>
<item id="description">
<rank>50</rank>
</item>
</items>
</item>
</items>
</item>
<item id="org_id">
<item id="col:col2">
<rank>20</rank>
<items>
<item id="fieldset:Contract:moreinfo">
<rank>10</rank>
<items>
<item id="status">
<rank>10</rank>
</item>
<item id="start_date">
<rank>20</rank>
</item>
<item id="end_date">
<rank>30</rank>
</item>
<item id="sla">
<rank>40</rank>
</item>
<item id="coverage">
<rank>50</rank>
</item>
</items>
</item>
<item id="fieldset:Contract:cost">
<items>
<item id="cost">
<rank>40</rank>
</item>
<item id="cost_currency">
<rank>50</rank>
</item>
<item id="cost_unit">
<rank>60</rank>
</item>
<item id="billing_frequency">
<rank>70</rank>
</item>
</items>
</item>
</items>
</item>
<item id="contacts_list">
<rank>30</rank>
</item>
<item id="documents_list">
<rank>40</rank>
</item>
<item id="description">
<rank>50</rank>
</item>
<item id="start_date">
<rank>60</rank>
</item>
<item id="end_date">
<rank>70</rank>
</item>
<item id="cost">
<rank>80</rank>
</item>
<item id="cost_currency">
<rank>90</rank>
</item>
<item id="billing_frequency">
<rank>100</rank>
</item>
<item id="cost_unit">
<item id="documents_list">
<rank>110</rank>
</item>
<item id="provider_id">
<rank>120</rank>
</item>
<item id="functionalcis_list">
<rank>130</rank>
</item>
<item id="sla">
<rank>140</rank>
</item>
<item id="coverage">
<rank>150</rank>
</item>
<item id="status">
<rank>160</rank>
</item>
<item id="contracttype_id">
<rank>170</rank>
</item>
</items>
</details>
<search>

9
datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php
View File

@@ -31,7 +31,9 @@
// Class:<class_name>/Stimulus:<stimulus_code>
// Class:<class_name>/Stimulus:<stimulus_code>+
//
// Menu, fieldsets, UI, messages translations
//
Dict::Add('EN US', 'English', 'English', array(
'Menu:ServiceManagement' => 'Service Management',
'Menu:ServiceManagement+' => 'Service Management Overview',
@@ -59,8 +61,11 @@ Dict::Add('EN US', 'English', 'English', array(
'Menu:DeliveryModel+' => 'Delivery models',
'Menu:ServiceFamily' => 'Service families',
'Menu:ServiceFamily+' => 'Service families',
));
'Contract:baseinfo' => 'General information',
'Contract:moreinfo' => 'Contractual information',
'Contract:cost' => 'Cost information',
));
/*
'UI:ServiceManagementMenu' => 'Gestion des Services',

7
datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php
View File

@@ -20,7 +20,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
//
// Class: ContractType
// Menu, fieldsets, UI, messages translations
//
Dict::Add('FR FR', 'French', 'Français', array(
'Menu:ServiceManagement' => 'Gestion des services',
@@ -49,8 +49,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Menu:DeliveryModel+' => 'Modèles de support',
'Menu:ServiceFamily' => 'Familles de service',
'Menu:ServiceFamily+' => 'Familles de service',
));
'Contract:baseinfo' => 'Information générale',
'Contract:moreinfo' => 'Aspects contractuels',
'Contract:cost' => 'Coûts',
));
/*
'UI:ServiceManagementMenu' => 'Gestion des Services',

207
datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
View File

@@ -279,6 +279,9 @@ public function PrefillSearchForm(&$aContextParam)
<item id="provider_id">
<rank>30</rank>
</item>
<item id="status">
<rank>40</rank>
</item>
</items>
</default_search>
<search>
@@ -439,50 +442,74 @@ public function PrefillSearchForm(&$aContextParam)
<presentation>
<details>
<items>
<item id="name">
<item id="col:col1">
<rank>10</rank>
<items>
<item id="fieldset:Contract:baseinfo">
<rank>10</rank>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="org_id">
<rank>20</rank>
</item>
<item id="provider_id">
<rank>30</rank>
</item>
<item id="contracttype_id">
<rank>40</rank>
</item>
<item id="description">
<rank>50</rank>
</item>
</items>
</item>
</items>
</item>
<item id="org_id">
<item id="col:col2">
<rank>20</rank>
<items>
<item id="fieldset:Contract:moreinfo">
<rank>10</rank>
<items>
<item id="status">
<rank>10</rank>
</item>
<item id="start_date">
<rank>20</rank>
</item>
<item id="end_date">
<rank>30</rank>
</item>
</items>
</item>
<item id="fieldset:Contract:cost">
<items>
<item id="cost">
<rank>40</rank>
</item>
<item id="cost_currency">
<rank>50</rank>
</item>
<item id="cost_unit">
<rank>60</rank>
</item>
<item id="billing_frequency">
<rank>70</rank>
</item>
</items>
</item>
</items>
</item>
<item id="contacts_list">
<rank>30</rank>
</item>
<item id="documents_list">
<rank>40</rank>
</item>
<item id="description">
<rank>50</rank>
</item>
<item id="start_date">
<rank>60</rank>
</item>
<item id="end_date">
<rank>70</rank>
</item>
<item id="cost">
<rank>80</rank>
</item>
<item id="cost_currency">
<rank>90</rank>
</item>
<item id="billing_frequency">
<rank>100</rank>
</item>
<item id="cost_unit">
<item id="documents_list">
<rank>110</rank>
</item>
<item id="provider_id">
<rank>120</rank>
</item>
<item id="status">
<rank>130</rank>
</item>
<item id="contracttype_id">
<rank>140</rank>
</item>
<item id="services_list">
<rank>150</rank>
<rank>140</rank>
</item>
</items>
</details>
@@ -594,62 +621,98 @@ public function PrefillSearchForm(&$aContextParam)
<default_value/>
<is_null_allowed>true</is_null_allowed>
</field>
<field id="services_list" xsi:type="AttributeLinkedSetIndirect">
<linked_class>lnkProviderContractToService</linked_class>
<ext_key_to_me>providercontract_id</ext_key_to_me>
<count_min>0</count_min>
<count_max>0</count_max>
<ext_key_to_remote>service_id</ext_key_to_remote>
<duplicates/>
<read_only>false</read_only>
</field>
</fields>
<methods/>
<presentation>
<details>
<items>
<item id="name">
<item id="col:col1">
<rank>10</rank>
<items>
<item id="fieldset:Contract:baseinfo">
<rank>10</rank>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="org_id">
<rank>20</rank>
</item>
<item id="provider_id">
<rank>30</rank>
</item>
<item id="contracttype_id">
<rank>40</rank>
</item>
<item id="description">
<rank>50</rank>
</item>
</items>
</item>
</items>
</item>
<item id="org_id">
<item id="col:col2">
<rank>20</rank>
<items>
<item id="fieldset:Contract:moreinfo">
<rank>10</rank>
<items>
<item id="status">
<rank>10</rank>
</item>
<item id="start_date">
<rank>20</rank>
</item>
<item id="end_date">
<rank>30</rank>
</item>
<item id="sla">
<rank>40</rank>
</item>
<item id="coverage">
<rank>50</rank>
</item>
</items>
</item>
<item id="fieldset:Contract:cost">
<items>
<item id="cost">
<rank>40</rank>
</item>
<item id="cost_currency">
<rank>50</rank>
</item>
<item id="cost_unit">
<rank>60</rank>
</item>
<item id="billing_frequency">
<rank>70</rank>
</item>
</items>
</item>
</items>
</item>
<item id="contacts_list">
<rank>30</rank>
</item>
<item id="documents_list">
<rank>40</rank>
</item>
<item id="description">
<rank>50</rank>
</item>
<item id="start_date">
<rank>60</rank>
</item>
<item id="end_date">
<rank>70</rank>
</item>
<item id="contracttype_id">
<rank>80</rank>
</item>
<item id="cost">
<rank>90</rank>
</item>
<item id="cost_currency">
<rank>100</rank>
</item>
<item id="billing_frequency">
<item id="documents_list">
<rank>110</rank>
</item>
<item id="cost_unit">
<rank>120</rank>
</item>
<item id="provider_id">
<item id="functionalcis_list">
<rank>130</rank>
</item>
<item id="functionalcis_list">
<item id="services_list">
<rank>140</rank>
</item>
<item id="sla">
<rank>150</rank>
</item>
<item id="coverage">
<rank>160</rank>
</item>
<item id="status">
<rank>170</rank>
</item>
</items>
</details>
<search>

5
datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
View File

@@ -31,6 +31,7 @@
// Class:<class_name>/Stimulus:<stimulus_code>
// Class:<class_name>/Stimulus:<stimulus_code>+
// Menu, fieldsets, UI, messages translations
Dict::Add('EN US', 'English', 'English', array(
'Menu:ServiceManagement' => 'Service management',
@@ -60,6 +61,10 @@ Dict::Add('EN US', 'English', 'English', array(
'Menu:ServiceFamily+' => 'Service families',
'Menu:Procedure' => 'Procedures catalog',
'Menu:Procedure+' => 'All procedures catalog',
'Contract:baseinfo' => 'General information',
'Contract:moreinfo' => 'Contractual information',
'Contract:cost' => 'Cost information',
));
//

7
datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
View File

@@ -19,8 +19,9 @@
* @copyright Copyright (C) 2010-2023 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
//
// Class: ContractType
// Menu, fieldsets, UI, messages translations
//
Dict::Add('FR FR', 'French', 'Français', array(
'Menu:ServiceManagement' => 'Gestion des services',
@@ -50,6 +51,10 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Menu:ServiceFamily+' => 'Familles de service',
'Menu:Procedure' => 'Catalogue des procédures',
'Menu:Procedure+' => 'Catalogue des procédures',
'Contract:baseinfo' => 'Information générale',
'Contract:moreinfo' => 'Aspects contractuels',
'Contract:cost' => 'Coûts',
));
//