From a1f5a330d4ee818a9080562344c684922c5513f4 Mon Sep 17 00:00:00 2001
From: Erwan Taloc <erwan.taloc@combodo.com>
Date: Fri, 26 Oct 2012 07:13:47 +0000
Subject: [PATCH] add dictionary for change mgmt ITIL Add external field for
 link SLA / SLT

SVN:trunk[2373]
---
 .../en.dict.itop-change-mgmt-itil.php         |   4 +
 .../fr.dict.itop-change-mgmt-itil.php         |   6 +
 .../2.x/itop-change-mgmt-itil/overview.xml    |   5 +-
 .../datamodel.itop-service-mgmt-provider.xml  | 108 +++++++++++++-----
 .../datamodel.itop-service-mgmt.xml           |  66 +++++++++--
 5 files changed, 152 insertions(+), 37 deletions(-)

diff --git a/datamodels/2.x/itop-change-mgmt-itil/en.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/en.dict.itop-change-mgmt-itil.php
index 2e750e2e0f..897d20bfd4 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/en.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/en.dict.itop-change-mgmt-itil.php
@@ -42,6 +42,10 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:Changes+' => 'All Opened Changes',
 	'Menu:MyChanges' => 'Changes assigned to me',
 	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes by status for the last 7 days',
 ));
 
 // Dictionnay conventions
diff --git a/datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php
index 22c27af044..e6b75f65da 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php
@@ -275,6 +275,12 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:Changes+' => 'Tickets de changement ouverts',
 	'Menu:MyChanges' => 'Mes tickets',
 	'Menu:MyChanges+' => 'Tickets de changement qui me sont assignés',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changements par catégorie',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Changements par jour',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changements par domaine',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changements par statut',
+	'UI:ChangeMgmtMenuOverview:Title' => 'Tableau de bord des changements pour les 7 derniers jours',
+
 
 ));
 ?>
diff --git a/datamodels/2.x/itop-change-mgmt-itil/overview.xml b/datamodels/2.x/itop-change-mgmt-itil/overview.xml
index 47bef0f6c9..93b461b680 100644
--- a/datamodels/2.x/itop-change-mgmt-itil/overview.xml
+++ b/datamodels/2.x/itop-change-mgmt-itil/overview.xml
@@ -10,7 +10,7 @@
           <rank>0</rank>
           <title>UI-ChangeManagementOverview-ChangeByCategory-last-7-days</title>
           <query>SELECT Change WHERE start_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
-          <group_by>category</group_by>
+          <group_by>finalclass</group_by>
           <style>table</style>
         </dashlet>
       </dashlets>
@@ -53,4 +53,5 @@
       </dashlets>
     </cell>
   </cells>
-</dashboard>
\ No newline at end of file
+</dashboard>
+
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 2544a53ecc..0bc641190c 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
@@ -1110,17 +1110,14 @@
         </search>
         <list>
           <items>
-            <item id="name">
+            <item id="org_id">
               <rank>10</rank>
             </item>
-            <item id="org_id">
+            <item id="servicefamily_id">
               <rank>20</rank>
             </item>
-            <item id="servicefamily_id">
-              <rank>30</rank>
-            </item>
             <item id="status">
-              <rank>40</rank>
+              <rank>30</rank>
             </item>
           </items>
         </list>
@@ -1296,7 +1293,7 @@
         <category>bizmodel,searchable</category>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
-        <db_table>ServiceSubcategory</db_table>
+        <db_table>servicesubcategory</db_table>
         <db_key_field>id</db_key_field>
         <db_final_class_field/>
         <naming>
@@ -1321,7 +1318,7 @@
           <default_value/>
           <is_null_allowed>true</is_null_allowed>
         </field>
-        <field id="description" xsi:type="AttributeString">
+        <field id="description" xsi:type="AttributeText">
           <sql>description</sql>
           <default_value/>
           <is_null_allowed>true</is_null_allowed>
@@ -1332,10 +1329,29 @@
           <is_null_allowed>false</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
         </field>
+        <field id="service_org_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>org_id</target_attcode>
+        </field>
         <field id="service_name" xsi:type="AttributeExternalField">
           <extkey_attcode>service_id</extkey_attcode>
           <target_attcode>name</target_attcode>
         </field>
+        <field id="service_provider" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>organization_name</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="request_type" xsi:type="AttributeEnum">
+          <values>
+            <value>incident</value>
+            <value>service_request</value>
+          </values>
+          <sql>request_type</sql>
+          <default_value>incident</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>radio_horizontal</display_style>
+        </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
             <value>production</value>
@@ -1347,16 +1363,6 @@
           <is_null_allowed>true</is_null_allowed>
           <display_style>list</display_style>
         </field>
-        <field id="request_type" xsi:type="AttributeEnum">
-          <values>
-            <value>incident</value>
-            <value>service_request</value>
-          </values>
-          <sql>request_type</sql>
-          <default_value>incident</default_value>
-          <is_null_allowed>false</is_null_allowed>
-          <display_style>radio_horizontal</display_style>
-        </field>
       </fields>
       <methods/>
       <presentation>
@@ -1368,15 +1374,21 @@
             <item id="service_id">
               <rank>20</rank>
             </item>
-            <item id="status">
+            <item id="service_org_id">
               <rank>30</rank>
             </item>
-            <item id="request_type">
+            <item id="status">
               <rank>40</rank>
             </item>
-            <item id="description">
+            <item id="request_type">
               <rank>50</rank>
             </item>
+            <item id="service_provider">
+              <rank>60</rank>
+            </item>
+            <item id="description">
+              <rank>70</rank>
+            </item>
           </items>
         </details>
         <search>
@@ -1396,21 +1408,24 @@
             <item id="request_type">
               <rank>50</rank>
             </item>
+            <item id="service_provider">
+              <rank>60</rank>
+            </item>
           </items>
         </search>
         <list>
           <items>
-            <item id="name">
+            <item id="service_id">
               <rank>10</rank>
             </item>
-            <item id="service_id">
+            <item id="status">
               <rank>20</rank>
             </item>
-            <item id="status">
+            <item id="request_type">
               <rank>30</rank>
             </item>
-            <item id="request_type">
-              <rank>40</rank>
+            <item id="service_provider">
+              <rank>60</rank>
             </item>
           </items>
         </list>
@@ -1570,7 +1585,6 @@
           <values>
             <value>servicerequest</value>
             <value>incident</value>
-            <value>other</value>
           </values>
           <sql>request_type</sql>
           <default_value/>
@@ -1717,6 +1731,31 @@
           <extkey_attcode>slt_id</extkey_attcode>
           <target_attcode>name</target_attcode>
         </field>
+        <field id="slt_metric" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>metric</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="slt_request_type" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>request_type</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="slt_ticket_priority" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>priority</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="slt_value" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>value</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="slt_value_unit" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>unit</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
       </fields>
       <methods/>
       <presentation>
@@ -1748,6 +1787,21 @@
             <item id="slt_id">
               <rank>20</rank>
             </item>
+            <item id="slt_metric">
+              <rank>30</rank>
+            </item>
+            <item id="slt_request_type">
+              <rank>40</rank>
+            </item>
+            <item id="slt_ticket_priority">
+              <rank>50</rank>
+            </item>
+            <item id="slt_value">
+              <rank>60</rank>
+            </item>
+            <item id="slt_value_unit">
+              <rank>70</rank>
+            </item>
           </items>
         </list>
       </presentation>
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 97818c7aaa..9f53f673e1 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
@@ -1105,17 +1105,14 @@
         </search>
         <list>
           <items>
-            <item id="name">
+            <item id="org_id">
               <rank>10</rank>
             </item>
-            <item id="org_id">
+            <item id="status">
               <rank>20</rank>
             </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
             <item id="servicefamily_id">
-              <rank>40</rank>
+              <rank>30</rank>
             </item>
           </items>
         </list>
@@ -1335,6 +1332,11 @@
           <extkey_attcode>service_id</extkey_attcode>
           <target_attcode>name</target_attcode>
         </field>
+        <field id="service_provider" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>organization_name</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
         <field id="request_type" xsi:type="AttributeEnum">
           <values>
             <value>incident</value>
@@ -1376,9 +1378,12 @@
             <item id="request_type">
               <rank>50</rank>
             </item>
-            <item id="description">
+            <item id="service_provider">
               <rank>60</rank>
             </item>
+            <item id="description">
+              <rank>70</rank>
+            </item>
           </items>
         </details>
         <search>
@@ -1398,6 +1403,9 @@
             <item id="request_type">
               <rank>50</rank>
             </item>
+            <item id="service_provider">
+              <rank>60</rank>
+            </item>
           </items>
         </search>
         <list>
@@ -1411,6 +1419,9 @@
             <item id="request_type">
               <rank>30</rank>
             </item>
+            <item id="service_provider">
+              <rank>60</rank>
+            </item>
           </items>
         </list>
       </presentation>
@@ -1569,7 +1580,6 @@
           <values>
             <value>servicerequest</value>
             <value>incident</value>
-            <value>other</value>
           </values>
           <sql>request_type</sql>
           <default_value/>
@@ -1716,6 +1726,31 @@
           <extkey_attcode>slt_id</extkey_attcode>
           <target_attcode>name</target_attcode>
         </field>
+        <field id="slt_metric" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>metric</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="slt_request_type" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>request_type</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="slt_ticket_priority" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>priority</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="slt_value" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>value</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="slt_value_unit" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>unit</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
       </fields>
       <methods/>
       <presentation>
@@ -1747,6 +1782,21 @@
             <item id="slt_id">
               <rank>20</rank>
             </item>
+            <item id="slt_metric">
+              <rank>30</rank>
+            </item>
+            <item id="slt_request_type">
+              <rank>40</rank>
+            </item>
+            <item id="slt_ticket_priority">
+              <rank>50</rank>
+            </item>
+            <item id="slt_value">
+              <rank>60</rank>
+            </item>
+            <item id="slt_value_unit">
+              <rank>70</rank>
+            </item>
           </items>
         </list>
       </presentation>