Changeset 856aac8


Ignore:
Timestamp:
Feb 9, 2010, 2:12:04 AM (15 years ago)
Author:
Alex Dehnert <adehnert@…>
Branches:
master, client
Children:
e601d3b
Parents:
004d06d
git-author:
Alex Dehnert <adehnert@…> (02/09/10 02:12:04)
git-committer:
Alex Dehnert <adehnert@…> (02/09/10 02:12:04)
Message:

Handle submission workflow better

Location:
remit
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • remit/media/style/style.css

    r84b3640 r856aac8  
    2121    color: red;
    2222}
     23
     24div.messagebox
     25{
     26    padding: 0 10px 10px 10px;
     27    margin: 2em 0;
     28    border: 1px solid;
     29    width: 50%;
     30}
     31div.messagebox > h3
     32{
     33    margin: 0 -10px;
     34    padding: 2px 10px;
     35    margin-bottom: 1em;
     36}
     37
     38div.infobox
     39{
     40    background-color: #afa;
     41    border-color: #0f0;
     42}
     43
     44div.infobox h3 {
     45    background: #6f6;
     46}
     47
     48div.warnbox
     49{
     50    background-color: #ffdf60;
     51    border-color: #ffbf00;
     52}
     53
     54div.warnbox h3 {
     55    background: #faba00;
     56}
     57
     58div.errorbox
     59{
     60    background-color: #faa;
     61    border-color: red;
     62}
     63
     64div.errorbox h3 {
     65    background: #f88;
     66}

  • remit/remit_templates/vouchers/ReimbursementRequest_review.html

    r7416c7e r856aac8  
    77<h2>Review reimbursement request: {{rr.name}}</h2>
    88
    9 <p>The following request has been stored in our database:</p>
     9{% if new %}
     10<div class='messagebox infobox'>
     11<h3>Request Submitted</h3>
     12<p>You have successfully submitted a request for reimbursement.</p>
     13</div>
     14{% endif %}
    1015
    1116<table class='pretty-table reimbursement-request'>
     17<tr>
     18    <th>Request ID</th>
     19    <td>{{rr.label}}</td>
     20</tr>
    1221<tr>
    1322    <th>Short description</th>
    … …  
    5968</table>
    6069
     70{% if new %}
     71{% include "vouchers/reimbursementrequest_instructions.fragment.html" %}
     72{% endif %}
     73
    6174{% if approve_form %}
    6275<h3>Request Approval</h3>

  • remit/settings.py

    r71d716d r856aac8  
    1616
    1717GROUP_NAME = 'Remit'
     18GROUP_ABBR = 'RM'
    1819SIGNATORY_EMAIL = None
    1920

  • remit/vouchers/models.py

    rdcaa9c0 r856aac8  
    5959        voucher.mailing_address = self.check_to_addr
    6060        voucher.amount = self.amount
    61         voucher.description = self.name
     61        voucher.description = self.label() + ': ' + self.name
    6262        voucher.gl = self.expense_area.get_account_number()
    6363        voucher.save()
    … …  
    7474        self.approval_time = datetime.datetime.now()
    7575        self.save()
     76
     77    def label(self, ):
     78        return settings.GROUP_ABBR + unicode(self.pk) + 'RR'
    7679
    7780class Voucher(models.Model):

  • remit/vouchers/views.py

    rdcaa9c0 r856aac8  
    118118        if form.is_valid(): # All validation rules pass
    119119            form.save()
    120             return HttpResponseRedirect(reverse(review_request, args=[new_request.pk],)) # Redirect after POST
     120            return HttpResponseRedirect(reverse(review_request, args=[new_request.pk],) + '?new=true') # Redirect after POST
    121121    else:
    122122        form = RequestForm(instance=new_request, initial=initial, ) # An unbound form
    … …  
    140140def review_request(http_request, object_id):
    141141    request_obj = get_object_or_404(ReimbursementRequest, pk=object_id)
     142    new = False
     143    if 'new' in http_request.REQUEST:
     144        if http_request.REQUEST['new'].upper() == 'TRUE':
     145            new = True
     146        else:
     147            new = False
    142148
    143149    show_approve = (http_request.user.has_perm('vouchers.can_approve')
    … …  
    182188        'rr':request_obj,
    183189        'pagename':'request_reimbursement',
     190        'new': new,
    184191    }
    185192    if show_approve:
Note: See TracChangeset for help on using the changeset viewer.