Fix field name

Add columns to offers et offersubsciptions admin

coin/offers/admin.py

@@ -1,7 +1,18 @@
 from django.contrib import admin
 from coin.offers.models import Offer, Service, OfferSubscription
 
-# Register your models here.
+
+class OfferAdmin(admin.ModelAdmin):
+    list_display = ('service', 'name', 'billing_period', 'period_fees',
+                    'initial_fees')
+    list_display_links = ('name',)
+
+class OfferSubscriptionAdmin(admin.ModelAdmin):
+    list_display = ('member', 'offer', 'subscription_date', 'commitment',
+                    'resign_date')
+    list_display_links = ('member','offer')
+
+
 admin.site.register(Service)
-admin.site.register(Offer)
-admin.site.register(OfferSubscription)
+admin.site.register(Offer, OfferAdmin)
+admin.site.register(OfferSubscription, OfferSubscriptionAdmin)

coin/offers/migrations/0004_auto__chg_field_offersubscription_commitment.py

@@ -0,0 +1,65 @@
+# -*- 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 'OfferSubscription.commitment'
+        db.alter_column(u'offers_offersubscription', 'commitment', self.gf('django.db.models.fields.IntegerField')())
+
+    def backwards(self, orm):
+
+        # Changing field 'OfferSubscription.commitment'
+        db.alter_column(u'offers_offersubscription', 'commitment', self.gf('django.db.models.fields.IntegerField')(null=True))
+
+    models = {
+        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', [], {'default': 'datetime.date.today'}),
+            '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'})
+        },
+        u'offers.offer': {
+            'Meta': {'object_name': 'Offer'},
+            'billing_period': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'initial_fees': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'period_fees': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['offers.Service']"})
+        },
+        u'offers.offersubscription': {
+            'Meta': {'object_name': 'OfferSubscription'},
+            'commitment': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
+            'offer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['offers.Offer']"}),
+            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'subscription_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
+        },
+        u'offers.service': {
+            'Meta': {'object_name': 'Service'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['offers']

coin/offers/models.py

@@ -26,6 +26,10 @@ class Offer(models.Model):
     def __unicode__(self):
         return u'%s - %d€ / %im [%s]' % (self.name, self.period_fees, self.billing_period, self.service)
 
+    class Meta:
+        verbose_name = 'Offre'
+
+
 class OfferSubscription(models.Model):
     subscription_date = models.DateField(
         null=False,
@@ -36,10 +40,14 @@ class OfferSubscription(models.Model):
         null=True,
         blank=True,
         help_text='Date de résiliation')
-    commitment = models.IntegerField(blank=True, null=True,
-                                     help_text='Période d\'engagement en mois')
-    member = models.ForeignKey('members.Member')
-    offer = models.ForeignKey('Offer')
+    commitment = models.IntegerField(blank=False, null=False,
+                                     help_text='Période d\'engagement en mois',
+                                     default=0)
+    member = models.ForeignKey('members.Member', verbose_name='Membre')
+    offer = models.ForeignKey('Offer', verbose_name='Offre')
 
     def __unicode__(self):
         return u'%s - %s - %s' % (self.member, self.offer.name, self.subscription_date)
+
+    class Meta:
+        verbose_name = 'Abonement'