From f7eeb1cb9a2adeeae483eab6c58f129456b4c4ae Mon Sep 17 00:00:00 2001 From: PA Parent Date: Wed, 12 Oct 2011 13:28:56 -0400 Subject: [PATCH] Rappel Modele --- auf_savoirs_en_partage/rappels/admin.py | 7 +- .../migrations/0003_auto__add_rappelmodele.py | 90 ++++++++++++++++++++ auf_savoirs_en_partage/rappels/models.py | 9 ++ 3 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 auf_savoirs_en_partage/rappels/migrations/0003_auto__add_rappelmodele.py diff --git a/auf_savoirs_en_partage/rappels/admin.py b/auf_savoirs_en_partage/rappels/admin.py index f71a0a4..0080166 100644 --- a/auf_savoirs_en_partage/rappels/admin.py +++ b/auf_savoirs_en_partage/rappels/admin.py @@ -3,7 +3,7 @@ from django.contrib import admin from chercheurs.admin import ChercheurAdmin -from rappels.models import ChercheurRappel +from rappels.models import ChercheurRappel, RappelModele from rappels import actions @@ -50,6 +50,9 @@ class ChercheurRappelAdmin(ChercheurAdmin): return actions +admin.site.register(ChercheurRappel, ChercheurRappelAdmin) -admin.site.register(ChercheurRappel, ChercheurRappelAdmin) +class RappelModeleAdmin(admin.ModelAdmin): + pass +admin.site.register(RappelModele, RappelModeleAdmin) diff --git a/auf_savoirs_en_partage/rappels/migrations/0003_auto__add_rappelmodele.py b/auf_savoirs_en_partage/rappels/migrations/0003_auto__add_rappelmodele.py new file mode 100644 index 0000000..ad49531 --- /dev/null +++ b/auf_savoirs_en_partage/rappels/migrations/0003_auto__add_rappelmodele.py @@ -0,0 +1,90 @@ +# encoding: 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): + + # Adding model 'RappelModele' + db.create_table('rappels_rappelmodele', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('nom', self.gf('django.db.models.fields.CharField')(max_length=100)), + ('sujet', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('contenu', self.gf('django.db.models.fields.TextField')()), + )) + db.send_create_signal('rappels', ['RappelModele']) + + + def backwards(self, orm): + + # Deleting model 'RappelModele' + db.delete_table('rappels_rappelmodele') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'rappels.rappel': { + 'Meta': {'object_name': 'Rappel'}, + 'contenu': ('django.db.models.fields.TextField', [], {}), + 'date_cible': ('django.db.models.fields.DateField', [], {}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_limite': ('django.db.models.fields.DateField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sujet': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'rappels.rappelmodele': { + 'Meta': {'object_name': 'RappelModele'}, + 'contenu': ('django.db.models.fields.TextField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'sujet': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'rappels.rappeluser': { + 'Meta': {'object_name': 'RappelUser'}, + 'date_envoi': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'rappel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rappels.Rappel']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + } + } + + complete_apps = ['rappels'] diff --git a/auf_savoirs_en_partage/rappels/models.py b/auf_savoirs_en_partage/rappels/models.py index 35e38f0..be2f5c2 100644 --- a/auf_savoirs_en_partage/rappels/models.py +++ b/auf_savoirs_en_partage/rappels/models.py @@ -35,6 +35,15 @@ class RappelUser(models.Model): print "Envoi du courriel à %s" % self.user.email +class RappelModele(models.Model): + nom = models.CharField("nom", max_length=100) + sujet = models.CharField("sujet", max_length=255) + contenu = models.TextField("contenu") + + def __unicode__(self): + return self.nom + + class ChercheurRappelManager(models.Manager): def get_query_set(self): last_year = datetime.datetime.today() - datetime.timedelta(days=365) -- 1.7.10.4