Dashboards - make sure that dashlet ids are unique within a given dashboard (not a cell), which can become uneasy when the dashlets are spread amongst several modules

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

datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml

@@ -7635,11 +7635,11 @@
           <icon>itop-config-mgmt/images/server.png</icon>
           <subtitle>Menu_ConfigManagement_AllDevices</subtitle>
         </dashlet>
-        <dashlet id="4" xsi:type="DashletBadge">
+        <dashlet id="2" xsi:type="DashletBadge">
           <rank>3</rank>
           <class>Server</class>
         </dashlet>
-        <dashlet id="5" xsi:type="DashletBadge">
+        <dashlet id="3" xsi:type="DashletBadge">
           <rank>4</rank>
           <class>NetworkDevice</class>
         </dashlet>
@@ -7648,44 +7648,44 @@
     <cell id="3">
       <rank>3</rank>
       <dashlets>
-        <dashlet id="23" xsi:type="DashletHeaderStatic">
+        <dashlet id="4" xsi:type="DashletHeaderStatic">
           <rank>0</rank>
           <title>Menu:ConfigManagement:SWAndApps</title>
           <icon>itop-config-mgmt/images/application.png</icon>
         </dashlet>
-        <dashlet id="24" xsi:type="DashletBadge">
+        <dashlet id="5" xsi:type="DashletBadge">
           <rank>1</rank>
           <class>Middleware</class>
         </dashlet>
-        <dashlet id="25" xsi:type="DashletBadge">
+        <dashlet id="6" xsi:type="DashletBadge">
           <rank>2</rank>
           <class>DBserver</class>
         </dashlet>
-        <dashlet id="26" xsi:type="DashletBadge">
+        <dashlet id="7" xsi:type="DashletBadge">
           <rank>3</rank>
           <class>Webserver</class>
         </dashlet>
-        <dashlet id="27" xsi:type="DashletBadge">
+        <dashlet id="8" xsi:type="DashletBadge">
           <rank>4</rank>
           <class>OtherSoftware</class>
         </dashlet>
-        <dashlet id="29" xsi:type="DashletBadge">
+        <dashlet id="9" xsi:type="DashletBadge">
           <rank>5</rank>
           <class>MiddlewareInstance</class>
         </dashlet>
-        <dashlet id="30" xsi:type="DashletBadge">
+        <dashlet id="10" xsi:type="DashletBadge">
           <rank>6</rank>
           <class>DatabaseSchema</class>
         </dashlet>
-        <dashlet id="31" xsi:type="DashletBadge">
+        <dashlet id="11" xsi:type="DashletBadge">
           <rank>7</rank>
           <class>WebApplication</class>
         </dashlet>
-        <dashlet id="32" xsi:type="DashletBadge">
+        <dashlet id="12" xsi:type="DashletBadge">
           <rank>8</rank>
           <class>Patch</class>
         </dashlet>
-        <dashlet id="33" xsi:type="DashletBadge">
+        <dashlet id="13" xsi:type="DashletBadge">
           <rank>9</rank>
           <class>Licence</class>
         </dashlet>
@@ -7694,28 +7694,28 @@
     <cell id="4">
       <rank>4</rank>
       <dashlets>
-        <dashlet id="34" xsi:type="DashletHeaderStatic">
+        <dashlet id="14" xsi:type="DashletHeaderStatic">
           <rank>0</rank>
           <title>Menu:ConfigManagement:Misc</title>
           <icon>itop-config-mgmt/images/subnet.png</icon>
         </dashlet>
-        <dashlet id="35" xsi:type="DashletBadge">
+        <dashlet id="15" xsi:type="DashletBadge">
           <rank>1</rank>
           <class>NetworkInterface</class>
         </dashlet>
-        <dashlet id="36" xsi:type="DashletBadge">
+        <dashlet id="16" xsi:type="DashletBadge">
           <rank>2</rank>
           <class>Subnet</class>
         </dashlet>
-        <dashlet id="38" xsi:type="DashletBadge">
+        <dashlet id="17" xsi:type="DashletBadge">
           <rank>4</rank>
           <class>BusinessProcess</class>
         </dashlet>
-        <dashlet id="39" xsi:type="DashletBadge">
+        <dashlet id="18" xsi:type="DashletBadge">
           <rank>5</rank>
           <class>ApplicationSolution</class>
         </dashlet>
-        <dashlet id="40" xsi:type="DashletBadge">
+        <dashlet id="19" xsi:type="DashletBadge">
           <rank>6</rank>
           <class>Group</class>
         </dashlet>

datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml

@@ -931,15 +931,15 @@
   <cells>
     <cell id="0" _delta="must_exist">
       <dashlets>
-        <dashlet id="2" xsi:type="DashletBadge" _delta="define">
+        <dashlet id="20" xsi:type="DashletBadge" _delta="define">
           <rank>1</rank>
           <class>Rack</class>
         </dashlet>
-        <dashlet id="3" xsi:type="DashletBadge" _delta="define">
+        <dashlet id="21" xsi:type="DashletBadge" _delta="define">
           <rank>2</rank>
           <class>Enclosure</class>
         </dashlet>
-        <dashlet id="10" xsi:type="DashletBadge" _delta="define">
+        <dashlet id="22" xsi:type="DashletBadge" _delta="define">
           <rank>9</rank>
           <class>PowerConnection</class>
         </dashlet>

datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml

@@ -1401,36 +1401,36 @@
         <cell id="2" _delta="define">
           <rank>2</rank>
           <dashlets>
-            <dashlet id="15" xsi:type="DashletHeaderStatic">
+            <dashlet id="25" xsi:type="DashletHeaderStatic">
               <rank>0</rank>
               <title>Menu:ConfigManagement:EndUsers</title>
               <icon>itop-config-mgmt/images/team.png</icon>
             </dashlet>
-            <dashlet id="16" xsi:type="DashletBadge">
+            <dashlet id="26" xsi:type="DashletBadge">
               <rank>1</rank>
               <class>PC</class>
             </dashlet>
-            <dashlet id="17" xsi:type="DashletBadge">
+            <dashlet id="27" xsi:type="DashletBadge">
               <rank>2</rank>
               <class>Phone</class>
             </dashlet>
-            <dashlet id="18" xsi:type="DashletBadge">
+            <dashlet id="28" xsi:type="DashletBadge">
               <rank>3</rank>
               <class>IpPhone</class>
             </dashlet>
-            <dashlet id="19" xsi:type="DashletBadge">
+            <dashlet id="29" xsi:type="DashletBadge">
               <rank>4</rank>
               <class>MobilePhone</class>
             </dashlet>
-            <dashlet id="20" xsi:type="DashletBadge">
+            <dashlet id="30" xsi:type="DashletBadge">
               <rank>5</rank>
               <class>Tablet</class>
             </dashlet>
-            <dashlet id="21" xsi:type="DashletBadge">
+            <dashlet id="31" xsi:type="DashletBadge">
               <rank>6</rank>
               <class>Printer</class>
             </dashlet>
-            <dashlet id="22" xsi:type="DashletBadge">
+            <dashlet id="32" xsi:type="DashletBadge">
               <rank>7</rank>
               <class>Peripheral</class>
             </dashlet>

datamodels/2.x/itop-incident-mgmt-itil/overview.xml

@@ -60,17 +60,5 @@
         </dashlet>
       </dashlets>
     </cell>
-    <cell id="5">
-      <rank>5</rank>
-      <dashlets>
-        <dashlet id="0" xsi:type="DashletEmptyCell" />
-      </dashlets>
-    </cell>
-    <cell id="6">
-      <rank>6</rank>
-      <dashlets>
-        <dashlet id="0" xsi:type="DashletEmptyCell" />
-      </dashlets>
-    </cell>
   </cells>
 </dashboard>

datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml

@@ -2233,7 +2233,7 @@
           <cell id="1" _delta="define">
             <rank>1</rank>
             <dashlets>
-              <dashlet id="8" xsi:type="DashletHeaderDynamic">
+              <dashlet id="11" xsi:type="DashletHeaderDynamic">
                 <rank>0</rank>
                 <title>Menu:RequestManagement</title>
                 <icon>itop-welcome-itil/images/user-request-deadline.png</icon>
@@ -2242,7 +2242,7 @@
                 <group_by>status</group_by>
                 <values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
               </dashlet>
-              <dashlet id="9" xsi:type="DashletObjectList">
+              <dashlet id="12" xsi:type="DashletObjectList">
                 <rank>1</rank>
                 <title>UI:WelcomeMenu:MyCalls</title>
                 <query>SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")</query>

datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml

@@ -2215,7 +2215,7 @@
           <cell id="1" _delta="define">
             <rank>1</rank>
             <dashlets>
-              <dashlet id="8" xsi:type="DashletHeaderDynamic">
+              <dashlet id="9" xsi:type="DashletHeaderDynamic">
                 <rank>0</rank>
                 <title>Menu:RequestManagement</title>
                 <icon>itop-welcome-itil/images/user-request-deadline.png</icon>
@@ -2224,7 +2224,7 @@
                 <group_by>status</group_by>
                 <values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
               </dashlet>
-              <dashlet id="9" xsi:type="DashletObjectList">
+              <dashlet id="10" xsi:type="DashletObjectList">
                 <rank>1</rank>
                 <title>UI:WelcomeMenu:MyCalls</title>
                 <query>SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")</query>

datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml

@@ -1823,19 +1823,19 @@
     <cell id="0" _delta="must_exist">
       <rank>0</rank>
       <dashlets>
-        <dashlet id="6" xsi:type="DashletBadge" _delta="define">
+        <dashlet id="33" xsi:type="DashletBadge" _delta="define">
           <rank>5</rank>
           <class>StorageSystem</class>
         </dashlet>
-        <dashlet id="7" xsi:type="DashletBadge" _delta="define">
+        <dashlet id="34" xsi:type="DashletBadge" _delta="define">
           <rank>6</rank>
           <class>SANSwitch</class>
         </dashlet>
-        <dashlet id="8" xsi:type="DashletBadge" _delta="define">
+        <dashlet id="35" xsi:type="DashletBadge" _delta="define">
           <rank>7</rank>
           <class>NAS</class>
         </dashlet>
-        <dashlet id="9" xsi:type="DashletBadge" _delta="define">
+        <dashlet id="36" xsi:type="DashletBadge" _delta="define">
           <rank>8</rank>
           <class>TapeLibrary</class>
         </dashlet>

datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml

@@ -914,20 +914,20 @@
         <cell id="1" _delta="define">
           <rank>1</rank>
           <dashlets>
-            <dashlet id="0" xsi:type="DashletHeaderStatic">
+            <dashlet id="38" xsi:type="DashletHeaderStatic">
               <rank>0</rank>
               <title>Menu:ConfigManagement:virtualization</title>
               <icon>itop-virtualization-mgmt/images/hypervisor-sw.png</icon>
             </dashlet>
-            <dashlet id="1" xsi:type="DashletBadge">
+            <dashlet id="39" xsi:type="DashletBadge">
               <rank>1</rank>
               <class>Farm</class>
             </dashlet>
-            <dashlet id="2" xsi:type="DashletBadge">
+            <dashlet id="40" xsi:type="DashletBadge">
               <rank>2</rank>
               <class>Hypervisor</class>
             </dashlet>
-            <dashlet id="3" xsi:type="DashletBadge">
+            <dashlet id="41" xsi:type="DashletBadge">
               <rank>3</rank>
               <class>VirtualMachine</class>
             </dashlet>