Evolutions for 0.4.0

TeemIp · Oct 10, 2019 · a2c55df · a2c55df
1 parent 786633f
commit a2c55df
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 18 deletions.
diff --git a/datamodel.teemip-ip-discovery.xml b/datamodel.teemip-ip-discovery.xml
@@ -388,6 +388,17 @@
           <is_null_allowed>true</is_null_allowed>
           <tracking_level>none</tracking_level>
         </field>
+        <field id="ipdiscovery_enabled" xsi:type="AttributeEnum" _delta="define">
+          <sql>ipdiscovery_enabled</sql>
+          <values>
+            <value id="yes">yes</value>
+            <value id="no">no</value>
+          </values>
+          <default_value>no</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>radio_horizontal</display_style>
+          <dependencies/>
+        </field>
       </fields>
       <presentation>
         <search _delta="must_exist">
@@ -398,9 +409,12 @@
             <item id="ping_enabled">
               <rank>90</rank>
             </item>
-            <item id="scan_enabled">
+            <item id="iplookup_enabled">
               <rank>100</rank>
             </item>
+            <item id="scan_enabled">
+              <rank>110</rank>
+            </item>
           </items>
         </search>
         <default_search _delta="must_exist">
@@ -423,36 +437,39 @@
                     <item id="ipdiscovery_id">
                       <rank>10</rank>
                     </item>
-                    <item id="last_discovery_date" _delta="define">
+                    <item id="ipdiscovery_enabled">
                       <rank>20</rank>
                     </item>
-                    <item id="ipdiscovery_ping_enabled">
+                    <item id="last_discovery_date" _delta="define">
                       <rank>30</rank>
                     </item>
-                    <item id="ping_enabled">
+                    <item id="ipdiscovery_ping_enabled">
                       <rank>40</rank>
                     </item>
-                    <item id="ping_duration">
+                    <item id="ping_enabled">
                       <rank>50</rank>
                     </item>
-                    <item id="ipdiscovery_iplookup_enabled">
+                    <item id="ping_duration">
                       <rank>60</rank>
                     </item>
-                    <item id="iplookup_enabled">
+                    <item id="ipdiscovery_iplookup_enabled">
                       <rank>70</rank>
                     </item>
-                    <item id="iplookup_duration">
+                    <item id="iplookup_enabled">
                       <rank>80</rank>
                     </item>
-                    <item id="ipdiscovery_scan_enabled">
+                    <item id="iplookup_duration">
                       <rank>90</rank>
                     </item>
-                    <item id="scan_enabled">
+                    <item id="ipdiscovery_scan_enabled">
                       <rank>100</rank>
                     </item>
-                    <item id="scan_duration">
+                    <item id="scan_enabled">
                       <rank>110</rank>
                     </item>
+                    <item id="scan_duration">
+                      <rank>120</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -466,18 +483,21 @@
              <item id="ipdiscovery_id" _delta="define">
               <rank>210</rank>
             </item>
-            <item id="last_discovery_date" _delta="define">
+            <item id="ipdiscovery_enabled" _delta="define">
               <rank>220</rank>
             </item>
-            <item id="ping_enabled" _delta="define">
+            <item id="last_discovery_date" _delta="define">
               <rank>230</rank>
             </item>
-            <item id="iplookup_enabled" _delta="define">
+            <item id="ping_enabled" _delta="define">
               <rank>240</rank>
             </item>
-            <item id="scan_enabled" _delta="define">
+            <item id="iplookup_enabled" _delta="define">
               <rank>250</rank>
             </item>
+            <item id="scan_enabled" _delta="define">
+              <rank>260</rank>
+            </item>
           </items>
         </search>
         <default_search _delta="must_exist">
@@ -487,6 +507,16 @@
             </item>
           </items>
         </default_search>
+        <list _delta="must_exist">
+          <items>
+            <item id="ipdiscovery_id">
+              <rank>90</rank>
+            </item>
+            <item id="ipdiscovery_enabled">
+              <rank>100</rank>
+            </item>
+          </items>
+        </list>
       </presentation>
     </class>
     <class id="IPAddress" _created_in="teemip-ip-mgmt" _delta="must_exist">

diff --git a/de.dict.teemip-ip-discovery.php b/de.dict.teemip-ip-discovery.php
@@ -77,6 +77,10 @@
 	'Class:IPSubnet/Attribute:ipdiscovery_id+' => '',
 	'Class:IPAddress/Attribute:ipdiscovery_name' => 'IP-Entdeckung Anwendung Name',
 	'Class:IPAddress/Attribute:ipdiscovery_name+' => '',
+	'Class:IPSubnet/Attribute:ipdiscovery_enabled' => 'IP-Entdeckung aktiviert',
+	'Class:IPSubnet/Attribute:ipdiscovery_enabled+' => '',
+	'Class:IPSubnet/Attribute:ipdiscovery_enabled/Value:yes' => 'Ja',
+	'Class:IPSubnet/Attribute:ipdiscovery_enabled/Value:no' => 'Nein',
 	'Class:IPSubnet/Attribute:last_discovery_date' => 'Datum der letzten Entdeckung',
 	'Class:IPSubnet/Attribute:last_discovery_date+' => 'Datum, an dem das Subnetz zuletzt entdeckt wurde',
 	'Class:IPSubnet/Attribute:ipdiscovery_ping_enabled' => 'IP-Entdeckung Ping ermöglicht',

diff --git a/en.dict.teemip-ip-discovery.php b/en.dict.teemip-ip-discovery.php
@@ -77,6 +77,10 @@
 	'Class:IPSubnet/Attribute:ipdiscovery_id+' => '',
 	'Class:IPSubnet/Attribute:ipdiscovery_name' => 'IP Discovery Application',
 	'Class:IPSubnet/Attribute:ipdiscovery_name+' => '',
+	'Class:IPSubnet/Attribute:ipdiscovery_enabled' => 'Discovery activated',
+	'Class:IPSubnet/Attribute:ipdiscovery_enabled+' => '',
+	'Class:IPSubnet/Attribute:ipdiscovery_enabled/Value:yes' => 'Yes',
+	'Class:IPSubnet/Attribute:ipdiscovery_enabled/Value:no' => 'No',
 	'Class:IPSubnet/Attribute:last_discovery_date' => 'Last discovery date',
 	'Class:IPSubnet/Attribute:last_discovery_date+' => 'Date when the subnet has been discovered last',
 	'Class:IPSubnet/Attribute:ipdiscovery_ping_enabled' => 'IP discovery ping enabled',

diff --git a/fr.dict.teemip-ip-discovery.php b/fr.dict.teemip-ip-discovery.php
@@ -75,8 +75,12 @@
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:IPSubnet/Attribute:ipdiscovery_id' => 'Application de découverte IPs',
 	'Class:IPSubnet/Attribute:ipdiscovery_id+' => '',
-	'Class:IPAddress/Attribute:ipdiscovery_name' => 'Nom de l\'application de découverte IPs',
-	'Class:IPAddress/Attribute:ipdiscovery_name+' => '',
+	'Class:IPSubnet/Attribute:ipdiscovery_name' => 'Nom de l\'application de découverte IPs',
+	'Class:IPSubnet/Attribute:ipdiscovery_name+' => '',
+	'Class:IPSubnet/Attribute:ipdiscovery_enabled' => 'Découverte activée',
+	'Class:IPSubnet/Attribute:ipdiscovery_enabled+' => '',
+	'Class:IPSubnet/Attribute:ipdiscovery_enabled/Value:yes' => 'Oui',
+	'Class:IPSubnet/Attribute:ipdiscovery_enabled/Value:no' => 'Non',
 	'Class:IPSubnet/Attribute:last_discovery_date' => 'Date de dernière découverte',
 	'Class:IPSubnet/Attribute:last_discovery_date+' => 'Date à laquelle le subnet a été découvert pour la dernière fois',
 	'Class:IPSubnet/Attribute:ipdiscovery_ping_enabled' => 'Ping activé par l\'application',

diff --git a/module.teemip-ip-discovery.php b/module.teemip-ip-discovery.php
@@ -1,7 +1,7 @@
 <?php
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'teemip-ip-discovery/0.3.0',
+	'teemip-ip-discovery/0.4.0',
 	array(
 		// Identification
 		//