X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.entity.api%2Fsrc%2Forg%2Fargeo%2Fentity%2Fentity.cnd;h=0b3127b305115cf16c82412b1f1b23df15825bdb;hp=78fb8ccb1c0f6fc7d1b530ce82be1ec839c39347;hb=8347556c9afb8e7ff128722ded5aa3f198b31079;hpb=1901817b83c8e1fc3f94d3c8a801a59f52b78a84

diff --git a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
index 78fb8cc..0b3127b 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
+++ b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
@@ -2,28 +2,35 @@
 <xsd = "http://www.w3.org/2001/XMLSchema">
 <h = "http://www.w3.org/1999/xhtml">
 // see https://www.w3.org/2003/01/geo/
-//<geo = "http://www.w3.org/2003/01/geo/wgs84_pos#">
+<geo = "http://www.w3.org/2003/01/geo/wgs84_pos#">
+<svg = "http://www.w3.org/2000/svg">
 
 <ldap = "http://www.argeo.org/ns/ldap">
 <entity = 'http://www.argeo.org/ns/entity'>
 
 [entity:entity] > mix:created, mix:referenceable
 mixin
-//- entity:uid (String) m // an implementation dependent UID for each entity
-//- entity:type (String) // the type of this entity
+
+[entity:local] > entity:entity
+mixin
+- entity:type (String) m
+
+[entity:relatedTo]
+mixin
++ entity:relatedTo (nt:address) *
 
 //
 // ENTITY DEFINITION
 //
-[entity:definition] > entity:composite, mix:created, mix:lastModified, mix:referenceable
+//[entity:definition] > entity:composite, mix:created, mix:lastModified, mix:referenceable
 //- entity:type (String) multiple
 
 //[entity:part]
 
 //[entity:reference]
 
-[entity:composite]
-orderable
+//[entity:composite]
+//orderable
 //+ * (entity:part)
 //+ * (entity:reference)
 //+ * (entity:composite)
@@ -36,11 +43,13 @@ orderable
 
 [entity:term]
 orderable
-+ * (entity:term) = entity:term *
+- name (NAME) m
+- * (*)
++ term (entity:term) = entity:term *
 
 [entity:terms] > mix:referenceable
 orderable
-+ * (entity:term) = entity:term *
++ term (entity:term) = entity:term *
 
 //
 // FORM
@@ -48,8 +57,22 @@ orderable
 [entity:form]
 mixin
 
-[entity:formSet]
+[entity:formSubmission]
+mixin
+
+[entity:formSet] > mix:title
+mixin
+
+//
+// GRAPHICS
+//
+[entity:box]
 mixin
+- svg:width (DOUBLE)
+- svg:height (DOUBLE)
+- svg:length (DOUBLE)
+- svg:unit (STRING)
+- svg:dur (DOUBLE)
 
 // LDAP-LIKE ENTITIES
 // A real person
@@ -57,3 +80,17 @@ mixin
 mixin
 - ldap:sn (String)
 - ldap:givenName (String)
+- ldap:mail (String) *
+
+[entity:user] > entity:person
+mixin
+- ldap:distinguishedName (String)
+- ldap:uid (String)
+
+// GEOGRAPHY
+[entity:geopoint]
+mixin
+- geo:long (DOUBLE)
+- geo:lat (DOUBLE)
+- geo:alt (DOUBLE)
+