Skip to content

Commit 64827d4

Browse files
HipskaHipska
authored
Merge branch 'main' into feat/attribute_alteration
2 parents a1d2b47 + f4adef6 commit 64827d4

File tree

3 files changed

+200
-156
lines changed

3 files changed

+200
-156
lines changed

‎3.2/itop_design.xsd‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2962,8 +2962,8 @@
29622962
<xs:complexContent>
29632963
<xs:extension base="Dashlet">
29642964
<xs:all>
2965-
<xs:element name="rank" type="xs:decimal" minOccurs="0" />
2966-
<xs:element name="class" type="xs:string" minOccurs="0" />
2965+
<xs:element name="rank" type="alteredFloat" minOccurs="0" />
2966+
<xs:element name="class" type="alteredString" minOccurs="0" />
29672967
</xs:all>
29682968
</xs:extension>
29692969
</xs:complexContent>
@@ -2975,7 +2975,7 @@
29752975
<xs:complexContent>
29762976
<xs:extension base="Dashlet">
29772977
<xs:all>
2978-
<xs:element name="rank" type="xs:decimal" minOccurs="0" />
2978+
<xs:element name="rank" type="alteredFloat" minOccurs="0" />
29792979
</xs:all>
29802980
</xs:extension>
29812981
</xs:complexContent>
@@ -2987,8 +2987,8 @@
29872987
<xs:complexContent>
29882988
<xs:extension base="Dashlet">
29892989
<xs:all>
2990-
<xs:element name="rank" type="xs:string" minOccurs="0" />
2991-
<xs:element name="text" type="xs:string" minOccurs="0" />
2990+
<xs:element name="rank" type="alteredFloat" minOccurs="0" />
2991+
<xs:element name="text" type="alteredString" minOccurs="0" />
29922992
</xs:all>
29932993
</xs:extension>
29942994
</xs:complexContent>
@@ -3000,13 +3000,13 @@
30003000
<xs:complexContent>
30013001
<xs:extension base="Dashlet">
30023002
<xs:all>
3003-
<xs:element name="rank" type="xs:string" minOccurs="0" />
3004-
<xs:element name="title" type="xs:string" minOccurs="0" />
3005-
<xs:element name="icon" type="xs:string" minOccurs="0" />
3006-
<xs:element name="subtitle" type="xs:string" minOccurs="0" />
3007-
<xs:element name="query" type="xs:string" minOccurs="0" />
3008-
<xs:element name="group_by" type="xs:string" minOccurs="0" />
3009-
<xs:element name="values" type="xs:string" minOccurs="0" />
3003+
<xs:element name="rank" type="alteredFloat" minOccurs="0" />
3004+
<xs:element name="title" type="alteredString" minOccurs="0" />
3005+
<xs:element name="icon" type="alteredString" minOccurs="0" />
3006+
<xs:element name="subtitle" type="alteredString" minOccurs="0" />
3007+
<xs:element name="query" type="alteredString" minOccurs="0" />
3008+
<xs:element name="group_by" type="alteredString" minOccurs="0" />
3009+
<xs:element name="values" type="alteredString" minOccurs="0" />
30103010
</xs:all>
30113011
</xs:extension>
30123012
</xs:complexContent>
@@ -3018,24 +3018,26 @@
30183018
<xs:complexContent>
30193019
<xs:extension base="Dashlet">
30203020
<xs:all>
3021-
<xs:element name="rank" type="xs:string" minOccurs="0" />
3022-
<xs:element name="title" type="xs:string" minOccurs="0" />
3023-
<xs:element name="query" type="xs:string" minOccurs="0" />
3024-
<xs:element name="group_by" type="xs:string" minOccurs="0" />
3021+
<xs:element name="rank" type="alteredFloat" minOccurs="0" />
3022+
<xs:element name="title" type="alteredString" minOccurs="0" />
3023+
<xs:element name="query" type="alteredString" minOccurs="0" />
3024+
<xs:element name="group_by" type="alteredString" minOccurs="0" />
30253025
<xs:element name="style" minOccurs="0">
3026-
<xs:simpleType>
3027-
<xs:restriction base="xs:string">
3028-
<xs:enumeration value="pie" />
3029-
<xs:enumeration value="bars" />
3030-
<xs:enumeration value="table" />
3031-
</xs:restriction>
3032-
</xs:simpleType>
3026+
<xs:complexType>
3027+
<xs:simpleContent>
3028+
<xs:restriction base="alteredString">
3029+
<xs:enumeration value="pie" />
3030+
<xs:enumeration value="bars" />
3031+
<xs:enumeration value="table" />
3032+
</xs:restriction>
3033+
</xs:simpleContent>
3034+
</xs:complexType>
30333035
</xs:element>
3034-
<xs:element name="aggregation_function" type="xs:string" minOccurs="0" />
3035-
<xs:element name="aggregation_attribute" type="xs:string" minOccurs="0" />
3036-
<xs:element name="limit" type="xs:string" minOccurs="0" />
3037-
<xs:element name="order_by" type="xs:string" minOccurs="0" />
3038-
<xs:element name="order_direction" type="xs:string" minOccurs="0" />
3036+
<xs:element name="aggregation_function" type="alteredString" minOccurs="0" />
3037+
<xs:element name="aggregation_attribute" type="alteredString" minOccurs="0" />
3038+
<xs:element name="limit" type="alteredString" minOccurs="0" />
3039+
<xs:element name="order_by" type="alteredString" minOccurs="0" />
3040+
<xs:element name="order_direction" type="alteredString" minOccurs="0" />
30393041
</xs:all>
30403042
</xs:extension>
30413043
</xs:complexContent>
@@ -3071,10 +3073,10 @@
30713073
<xs:complexContent>
30723074
<xs:extension base="Dashlet">
30733075
<xs:all>
3074-
<xs:element name="rank" type="xs:string" minOccurs="0" />
3075-
<xs:element name="title" type="xs:string" minOccurs="0" />
3076-
<xs:element name="subtitle" type="xs:string" minOccurs="0" />
3077-
<xs:element name="icon" type="xs:string" minOccurs="0" />
3076+
<xs:element name="rank" type="alteredFloat" minOccurs="0" />
3077+
<xs:element name="title" type="alteredString" minOccurs="0" />
3078+
<xs:element name="subtitle" type="alteredString" minOccurs="0" />
3079+
<xs:element name="icon" type="alteredString" minOccurs="0" />
30783080
</xs:all>
30793081
</xs:extension>
30803082
</xs:complexContent>
@@ -3086,10 +3088,10 @@
30863088
<xs:complexContent>
30873089
<xs:extension base="Dashlet">
30883090
<xs:all>
3089-
<xs:element name="rank" type="xs:string" minOccurs="0" />
3090-
<xs:element name="title" type="xs:string" minOccurs="0" />
3091-
<xs:element name="query" type="xs:string" minOccurs="0" />
3092-
<xs:element name="menu" type="xs:boolean" minOccurs="0" />
3091+
<xs:element name="rank" type="alteredFloat" minOccurs="0" />
3092+
<xs:element name="title" type="alteredString" minOccurs="0" />
3093+
<xs:element name="query" type="alteredString" minOccurs="0" />
3094+
<xs:element name="menu" type="alteredBoolean" minOccurs="0" />
30933095
</xs:all>
30943096
</xs:extension>
30953097
</xs:complexContent>

‎dist/3.2/itop_design.xsd‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Project website: https://rudnerbjoern.github.io/iTop-schema/
77
GitHub repository: https://github.com/rudnerbjoern/iTop-schema
88
9-
Generated on: 2025-08-04 08:49:54 UTC
9+
Generated on: 2025-08-04 09:14:29 UTC
1010
1111
Use this file to validate your iTop datamodels with confidence and consistency.
1212
-->
@@ -2733,8 +2733,8 @@
27332733
<xs:complexContent>
27342734
<xs:extension base="Dashlet">
27352735
<xs:all>
2736-
<xs:element name="rank" type="xs:decimal" minOccurs="0"/>
2737-
<xs:element name="class" type="xs:string" minOccurs="0"/>
2736+
<xs:element name="rank" type="alteredFloat" minOccurs="0"/>
2737+
<xs:element name="class" type="alteredString" minOccurs="0"/>
27382738
</xs:all>
27392739
</xs:extension>
27402740
</xs:complexContent>
@@ -2745,7 +2745,7 @@
27452745
<xs:complexContent>
27462746
<xs:extension base="Dashlet">
27472747
<xs:all>
2748-
<xs:element name="rank" type="xs:decimal" minOccurs="0"/>
2748+
<xs:element name="rank" type="alteredFloat" minOccurs="0"/>
27492749
</xs:all>
27502750
</xs:extension>
27512751
</xs:complexContent>
@@ -2756,8 +2756,8 @@
27562756
<xs:complexContent>
27572757
<xs:extension base="Dashlet">
27582758
<xs:all>
2759-
<xs:element name="rank" type="xs:string" minOccurs="0"/>
2760-
<xs:element name="text" type="xs:string" minOccurs="0"/>
2759+
<xs:element name="rank" type="alteredFloat" minOccurs="0"/>
2760+
<xs:element name="text" type="alteredString" minOccurs="0"/>
27612761
</xs:all>
27622762
</xs:extension>
27632763
</xs:complexContent>
@@ -2768,13 +2768,13 @@
27682768
<xs:complexContent>
27692769
<xs:extension base="Dashlet">
27702770
<xs:all>
2771-
<xs:element name="rank" type="xs:string" minOccurs="0"/>
2772-
<xs:element name="title" type="xs:string" minOccurs="0"/>
2773-
<xs:element name="icon" type="xs:string" minOccurs="0"/>
2774-
<xs:element name="subtitle" type="xs:string" minOccurs="0"/>
2775-
<xs:element name="query" type="xs:string" minOccurs="0"/>
2776-
<xs:element name="group_by" type="xs:string" minOccurs="0"/>
2777-
<xs:element name="values" type="xs:string" minOccurs="0"/>
2771+
<xs:element name="rank" type="alteredFloat" minOccurs="0"/>
2772+
<xs:element name="title" type="alteredString" minOccurs="0"/>
2773+
<xs:element name="icon" type="alteredString" minOccurs="0"/>
2774+
<xs:element name="subtitle" type="alteredString" minOccurs="0"/>
2775+
<xs:element name="query" type="alteredString" minOccurs="0"/>
2776+
<xs:element name="group_by" type="alteredString" minOccurs="0"/>
2777+
<xs:element name="values" type="alteredString" minOccurs="0"/>
27782778
</xs:all>
27792779
</xs:extension>
27802780
</xs:complexContent>
@@ -2785,24 +2785,26 @@
27852785
<xs:complexContent>
27862786
<xs:extension base="Dashlet">
27872787
<xs:all>
2788-
<xs:element name="rank" type="xs:string" minOccurs="0"/>
2789-
<xs:element name="title" type="xs:string" minOccurs="0"/>
2790-
<xs:element name="query" type="xs:string" minOccurs="0"/>
2791-
<xs:element name="group_by" type="xs:string" minOccurs="0"/>
2788+
<xs:element name="rank" type="alteredFloat" minOccurs="0"/>
2789+
<xs:element name="title" type="alteredString" minOccurs="0"/>
2790+
<xs:element name="query" type="alteredString" minOccurs="0"/>
2791+
<xs:element name="group_by" type="alteredString" minOccurs="0"/>
27922792
<xs:element name="style" minOccurs="0">
2793-
<xs:simpleType>
2794-
<xs:restriction base="xs:string">
2795-
<xs:enumeration value="pie"/>
2796-
<xs:enumeration value="bars"/>
2797-
<xs:enumeration value="table"/>
2798-
</xs:restriction>
2799-
</xs:simpleType>
2793+
<xs:complexType>
2794+
<xs:simpleContent>
2795+
<xs:restriction base="alteredString">
2796+
<xs:enumeration value="pie"/>
2797+
<xs:enumeration value="bars"/>
2798+
<xs:enumeration value="table"/>
2799+
</xs:restriction>
2800+
</xs:simpleContent>
2801+
</xs:complexType>
28002802
</xs:element>
2801-
<xs:element name="aggregation_function" type="xs:string" minOccurs="0"/>
2802-
<xs:element name="aggregation_attribute" type="xs:string" minOccurs="0"/>
2803-
<xs:element name="limit" type="xs:string" minOccurs="0"/>
2804-
<xs:element name="order_by" type="xs:string" minOccurs="0"/>
2805-
<xs:element name="order_direction" type="xs:string" minOccurs="0"/>
2803+
<xs:element name="aggregation_function" type="alteredString" minOccurs="0"/>
2804+
<xs:element name="aggregation_attribute" type="alteredString" minOccurs="0"/>
2805+
<xs:element name="limit" type="alteredString" minOccurs="0"/>
2806+
<xs:element name="order_by" type="alteredString" minOccurs="0"/>
2807+
<xs:element name="order_direction" type="alteredString" minOccurs="0"/>
28062808
</xs:all>
28072809
</xs:extension>
28082810
</xs:complexContent>
@@ -2834,10 +2836,10 @@
28342836
<xs:complexContent>
28352837
<xs:extension base="Dashlet">
28362838
<xs:all>
2837-
<xs:element name="rank" type="xs:string" minOccurs="0"/>
2838-
<xs:element name="title" type="xs:string" minOccurs="0"/>
2839-
<xs:element name="subtitle" type="xs:string" minOccurs="0"/>
2840-
<xs:element name="icon" type="xs:string" minOccurs="0"/>
2839+
<xs:element name="rank" type="alteredFloat" minOccurs="0"/>
2840+
<xs:element name="title" type="alteredString" minOccurs="0"/>
2841+
<xs:element name="subtitle" type="alteredString" minOccurs="0"/>
2842+
<xs:element name="icon" type="alteredString" minOccurs="0"/>
28412843
</xs:all>
28422844
</xs:extension>
28432845
</xs:complexContent>
@@ -2848,10 +2850,10 @@
28482850
<xs:complexContent>
28492851
<xs:extension base="Dashlet">
28502852
<xs:all>
2851-
<xs:element name="rank" type="xs:string" minOccurs="0"/>
2852-
<xs:element name="title" type="xs:string" minOccurs="0"/>
2853-
<xs:element name="query" type="xs:string" minOccurs="0"/>
2854-
<xs:element name="menu" type="xs:boolean" minOccurs="0"/>
2853+
<xs:element name="rank" type="alteredFloat" minOccurs="0"/>
2854+
<xs:element name="title" type="alteredString" minOccurs="0"/>
2855+
<xs:element name="query" type="alteredString" minOccurs="0"/>
2856+
<xs:element name="menu" type="alteredBoolean" minOccurs="0"/>
28552857
</xs:all>
28562858
</xs:extension>
28572859
</xs:complexContent>

0 commit comments

Comments
 (0)