diff --git a/.vscode/settings.json b/.vscode/settings.json
index a439019..fa02a90 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -25,6 +25,7 @@
"noout",
"stylesheet",
"teemip",
+ "timespent",
"Zlist"
],
"xml.codeLens.enabled": true,
diff --git a/3.2/itop_design.xsd b/3.2/itop_design.xsd
index 36c9a03..aa4676c 100644
--- a/3.2/itop_design.xsd
+++ b/3.2/itop_design.xsd
@@ -1555,6 +1555,24 @@
+
+
+
+ iTop-specific alias for xs:integer.
+
+
+
+
+
+
+
+
+ iTop-specific alias for xs:boolean.
+
+
+
+
+
@@ -1618,6 +1636,7 @@
+
@@ -1807,8 +1826,8 @@
-
-
+
+
@@ -1950,7 +1969,7 @@
-
+
@@ -1985,8 +2004,8 @@
-
-
+
+
@@ -2013,8 +2032,8 @@
-
-
+
+
@@ -2033,7 +2052,11 @@
-
+
+
+ This tag has no effect.
+
+
@@ -2162,21 +2185,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2194,11 +2224,11 @@
-
+
-
-
+
+
@@ -2216,9 +2246,9 @@
-
-
-
+
+
+
@@ -2246,7 +2276,7 @@
-
+
@@ -2380,14 +2410,14 @@
-
-
+
+
-
+
@@ -2398,15 +2428,7 @@
-
-
-
-
-
-
-
-
-
+
@@ -2416,16 +2438,16 @@
-
+
-
+
-
+
-
-
+
+
@@ -2478,7 +2500,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2493,8 +2536,8 @@
-
-
+
+
diff --git a/test/datamodel.must-validate.xml b/test/datamodel.must-validate.xml
index 04d4f65..8aa4142 100644
--- a/test/datamodel.must-validate.xml
+++ b/test/datamodel.must-validate.xml
@@ -389,6 +389,331 @@
+
+
+
+ blob
+ true
+ true
+ none
+
+
+
+
+
+
+ log
+ true
+ none
+ false
+
+
+
+
+
+ MyClass
+ none
+
+
+ date
+ nothing
+ true
+ none
+ false
+
+
+
+
+
+ datetime
+ 123
+ false
+ none
+ true
+
+
+
+
+
+ decimal
+ 10.2
+ true
+ 6
+ 2
+ all
+ false
+
+
+
+
+
+ duration
+ value
+ false
+ none
+ false
+
+
+
+
+
+ email
+ aaa@example.tld
+ true
+ all
+ true
+ [a-z]+@[a-z]+
+
+
+
+
+
+ pwd
+ 123
+ false
+ ^[a-z]*\d+$
+ none
+ false
+
+
+
+
+
+ string1
+ value
+ false
+ ^[a-z]*\d+$
+ all
+ true
+
+
+
+
+
+ enum
+ rank
+ true
+ all
+ true
+
+
+ value1
+ 10.2
+
+
+
+ value2
+ 20
+
+
+
+ value1
+
+ #4E79A5
+ #FFFFFF
+ fas fa-user-tag
+
+ select
+
+
+
+
+
+ enumSet
+
+
+ 1
+
+
+ 255
+
+
+ attcode
+ attcode
+
+
+ external2
+ true
+ DEL_AUTO
+ class1
+ org_id]]>
+
+
+
+ 10
+ 3
+ true
+ all
+ true
+ select
+ true
+
+
+ key2
+ false
+ DEL_MANUAL
+ org_id]]>
+
+
+
+
+ 50
+ 4
+ false
+ all
+ false
+
+
+ html
+
+ false
+ none
+ 800px
+ 200px
+
+
+ image
+ 4096
+ 1024
+ 4096
+ 1024
+ nobody.png
+ true
+ none
+ false
+
+
+ int
+ 123
+ false
+
+
+ ip
+ 0.0.0.0
+ false
+
+
+ name
+ SELECT Person AS P
+ name
+ list
+ actions
+ always
+ 0
+ 0
+ false
+ false
+
+
+
+
+
+
+ class2
+ key1
+ key2
+ list
+ always
+ true
+ 0
+ 0
+ property
+ false
+ true
+ filter
+
+
+
+
+
+
+ DefaultMetricComputer
+ DefaultWorkingTimeComputer
+
+
+
+
+ DoThis
+
+ ev_close
+ 10
+ 10
+ true
+ other
+
+
+
+ DoThat
+
+
+
+ warning
+ true
+
+
+
+
+
+ DoThis
+
+ ev_close
+
+
+
+ DoThat
+
+
+
+ critical
+ false
+
+
+
+
+
+ watch1
+ 100_passed
+
+
+
+
+
+ attcode
+ stopped
+
+
+
+
+
+ tag
+ false
+ 5
+ 255
+
+
+ url
+
+ true
+ _blank
+ ^[a-z]*\d+$
+
+
+ true
+ filename
+
+
+
+
+
+