Changeset 92
- Timestamp:
- 04/03/08 17:48:30 (6 months ago)
- Files:
-
- sucrose/trunk/www/src/sucrose/machine/models.py (modified) (4 diffs)
- sucrose/trunk/www/src/sucrose/settings.py (modified) (1 diff)
- sucrose/trunk/www/src/sucrose/urls.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
sucrose/trunk/www/src/sucrose/machine/models.py
r91 r92 12 12 name = models.CharField(max_length=765) 13 13 price = models.DecimalField(max_digits=4, decimal_places=2) 14 num_consumed = models.IntegerField(' Number consumed',14 num_consumed = models.IntegerField('number consumed', default=0, 15 15 null=True, blank=True, editable=False) 16 16 tray_slot_size = models.CharField(max_length=39, choices=SLOT_SIZE_CHOICES) … … 27 27 28 28 def __unicode__(self): 29 return '%s @ $%s' % (self.name, self.price)29 return self.name 30 30 31 31 class Meta: … … 45 45 ) 46 46 47 MACHINE_CHOICES = ( 48 ('caffeine', 'Caffeine'), 49 ('sucrose', 'Sucrose'), 50 ) 51 47 52 class Tray(models.Model): 48 53 tray_id = models.AutoField(primary_key=True) 49 54 item = models.ForeignKey(Item, null=True, blank=True) 50 machine_tray_id = models.IntegerField(' Tray', unique=True, editable=False)55 machine_tray_id = models.IntegerField('tray', unique=True, editable=False) 51 56 quantity = models.IntegerField() 52 machine = models.CharField(unique=True, max_length=24, default='sucrose',53 editable=False)54 cur_price = models.DecimalField(' Price', max_digits=4, decimal_places=2)57 machine = models.CharField(unique=True, max_length=24, editable=False, 58 choices=MACHINE_CHOICES, default='Sucrose') 59 cur_price = models.DecimalField('price', max_digits=4, decimal_places=2) 55 60 56 61 def __unicode__(self): 57 return '%s tray %d: %d %s @ $%s' % ( 58 self.machine, self.machine_tray_id, self.quantity, 59 (self.item and self.item.name), self.cur_price) 62 return '%s tray %d' % (self.get_machine_display(), 63 self.machine_tray_id) 60 64 61 65 class Meta: … … 64 68 65 69 class Admin: 66 list_display = ('machine_tray_id', 'item', 'quantity', 'cur_price') 67 list_display_links = ('machine_tray_id', 'item') 70 # list_filter = ('machine',) 71 list_display = ('machine', 'machine_tray_id', 'item', 72 'quantity', 'cur_price') 73 list_display_links = ('machine', 'machine_tray_id', 'item') sucrose/trunk/www/src/sucrose/settings.py
r90 r92 46 46 # trailing slash. 47 47 # Examples: "http://foo.com/media/", "/media/". 48 ADMIN_MEDIA_PREFIX = '/ media/'48 ADMIN_MEDIA_PREFIX = '/sucrose/media/' 49 49 50 50 # Make this unique, and don't share it with anybody. sucrose/trunk/www/src/sucrose/urls.py
r91 r92 6 6 7 7 # Uncomment this for admin: 8 (r'^ admin/', include('django.contrib.admin.urls')),8 (r'^sucrose/admin/', include('django.contrib.admin.urls')), 9 9 )
