From 2c2b5078f8995f4ac6f66ae51acf69bfba93f6dd Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Mon, 12 Nov 2012 20:02:06 +0100
Subject: [PATCH] Added more fields (archived)

---
 stages/admin.py                   |  7 +++++--
 stages/fixtures/test_fixture.json | 18 ++++++++++++------
 stages/models.py                  | 10 +++++++++-
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/stages/admin.py b/stages/admin.py
index fc94bc0..d66cdd9 100644
--- a/stages/admin.py
+++ b/stages/admin.py
@@ -7,8 +7,9 @@ from stages.models import (Student, Section, Klass, Referent, Corporation, CorpC
 class StudentAdmin(admin.ModelAdmin):
     list_display = ('__unicode__', 'pcode', 'city', 'klass')
     list_filter = ('klass',)
+    search_fields = ('last_name', 'first_name', 'pcode', 'city', 'klass')
     fields = (('last_name', 'first_name'), ('pcode', 'city'),
-              'birth_date', 'klass')
+              'birth_date', 'klass', 'archived')
 
 
 class CorpContactAdmin(admin.ModelAdmin):
@@ -24,7 +25,9 @@ class ContactInline(admin.StackedInline):
 
 class CorporationAdmin(admin.ModelAdmin):
     list_display = ('name', 'pcode', 'city')
-    fields = ('name', 'typ', 'street', ('pcode', 'city'), ('tel', 'email'), 'web')
+    search_fields = ('name', 'pcode', 'city')
+    fields = ('name', 'typ', 'street', ('pcode', 'city'), ('tel', 'email'),
+              'web', 'archived')
     inlines = [ContactInline]
 
 
diff --git a/stages/fixtures/test_fixture.json b/stages/fixtures/test_fixture.json
index ad1eb95..c33db51 100644
--- a/stages/fixtures/test_fixture.json
+++ b/stages/fixtures/test_fixture.json
@@ -37,7 +37,8 @@
       "last_name": "Dupond", 
       "klass": 1, 
       "pcode": "2300", 
-      "birth_date": "1994-05-12"
+      "birth_date": "1994-05-12",
+      "archived": false
     }
   }, 
   {
@@ -49,7 +50,8 @@
       "last_name": "Varrin", 
       "klass": 1, 
       "pcode": "2000", 
-      "birth_date": "1994-07-12"
+      "birth_date": "1994-07-12",
+      "archived": false
     }
   }, 
   {
@@ -61,7 +63,8 @@
       "last_name": "Hickx", 
       "klass": 1, 
       "pcode": "2053", 
-      "birth_date": "1994-05-20"
+      "birth_date": "1994-05-20",
+      "archived": false
     }
   }, 
   {
@@ -73,7 +76,8 @@
       "last_name": "Allemand", 
       "klass": 1, 
       "pcode": "2314", 
-      "birth_date": "1994-10-11"
+      "birth_date": "1994-10-11",
+      "archived": false
     }
   }, 
   {
@@ -82,7 +86,8 @@
     "fields": {
       "first_name": "Julie", 
       "last_name": "Caux",
-      "abrev": "JCA"
+      "abrev": "JCA",
+      "archived": false
     }
   }, 
   {
@@ -96,7 +101,8 @@
       "pcode": "2500", 
       "street": "Rue des champs 12", 
       "email": "",
-      "web": ""
+      "web": "",
+      "archived": false
     }
   }, 
   {
diff --git a/stages/models.py b/stages/models.py
index 0ac6cdf..54877e6 100644
--- a/stages/models.py
+++ b/stages/models.py
@@ -27,12 +27,16 @@ class Klass(models.Model):
 
 
 class Student(models.Model):
+    ext_id = models.IntegerField(null=True, unique=True, verbose_name='ID externe')
     first_name = models.CharField(max_length=40, verbose_name='Prénom')
     last_name = models.CharField(max_length=40, verbose_name='Nom')
     birth_date = models.DateField(verbose_name='Date de naissance')
     pcode = models.CharField(max_length=4, verbose_name='Code postal')
     city = models.CharField(max_length=40, verbose_name='Localité')
-    klass = models.ForeignKey(Klass)
+    klass = models.ForeignKey(Klass, verbose_name='Classe')
+    archived = models.BooleanField(default=False, verbose_name='Archivé')
+
+    support_tabimport = True
 
     class Meta:
         verbose_name = "Étudiant"
@@ -45,6 +49,9 @@ class Referent(models.Model):
     first_name = models.CharField(max_length=40, verbose_name='Prénom')
     last_name = models.CharField(max_length=40, verbose_name='Nom')
     abrev = models.CharField(max_length=10, blank=True, verbose_name='Initiales')
+    archived = models.BooleanField(default=False, verbose_name='Archivé')
+
+    support_tabimport = True
 
     class Meta:
         verbose_name = "Référent"
@@ -62,6 +69,7 @@ class Corporation(models.Model):
     tel = models.CharField(max_length=20, blank=True, verbose_name='Téléphone')
     email = models.EmailField(blank=True, verbose_name='Courriel')
     web = models.URLField(blank=True, verbose_name='Site Web')
+    archived = models.BooleanField(default=False, verbose_name='Archivé')
 
     class Meta:
         verbose_name = "Institution"