Changeset 89

Timestamp:

04/03/08 16:36:39 (5 months ago)

Author:

njriley

Message:

Working models.

Files:

• sucrose/trunk/www/src/sucrose (modified) (1 prop)
• sucrose/trunk/www/src/sucrose/machine (modified) (1 prop)
• 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/machine/models.py

@@ -1 @@
-# This is an auto-generated Django model module.
-# You'll have to do the following manually to clean this up:
-#     * Rearrange models' order
-#     * Make sure each model has one field with primary_key=True
-# Feel free to rename the models, but don't rename db_table values or field names.
-#
-# Also note: You'll have to insert the output of 'django-admin.py sqlcustom [appname]'
-# into your database.
-
-from django.db import models
-
@@ -13 +4 @@
-    item_id = models.IntegerField(primary_key=True)
-    name = models.CharField(max_length=765)
-4, 
+max_digits=4, decimal_places=
-    num_consumed = models.IntegerField(null=True, blank=True)
-    tray_slot_size = models.CharField(max_length=39)
@@ -26 +17 @@
-    protein = models.IntegerField(null=True, blank=True)
-    cholesterol = models.IntegerField(null=True, blank=True)
+
-    class Meta:
-        db_table = u'items'
+
+    def __unicode__(self):
+        return '%s @ $%s' % (self.item.name, self.price)
-
-class Trays(models.Model):
@@ -35 +30 @@
-    quantity = models.IntegerField()
-    machine = models.CharField(unique=True, max_length=24)
-
+
+
-    class Meta:
-        db_table = u'trays'
-
+    def __unicode__(self):
+        return '%s tray %d: %d %s @ $%s' % (
+            self.machine, self.machine_tray_id, self.quantity,
+            (self.item and self.item.name), self.cur_price)

sucrose/trunk/www/src/sucrose/settings.py

@@ -78 +78 @@
-    'django.contrib.sessions',
-    'django.contrib.sites',
+    'sucrose.machine',
-)