Changeset ad530b4

Timestamp:

Aug 26, 2010, 10:55:42 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

5cfd6f6

Parents:

0df317c (diff), af48a00 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (08/26/10 22:55:42)

git-committer:

Alex Dehnert <adehnert@…> (08/26/10 22:55:42)

Message:

Merge branch 'bulk-actions'

Location:

remit

Files:

• media/style/style.css (modified) (1 diff)
• remit_templates/base.html (modified) (1 diff)
• remit_templates/vouchers/reimbursementrequest_list.html (modified) (5 diffs)
• util/templatetags/misc.py (modified) (2 diffs)
• vouchers/models.py (modified) (4 diffs)
• vouchers/views.py (modified) (4 diffs)
• util/add_gl_accounts.py (modified) (2 diffs)

remit/media/style/style.css

@@ -96 +96 @@
     font-family: "Courier", monospace;
 }
+
+.select-modifiers li
+{
+    display: inline;
+}
+.select-modifiers li a
+{
+    border: 1px solid black;
+    padding: 0.25em;
+}

remit/remit_templates/base.html

@@ -7 +7 @@
     <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}style/style.css" />
     <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}style/default.css" />
+    <script type="text/javascript"
+        src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+
 
   </head>

remit/remit_templates/vouchers/reimbursementrequest_list.html

@@ -13 +13 @@
 {%endif%}
 
-<form>
+<form method='get' action=''>
+<h3>Filter and Sort</h3>
+
 <table class='pretty-table'>
 <tr>
@@ -33 +35 @@
 </tr>
 <tr>
-    <th colspan='2'><input type='submit' name='submit' value='Submit'></th>
+    <th colspan='2'><input type='submit' name='submit' value='Submit' /></th>
 </tr>
 </table>
@@ -40 +42 @@
 <p><br /></p>
 
-<table class='pretty-table'>
+<form method='post' action=''>
+<h3>Request List</h3>
+
+<table class='pretty-table' id='request-list'>
 <tr>
     <th>#</th>
@@ -49 +54 @@
     <th>Approval state (date)</th>
 </tr>
-
 {% for object in object_list %}
 <tr>
-    <td><a href='{% url review_request object.pk %}'>{{ object.pk }}</a></td>
+    <td>
+        <input type='checkbox' name='select' value='{{object.pk}}'{%ifin object.pk selected_ids %} checked='checked'{%endifin%}></input>
+        <a href='{% url review_request object.pk %}'>{{ object.pk }}</a>
+    </td>
     <td>
         <a href='{% url review_request object.pk %}'>{{ object.name }}</a>
@@ -77 +84 @@
 </table>
 
+<ul class='select-modifiers'>
+<li><a id='select-all'   href='#'>Select All</a></li>
+<li><a id='select-none'  href='#'>Select None</a></li>
+<li><a id='select-other' href='#'>Invert Selection</a></li>
+</ul>
+
+<script type='text/javascript'>
+$('#select-all').click(function(){
+    $('#request-list input:checkbox').attr('checked', 'checked');
+    return false;
+});
+$('#select-none').click(function(){
+    $('#request-list input:checkbox').removeAttr('checked');
+    return false;
+});
+$('#select-other').click(function(){
+    $('#request-list input:checkbox').each(function(){
+        this.checked = !this.checked;
+    });
+    return false;
+});
+</script>
+
+<h3>Bulk Actions</h3>
+
+<p>
+    <select name='action'>
+        <option value="none" selected="selected">-----------</option>
+        {% for action in actions %}
+        <option value='{{action.name}}'>{{action.label}}</option>
+        {%endfor%}
+    </select>
+    <input type='submit' name='apply-action' value='Apply' />
+</p>
+
+{%if action_message%}
+<p>{{action_message}}</p>
+{% if action_errors %}
+<p>Errors:</p>
+<table class='pretty-table'>
+<tr>
+    <th>ID</th>
+    <th>Message</th>
+{% for err in action_errors %}
+<tr><th>{{err.0.pk}}</th><td>{{err.1}}</td></tr>
+{%endfor%}
+</ul>
+{%endif%}
+{%endif%}
+</form>
+
 {% endblock %}

remit/util/templatetags/misc.py

@@ -1 +1 @@
 from django import template
+from django.template import Node, NodeList, Template, Context, Variable
 import finance_core.models
 
@@ -30 +31 @@
     else: return 'zero'
 
+class IfInNode(Node):
+    def __init__(self, member, container, nodelist_true, nodelist_false, negate):
+        self.member, self.container = member, container
+        self.nodelist_true, self.nodelist_false = nodelist_true, nodelist_false
+        self.negate = negate
+
+    def __repr__(self):
+        return "<IfInNode>"
+
+    def render(self, context):
+        member_val = self.member.resolve(context, True)
+        container_val = self.container.resolve(context, True)
+        res = member_val in container_val
+        if (self.negate and not res) or (not self.negate and res):
+            return self.nodelist_true.render(context)
+        return self.nodelist_false.render(context)
+
+def do_ifin(parser, token, negate):
+    bits = list(token.split_contents())
+    if len(bits) != 3:
+        raise TemplateSyntaxError, "%r takes two arguments" % bits[0]
+    end_tag = 'end' + bits[0]
+    nodelist_true = parser.parse(('else', end_tag))
+    token = parser.next_token()
+    if token.contents == 'else':
+        nodelist_false = parser.parse((end_tag,))
+        parser.delete_first_token()
+    else:
+        nodelist_false = NodeList()
+    member = parser.compile_filter(bits[1])
+    container = parser.compile_filter(bits[2])
+    return IfInNode(member, container, nodelist_true, nodelist_false, negate)
+register.tag("ifin", lambda x, y: do_ifin(x, y, False))
+
+
 register.filter('layer_num', finance_core.models.layer_num)
 register.filter('layer_name', finance_core.models.layer_name)

remit/vouchers/models.py

@@ -3 +3 @@
 import finance_core
 from finance_core.models import BudgetArea, BudgetTerm
+
+from django.core.mail import send_mail, mail_admins
+from django.template import Context, Template
+from django.template.loader import get_template
 
 import datetime
@@ -52 +56 @@
         )
 
-    def convert(self, signatory, signatory_email=settings.SIGNATORY_EMAIL):
+    def convert(self, signatory, signatory_email=None):
+        if signatory_email is None:
+            signatory_email = settings.SIGNATORY_EMAIL
         voucher = Voucher()
         voucher.group_name = settings.GROUP_NAME
@@ -82 +88 @@
         self.save()
 
+    def approve(self, approver, signatory_name, signatory_email=None, ):
+        """Mark a request as approved.
+
+        approver:       user object of the approving user
+        signatory_name: name of signatory
+        signatory_email: email address of signatory (provide None for default)
+        """
+        voucher = self.convert(signatory_name, signatory_email,)
+        tmpl = get_template('vouchers/emails/request_approval_admin.txt')
+        ctx = Context({
+            'approver': approver,
+            'request': self,
+        })
+        body = tmpl.render(ctx)
+        mail_admins(
+            'Request approval: %s approved $%s' % (
+                approver,
+                self.amount,
+            ),
+            body,
+        )
+
     def label(self, ):
         return settings.GROUP_ABBR + unicode(self.pk) + 'RR'
@@ -222 +250 @@
     ),
 }
+
+class BulkRequestAction:
+    def __init__(self, name, label, action, perm_predicate=None, ):
+        self.name = name
+        self.label = label
+        self.action = action
+        if perm_predicate is None:
+            perm_predicate = lambda user: True
+        elif perm_predicate == True:
+            perm_predicate = lambda user: True
+        self.perm_predicate = perm_predicate
+    def can(self, user):
+        return self.perm_predicate(user)
+    def do(self, http_request, rr, ):
+        if self.can(http_request.user):
+            return self.action(http_request, rr, )
+        else:
+            return False, "permission denied"
+    def __str__(self):
+        return self.label
+    @classmethod
+    def filter_can_only(cls, actions, user):
+        return [ action for action in actions if action.can(user) ]
+def bulk_action_approve(http_request, rr):
+    approver = http_request.user
+    signatory_name = http_request.user.get_full_name()
+    if rr.voucher:
+        return False, "already approved"
+    else:
+        rr.approve(approver, signatory_name)
+        return True, "request approved"
+
+def bulk_action_email_factory(stock_email_obj):
+    assert stock_email_obj.context == 'request'
+    def inner(http_request, rr):
+        stock_email_obj.send_email_request(rr)
+        return True, "mail sent"
+    return inner
+def perm_checker(perm):
+    def predicate(user):
+        return user.has_perm(perm)
+    return predicate
+
+bulk_request_actions = []
+if settings.SIGNATORY_EMAIL:
+    bulk_request_actions.append(BulkRequestAction(
+        name='approve',
+        label='Approve Requests',
+        action=bulk_action_approve,
+        perm_predicate=perm_checker('vouchers.can_approve'),
+    ))
+for name, stockemail in stock_emails.items():
+    if stockemail.context == 'request':
+        bulk_request_actions.append(BulkRequestAction(
+            name='email/%s' % name,
+            label='Stock Email: %s' % stockemail.label,
+            action=bulk_action_email_factory(stockemail),
+            perm_predicate=perm_checker('vouchers.can_email'),
+        ))

remit/vouchers/views.py

@@ -257 +257 @@
             approve_form = VoucherizeForm(http_request.POST)
             if approve_form.is_valid():
-                voucher = request_obj.convert(
-                    approve_form.cleaned_data['name'],
-                    signatory_email=approve_form.cleaned_data['email'],)
-                tmpl = get_template('vouchers/emails/request_approval_admin.txt')
-                ctx = Context({
-                    'approver': http_request.user,
-                    'request': request_obj,
-                })
-                body = tmpl.render(ctx)
-                mail_admins(
-                    'Request approval: %s approved $%s' % (
-                        http_request.user,
-                        request_obj.amount,
-                    ),
-                    body,
+                request_obj.approve(
+                    approver=http_request.user,
+                    signatory_name=approve_form.cleaned_data['name'],
+                    signatory_email=approve_form.cleaned_data['email'],
                 )
                 approve_message = 'Created new voucher from request'
@@ -365 +354 @@
 )
 
+def list_to_keys(lst):
+    dct = {}
+    for key in lst:
+        dct[key] = True
+    return dct
+
 @login_required
-def show_requests(request, ):
-    if request.user.has_perm('vouchers.can_list'):
+def show_requests(http_request, ):
+    # BULK ACTIONS
+    actions = vouchers.models.BulkRequestAction.filter_can_only(
+        vouchers.models.bulk_request_actions,
+        http_request.user,
+    )
+    apply_action_message = None
+    apply_action_errors = []
+    if 'select' in http_request.REQUEST:
+        selected_rr_ids = [ int(item) for item in http_request.REQUEST.getlist('select') ]
+    else:
+        selected_rr_ids = []
+    if "apply-action" in http_request.POST:
+        action_name = http_request.POST['action']
+        if action_name == 'none':
+            apply_action_message = "No action selected."
+        else:
+            matching_actions = [ action for action in actions if action.name == action_name]
+            if(len(matching_actions) > 0):
+                action = matching_actions[0]
+                rrs = ReimbursementRequest.objects.filter(pk__in=selected_rr_ids)
+                for rr in rrs:
+                    success, msg = action.do(http_request, rr)
+                    if not success:
+                        apply_action_errors.append((rr, msg))
+                apply_action_message = '"%s" applied to %d request(s) (%d errors encountered)' % (action.label, len(rrs), len(apply_action_errors), )
+            else:
+                apply_action_message = "Unknown or forbidden action requested."
+
+    # PERMISSION-BASED REQUEST FILTERING
+    if http_request.user.has_perm('vouchers.can_list'):
         qs = ReimbursementRequest.objects.all()
         useronly = False
     else:
-        qs = ReimbursementRequest.objects.filter(get_related_requests_qobj(request.user))
+        qs = ReimbursementRequest.objects.filter(get_related_requests_qobj(http_request.user))
         useronly = True
 
-    if 'order' in request.REQUEST:
-        order_row = [row for row in request_list_orders if row[0] == request.REQUEST['order']]
+    # SORTING
+    if 'order' in http_request.REQUEST:
+        order_row = [row for row in request_list_orders if row[0] == http_request.REQUEST['order']]
         if order_row:
             order, label, cols = order_row[0]
@@ -384 +409 @@
         order = 'default'
 
-    if 'approval_status' in request.REQUEST:
-        approval_status = request.REQUEST['approval_status']
+    # DISCRETIONARY REQUEST FILTERING
+    if 'approval_status' in http_request.REQUEST:
+        approval_status = http_request.REQUEST['approval_status']
     else:
         approval_status = vouchers.models.APPROVAL_STATE_PENDING
@@ -401 +427 @@
             raise Http404('approval_status not known')
 
+    # GENERATE THE REQUEST
     return list_detail.object_list(
-        request,
+        http_request,
         queryset=qs,
         extra_context={
+            'actions' : actions,
+            'selected_ids'  : list_to_keys(selected_rr_ids),
+            'action_message': apply_action_message,
+            'action_errors' : apply_action_errors,
             'useronly': useronly,
             'order'   : order,

remit/util/add_gl_accounts.py

@@ +1 @@
+#!/usr/bin/python
+
 import sys
 import os
@@ -25 +27 @@
     ('Food.Meetings', 421000),
     ('Food.Events', 421200),
-    ('Computer Supplies', 421900),
+    ('IT', None),
+    ('IT.Computer Supplies', 421900),
+    ('IT.On-line Services', 421920),
+    ('Promotional & Memorabilia', 420302),
 )