Mise en conformité des champs en fonction du modèle définit en réunion

coin/members/admin.py

@@ -19,7 +19,7 @@ class CryptoKeyInline(admin.StackedInline):
     extra = 0
 
 class MemberAdminForm(forms.ModelForm):
-    password = forms.CharField(widget=forms.PasswordInput(), required=False)
+    # password = forms.CharField(widget=forms.PasswordInput(), required=False)
     
     def clean(self):
         cleaned_data = super(MemberAdminForm, self).clean()
@@ -39,4 +39,4 @@ class MemberAdmin(admin.ModelAdmin):
     
 
 admin.site.register(Member, MemberAdmin)
-admin.site.register(LdapUser, LdapUserAdmin)
+admin.site.register(LdapUser, LdapUserAdmin)

coin/members/migrations/0002_auto__del_field_member_gender__add_field_member_ldap_cn__add_field_mem.py

@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'Member.gender'
+        db.delete_column(u'members_member', 'gender')
+
+        # Adding field 'Member.ldap_cn'
+        db.add_column(u'members_member', 'ldap_cn',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=200),
+                      keep_default=False)
+
+        # Adding field 'Member.status'
+        db.add_column(u'members_member', 'status',
+                      self.gf('django.db.models.fields.CharField')(default='non_adherent', max_length=50),
+                      keep_default=False)
+
+        # Adding field 'Member.entry_date'
+        db.add_column(u'members_member', 'entry_date',
+                      self.gf('django.db.models.fields.DateField')(null=True),
+                      keep_default=False)
+
+        # Adding field 'Member.resign_date'
+        db.add_column(u'members_member', 'resign_date',
+                      self.gf('django.db.models.fields.DateField')(null=True),
+                      keep_default=False)
+
+
+        # Changing field 'Member.address'
+        db.alter_column(u'members_member', 'address', self.gf('django.db.models.fields.TextField')())
+
+    def backwards(self, orm):
+        # Adding field 'Member.gender'
+        db.add_column(u'members_member', 'gender',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=6),
+                      keep_default=False)
+
+        # Deleting field 'Member.ldap_cn'
+        db.delete_column(u'members_member', 'ldap_cn')
+
+        # Deleting field 'Member.status'
+        db.delete_column(u'members_member', 'status')
+
+        # Deleting field 'Member.entry_date'
+        db.delete_column(u'members_member', 'entry_date')
+
+        # Deleting field 'Member.resign_date'
+        db.delete_column(u'members_member', 'resign_date')
+
+
+        # Changing field 'Member.address'
+        db.alter_column(u'members_member', 'address', self.gf('django.db.models.fields.CharField')(max_length=200))
+
+    models = {
+        u'members.cryptokey': {
+            'Meta': {'object_name': 'CryptoKey'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.TextField', [], {}),
+            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
+        },
+        u'members.ldapuser': {
+            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
+            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'members.member': {
+            'Meta': {'object_name': 'Member'},
+            'address': ('django.db.models.fields.TextField', [], {}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
+            'entry_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'ldap_cn': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '200'}),
+            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'individual'", 'max_length': '11'})
+        }
+    }
+
+    complete_apps = ['members']

coin/members/migrations/0003_auto__chg_field_member_type.py

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'Member.type'
+        db.alter_column(u'members_member', 'type', self.gf('django.db.models.fields.CharField')(max_length=20))
+
+    def backwards(self, orm):
+
+        # Changing field 'Member.type'
+        db.alter_column(u'members_member', 'type', self.gf('django.db.models.fields.CharField')(max_length=11))
+
+    models = {
+        u'members.cryptokey': {
+            'Meta': {'object_name': 'CryptoKey'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.TextField', [], {}),
+            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
+        },
+        u'members.ldapuser': {
+            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
+            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'members.member': {
+            'Meta': {'object_name': 'Member'},
+            'address': ('django.db.models.fields.TextField', [], {}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
+            'entry_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'ldap_cn': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'})
+        }
+    }
+
+    complete_apps = ['members']

coin/members/models.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import ldapdb.models
-import pprint, base64, hashlib, os
+import pprint, os #, base64, hashlib
 from django.db import models
 from ldapdb.models.fields import CharField, IntegerField, ListField
 from django.db.models.signals import post_save, pre_save
@@ -8,7 +8,7 @@ from django.dispatch import receiver
 from south.modelsinspector import add_ignored_fields
 
 class LdapUser(ldapdb.models.Model):
-    base_dn = "ou=users,o=ILLYSE,l=Villeurbanne,st=RHA,c=FR"
+    base_dn = "ou=users,o=ILLYSE,l=Villeurbanne,st=RHA,c=FR" #TODO déplacer dans settings.py
     object_classes = ['inetOrgPerson', 'organizationalPerson', 'person', 'top']
 
     uid = CharField(db_column='uid', unique=True,max_length=255)
@@ -28,15 +28,13 @@ add_ignored_fields(["^ldapdb\.models\.fields"]) #Indique à South de ne pas gér
 
 class Member(models.Model):
 
-    #TODO : Comment traduire ces valeurs
-    MEMBER_TYPE_CHOICES =(('individual','individual'),('corporation','corporation'))
-    MEMBER_GENDER_CHOICES = (('male','male'),('female','female'))
+    MEMBER_TYPE_CHOICES =(('personne_physique','Personne physique'),('personne_morale','Personne morale'))
+    MEMBER_STATUS_CHOICES = (('adherent','Adhérent'),('non_adherent','Non adhérent'),('demande_adhesion','Demande d\'adhésion'))
     
-    type = models.CharField(max_length=11, choices=MEMBER_TYPE_CHOICES, default='individual');
-    gender = models.CharField(max_length=6, choices=MEMBER_GENDER_CHOICES);
+    type = models.CharField(max_length=20, choices=MEMBER_TYPE_CHOICES, default='personne_physique');
     first_name = models.CharField(max_length=200);
     last_name = models.CharField(max_length=200);
-    ldap_cn = models.CharField(max_length=200, default='');
+    ldap_cn = models.CharField(max_length=200, blank=True);
     organization_name = models.CharField(max_length=200, blank=True);
     email = models.EmailField(max_length=254);
     home_phone_number = models.CharField(max_length=25, blank=True);
@@ -45,6 +43,9 @@ class Member(models.Model):
     postal_code = models.CharField(max_length=15);
     city = models.CharField(max_length=200);
     country = models.CharField(max_length=200);
+    status = models.CharField(max_length=50, choices=MEMBER_STATUS_CHOICES, default='non_adherent');
+    entry_date = models.DateField(null=True, blank=True);
+    resign_date = models.DateField(null=True, blank=True);
         
     def __unicode__(self):
         return self.first_name+' '+self.last_name;
@@ -62,7 +63,7 @@ class CryptoKey(models.Model):
         return self.member.__str__();
 
 
-
+#~ Lors de la sauvegarde d'un membre, cette fonction est exécutée pour mettre à jour les données dans le LDAP
 @receiver(post_save, sender=Member)
 def sync_ldap(sender, instance, created, **kwargs):