Changeset d50ec5b for remit

Timestamp:

Feb 1, 2011, 10:33:23 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

0e4f185

Parents:

f63d43a

git-author:

Alex Dehnert <adehnert@…> (02/01/11 10:29:23)

git-committer:

Alex Dehnert <adehnert@…> (02/01/11 10:33:23)

Message:

Allow marking things as RFPized

Location:

remit

Files:

• remit_templates/vouchers/emails/request_approval_admin.txt (modified) (1 diff)
• remit_templates/vouchers/reimbursementrequest_list.html (modified) (1 diff)
• settings.py (modified) (1 diff)
• vouchers/migrations/0008_add_rfp.py (added)
• vouchers/models.py (modified) (7 diffs)

remit/remit_templates/vouchers/emails/request_approval_admin.txt

@@ -18 +18 @@
 Approval Status:    {{ request.approval_status|approval_status }}
 Approval Time:      {{ request.approval_time }}
+Approval Type:      {{ approval_type }}
 
 Check Address:

remit/remit_templates/vouchers/reimbursementrequest_list.html

@@ -78 +78 @@
     </td>
     <td class='request-status-{{ object.approval_status|approval_status_class}}'>
-        {{ object.approval_status|approval_status }} ({{ object.approval_time }})
+        {{ object.approval_status|approval_status }} ({{ object.approval_time|date:"SHORT_DATETIME_FORMAT"}})
+        {% if object.voucher %}
+        <br />[Voucher: {{object.voucher.pk}}]
+        {% endif %}
+        {% if object.rfp %}
+        <br />[{{object.rfp}}]
+        {% endif %}
     </td>
 </tr>

remit/settings.py

@@ -39 +39 @@
 # making browsers want to open in an external application
 LATEX_MIMETYPE = 'application/x-latex'
+
+SHORT_DATETIME_FORMAT = 'Y-m-d G:i'
+SHORT_DATETIME_FORMAT_F = '%Y-%M-%d %H:%M'
 
 from local_settings import *

remit/vouchers/models.py

@@ -57 +57 @@
         )
 
-    def create_transfers(self, signatory, signatory_email=None):
+    def create_transfers(self, ):
         finance_core.models.make_transfer(
             self.name,
@@ -108 +108 @@
         signatory_email: email address of signatory (provide None for default)
         """
-        voucher = self.convert_to_voucher(signatory_name, signatory_email,)
+        self.convert_to_voucher(signatory_name, signatory_email,)
         tmpl = get_template('vouchers/emails/request_approval_admin.txt')
         ctx = Context({
             'approver': approver,
             'request': self,
+            'approval_type': 'voucher',
         })
         body = tmpl.render(ctx)
         mail_admins(
-            'Request approval: %s approved $%s' % (
+            'Request approval: %s approved $%s [voucher]' % (
                 approver,
                 self.amount,
@@ -123 +124 @@
         )
 
-    def approve_with_rfp(self, approver, ):
+    def approve_as_rfp(self, approver, ):
+        self.convert_to_rfp()
+        tmpl = get_template('vouchers/emails/request_approval_admin.txt')
+        ctx = Context({
+            'approver': approver,
+            'request': self,
+            'approval_type': 'RFP',
+        })
+        body = tmpl.render(ctx)
+        mail_admins(
+            'Request approval: %s approved $%s [RFP]' % (
+                approver,
+                self.amount,
+            ),
+            body,
+        )
         
 
@@ -174 +190 @@
         )
 
+class RFP(models.Model):
+    create_time = models.DateTimeField(default=datetime.datetime.now)
+
+    def __unicode__(self, ):
+        return "RFP: %s" % (self.create_time.strftime(settings.SHORT_DATETIME_FORMAT_F), )
 
 class Documentation(models.Model):
@@ -289 +310 @@
     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
@@ -297 +319 @@
         rr.approve(approver, signatory_name)
         return True, "request approved"
+
+def bulk_action_approve_as_rfp(http_request, rr):
+    approver = http_request.user
+    if rr.rfp:
+        return False, "already marked as RFPized"
+    else:
+        rr.approve_as_rfp(approver, )
+        return True, "request marked as RFPized"
 
 def bulk_action_email_factory(stock_email_obj):
@@ -317 +347 @@
         perm_predicate=perm_checker('vouchers.can_approve'),
     ))
+bulk_request_actions.append(BulkRequestAction(
+    name='approve_as_rfp',
+    label='Mark Requests as RFPized',
+    action=bulk_action_approve_as_rfp,
+    perm_predicate=perm_checker('vouchers.can_approve'),
+))
 for name, stockemail in stock_emails.items():
     if stockemail.context == 'request':