carto_1_1 : ForeignKey et saisie de données

diff --git a/ateliers/django/carto_1_1/annuaire/migrations/0003_fk_universite.py b/ateliers/django/carto_1_1/annuaire/migrations/0003_fk_universite.py
new file mode 100644 (file)
index 0000000..eb08248
--- /dev/null
+++ b/ateliers/django/carto_1_1/annuaire/migrations/0003_fk_universite.py
@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+
+from south.db import db
+from django.db import models
+from annuaire.models import *
+
+class Migration:
+    
+    def forwards(self, orm):
+        
+        # Adding field 'Personne.universite'
+        db.add_column('annuaire_personne', 'universite', orm['annuaire.personne:universite'])
+        
+    
+    
+    def backwards(self, orm):
+        
+        # Deleting field 'Personne.universite'
+        db.delete_column('annuaire_personne', 'universite_id')
+        
+    
+    
+    models = {
+        'annuaire.etablissement': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'sigle': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
+        },
+        'annuaire.personne': {
+            'date_naissance': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'prenom': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'universite': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['annuaire.Etablissement']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+    
+    complete_apps = ['annuaire']

diff --git a/ateliers/django/carto_1_1/annuaire/models.py b/ateliers/django/carto_1_1/annuaire/models.py
index 7829380..ca9cf70 100644 (file)
--- a/ateliers/django/carto_1_1/annuaire/models.py
+++ b/ateliers/django/carto_1_1/annuaire/models.py
@@ -14,5 +14,7 @@ class Personne(models.Model):
     prenom = models.CharField(max_length=255, blank=True, null=True)
     date_naissance = models.DateField(blank=True, null=True)
     
+    universite = models.ForeignKey('Etablissement', blank=True, null=True)
+    
     def __unicode__(self):
-        return self.nom.upper()
+        return "%s %s" % (self.nom.upper(), self.prenom)

diff --git a/ateliers/django/carto_1_1/carto.db b/ateliers/django/carto_1_1/carto.db
index 9c26a82..5274d32 100644 (file)
Binary files a/ateliers/django/carto_1_1/carto.db and b/ateliers/django/carto_1_1/carto.db differ