Changeset f468e6d

Timestamp:

Jan 6, 2010, 3:04:46 AM (16 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

b26026c

Parents:

6027277

git-author:

Alex Dehnert <adehnert@…> (01/06/10 03:04:46)

git-committer:

Alex Dehnert <adehnert@…> (01/06/10 03:04:46)

Message:

Split vouchers off into a finance_core app too

Location:

treasury

Files:

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

treasury/settings.py

@@ -88 +88 @@
     'treebeard',
     'vouchers',
+    'finance_core',
 )

treasury/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
+
+# Necessary views
+import treasury.finance_core.views
 
 # Uncomment the next two lines to enable the admin:
@@ -7 +10 @@
 urlpatterns = patterns('',
     # Example:
+    (r'^accounts/display_tree', treasury.finance_core.views.display_tree),
     (r'^vouchers/', include('treasury.vouchers.urls')),
+    (r'^finance_core/', include('treasury.finance_core.urls')),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 

treasury/vouchers/admin.py

@@ -1 +1 @@
 import vouchers
 from django.contrib import admin
-
-indent_str = u"\u00A0\u00A0"
-
-
-class BudgetAreaAdmin(admin.ModelAdmin):
-    pass
-    #fields = [ 'path', 'name', 'comment', 'owner', 'interested', ]
-
-
-class BudgetTermAdmin(admin.ModelAdmin):
-    prepopulated_fields = {"slug": ("name",)}
 
 
@@ -24 +13 @@
 
     def get_budgetarea_name(self, area, ):
-        return indent_str*area.depth + unicode(area)
+        return area.indented_name()
 
     fieldsets = [
@@ -33 +22 @@
 
 
-admin.site.register(vouchers.models.BudgetArea, BudgetAreaAdmin)
-admin.site.register(vouchers.models.BudgetTerm, BudgetTermAdmin)
-admin.site.register(vouchers.models.BudgetAreaTerm)
 admin.site.register(vouchers.models.ReimbursementRequest, ReimbursementRequestAdmin)

treasury/vouchers/models.py

@@ -1 +1 @@
 from django.db import models
-import treebeard.mp_tree
 import settings
-
-
-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)
-    slug = models.SlugField(max_length=20)
-    start_date = models.DateField()
-    end_date = models.DateField()
-    submit_deadline = models.DateField()
-
-    def __unicode__(self,):
-        return "%s (%s to %s [due %s])" % (self.name, self.start_date, self.end_date, self.submit_deadline, )
-
-
-class BudgetAreaTerm(models.Model):
-    budget_area = models.ForeignKey(BudgetArea)
-    budget_term = models.ForeignKey(BudgetTerm)
-    comment = models.TextField(blank=True, )
-
-    def __unicode__(self,):
-        return "%s during %s" % (self.budget_area, self.budget_term, )
+from finance_core.models import BudgetArea, BudgetTerm
 
 
@@ -88 +12 @@
     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/urls.py

@@ -3 +3 @@
 
 urlpatterns = patterns('',
-    (r'^accounts/display_tree', treasury.vouchers.views.display_tree),
 )

treasury/vouchers/views.py

@@ -1 @@
-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())
+# Create your views here.