Preparing for the 1.0 beta release... final adjustments

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@591 a333f486-631f-4898-b8df-5754b55c2be0

business/templates/welcome_menu.html

@@ -29,24 +29,24 @@ display: list-item;
 <p></p>
 <table border="0" style="padding:10px;border-spacing: 10px;">
 <tr>
-<td class="dashboard">
+<td class="dashboard" style="border:0;text-align:left;">
 <itopstring>UI:WelcomeMenu:LeftBlock</itopstring>
 </td>
-<td class="dashboard">
+<td class="dashboard" style="border:0;text-align:left;">
 <itopstring>UI:WelcomeMenu:RightBlock</itopstring>
 </td>
 </tr>
 <tr>
 <td class="dashboard2">
-<itopcheck class="ServiceCall">
+<itopcheck class="UserRequest">
 <p style="text-align:left; font-family:Verdana, Arial, sans-serif; font-size:16px;"><itopstring>UI:WelcomeMenu:MyCalls</itopstring></p>
-<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql">SELECT ServiceCall AS i WHERE i.caller_id = :current_contact_id</itopblock>
+<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql">SELECT UserRequest AS i WHERE i.caller_id = :current_contact_id</itopblock>
 </itopcheck>
 </td>
 <td class="dashboard2">
-<itopcheck class="IncidentTicket">
+<itopcheck class="Incident">
 <p style="text-align:left; font-family:Verdana, Arial, sans-serif; font-size:16px;"><itopstring>UI:WelcomeMenu:MyIncidents</itopstring></p>
-<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql">SELECT IncidentTicket AS i WHERE i.caller_id = :current_contact_id</itopblock>
+<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql">SELECT Incident AS i WHERE i.caller_id = :current_contact_id</itopblock>
 </itopcheck>
 </td>
 

core/config.class.inc.php

@@ -14,7 +14,7 @@
 //   along with this program; if not, write to the Free Software
 //   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-define('ITOP_VERSION', '0.9');
+define('ITOP_VERSION', '1.0 beta');
 define('ITOP_REVISION', '$WCREV$');
 define('ITOP_BUILD_DATE', '$WCNOW$');
 

dictionaries/dictionary.itop.ui.php

@@ -329,8 +329,8 @@ Dict::Add('EN US', 'English', 'English', array(
 </ul>
 </p>',
 
-	'UI:WelcomeMenu:MyCalls' => 'My Service Calls',
-	'UI:WelcomeMenu:MyIncidents' => 'My Incidents',
+	'UI:WelcomeMenu:MyCalls' => 'User Requests assigned to me',
+	'UI:WelcomeMenu:MyIncidents' => 'Incidents assigned to me',
 	'UI:AllOrganizations' => ' All Organizations ',
 	'UI:YourSearch' => 'Your Search',
 	'UI:LoggedAsMessage' => 'Logged in as %1$s',
@@ -722,6 +722,29 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:ConfigurationManagementMenu:Title' => 'Infrastructure Overview',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastructure objects by type',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastructure objects by status',
+
+'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard for Configuration Management',
+'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items by status',
+'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items by type',
+
+'UI:RequestMgmtMenuOverview:Title' => 'Dashboard for Request Management',
+'UI-RequestManagementOverview-RequestByService' => 'User Requests by service',
+'UI-RequestManagementOverview-RequestByPriority' => 'User Requests by priority',
+'UI-RequestManagementOverview-RequestUnassigned' => 'User Requests not yet assigned to an agent',
+
+'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard for Incident Management',
+'UI-IncidentManagementOverview-IncidentByService' => 'Incidents by service',
+'UI-IncidentManagementOverview-IncidentByPriority' => 'Incident by priority',
+'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents not yet assigned to an agent',
+
+'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard for Change Management',
+'UI-ChangeManagementOverview-ChangeByType' => 'Changes by type',
+'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes not yet assigned to an agent',
+'UI-ChangeManagementOverview-ChangeWithOutage' => 'Outages due to changes',
+
+'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard for Service Management',
+'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Customer contracts to be renewed in 30 days',
+'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Provider contracts to be renewed in 30 days',
 
 	'UI:ContactsMenu' => 'Contacts',
 	'UI:ContactsMenu+' => 'Contacts',

modules/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php

@@ -36,8 +36,8 @@ SetupWebPage::AddModule(
 		
 		// Documentation
 		//
-		'doc.manual_setup' => '/doc/xxx/yyy.htm',
-		'doc.more_information' => '/doc/xxx/yyy.htm',
+		'doc.manual_setup' => '',
+		'doc.more_information' => '/doc/itop-documentation.htm#ChangeMgmt',
 	)
 );
 

modules/itop-change-mgmt-1.0.0/overview.html

@@ -0,0 +1,22 @@
+<h1><itopstring>UI:ChangeMgmtMenuOverview:Title</itopstring></h1>
+<table border="0" padding="5" class="layout" width="100%">
+<tr>
+<td class="dashboard">
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:bars;group_by:finalclass;chart_title:UI-ChangeManagementOverview-ChangeByType" asynchronous="false" encoding="text/oql">SELECT Change</itopblock>
+</td>
+<td class="dashboard">
+<h2><itopstring>UI-ChangeManagementOverview-ChangeUnassigned</itopstring></h2>
+<itopblock BlockClass="DisplayBlock" type="list" parameters="dashboard:true" asynchronous="false" encoding="text/oql">SELECT Change WHERE status = 'new'</itopblock>
+</td>
+</tr>
+<tr>
+<td class="dashboard">
+<h2><itopstring>UI-ChangeManagementOverview-ChangeWithOutage</itopstring></h2>
+<itopblock BlockClass="DisplayBlock" type="list" parameters="dashboard:true" asynchronous="false" encoding="text/oql">SELECT Change WHERE outage = 'yes'</itopblock>
+</td>
+<td>
+&nbsp;
+</td>
+</tr>
+</table>
+

modules/itop-config-mgmt-1.0.0/cis_menu.html

@@ -0,0 +1,20 @@
+<h1><itopstring>UI:ConfigurationManagementMenu:Title</itopstring></h1>
+<table border="0" padding="5" class="layout" width="100%">
+<tr>
+<td class="dashboard">
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;group_by:status;chart_title:UI-ConfigurationManagementMenu-InfraByStatus" asynchronous="false" encoding="text/oql">SELECT FunctionalCI</itopblock>
+</td>
+<td class="dashboard">
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:bars;group_by:finalclass;chart_title:UI-ConfigurationManagementMenu-InfraByType" asynchronous="false" encoding="text/oql">SELECT FunctionalCI</itopblock>
+</td>
+</tr>
+<tr>
+<td class="dashboard">
+<h2><itopstring>UI-ConfigurationManagementMenu-InfraByType</itopstring></h2>
+<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:finalclass" asynchronous="false" encoding="text/oql">SELECT FunctionalCI</itopblock>
+</td>
+<td>
+&nbsp;
+</td>
+</tr>
+</table>

modules/itop-config-mgmt-1.0.0/contacts_menu.html

@@ -0,0 +1,22 @@
+<h1><itopstring>UI:ContactsMenu:Title</itopstring></h1>
+<table border="0" padding="5" class="layout" width="100%">
+<tr>
+<td class="dashboard">
+<h2><itopstring>UI-ContactsMenu-ContactsByLocation</itopstring></h2>
+<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:location_id" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
+</td>
+<td class="dashboard">
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ContactsMenu-ContactsByLocation;group_by:location_name" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
+</td>
+</tr>
+<tr>
+<td class="dashboard">
+<h2><itopstring>UI-ContactsMenu-ContactsByType</itopstring></h2>
+<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:finalclass" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
+</td>
+<td class="dashboard">
+<h2><itopstring>UI-ContactsMenu-ContactsByStatus</itopstring></h2>
+<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:status" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
+</td>
+</tr>
+</table>

modules/itop-config-mgmt-1.0.0/data.sample.ApplicationInstance.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<ApplicationInstance alias="ApplicationInstance" id="10">
+<name>Apache web server</name>
+<status>production</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<device_id>9</device_id>
+<licence_id>0</licence_id>
+<software_id>1</software_id>
+<version>2.2</version>
+<description></description>
+</ApplicationInstance>
+<ApplicationInstance alias="ApplicationInstance" id="11">
+<name>Tomcat</name>
+<status>production</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<device_id>9</device_id>
+<licence_id>0</licence_id>
+<software_id>2</software_id>
+<version></version>
+<description></description>
+</ApplicationInstance>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.Contact.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<Person alias="Contact" id="3">
+<name>Dali</name>
+<status>active</status>
+<org_id>2</org_id>
+<email>salvador@combodo.com</email>
+<phone></phone>
+<location_id>3</location_id>
+<first_name>Salvador</first_name>
+<employee_id></employee_id>
+</Person>
+<Team alias="Contact" id="2">
+<name>Hardware support</name>
+<status>active</status>
+<org_id>2</org_id>
+<email>support@combodo.com</email>
+<phone></phone>
+<location_id>2</location_id>
+</Team>
+<Team alias="Contact" id="4">
+<name>NW support</name>
+<status>active</status>
+<org_id>2</org_id>
+<email>nw@company.com</email>
+<phone></phone>
+<location_id>3</location_id>
+</Team>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.DBServerInstance.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<DBServerInstance alias="DBServerInstance" id="7">
+<name>MySql server</name>
+<status>implementation</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<device_id>2</device_id>
+<licence_id>0</licence_id>
+<software_id>3</software_id>
+<version>5.0.27</version>
+<description></description>
+</DBServerInstance>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.DatabaseInstance.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<DatabaseInstance alias="DatabaseInstance" id="8">
+<name>itop-alpha</name>
+<status>implementation</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<db_server_instance_id>7</db_server_instance_id>
+<description>database instance for iTop application</description>
+</DatabaseInstance>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.FunctionalCI.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<Server alias="FunctionalCI" id="2">
+<name>dbserver1.demo.com</name>
+<status>production</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<brand>HP</brand>
+<model>DL380</model>
+<serial_number></serial_number>
+<asset_ref></asset_ref>
+<description></description>
+<location_id>3</location_id>
+<location_details></location_details>
+<management_ip>10.1.1.10</management_ip>
+<default_gateway>255.255.255.0</default_gateway>
+<cpu>2</cpu>
+<ram>16Gb</ram>
+<hdd>120Gb</hdd>
+<os_family>Linux</os_family>
+<os_version>Debian (Lenny)</os_version>
+</Server>
+<ApplicationSolution alias="FunctionalCI" id="12">
+<name>iTop</name>
+<status>production</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<description>iTop application for IT Management</description>
+</ApplicationSolution>
+<BusinessProcess alias="FunctionalCI" id="15">
+<name>iTop Demonstration</name>
+<status>production</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<description></description>
+</BusinessProcess>
+<NetworkDevice alias="FunctionalCI" id="1">
+<name>router1</name>
+<status>implementation</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<brand></brand>
+<model></model>
+<serial_number></serial_number>
+<asset_ref></asset_ref>
+<description></description>
+<location_id>0</location_id>
+<location_details></location_details>
+<management_ip></management_ip>
+<default_gateway></default_gateway>
+<type>router</type>
+<ios_version></ios_version>
+<ram></ram>
+<snmp_read></snmp_read>
+<snmp_write></snmp_write>
+</NetworkDevice>
+<NetworkDevice alias="FunctionalCI" id="4">
+<name>switch01</name>
+<status>production</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<brand>3Com</brand>
+<model>2300</model>
+<serial_number></serial_number>
+<asset_ref></asset_ref>
+<description></description>
+<location_id>2</location_id>
+<location_details></location_details>
+<management_ip>10.1.1.2</management_ip>
+<default_gateway>255.255.255.0</default_gateway>
+<type>switch</type>
+<ios_version></ios_version>
+<ram></ram>
+<snmp_read></snmp_read>
+<snmp_write></snmp_write>
+</NetworkDevice>
+<Server alias="FunctionalCI" id="9">
+<name>webserver.demo.com</name>
+<status>production</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<brand>IBM</brand>
+<model>x3400 Tower Server</model>
+<serial_number></serial_number>
+<asset_ref></asset_ref>
+<description></description>
+<location_id>3</location_id>
+<location_details></location_details>
+<management_ip>10.1.1.20</management_ip>
+<default_gateway>255.255.255.0</default_gateway>
+<cpu>4</cpu>
+<ram>8Gb</ram>
+<hdd>240Gb</hdd>
+<os_family>Unix</os_family>
+<os_version>AIX 4.0</os_version>
+</Server>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.Location.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<Location alias="Location" id="3">
+<name>Grenoble</name>
+<status>active</status>
+<org_id>2</org_id>
+<address>24, rue Lamartine</address>
+<postal_code>38320</postal_code>
+<city>Eybens</city>
+<country>France</country>
+<parent_id>0</parent_id>
+</Location>
+<Location alias="Location" id="2">
+<name>Paris</name>
+<status>active</status>
+<org_id>2</org_id>
+<address>5, rue du Sentier</address>
+<postal_code>75002</postal_code>
+<city>Paris</city>
+<country>Franche</country>
+<parent_id>0</parent_id>
+</Location>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.NetworkInterface.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<NetworkInterface alias="NetworkInterface" id="5">
+<name>A0</name>
+<status>production</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<brand></brand>
+<model></model>
+<serial_number></serial_number>
+<asset_ref></asset_ref>
+<device_id>4</device_id>
+<logical_type>primary</logical_type>
+<physical_type>ethernet</physical_type>
+<ip_address></ip_address>
+<ip_mask></ip_mask>
+<mac_address></mac_address>
+<speed></speed>
+<duplex>full</duplex>
+<connected_if>3</connected_if>
+<link_type>downlink</link_type>
+</NetworkInterface>
+<NetworkInterface alias="NetworkInterface" id="6">
+<name>A1</name>
+<status>production</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<brand></brand>
+<model></model>
+<serial_number></serial_number>
+<asset_ref></asset_ref>
+<device_id>4</device_id>
+<logical_type>primary</logical_type>
+<physical_type>ethernet</physical_type>
+<ip_address>10.1.1.2</ip_address>
+<ip_mask>255.255.255.0</ip_mask>
+<mac_address></mac_address>
+<speed></speed>
+<duplex>full</duplex>
+<connected_if>0</connected_if>
+<link_type>uplink</link_type>
+</NetworkInterface>
+<NetworkInterface alias="NetworkInterface" id="13">
+<name>A2</name>
+<status>implementation</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<brand></brand>
+<model></model>
+<serial_number></serial_number>
+<asset_ref></asset_ref>
+<device_id>4</device_id>
+<logical_type>primary</logical_type>
+<physical_type>ethernet</physical_type>
+<ip_address></ip_address>
+<ip_mask></ip_mask>
+<mac_address></mac_address>
+<speed></speed>
+<duplex>full</duplex>
+<connected_if>14</connected_if>
+<link_type>downlink</link_type>
+</NetworkInterface>
+<NetworkInterface alias="NetworkInterface" id="3">
+<name>eth0</name>
+<status>implementation</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<brand></brand>
+<model></model>
+<serial_number></serial_number>
+<asset_ref></asset_ref>
+<device_id>2</device_id>
+<logical_type>primary</logical_type>
+<physical_type>ethernet</physical_type>
+<ip_address>10.1.1.10</ip_address>
+<ip_mask>255.255.255.0</ip_mask>
+<mac_address>00:a2:23:b45:34</mac_address>
+<speed></speed>
+<duplex>full</duplex>
+<connected_if>5</connected_if>
+<link_type>uplink</link_type>
+</NetworkInterface>
+<NetworkInterface alias="NetworkInterface" id="14">
+<name>eth0</name>
+<status>production</status>
+<org_id>2</org_id>
+<importance>medium</importance>
+<brand></brand>
+<model></model>
+<serial_number></serial_number>
+<asset_ref></asset_ref>
+<device_id>9</device_id>
+<logical_type>primary</logical_type>
+<physical_type>ethernet</physical_type>
+<ip_address>10.1.1.20</ip_address>
+<ip_mask>255.255.255.0</ip_mask>
+<mac_address></mac_address>
+<speed></speed>
+<duplex>full</duplex>
+<connected_if>13</connected_if>
+<link_type>uplink</link_type>
+</NetworkInterface>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.organization.xml → modules/itop-config-mgmt-1.0.0/data.sample.Organization.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
 <Organization alias="Organization" id="2">
-<name>Demo company</name>
-<code>DEMO</code>
+<name>Demo</name>
+<code></code>
 <status>active</status>
 <parent_id>0</parent_id>
 </Organization>
-</Set>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.Software.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<Application alias="Software" id="1">
+<name>Apache</name>
+<description></description>
+</Application>
+<DBServer alias="Software" id="3">
+<name>MySql</name>
+<description></description>
+</DBServer>
+<DBServer alias="Software" id="4">
+<name>Oracle</name>
+<description></description>
+</DBServer>
+<DBServer alias="Software" id="5">
+<name>Outlook Server</name>
+<description></description>
+</DBServer>
+<Application alias="Software" id="2">
+<name>Tomcat</name>
+<description></description>
+</Application>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.application.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<Application alias="Application" id="2">
-<name>Apache Web Server</name>
-<description></description>
-</Application>
-<DBServer alias="Application" id="1">
-<name>MySQL 5</name>
-<description>MySQL Server version 5</description>
-</DBServer>
-<ApplicationInstance alias="ApplicationInstance" id="5">
-<name>Apache Web Server</name>
-<status>production</status>
-<org_id>2</org_id>
-<importance>medium</importance>
-<device_id>4</device_id>
-<licence_id>0</licence_id>
-<software_id>2</software_id>
-<version>2.2</version>
-<description>Apache 2.2 with PHP 5.3.4</description>
-</ApplicationInstance>
-<ApplicationInstance alias="ApplicationInstance" id="2">
-<name>MySQL 5 prod</name>
-<status>production</status>
-<org_id>2</org_id>
-<importance>medium</importance>
-<device_id>1</device_id>
-<licence_id>0</licence_id>
-<software_id>1</software_id>
-<version>5.0.27</version>
-<description></description>
-</ApplicationInstance>
-<DatabaseInstance alias="DatabaseInstance" id="3">
-<name>itop_beta</name>
-<status>implementation</status>
-<org_id>2</org_id>
-<importance>medium</importance>
-<db_server_instance_id>2</db_server_instance_id>
-<description>iTop beta test instance</description>
-</DatabaseInstance>
-<ApplicationSolution alias="ApplicationSolution" id="6">
-<name>iTop demo</name>
-<status>production</status>
-<org_id>2</org_id>
-<importance>high</importance>
-<description>Demo instance of iTop</description>
-</ApplicationSolution>
-<lnkSolutionToCI alias="lnkSolutionToCI" id="1">
-<solution_id>6</solution_id>
-<ci_id>5</ci_id>
-<utility>itop beta instance</utility>
-</lnkSolutionToCI>
-<lnkSolutionToCI alias="lnkSolutionToCI" id="2">
-<solution_id>6</solution_id>
-<ci_id>3</ci_id>
-<utility>itop beta instance</utility>
-</lnkSolutionToCI>
-</Set>

modules/itop-config-mgmt-1.0.0/data.sample.business.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<BusinessProcess alias="BusinessProcess" id="7">
-<name>iTop demonstration</name>
-<status>production</status>
-<org_id>2</org_id>
-<importance>medium</importance>
-<description>Demonstrating iTop on line</description>
-</BusinessProcess>
-<lnkProcessToSolution alias="lnkProcessToSolution" id="2">
-<solution_id>6</solution_id>
-<process_id>7</process_id>
-<reason>On demand demo of iTop</reason>
-</lnkProcessToSolution>
-<lnkCIToContact alias="lnkCIToContact" id="1">
-<ci_id>7</ci_id>
-<contact_id>3</contact_id>
-<role>Operations Manager</role>
-</lnkCIToContact>
-<lnkCIToContact alias="lnkCIToContact" id="2">
-<ci_id>7</ci_id>
-<contact_id>4</contact_id>
-<role>Support Specialist</role>
-</lnkCIToContact>
-</Set>

modules/itop-config-mgmt-1.0.0/data.sample.contact.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<Person alias="Contact" id="4">
-<name>Dumas</name>
-<status>active</status>
-<org_id>2</org_id>
-<email>alexandre.dumas@demo-noemail.net</email>
-<phone></phone>
-<location_id>1</location_id>
-<first_name>Alexandre</first_name>
-<employee_id>20100002</employee_id>
-</Person>
-<Person alias="Contact" id="3">
-<name>Hugo</name>
-<status>active</status>
-<org_id>2</org_id>
-<email>victor.hugo@demo-noemail.net</email>
-<phone></phone>
-<location_id>1</location_id>
-<first_name>Victor</first_name>
-<employee_id>20100001</employee_id>
-</Person>
-<Person alias="Contact" id="5">
-<name>Verne</name>
-<status>active</status>
-<org_id>2</org_id>
-<email>jules.verne@demo-noemail.net</email>
-<phone></phone>
-<location_id>1</location_id>
-<first_name>Jules</first_name>
-<employee_id>20100003</employee_id>
-</Person>
-<lnkTeamToContact alias="lnkTeamToContact" id="1">
-<team_id>2</team_id>
-<contact_id>4</contact_id>
-</lnkTeamToContact>
-<lnkTeamToContact alias="lnkTeamToContact" id="2">
-<team_id>2</team_id>
-<contact_id>5</contact_id>
-</lnkTeamToContact>
-</Set>

modules/itop-config-mgmt-1.0.0/data.sample.lnkCIToContact.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.lnkProcessToSolution.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<lnkProcessToSolution alias="lnkProcessToSolution" id="1">
+<solution_id>12</solution_id>
+<process_id>15</process_id>
+<reason>core application</reason>
+</lnkProcessToSolution>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.lnkSolutionToCI.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<lnkSolutionToCI alias="lnkSolutionToCI" id="1">
+<solution_id>12</solution_id>
+<ci_id>10</ci_id>
+<utility></utility>
+</lnkSolutionToCI>
+<lnkSolutionToCI alias="lnkSolutionToCI" id="2">
+<solution_id>12</solution_id>
+<ci_id>8</ci_id>
+<utility></utility>
+</lnkSolutionToCI>
+<lnkSolutionToCI alias="lnkSolutionToCI" id="3">
+<solution_id>12</solution_id>
+<ci_id>11</ci_id>
+<utility></utility>
+</lnkSolutionToCI>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.lnkTeamToContact.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<lnkTeamToContact alias="lnkTeamToContact" id="5">
+<team_id>2</team_id>
+<contact_id>1</contact_id>
+<role>support agent</role>
+</lnkTeamToContact>
+<lnkTeamToContact alias="lnkTeamToContact" id="6">
+<team_id>4</team_id>
+<contact_id>3</contact_id>
+<role>support agent</role>
+</lnkTeamToContact>
+</Set>

modules/itop-config-mgmt-1.0.0/data.sample.location.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<Location alias="Location" id="1">
-<name>Headquarters</name>
-<status>active</status>
-<org_id>2</org_id>
-<address>1, rue de la Paix</address>
-<postal_code>75000</postal_code>
-<city>Paris</city>
-<country>France</country>
-<parent_id>0</parent_id>
-</Location>
-</Set>

modules/itop-config-mgmt-1.0.0/data.sample.server.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<Server alias="Server" id="1">
-<name>dbserver1.demo.net</name>
-<status>implementation</status>
-<org_id>2</org_id>
-<importance>medium</importance>
-<brand>Hewlett-Packard</brand>
-<model>Proliant DL380 G5</model>
-<serial_number>US0123421</serial_number>
-<asset_ref>DEMO-2314</asset_ref>
-<description>Dedicated database server running MySQL</description>
-<location_id>1</location_id>
-<location_details>Bottom of Rack 1 in DC</location_details>
-<management_ip>192.168.10.49</management_ip>
-<default_gateway>192.168.10.254</default_gateway>
-<cpu>4 x 3GHz</cpu>
-<ram>8 GB</ram>
-<hdd>5 x 72 GB  RAID 5</hdd>
-<os_family>Linux</os_family>
-<os_version>Debian 5 (Lenny)</os_version>
-</Server>
-<Server alias="Server" id="4">
-<name>itop.demo.net</name>
-<status>production</status>
-<org_id>2</org_id>
-<importance>high</importance>
-<brand>Hewlet-Packard</brand>
-<model>Proliant DL380 G5</model>
-<serial_number>US4123423</serial_number>
-<asset_ref>DEMO-2321</asset_ref>
-<description>Web server for running the iTop demo</description>
-<location_id>1</location_id>
-<location_details></location_details>
-<management_ip>192.168.10.50</management_ip>
-<default_gateway>192.168.10.254</default_gateway>
-<cpu>4 x 3GHz</cpu>
-<ram>8 GB</ram>
-<hdd>5 x 72 GB  RAID 5</hdd>
-<os_family>Linux</os_family>
-<os_version>Debian 5 (Lenny)</os_version>
-</Server>
-</Set>

modules/itop-config-mgmt-1.0.0/data.sample.team.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<Team alias="Team" id="2">
-<name>Hardware Support Team</name>
-<status>active</status>
-<org_id>2</org_id>
-<email>pcsupport@demo-noemail.net</email>
-<phone></phone>
-<location_id>1</location_id>
-</Team>
-</Set>

modules/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php

@@ -32,6 +32,9 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Relation:impacts/Description' => 'Elements impacted by',
 	'Relation:impacts/VerbUp' => 'Impact...',
 	'Relation:impacts/VerbDown' => 'Elements impacted by...',
+	'Relation:depends on/Description' => 'Elements this element depends on',
+	'Relation:depends on/VerbUp' => 'Depends on...',
+	'Relation:depends on/VerbDown' => 'Impacts...',
 ));
 
 

modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php

@@ -89,7 +89,7 @@ class Location extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeString("postal_code", array("allowed_values"=>null, "sql"=>"postal_code", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("city", array("allowed_values"=>null, "sql"=>"city", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("country", array("allowed_values"=>null, "sql"=>"country", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("parent_id", array("targetclass"=>"Location", "jointype"=>null, "allowed_values"=>null, "sql"=>"parent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("parent_id", array("targetclass"=>"Location", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Location AS L WHERE L.org_id = :this->org_id'), "sql"=>"parent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id"))));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("parent_name", array("allowed_values"=>null, "extkey_attcode"=>"parent_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
 
 		MetaModel::Init_AddAttribute(new AttributeLinkedSet("contact_list", array("linked_class"=>"Contact", "ext_key_to_me"=>"location_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
@@ -717,7 +717,7 @@ abstract class SoftwareInstance extends FunctionalCI
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
 
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("device_id", array("targetclass"=>"Device", "jointype"=>null, "allowed_values"=>null, "sql"=>"device_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("device_id", array("targetclass"=>"Device", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Device WHERE org_id = :this->org_id'), "sql"=>"device_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array("org_id"))));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("device_name", array("allowed_values"=>null, "extkey_attcode"=>"device_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("licence_id", array("targetclass"=>"Licence", "jointype"=>null, "allowed_values"=>null, "sql"=>"licence_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("licence_name", array("allowed_values"=>null, "extkey_attcode"=>"licence_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
@@ -842,7 +842,7 @@ class DatabaseInstance extends FunctionalCI
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
 
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("db_server_instance_id", array("targetclass"=>"DBServerInstance", "jointype"=>null, "allowed_values"=>null, "sql"=>"db_server_instance_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("db_server_instance_id", array("targetclass"=>"DBServerInstance", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT DBServerInstance WHERE org_id = :this->org_id'), "sql"=>"db_server_instance_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id"))));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("db_server_instance_name", array("allowed_values"=>null, "extkey_attcode"=>"db_server_instance_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("db_server_instance_version", array("allowed_values"=>null, "extkey_attcode"=>"db_server_instance_id", "target_attcode"=>"version", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeWikiText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
@@ -1022,7 +1022,7 @@ class NetworkInterface extends ConnectableCI
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
 
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("device_id", array("targetclass"=>"Device", "jointype"=>null, "allowed_values"=>null, "sql"=>"device_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("device_id", array("targetclass"=>"Device", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Device WHERE org_id = :this->org_id'), "sql"=>"device_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array("org_id"))));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("device_name", array("allowed_values"=>null, "extkey_attcode"=>"device_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("logical_type", array("allowed_values"=>new ValueSetEnum('backup,logical,port,primary,secondary'), "sql"=>"logical_type", "default_value"=>"primary", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("physical_type", array("allowed_values"=>new ValueSetEnum('atm,ethernet,framerelay,vlan'), "sql"=>"physical_type", "default_value"=>"ethernet", "is_null_allowed"=>false, "depends_on"=>array())));
@@ -1031,7 +1031,7 @@ class NetworkInterface extends ConnectableCI
 		MetaModel::Init_AddAttribute(new AttributeString("mac_address", array("allowed_values"=>null, "sql"=>"mac_address", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeInteger("speed", array("allowed_values"=>null, "sql"=>"speed", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("duplex", array("allowed_values"=>new ValueSetEnum('full,half,unknown'), "sql"=>"duplex", "default_value"=>"full", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("connected_if", array("targetclass"=>"NetworkInterface", "jointype"=>null, "allowed_values"=>null, "sql"=>"connected_if", "is_null_allowed"=>true, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("connected_if", array("targetclass"=>"NetworkInterface", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT NetworkInterface WHERE org_id = :this->org_id'), "sql"=>"connected_if", "is_null_allowed"=>true, "on_target_delete"=>DEL_AUTO, "depends_on"=>array("org_id"))));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("connected_name", array("allowed_values"=>null, "extkey_attcode"=>"connected_if", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("connected_if_device_id", array("allowed_values"=>null, "extkey_attcode"=>"connected_if", "target_attcode"=>"device_id", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("connected_if_device_id_name", array("allowed_values"=>null, "extkey_attcode"=>"connected_if", "target_attcode"=>"device_name", "is_null_allowed"=>true, "depends_on"=>array())));
@@ -1481,10 +1481,10 @@ new OQLMenuNode('DBServer', 'SELECT DBServer', $iTopology, 40 /* fRank */);
 $oConfigManagementGroup = new MenuGroup('ConfigManagement', 20 /* fRank */);
 
 // Create an entry, based on a custom template, for the Configuration management overview, under the top-level group
-new TemplateMenuNode('ConfigManagementOverview', '../../modules/itop-config-mgmt-1.0.0/overview.html', $oConfigManagementGroup->GetIndex(), 0 /* fRank */);
+new TemplateMenuNode('ConfigManagementOverview', '../modules/itop-config-mgmt-1.0.0/overview.html', $oConfigManagementGroup->GetIndex(), 0 /* fRank */);
 
 
-$oContactNode = new TemplateMenuNode('Contact', '../../modules/itop-config-mgmt-1.0.0/contacts_menu.html', $oConfigManagementGroup->GetIndex(), 1 /* fRank */);
+$oContactNode = new TemplateMenuNode('Contact', '../modules/itop-config-mgmt-1.0.0/contacts_menu.html', $oConfigManagementGroup->GetIndex(), 1 /* fRank */);
 new OQLMenuNode('Person', 'SELECT Person', $oContactNode->GetIndex(), 1 /* fRank */);
 new OQLMenuNode('Team', 'SELECT Team', $oContactNode->GetIndex(), 2 /* fRank */);
 

modules/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php

@@ -30,19 +30,25 @@ SetupWebPage::AddModule(
 			//'data.struct.itop-config-mgmt.xml',
 		),
 		'data.sample' => array(
-			'data.sample.organization.xml',
-			'data.sample.location.xml',
-			'data.sample.team.xml',
-			'data.sample.contact.xml',
-			'data.sample.server.xml',
-			'data.sample.application.xml',
-			'data.sample.business.xml',
+			'data.sample.Organization.xml',
+			'data.sample.Location.xml',
+			'data.sample.Software.xml',
+			'data.sample.Contact.xml',
+			'data.sample.lnkTeamToContact.xml',
+			'data.sample.FunctionalCI.xml',
+			'data.sample.DBServerInstance.xml',
+			'data.sample.ApplicationInstance.xml',
+			'data.sample.DatabaseInstance.xml',
+			//'data.sample.NetworkInterface.xml',
+			'data.sample.lnkCIToContact.xml',
+			'data.sample.lnkProcessToSolution.xml',
+			'data.sample.lnkSolutionToCI.xml',
 		),
 		
 		// Documentation
 		//
 		'doc.manual_setup' => '', // No manual installation required
-		'doc.more_information' => '/doc/xxx/yyy.htm',
+		'doc.more_information' => '/doc/itop-documentation.htm#ConfigMgmt',
 	)
 );
 

modules/itop-config-mgmt-1.0.0/overview.html

@@ -0,0 +1,21 @@
+<h1><itopstring>UI:ConfigMgmtMenuOverview:Title</itopstring></h1>
+<table border="0" padding="5" class="layout" width="100%">
+<tr>
+<td class="dashboard">
+<itopblock BlockClass="DisplayBlock"  type="open_flash_chart" parameters="chart_type:pie;group_by:status;chart_title:UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus" asynchronous="false" encoding="text/oql">SELECT FunctionalCI</itopblock>
+</td>
+<td class="dashboard">
+<itopblock BlockClass="DisplayBlock"  type="open_flash_chart" parameters="chart_type:bars;group_by:finalclass;chart_title:UI-ConfigMgmtMenuOverview-FunctionalCIByType" asynchronous="false" encoding="text/oql">SELECT FunctionalCI</itopblock>
+</td>
+</tr><tr>
+<td class="dashboard">
+<h1><itopstring>UI-ConfigMgmtMenuOverview-FunctionalCIByType</itopstring></h1>
+<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:finalclass" asynchronous="false" encoding="text/oql">SELECT FunctionalCI</itopblock>
+</td>
+<td>
+&nbsp;
+</td>
+</tr>
+</table>
+
+

modules/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php

@@ -37,8 +37,8 @@ SetupWebPage::AddModule(
 		
 		// Documentation
 		//
-		'doc.manual_setup' => '/doc/xxx/yyy.htm',
-		'doc.more_information' => '/doc/xxx/yyy.htm',
+		'doc.manual_setup' => '',
+		'doc.more_information' => '/doc/itop-documentation.htm#IncidentMgmt',
 	)
 );
 

modules/itop-incident-mgmt-1.0.0/overview.html

@@ -0,0 +1,20 @@
+<h1><itopstring>UI:IncidentMgmtMenuOverview:Title</itopstring></h1>
+<table border="0" padding="5" class="layout" width="100%">
+<tr>
+<td class="dashboard">
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:bars;group_by:service_name;chart_title:UI-IncidentManagementOverview-IncidentByService" asynchronous="false" encoding="text/oql">SELECT Incident</itopblock>
+</td>
+<td class="dashboard">
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;group_by:priority;chart_title:UI-IncidentManagementOverview-IncidentByPriority" asynchronous="false" encoding="text/oql">SELECT Incident</itopblock>
+</td>
+</tr>
+<tr>
+<td class="dashboard">
+<h2><itopstring>UI-IncidentManagementOverview-IncidentUnassigned</itopstring></h2>
+<itopblock BlockClass="DisplayBlock" type="list" parameters="dashboard:true" asynchronous="false" encoding="text/oql">SELECT Incident WHERE status = 'new'</itopblock>
+</td>
+<td class="dashboard">
+</td>
+</tr>
+</table>
+

modules/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php

@@ -37,7 +37,7 @@ SetupWebPage::AddModule(
 		// Documentation
 		//
 		'doc.manual_setup' => '', // No manual installation instructions
-		'doc.more_information' => '/doc/xxx/yyy.htm',
+		'doc.more_information' => '/doc/itop-documentation.htm#KnownErrorsDB',
 	)
 );
 

modules/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php

@@ -37,7 +37,7 @@ SetupWebPage::AddModule(
 		// Documentation
 		//
 		'doc.manual_setup' => '', // No manual installation instructions
-		'doc.more_information' => '/doc/xxx/yyy.htm',
+		'doc.more_information' => '/doc/itop-documentation.htm#ProblemMgmt',
 	)
 );
 

modules/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php

@@ -36,8 +36,8 @@ SetupWebPage::AddModule(
 		
 		// Documentation
 		//
-		'doc.manual_setup' => '/doc/xxx/yyy.htm',
-		'doc.more_information' => '/doc/xxx/yyy.htm',
+		'doc.manual_setup' => '',
+		'doc.more_information' => '/doc/itop-documentation.htm#RequestMgmt',
 	)
 );
 

modules/itop-request-mgmt-1.0.0/overview.html

@@ -0,0 +1,21 @@
+<h1><itopstring>UI:RequestMgmtMenuOverview:Title</itopstring></h1>
+<table border="0" padding="5" class="layout" width="100%">
+<tr>
+<td class="dashboard">
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:bars;group_by:service_name;chart_title:UI-RequestManagementOverview-RequestByService" asynchronous="false" encoding="text/oql">SELECT UserRequest</itopblock>
+</td>
+<td class="dashboard">
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;group_by:priority;chart_title:UI-RequestManagementOverview-RequestByPriority" asynchronous="false" encoding="text/oql">SELECT UserRequest</itopblock>
+</td>
+</tr>
+<tr>
+<td class="dashboard">
+<h2><itopstring>UI-RequestManagementOverview-RequestUnassigned</itopstring></h2>
+<itopblock BlockClass="DisplayBlock" type="list" parameters="dashboard:true" asynchronous="false" encoding="text/oql">SELECT UserRequest WHERE status = 'new'</itopblock>
+</td>
+<td>
+&nbsp;
+</td>
+</tr>
+</table>
+

modules/itop-service-mgmt-1.0.0/data.sample.Contract.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<CustomerContract alias="Contract" id="3">
+<name>Hw Management</name>
+<description></description>
+<start_date>2010-07-01 00:00:00</start_date>
+<end_date>2011-07-01 00:00:00</end_date>
+<cost></cost>
+<cost_currency>euros</cost_currency>
+<cost_unit></cost_unit>
+<billing_frequency></billing_frequency>
+<org_id>2</org_id>
+<provider_id>1</provider_id>
+<support_team_id>2</support_team_id>
+</CustomerContract>
+<CustomerContract alias="Contract" id="2">
+<name>Nw Management</name>
+<description></description>
+<start_date>2010-06-01 00:00:00</start_date>
+<end_date>2010-07-14 00:00:00</end_date>
+<cost></cost>
+<cost_currency>euros</cost_currency>
+<cost_unit></cost_unit>
+<billing_frequency></billing_frequency>
+<org_id>2</org_id>
+<provider_id>1</provider_id>
+<support_team_id>4</support_team_id>
+</CustomerContract>
+</Set>

modules/itop-service-mgmt-1.0.0/data.sample.SLA.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<SLA alias="SLA" id="8">
+<name>Bronze - Service - HW Mgmt</name>
+<service_id>1</service_id>
+</SLA>
+<SLA alias="SLA" id="5">
+<name>Bronze - Service - NW Mgmt</name>
+<service_id>2</service_id>
+</SLA>
+<SLA alias="SLA" id="6">
+<name>Gold - Service - HW Mgmt</name>
+<service_id>1</service_id>
+</SLA>
+<SLA alias="SLA" id="3">
+<name>Gold - Service - NW Mgmt</name>
+<service_id>2</service_id>
+</SLA>
+<SLA alias="SLA" id="7">
+<name>Silver - Service - HW Mgmt</name>
+<service_id>1</service_id>
+</SLA>
+<SLA alias="SLA" id="4">
+<name>Silver - Service - NW Mgmt</name>
+<service_id>2</service_id>
+</SLA>
+</Set>

modules/itop-service-mgmt-1.0.0/data.sample.SLT.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<SLT alias="SLT" id="1">
+<name>TTO -15mn - Prio1</name>
+<metric>TTO</metric>
+<ticket_priority>1</ticket_priority>
+<value>15</value>
+<value_unit>minutes</value_unit>
+</SLT>
+<SLT alias="SLT" id="2">
+<name>TTO -30mn - Prio2</name>
+<metric>TTO</metric>
+<ticket_priority>2</ticket_priority>
+<value>30</value>
+<value_unit>minutes</value_unit>
+</SLT>
+<SLT alias="SLT" id="3">
+<name>TTO -4h - Prio3</name>
+<metric>TTO</metric>
+<ticket_priority>3</ticket_priority>
+<value>4</value>
+<value_unit>hours</value_unit>
+</SLT>
+<SLT alias="SLT" id="4">
+<name>TTR -2h - Prio1</name>
+<metric>TTR</metric>
+<ticket_priority>1</ticket_priority>
+<value>2</value>
+<value_unit>hours</value_unit>
+</SLT>
+<SLT alias="SLT" id="5">
+<name>TTR -4h - Prio2</name>
+<metric>TTR</metric>
+<ticket_priority>2</ticket_priority>
+<value>4</value>
+<value_unit>hours</value_unit>
+</SLT>
+<SLT alias="SLT" id="6">
+<name>TTR -8h- Prio3</name>
+<metric>TTR</metric>
+<ticket_priority>3</ticket_priority>
+<value>8</value>
+<value_unit>hours</value_unit>
+</SLT>
+</Set>

modules/itop-service-mgmt-1.0.0/data.sample.Service.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+</Set>

modules/itop-service-mgmt-1.0.0/data.sample.ServiceSubcategory.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<ServiceSubcategory alias="ServiceSubcategory" id="1">
+<name>Break</name>
+<description></description>
+<service_id>1</service_id>
+</ServiceSubcategory>
+<ServiceSubcategory alias="ServiceSubcategory" id="2">
+<name>Troubleshooting</name>
+<description></description>
+<service_id>2</service_id>
+</ServiceSubcategory>
+</Set>

modules/itop-service-mgmt-1.0.0/data.sample.contracttosla.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<lnkContractToSLA alias="lnkContractToSLA" id="2">
-<contract_id>2</contract_id>
-<sla_id>6</sla_id>
-<coverage>8h-18h, business days</coverage>
-</lnkContractToSLA>
-</Set>

modules/itop-service-mgmt-1.0.0/data.sample.customercontract.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<CustomerContract alias="CustomerContract" id="2">
-<name>End-User PC Support</name>
-<description>Hardware support for end-users' PC</description>
-<start_date>2010-07-01</start_date>
-<end_date>2012-07-31</end_date>
-<cost></cost>
-<cost_currency>euros</cost_currency>
-<cost_unit></cost_unit>
-<billing_frequency></billing_frequency>
-<org_id>2</org_id>
-<support_team_id>2</support_team_id>
-</CustomerContract>
-</Set>

modules/itop-service-mgmt-1.0.0/data.sample.lnkContractToSLA.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<lnkContractToSLA alias="lnkContractToSLA" id="9">
+<contract_id>2</contract_id>
+<sla_id>3</sla_id>
+<coverage></coverage>
+</lnkContractToSLA>
+<lnkContractToSLA alias="lnkContractToSLA" id="7">
+<contract_id>3</contract_id>
+<sla_id>6</sla_id>
+<coverage></coverage>
+</lnkContractToSLA>
+</Set>

modules/itop-service-mgmt-1.0.0/data.sample.lnkSLTToSLA.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<lnkSLTToSLA alias="lnkSLTToSLA" id="2">
+<sla_id>3</sla_id>
+<slt_id>2</slt_id>
+</lnkSLTToSLA>
+<lnkSLTToSLA alias="lnkSLTToSLA" id="5">
+<sla_id>3</sla_id>
+<slt_id>5</slt_id>
+</lnkSLTToSLA>
+<lnkSLTToSLA alias="lnkSLTToSLA" id="3">
+<sla_id>4</sla_id>
+<slt_id>3</slt_id>
+</lnkSLTToSLA>
+<lnkSLTToSLA alias="lnkSLTToSLA" id="6">
+<sla_id>4</sla_id>
+<slt_id>6</slt_id>
+</lnkSLTToSLA>
+<lnkSLTToSLA alias="lnkSLTToSLA" id="1">
+<sla_id>5</sla_id>
+<slt_id>1</slt_id>
+</lnkSLTToSLA>
+<lnkSLTToSLA alias="lnkSLTToSLA" id="4">
+<sla_id>5</sla_id>
+<slt_id>4</slt_id>
+</lnkSLTToSLA>
+<lnkSLTToSLA alias="lnkSLTToSLA" id="8">
+<sla_id>6</sla_id>
+<slt_id>2</slt_id>
+</lnkSLTToSLA>
+<lnkSLTToSLA alias="lnkSLTToSLA" id="11">
+<sla_id>6</sla_id>
+<slt_id>5</slt_id>
+</lnkSLTToSLA>
+<lnkSLTToSLA alias="lnkSLTToSLA" id="9">
+<sla_id>7</sla_id>
+<slt_id>3</slt_id>
+</lnkSLTToSLA>
+<lnkSLTToSLA alias="lnkSLTToSLA" id="12">
+<sla_id>7</sla_id>
+<slt_id>6</slt_id>
+</lnkSLTToSLA>
+<lnkSLTToSLA alias="lnkSLTToSLA" id="7">
+<sla_id>8</sla_id>
+<slt_id>1</slt_id>
+</lnkSLTToSLA>
+<lnkSLTToSLA alias="lnkSLTToSLA" id="10">
+<sla_id>8</sla_id>
+<slt_id>4</slt_id>
+</lnkSLTToSLA>
+</Set>

modules/itop-service-mgmt-1.0.0/data.sample.service.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<Service alias="Service" id="4">
-<name>NW Support</name>
-<description>Network infrastructure support</description>
-<type>IncidentManagement</type>
-<status>production</status>
-</Service>
-<Service alias="Service" id="2">
-<name>PC Support</name>
-<description>Hardware support for end-user PC</description>
-<type>RequestManagement</type>
-<status>production</status>
-</Service>
-<Service alias="Service" id="3">
-<name>SW Support</name>
-<description>Software support for end-user applications</description>
-<type>RequestManagement</type>
-<status>production</status>
-</Service>
-</Set>

modules/itop-service-mgmt-1.0.0/data.sample.servicesubcategory.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<ServiceSubcategory alias="ServiceSubcategory" id="8">
-<name>Configuration</name>
-<description>Request application configuration</description>
-<service_id>3</service_id>
-</ServiceSubcategory>
-<ServiceSubcategory alias="ServiceSubcategory" id="6">
-<name>DataRestore</name>
-<description>Restore data from backup</description>
-<service_id>2</service_id>
-</ServiceSubcategory>
-<ServiceSubcategory alias="ServiceSubcategory" id="12">
-<name>Equipment down</name>
-<description>Network equipment</description>
-<service_id>4</service_id>
-</ServiceSubcategory>
-<ServiceSubcategory alias="ServiceSubcategory" id="4">
-<name>Failure</name>
-<description>PC not working</description>
-<service_id>2</service_id>
-</ServiceSubcategory>
-<ServiceSubcategory alias="ServiceSubcategory" id="14">
-<name>Installation</name>
-<description>Request PC setup</description>
-<service_id>2</service_id>
-</ServiceSubcategory>
-<ServiceSubcategory alias="ServiceSubcategory" id="3">
-<name>Installation</name>
-<description>Request application installation</description>
-<service_id>3</service_id>
-</ServiceSubcategory>
-<ServiceSubcategory alias="ServiceSubcategory" id="13">
-<name>Intrusion</name>
-<description>An intrusion has been detected</description>
-<service_id>4</service_id>
-</ServiceSubcategory>
-<ServiceSubcategory alias="ServiceSubcategory" id="11">
-<name>Performance</name>
-<description>Slow traffic</description>
-<service_id>4</service_id>
-</ServiceSubcategory>
-<ServiceSubcategory alias="ServiceSubcategory" id="7">
-<name>Renew</name>
-<description>Order a replacement PC</description>
-<service_id>2</service_id>
-</ServiceSubcategory>
-<ServiceSubcategory alias="ServiceSubcategory" id="9">
-<name>Training</name>
-<description>Request application training</description>
-<service_id>3</service_id>
-</ServiceSubcategory>
-<ServiceSubcategory alias="ServiceSubcategory" id="10">
-<name>Troubleshooting</name>
-<description>Request help for troubleshooting</description>
-<service_id>3</service_id>
-</ServiceSubcategory>
-<ServiceSubcategory alias="ServiceSubcategory" id="5">
-<name>Virus</name>
-<description>Suspecting a virus infection</description>
-<service_id>2</service_id>
-</ServiceSubcategory>
-</Set>

modules/itop-service-mgmt-1.0.0/data.sample.sla.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<SLA alias="SLA" id="10">
-<name>NW support - Bronze</name>
-<service_id>4</service_id>
-</SLA>
-<SLA alias="SLA" id="8">
-<name>NW support - Gold</name>
-<service_id>4</service_id>
-</SLA>
-<SLA alias="SLA" id="9">
-<name>NW support - Silver</name>
-<service_id>4</service_id>
-</SLA>
-<SLA alias="SLA" id="4">
-<name>PC support - Bronze</name>
-<service_id>2</service_id>
-</SLA>
-<SLA alias="SLA" id="2">
-<name>PC support - Gold</name>
-<service_id>2</service_id>
-</SLA>
-<SLA alias="SLA" id="3">
-<name>PC support - Silver</name>
-<service_id>2</service_id>
-</SLA>
-<SLA alias="SLA" id="7">
-<name>SW support - Bronze</name>
-<service_id>3</service_id>
-</SLA>
-<SLA alias="SLA" id="5">
-<name>SW support - Gold</name>
-<service_id>3</service_id>
-</SLA>
-<SLA alias="SLA" id="6">
-<name>SW support - Silver</name>
-<service_id>3</service_id>
-</SLA>
-</Set>

modules/itop-service-mgmt-1.0.0/data.sample.slt.xml

@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<SLT alias="SLT" id="13">
-<name>Bronze-TTO prio1</name>
-<metric>TTO</metric>
-<ticket_priority>1</ticket_priority>
-<value>2</value>
-<value_unit>hours</value_unit>
-</SLT>
-<SLT alias="SLT" id="15">
-<name>Bronze-TTO prio2</name>
-<metric>TTO</metric>
-<ticket_priority>2</ticket_priority>
-<value>4</value>
-<value_unit>hours</value_unit>
-</SLT>
-<SLT alias="SLT" id="17">
-<name>Bronze-TTO prio3</name>
-<metric>TTO</metric>
-<ticket_priority>3</ticket_priority>
-<value>8</value>
-<value_unit>hours</value_unit>
-</SLT>
-<SLT alias="SLT" id="14">
-<name>Bronze-TTR prio1</name>
-<metric>TTR</metric>
-<ticket_priority>1</ticket_priority>
-<value>1</value>
-<value_unit>days</value_unit>
-</SLT>
-<SLT alias="SLT" id="16">
-<name>Bronze-TTR prio2</name>
-<metric>TTR</metric>
-<ticket_priority>2</ticket_priority>
-<value>2</value>
-<value_unit>days</value_unit>
-</SLT>
-<SLT alias="SLT" id="18">
-<name>Bronze-TTR prio3</name>
-<metric>TTR</metric>
-<ticket_priority>3</ticket_priority>
-<value>3</value>
-<value_unit>days</value_unit>
-</SLT>
-<SLT alias="SLT" id="1">
-<name>Gold-TTO prio1</name>
-<metric>TTO</metric>
-<ticket_priority>1</ticket_priority>
-<value>30</value>
-<value_unit>minutes</value_unit>
-</SLT>
-<SLT alias="SLT" id="3">
-<name>Gold-TTO prio2</name>
-<metric>TTO</metric>
-<ticket_priority>2</ticket_priority>
-<value>1</value>
-<value_unit>hours</value_unit>
-</SLT>
-<SLT alias="SLT" id="5">
-<name>Gold-TTO prio3</name>
-<metric>TTO</metric>
-<ticket_priority>3</ticket_priority>
-<value>2</value>
-<value_unit>hours</value_unit>
-</SLT>
-<SLT alias="SLT" id="2">
-<name>Gold-TTR prio1</name>
-<metric>TTR</metric>
-<ticket_priority>1</ticket_priority>
-<value>2</value>
-<value_unit>hours</value_unit>
-</SLT>
-<SLT alias="SLT" id="4">
-<name>Gold-TTR prio2</name>
-<metric>TTR</metric>
-<ticket_priority>2</ticket_priority>
-<value>4</value>
-<value_unit>hours</value_unit>
-</SLT>
-<SLT alias="SLT" id="6">
-<name>Gold-TTR prio3</name>
-<metric>TTR</metric>
-<ticket_priority>3</ticket_priority>
-<value>1</value>
-<value_unit>days</value_unit>
-</SLT>
-<SLT alias="SLT" id="7">
-<name>Silver-TTO prio1</name>
-<metric>TTO</metric>
-<ticket_priority>1</ticket_priority>
-<value>1</value>
-<value_unit>hours</value_unit>
-</SLT>
-<SLT alias="SLT" id="9">
-<name>Silver-TTO prio2</name>
-<metric>TTO</metric>
-<ticket_priority>2</ticket_priority>
-<value>2</value>
-<value_unit>hours</value_unit>
-</SLT>
-<SLT alias="SLT" id="11">
-<name>Silver-TTO prio3</name>
-<metric>TTO</metric>
-<ticket_priority>3</ticket_priority>
-<value>4</value>
-<value_unit>hours</value_unit>
-</SLT>
-<SLT alias="SLT" id="8">
-<name>Silver-TTR prio1</name>
-<metric>TTR</metric>
-<ticket_priority>1</ticket_priority>
-<value>4</value>
-<value_unit>hours</value_unit>
-</SLT>
-<SLT alias="SLT" id="10">
-<name>Silver-TTR prio2</name>
-<metric>TTR</metric>
-<ticket_priority>2</ticket_priority>
-<value>1</value>
-<value_unit>days</value_unit>
-</SLT>
-<SLT alias="SLT" id="12">
-<name>Silver-TTR prio3</name>
-<metric>TTR</metric>
-<ticket_priority>3</ticket_priority>
-<value>2</value>
-<value_unit>days</value_unit>
-</SLT>
-</Set>

modules/itop-service-mgmt-1.0.0/data.sample.slttosla.xml

@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="23">
-<sla_id>1</sla_id>
-<slt_id>4</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="24">
-<sla_id>1</sla_id>
-<slt_id>3</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="25">
-<sla_id>1</sla_id>
-<slt_id>2</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="26">
-<sla_id>1</sla_id>
-<slt_id>1</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="21">
-<sla_id>1</sla_id>
-<slt_id>6</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="22">
-<sla_id>1</sla_id>
-<slt_id>5</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="27">
-<sla_id>2</sla_id>
-<slt_id>12</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="28">
-<sla_id>2</sla_id>
-<slt_id>11</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="29">
-<sla_id>2</sla_id>
-<slt_id>10</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="30">
-<sla_id>2</sla_id>
-<slt_id>9</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="31">
-<sla_id>2</sla_id>
-<slt_id>8</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="32">
-<sla_id>2</sla_id>
-<slt_id>7</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="36">
-<sla_id>3</sla_id>
-<slt_id>15</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="37">
-<sla_id>3</sla_id>
-<slt_id>14</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="38">
-<sla_id>3</sla_id>
-<slt_id>13</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="33">
-<sla_id>3</sla_id>
-<slt_id>18</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="34">
-<sla_id>3</sla_id>
-<slt_id>17</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="35">
-<sla_id>3</sla_id>
-<slt_id>16</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="15">
-<sla_id>4</sla_id>
-<slt_id>1</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="16">
-<sla_id>4</sla_id>
-<slt_id>4</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="17">
-<sla_id>4</sla_id>
-<slt_id>2</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="18">
-<sla_id>4</sla_id>
-<slt_id>5</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="19">
-<sla_id>4</sla_id>
-<slt_id>3</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="20">
-<sla_id>4</sla_id>
-<slt_id>6</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="7">
-<sla_id>5</sla_id>
-<slt_id>9</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="8">
-<sla_id>5</sla_id>
-<slt_id>12</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="3">
-<sla_id>5</sla_id>
-<slt_id>7</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="4">
-<sla_id>5</sla_id>
-<slt_id>10</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="5">
-<sla_id>5</sla_id>
-<slt_id>8</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="6">
-<sla_id>5</sla_id>
-<slt_id>11</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="9">
-<sla_id>6</sla_id>
-<slt_id>18</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="10">
-<sla_id>6</sla_id>
-<slt_id>13</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="11">
-<sla_id>6</sla_id>
-<slt_id>16</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="12">
-<sla_id>6</sla_id>
-<slt_id>14</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="13">
-<sla_id>6</sla_id>
-<slt_id>17</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="14">
-<sla_id>6</sla_id>
-<slt_id>15</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="43">
-<sla_id>7</sla_id>
-<slt_id>2</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="44">
-<sla_id>7</sla_id>
-<slt_id>1</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="39">
-<sla_id>7</sla_id>
-<slt_id>6</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="40">
-<sla_id>7</sla_id>
-<slt_id>5</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="41">
-<sla_id>7</sla_id>
-<slt_id>4</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="42">
-<sla_id>7</sla_id>
-<slt_id>3</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="45">
-<sla_id>8</sla_id>
-<slt_id>12</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="46">
-<sla_id>8</sla_id>
-<slt_id>11</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="47">
-<sla_id>8</sla_id>
-<slt_id>10</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="48">
-<sla_id>8</sla_id>
-<slt_id>9</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="49">
-<sla_id>8</sla_id>
-<slt_id>8</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="50">
-<sla_id>8</sla_id>
-<slt_id>7</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="56">
-<sla_id>9</sla_id>
-<slt_id>13</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="51">
-<sla_id>9</sla_id>
-<slt_id>18</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="52">
-<sla_id>9</sla_id>
-<slt_id>17</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="53">
-<sla_id>9</sla_id>
-<slt_id>16</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="54">
-<sla_id>9</sla_id>
-<slt_id>15</slt_id>
-</lnkSLTToSLA>
-<lnkSLTToSLA alias="lnkSLTToSLA" id="55">
-<sla_id>9</sla_id>
-<slt_id>14</slt_id>
-</lnkSLTToSLA>
-</Set>

modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php

@@ -300,7 +300,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:SLA/Attribute:service_name' => 'Service',
 	'Class:SLA/Attribute:service_name+' => '',
 	'Class:SLA/Attribute:slt_list' => 'SLTs',
-	'Class:SLA/Attribute:slt_list+' => 'List of Service Level Targets',
+	'Class:SLA/Attribute:slt_list+' => 'List Service Level Thresholds',
 ));
 
 //

modules/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php

@@ -30,19 +30,19 @@ SetupWebPage::AddModule(
 			//'data.struct.itop-service-mgmt.xml',
 		),
 		'data.sample' => array(
-			'data.sample.service.xml',
-			'data.sample.servicesubcategory.xml',
-			'data.sample.sla.xml',
-			'data.sample.slt.xml',
-			'data.sample.slttosla.xml',
-			'data.sample.customercontract.xml',
-			'data.sample.contracttosla.xml',
+			'data.sample.Service.xml',
+			'data.sample.ServiceSubcategory.xml',
+			'data.sample.SLA.xml',
+			'data.sample.SLT.xml',
+			'data.sample.lnkSLTToSLA.xml',
+			'data.sample.Contract.xml',
+			'data.sample.lnkContractToSLA.xml',
 		),
 		
 		// Documentation
 		//
 		'doc.manual_setup' => '', // No manual installation instructions
-		'doc.more_information' => '/doc/xxx/yyy.htm',
+		'doc.more_information' => '/doc/itop-documentation.htm#ServiceMgmt',
 	)
 );
 

modules/itop-service-mgmt-1.0.0/overview.html

@@ -0,0 +1,14 @@
+<h1><itopstring>UI:ServiceMgmtMenuOverview:Title</itopstring></h1>
+<table border="0" padding="5" class="layout" width="100%">
+<tr>
+<td class="dashboard">
+<h2><itopstring>UI-ServiceManagementOverview-CustomerContractToRenew</itopstring></h2>
+<itopblock BlockClass="DisplayBlock" type="list" parameters="dashboard:true" asynchronous="false" encoding="text/oql">SELECT CustomerContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY)</itopblock>
+</td>
+<td class="dashboard">
+<h2><itopstring>UI-ServiceManagementOverview-ProviderContractToRenew</itopstring></h2>
+<itopblock BlockClass="DisplayBlock" type="list" parameters="dashboard:true" asynchronous="false" encoding="text/oql">SELECT ProviderContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY)</itopblock>
+</td>
+</tr>
+</table>
+

modules/itop-tickets-1.0.0/model.itop-tickets.php

@@ -177,21 +177,21 @@ abstract class ResponseTicket extends Ticket
 		MetaModel::Init_InheritAttributes();
 
 		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('new,assigned,frozen,escalated_tto,escalated_ttr,resolved,closed'), "sql"=>"status", "default_value"=>"new", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("caller_id", array("targetclass"=>"Person", "jointype"=>null, "allowed_values"=>null, "sql"=>"caller_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("caller_id", array("targetclass"=>"Person", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Person WHERE org_id = :this->org_id'), "sql"=>"caller_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id"))));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("caller_email", array("allowed_values"=>null, "extkey_attcode"=>"caller_id", "target_attcode"=>"email", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"Organization", "jointype"=>null, "allowed_values"=>null, "sql"=>"org_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("org_name", array("allowed_values"=>null, "extkey_attcode"=>"org_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("service_id", array("targetclass"=>"Service", "jointype"=>null, "allowed_values"=>null, "sql"=>"service_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("service_id", array("targetclass"=>"Service", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Service AS s JOIN SLA AS sla ON sla.service_id=s.id JOIN lnkContractToSLA AS ln ON ln.sla_id=sla.id JOIN CustomerContract AS cc ON ln.contract_id=cc.id WHERE cc.org_id =:this->org_id'), "sql"=>"service_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id"))));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("service_name", array("allowed_values"=>null, "extkey_attcode"=>"service_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("servicesubcategory_id", array("targetclass"=>"ServiceSubcategory", "jointype"=>null, "allowed_values"=>null, "sql"=>"servicesubcategory_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("servicesubcategory_id", array("targetclass"=>"ServiceSubcategory", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT ServiceSubcategory WHERE service_id = :this->service_id'), "sql"=>"servicesubcategory_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("service_id"))));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("servicesubcategory_name", array("allowed_values"=>null, "extkey_attcode"=>"servicesubcategory_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("product", array("allowed_values"=>null, "sql"=>"product", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("impact", array("allowed_values"=>new ValueSetEnum('1,2,3'), "sql"=>"impact", "default_value"=>"1", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("urgency", array("allowed_values"=>new ValueSetEnum('1,2,3'), "sql"=>"urgency", "default_value"=>"1", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("priority", array("allowed_values"=>new ValueSetEnum('1,2,3'), "sql"=>"priority", "default_value"=>"1", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"Team", "jointype"=>null, "allowed_values"=>null, "sql"=>"workgroup_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"Team", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Team AS t JOIN CustomerContract AS cc ON cc.support_team_id=t.id JOIN lnkContractToSLA AS ln ON ln.contract_id=cc.id JOIN SLA AS sla ON ln.sla_id=sla.id WHERE sla.service_id = :this->service_id AND cc.org_id = :this->org_id'), "sql"=>"workgroup_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id","service_id"))));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("workgroup_name", array("allowed_values"=>null, "extkey_attcode"=>"workgroup_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"Person", "jointype"=>null, "allowed_values"=>null, "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"Person", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Person AS p JOIN lnkTeamToContact AS l ON l.contact_id=p.id JOIN Team AS t ON l.team_id=t.id WHERE t.id = :this->workgroup_id'), "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("workgroup_id"))));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("agent_name", array("allowed_values"=>null, "extkey_attcode"=>"agent_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("agent_email", array("allowed_values"=>null, "extkey_attcode"=>"agent_id", "target_attcode"=>"email", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("related_problem_id", array("targetclass"=>"Problem", "jointype"=>null, "allowed_values"=>null, "sql"=>"related_problem_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
@@ -208,7 +208,7 @@ abstract class ResponseTicket extends Ticket
 		MetaModel::Init_AddAttribute(new AttributeEnum("user_satisfaction", array("allowed_values"=>new ValueSetEnum('1,2,3,4'), "sql"=>"user_satisfaction", "default_value"=>"1", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeText("user_commment", array("allowed_values"=>null, "sql"=>"user_commment", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 
-		MetaModel::Init_SetZListItems('details', array('ref', 'title', 'ticket_log', 'start_date', 'escalation_deadline', 'closure_deadline', 'document_list', 'ci_list', 'contact_list', 'status', 'caller_id', 'org_id', 'service_id', 'servicesubcategory_id', 'product', 'impact', 'urgency', 'priority', 'workgroup_id', 'agent_id', 'agent_email', 'related_problem_id', 'related_change_id', 'close_date', 'last_update', 'assignment_date', 'closure_deadline', 'resolution_code', 'solution', 'user_satisfaction', 'user_commment'));
+		MetaModel::Init_SetZListItems('details', array('ref', 'title', 'ticket_log', 'start_date', 'escalation_deadline', 'closure_deadline', 'document_list', 'ci_list', 'contact_list', 'status', 'caller_id', 'org_id', 'service_id', 'servicesubcategory_id', 'product', 'impact', 'urgency', 'priority', 'workgroup_id', 'agent_id', 'agent_email', 'related_problem_id', 'related_change_id', 'close_date', 'last_update', 'assignment_date', 'resolution_code', 'solution', 'user_satisfaction', 'user_commment'));
 		MetaModel::Init_SetZListItems('advanced_search', array('finalclass', 'ref', 'title', 'ticket_log', 'start_date', 'status', 'caller_id', 'org_id', 'service_id', 'servicesubcategory_id', 'product', 'impact', 'urgency', 'priority', 'workgroup_id', 'agent_id', 'agent_email', 'related_problem_id', 'related_change_id', 'close_date', 'last_update', 'assignment_date', 'escalation_deadline', 'closure_deadline', 'resolution_code', 'solution', 'user_satisfaction', 'user_commment'));
 		MetaModel::Init_SetZListItems('standard_search', array('finalclass', 'ref', 'title', 'ticket_log', 'start_date', 'status', 'caller_id', 'org_id', 'service_id', 'servicesubcategory_id', 'product', 'impact', 'urgency', 'priority', 'workgroup_id', 'agent_id', 'agent_email', 'related_problem_id', 'related_change_id', 'close_date', 'last_update', 'assignment_date', 'escalation_deadline', 'closure_deadline', 'resolution_code', 'solution', 'user_satisfaction', 'user_commment'));
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'ref', 'title', 'ticket_log', 'start_date', 'status', 'caller_id', 'org_id', 'service_id', 'servicesubcategory_id', 'product', 'impact', 'urgency', 'priority', 'workgroup_id', 'agent_id', 'agent_email', 'related_problem_id', 'related_change_id', 'close_date', 'last_update', 'assignment_date', 'escalation_deadline', 'closure_deadline', 'resolution_code', 'solution', 'user_satisfaction', 'user_commment'));

setup/index.php

@@ -48,18 +48,25 @@ $oP = new SetupWebPage('iTop configuration wizard');
 /**
  * Get a nicely formatted version string
  */
-function GetITopVersion()
+function GetITopVersion($bShort = true)
 {
 	$sVersionString = '';
-	if (ITOP_REVISION == '$WCREV$')
+	if ($bShort)
 	{
-		// This is NOT a version built using the buil system, just display the main version
 		$sVersionString = "iTop Version ".ITOP_VERSION;
 	}
 	else
 	{
-		// This is a build made from SVN, let display the full information
-		$sVersionString = "iTop Version ".ITOP_VERSION." revision ".ITOP_REVISION.", built on: ".ITOP_BUILD_DATE;
+		if (ITOP_REVISION == '$WCREV$')
+		{
+			// This is NOT a version built using the buil system, just display the main version
+			$sVersionString = "iTop Version ".ITOP_VERSION;
+		}
+		else
+		{
+			// This is a build made from SVN, let display the full information
+			$sVersionString = "iTop Version ".ITOP_VERSION." revision ".ITOP_REVISION.", built on: ".ITOP_BUILD_DATE;
+		}
 	}
 	return $sVersionString;
 }
@@ -577,9 +584,10 @@ function WelcomeAndCheckPrerequisites(SetupWebPage $oP, $aParamValues, $iCurrent
 {
 	$sNextOperation = 'step'.($iCurrentStep+1);
 	$oP->add("<h1>iTop configuration wizard</h1>\n");
-	$sVersionString = GetITopVersion();
-	$oP->set_title('Welcome to '.$sVersionString);
-	$oP->log($sVersionString);
+	$sVersionStringShort = GetITopVersion(true);
+	$sVersionStringLong = GetITopVersion(false);
+	$oP->set_title('Welcome to '.$sVersionStringShort);
+	$oP->log($sVersionStringLong);
 	$oP->add("<h2>Checking prerequisites</h2>\n");
 	if (CheckPHPVersion($oP))
 	{

setup/xmldataloader.class.inc.php

@@ -319,9 +319,9 @@ class XMLDataLoader
 						{
 							$sMsg = "unresolved extkey in $sClass::".$oTargetObj->GetKey()."(".$oTargetObj->GetName().")::$sAttCode=$sTargetClass::$iTempKey";
 							SetupWebPage::log_warning($sMsg);
-							echo "<pre>aKeys[".$sTargetClass."]:\n";
-							print_r($this->m_aKeys[$sTargetClass]);
-							echo "</pre>\n";
+							//echo "<pre>aKeys[".$sTargetClass."]:\n";
+							//print_r($this->m_aKeys[$sTargetClass]);
+							//echo "</pre>\n";
 						}
 						else
 						{