Changeset 13a23ce

Timestamp:

Jan 5, 2010, 4:53:12 AM (16 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

7874f6a

Parents:

719e4bb

git-author:

Alex Dehnert <adehnert@…> (01/05/10 04:53:12)

git-committer:

Alex Dehnert <adehnert@…> (01/05/10 04:53:12)

Message:

Bunch of work on the accounting system

Location:

treasury

Files:

• settings.py (modified) (3 diffs)
• urls.py (modified) (1 diff)
• vouchers/admin.py (added)
• vouchers/models.py (modified) (1 diff)
• vouchers/urls.py (added)
• vouchers/views.py (modified) (1 diff)

treasury/settings.py

@@ -1 +1 @@
 # Django settings for treasury project.
+import os
+
+APP_ROOT = os.path.dirname(__file__)
+DEFAULT_DOMAIN = 'mit.edu'
 
 DEBUG = True
@@ -5 +9 @@
 
 ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
+    ('Alex Dehnert', 'adehnert@mit.edu'),
 )
 
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = ''             # Or path to database file if using sqlite3.
+DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+DATABASE_NAME = 'treasury.sqlite'             # Or path to database file if using sqlite3.
 DATABASE_USER = ''             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
@@ -70 +74 @@
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
+    APP_ROOT + '/templates/',
 )
 
 INSTALLED_APPS = (
+    'django.contrib.admin',
+    'django.contrib.admindocs',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
+    'treebeard',
+    'vouchers',
 )

treasury/urls.py

@@ -2 +2 @@
 
 # Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
+from django.contrib import admin
+admin.autodiscover()
 
 urlpatterns = patterns('',
     # Example:
-    # (r'^treasury/', include('treasury.foo.urls')),
+    (r'^vouchers/', include('treasury.vouchers.urls')),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
     # to INSTALLED_APPS to enable admin documentation:
-    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
     # Uncomment the next line to enable the admin:
-    # (r'^admin/(.*)', admin.site.root),
+    (r'^admin/(.*)', admin.site.root),
 )

treasury/vouchers/models.py

@@ -1 +1 @@
 from django.db import models
+import treebeard.mp_tree
+import settings
 
-# Create your models here.
+class BudgetArea(treebeard.mp_tree.MP_Node):
+    name = models.CharField(max_length=50)
+    comment = models.TextField(blank=True)
+    always = models.BooleanField(blank=True, default=False)
+
+    # Contact / ACL information
+    # If not specified, inherit from parent
+    owner = models.EmailField(help_text = 'Email address of the officer responsible for the area', blank=True) # owner of the budget area
+    interested = models.EmailField(help_text='Email address of parties interested in the area', blank=True) # interested parties (ie, whole committee)
+    use_owner = models.BooleanField(default=False, blank=True)
+
+    def contact_address(self,):
+        address = ''
+        if self.use_owner:
+            address = self.owner or self.interested
+        else:
+            address = self.interested or self.owner
+        return address or self.get_parent().contact_address()
+
+    def mark_used(self, term, comment=""):
+        BudgetAreaTerm.objects.get_or_create(
+            budget_area=self,
+            budget_term=term,
+            defaults={'comment':comment}
+        )
+
+    @classmethod
+    def get_by_path(cls, path):
+        root = BudgetArea.objects.get(name=path[0], depth=1)
+        node = root
+        for name in path[1:]:
+            node = node.get_children().filter(name=name)[0]
+        return node
+
+    def dump_to_html(self):
+        struct = self.dump_bulk()
+        return self.struct_to_html(struct, depth=0)
+
+    def struct_to_html(self, struct, depth=0):
+        def format_data(data):
+            return "<em>"+data['name']+"</em> "+unicode(data)
+        prefix = "\t"*depth
+        html = prefix+"<ul>\n"
+        html = html + "\n".join(
+            [("%(prefix)s\t<li>%(data)s\n%(children)s\t%(prefix)s</li>\n" % {
+                'prefix':prefix,
+                'data':format_data(elem['data']),
+                'children':('children' in elem and self.struct_to_html(elem['children'], depth+1) or '')
+            }) for elem in struct])
+        html = html + prefix + "</ul>\n"
+        return html
+
+    def __unicode__(self,):
+        return u"%s [%s] (%s)" % (self.name, self.contact_address(), self.always, )
+
+class BudgetTerm(models.Model):
+    name = models.CharField(max_length=20)
+    start_date = models.DateField()
+    end_date = models.DateField()
+    submit_deadline = models.DateField()
+
+class BudgetAreaTerm(models.Model):
+    budget_area = models.ForeignKey(BudgetArea)
+    budget_term = models.ForeignKey(BudgetTerm)
+    comment = models.TextField(blank=True, )
+
+class ReimbursementRequest(models.Model):
+    submitter = models.CharField(max_length=10) # MIT username of submitter
+    check_to_name = models.CharField(max_length=50)
+    check_to_email = models.EmailField()
+    check_to_addr = models.TextField(blank=True)
+    amount = models.DecimalField(max_digits=7, decimal_places=2)
+    budget_area = models.ForeignKey(BudgetArea)
+    budget_term = models.ForeignKey(BudgetTerm)
+
+def coerce_full_email(email):
+    if '@' in email: return email
+    else: return email + '@' + settings.DEFAULT_DOMAIN

treasury/vouchers/views.py

@@ -1 @@
-# Create your views here.
+from django.http import HttpResponse
+import treasury.vouchers.models
+
+def display_tree(request):
+    root = treasury.vouchers.models.BudgetArea.get_by_path(['Accounts'])
+    return HttpResponse(root.dump_to_html())