Add "location" and "birthday" User's properties

2 files changed, 108 insertions, 46 deletions

diff --git a/doc/objects.dia b/doc/objects.dia
index d403719..98ae33e 100644
--- a/doc/objects.dia
+++ b/doc/objects.dia
@@ -408,19 +408,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="-14,16"/>
+        <dia:point val="-14,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-14.015,15.985;-2.4525,41.615"/>
+        <dia:rectangle val="-14.015,10.985;-1.935,41.415"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-14,16"/>
+        <dia:point val="-14,11"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="11.532500000000001"/>
+        <dia:real val="12.050000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="25.599999999999998"/>
+        <dia:real val="30.399999999999999"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#User#</dia:string>
@@ -590,10 +590,10 @@
             <dia:string>#[str] [R WA F S D]#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
-            <dia:string>##</dia:string>
+            <dia:string>#[]#</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Space separated list of tags#</dia:string>
+            <dia:string>#List of tags#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -697,6 +697,52 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#location#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#str [R WA F S]#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>#""#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#User's real address in arbitrary form#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#birthday#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int [R WA S]#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>#0#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#User's birthday in UNIX seconds#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
@@ -706,13 +752,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="7,16"/>
+        <dia:point val="7,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.985,15.985;18.77,37.615"/>
+        <dia:rectangle val="6.985,10.985;18.77,32.615"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="7,16"/>
+        <dia:point val="7,11"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.754999999999999"/>
@@ -4096,13 +4142,13 @@
       <dia:attribute name="matrix"/>
       <dia:object type="Standard - Box" version="0" id="O25">
         <dia:attribute name="obj_pos">
-          <dia:point val="61,16"/>
+          <dia:point val="61,11"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="60.9995,15.9995;83.0005,29.0005"/>
+          <dia:rectangle val="60.9995,10.9995;83.0005,24.0005"/>
         </dia:attribute>
         <dia:attribute name="elem_corner">
-          <dia:point val="61,16"/>
+          <dia:point val="61,11"/>
         </dia:attribute>
         <dia:attribute name="elem_width">
           <dia:real val="22"/>
@@ -4125,10 +4171,10 @@
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O26">
         <dia:attribute name="obj_pos">
-          <dia:point val="62,26.1586"/>
+          <dia:point val="62,21.1586"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="62,25.5636;70.3025,26.3086"/>
+          <dia:rectangle val="62,20.5636;70.3025,21.3086"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -4142,7 +4188,7 @@
               <dia:real val="0.80000000000000004"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="62,26.1586"/>
+              <dia:point val="62,21.1586"/>
             </dia:attribute>
             <dia:attribute name="color">
               <dia:color val="#000000ff"/>
@@ -4158,10 +4204,10 @@
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O27">
         <dia:attribute name="obj_pos">
-          <dia:point val="62,17.3"/>
+          <dia:point val="62,12.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="62,16.705;70.67,17.45"/>
+          <dia:rectangle val="62,11.705;70.67,12.45"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -4175,7 +4221,7 @@
               <dia:real val="0.80000000000000004"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="62,17.3"/>
+              <dia:point val="62,12.3"/>
             </dia:attribute>
             <dia:attribute name="color">
               <dia:color val="#000000ff"/>
@@ -4191,10 +4237,10 @@
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O28">
         <dia:attribute name="obj_pos">
-          <dia:point val="62,20.3"/>
+          <dia:point val="62,15.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="62,19.705;78.725,20.45"/>
+          <dia:rectangle val="62,14.705;78.725,15.45"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -4208,7 +4254,7 @@
               <dia:real val="0.80000000000000004"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="62,20.3"/>
+              <dia:point val="62,15.3"/>
             </dia:attribute>
             <dia:attribute name="color">
               <dia:color val="#000000ff"/>
@@ -4224,10 +4270,10 @@
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O29">
         <dia:attribute name="obj_pos">
-          <dia:point val="62,21.3"/>
+          <dia:point val="62,16.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="62,20.705;80.39,21.45"/>
+          <dia:rectangle val="62,15.705;80.39,16.45"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -4241,7 +4287,7 @@
               <dia:real val="0.80000000000000004"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="62,21.3"/>
+              <dia:point val="62,16.3"/>
             </dia:attribute>
             <dia:attribute name="color">
               <dia:color val="#000000ff"/>
@@ -4257,10 +4303,10 @@
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O30">
         <dia:attribute name="obj_pos">
-          <dia:point val="62,19.3"/>
+          <dia:point val="62,14.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="62,18.705;75.6375,19.45"/>
+          <dia:rectangle val="62,13.705;75.6375,14.45"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -4274,7 +4320,7 @@
               <dia:real val="0.80000000000000004"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="62,19.3"/>
+              <dia:point val="62,14.3"/>
             </dia:attribute>
             <dia:attribute name="color">
               <dia:color val="#000000ff"/>
@@ -4290,10 +4336,10 @@
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O31">
         <dia:attribute name="obj_pos">
-          <dia:point val="62,22.3"/>
+          <dia:point val="62,17.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="62,21.705;79.82,22.45"/>
+          <dia:rectangle val="62,16.705;79.82,17.45"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -4307,7 +4353,7 @@
               <dia:real val="0.80000000000000004"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="62,22.3"/>
+              <dia:point val="62,17.3"/>
             </dia:attribute>
             <dia:attribute name="color">
               <dia:color val="#000000ff"/>
@@ -4323,10 +4369,10 @@
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O32">
         <dia:attribute name="obj_pos">
-          <dia:point val="62,18.3"/>
+          <dia:point val="62,13.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="62,17.705;73.7525,18.45"/>
+          <dia:rectangle val="62,12.705;73.7525,13.45"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -4340,7 +4386,7 @@
               <dia:real val="0.80000000000000004"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="62,18.3"/>
+              <dia:point val="62,13.3"/>
             </dia:attribute>
             <dia:attribute name="color">
               <dia:color val="#000000ff"/>
@@ -4356,10 +4402,10 @@
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O33">
         <dia:attribute name="obj_pos">
-          <dia:point val="62,28"/>
+          <dia:point val="62,23"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="62,27.405;79.41,28.15"/>
+          <dia:rectangle val="62,22.405;79.41,23.15"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -4373,7 +4419,7 @@
               <dia:real val="0.80000000000000004"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="62,28"/>
+              <dia:point val="62,23"/>
             </dia:attribute>
             <dia:attribute name="color">
               <dia:color val="#000000ff"/>
@@ -4389,10 +4435,10 @@
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O34">
         <dia:attribute name="obj_pos">
-          <dia:point val="62,23.3"/>
+          <dia:point val="62,18.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="62,22.705;75.82,23.45"/>
+          <dia:rectangle val="62,17.705;75.82,18.45"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -4406,7 +4452,7 @@
               <dia:real val="0.80000000000000004"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="62,23.3"/>
+              <dia:point val="62,18.3"/>
             </dia:attribute>
             <dia:attribute name="color">
               <dia:color val="#000000ff"/>
@@ -4422,10 +4468,10 @@
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O35">
         <dia:attribute name="obj_pos">
-          <dia:point val="62,24.3"/>
+          <dia:point val="62,19.3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="62,23.705;78.9,24.45"/>
+          <dia:rectangle val="62,18.705;78.9,19.45"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -4439,7 +4485,7 @@
               <dia:real val="0.80000000000000004"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="62,24.3"/>
+              <dia:point val="62,19.3"/>
             </dia:attribute>
             <dia:attribute name="color">
               <dia:color val="#000000ff"/>
@@ -4455,10 +4501,10 @@
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O36">
         <dia:attribute name="obj_pos">
-          <dia:point val="62,25.1586"/>
+          <dia:point val="62,20.1586"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="62,24.5636;79.21,25.3086"/>
+          <dia:rectangle val="62,19.5636;79.21,20.3086"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -4472,7 +4518,7 @@
               <dia:real val="0.80000000000000004"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="62,25.1586"/>
+              <dia:point val="62,20.1586"/>
             </dia:attribute>
             <dia:attribute name="color">
               <dia:color val="#000000ff"/>
diff --git a/sugar_network_server/resources/user.py b/sugar_network_server/resources/user.py
index 07c9c8f..ef4c5b2 100644
--- a/sugar_network_server/resources/user.py
+++ b/sugar_network_server/resources/user.py
@@ -32,3 +32,19 @@ class User(StatsUser):
     @ad.active_property(ad.CounterProperty, slot=1)
     def reputation(self, value):
         return value
+
+    @ad.active_property(slot=2, prefix='L', full_text=True, default='')
+    def location(self, value):
+        return value
+
+    @location.setter
+    def location(self, value):
+        return value
+
+    @ad.active_property(slot=3, prefix='B', default=0, typecast=int)
+    def birthday(self, value):
+        return value
+
+    @birthday.setter
+    def birthday(self, value):
+        return value