[not tested] Added 3 more fieldtypes : file, datetime, text

EditorialModel/fields.py

@@ -35,7 +35,7 @@ class EmField(EmComponent):
     ## Instanciate a new EmField
     # @todo define and test type for icon and fieldtype
     # @warning nullable == True by default
-    def __init__(self, model, uid, name, fieldgroup_id, optional=False, internal=False, rel_field_id=None, icon='0', string=None, help_text=None, date_update=None, date_create=None, rank=None, nullable = True, default = None, **kwargs):
+    def __init__(self, model, uid, name, fieldgroup_id, optional=False, internal=False, rel_field_id=None, icon='0', string=None, help_text=None, date_update=None, date_create=None, rank=None, nullable = True, default = None, uniq = False, **kwargs):
 
         self.fieldgroup_id = fieldgroup_id
         self.check_type('fieldgroup_id', int)
@@ -47,8 +47,10 @@ class EmField(EmComponent):
         self.check_type('rel_field_id', (int, type(None)))
         self.icon = icon
 
+        #Field type elements
         self.nullable = nullable
         self.default = default
+        self.uniq = uniq
 
         self.options = kwargs
 

EditorialModel/fieldtypes/char.py

@@ -5,7 +5,9 @@ from EditorialModel.fields import EmField
 class EmFieldChar(EmField):
     
     ftype = 'char'
-
+    
+    ## @brief A char field
+    # @brief max_length int : The maximum length of this field
     def __init__(self, max_length=64, **kwargs):
         self.max_length = max_length
         super(EmFieldChar, self).__init__(**kwargs)

EditorialModel/fieldtypes/datetime.py

@@ -0,0 +1,17 @@
+#-*- coding: utf-8 -*-
+
+from EditorialModel.fields import EmField
+
+class EmFieldDatetime(EmField):
+    
+    ftype = 'datetime'
+
+    ## @brief A datetime field
+    # @param now_on_update bool : If true the date is set to NOW on update
+    # @param now_on_create bool : If true the date is set to NEW on creation
+    def __init__(self, now_on_update = False, now_on_create = False, **kwargs):
+        self.now_on_update = now_on_update
+        self.now_on_create = now_on_create
+        super(EmFieldDatetime, self).__init__(**kwargs)
+
+fclass = EmFieldDatetime

EditorialModel/fieldtypes/file.py

@@ -0,0 +1,15 @@
+#-*- coding: utf-8 -*-
+
+from EditorialModel.fields import EmField
+
+class EmFieldFile(EmField):
+    
+    ftype = 'file'
+    
+    ## @brief A char field
+    # @brief max_length int : The maximum length of this field
+    def __init__(self, upload_path = None,**kwargs):
+        self.upload_path = upload_path
+        super(EmFieldChar, self).__init__(**kwargs)
+
+fclass=EmFieldFile

EditorialModel/fieldtypes/regexchar.py

@@ -5,6 +5,9 @@ from EditorialModel.fieldtypes import EmFieldChar
 
 class EmFieldCharRegex(EmFieldChar):
     
+    ## @brief A char field validated with a regex
+    # @param regex str : a regex string (passed as argument to re.compile() )
+    # @param max_length int : the maximum length for this field
     def __init__(self, regex = '', **kwargs):
         self.regex = regex
         v_re = re.compile(regex) #trigger an error if invalid regex

EditorialModel/fieldtypes/text.py

@@ -0,0 +1,12 @@
+#-*- coding: utf-8 -*-
+
+from EditorialModel.fields import EmField
+
+class EmFieldText(EmField):
+    
+    ftype = 'text'
+
+    def __init__(self, **kwargs):
+        super(EmFieldText, self).__init__(**kwargs)
+
+fclass = EmFieldText

EditorialModel/migrationhandler/django.py

@@ -278,8 +278,11 @@ class DjangoMigrationHandler(object):
     ## @brief Return a good django field type given a field
     # @param f EmField : an EmField object
     # @param assoc_comp EmComponent : The associated component (type or class)
+    # @return A django field instance
+    # @note The manytomany fields created with the rel2type field has no related_name associated to it
     def field_to_django(self, f, assoc_comp):
 
+        #Building the args dictionnary for django field instanciation
         args = dict()
         args['null'] = f.nullable
         if not (f.default is None):
@@ -287,13 +290,22 @@ class DjangoMigrationHandler(object):
         v_fun = f.validation_function(raise_e = ValidationError)
         if v_fun:
             args['validators'] = [v_fun]
-
-        if f.ftype == 'char':
+        if f.uniq:
+            args['unique'] = True
+        
+        # Field instanciation
+        if f.ftype == 'char': #varchar field
             args['max_length'] = f.max_length
             return models.CharField(**args)
-        elif f.ftype == 'int':
+        elif f.ftype == 'int': #integer field
             return models.IntegerField(**args)
-        elif f.ftype == 'rel2type':
+        elif f.ftype == 'text': #text field
+            return models.TextField(**args)
+        elif f.ftype == 'datetime': #Datetime field
+            args['auto_now'] = f.now_on_update
+            args['auto_now_add'] = f.now_on_create
+            return models.DateTimeField(**args)
+        elif f.ftype == 'rel2type': #Relation to type
 
             if assoc_comp == None:
                 raise RuntimeError("Rel2type field in a rel2type table is not allowed")