Include work in progress on the proposal overview page

This commit is contained in:
Sander Ferdinand 2018-07-04 23:01:18 +02:00
parent 45fdd53e40
commit 7f0bb1c4f6
3 changed files with 11 additions and 7 deletions

View file

@ -205,7 +205,7 @@ def proposals(status, page, cat):
proposals = { proposals = {
'proposed': Proposal.find_by_args(status=1, limit=10), 'proposed': Proposal.find_by_args(status=1, limit=10),
'funding': Proposal.find_by_args(status=2, limit=10), 'funding': Proposal.find_by_args(status=2, limit=10),
'wip': Proposal.find_by_args(status=3, limit=4)} 'wip': Proposal.find_by_args(status=3, limit=5)}
return make_response(render_template('proposal/overview.html', proposals=proposals)) return make_response(render_template('proposal/overview.html', proposals=proposals))
try: try:

View file

@ -27,7 +27,7 @@
<div class="card-body"> <div class="card-body">
<h5 class="card-title">WFS length</h5> <h5 class="card-title">WFS length</h5>
<p class="card-text"> <p class="card-text">
Tasks should be capable being completed within <b>90 days</b> of the proposal reaching the target funding unless the proposal is a bounty. Tasks should be capable of being completed within <b>90 days</b> of the proposal reaching the target funding unless the proposal is a bounty.
</p> </p>
<p> <p>
Having indefinite, open-ended tasks could lead to <b>mission creep</b> and expanded completion time, which is not ideal because the value of WOW could become volatile. Having indefinite, open-ended tasks could lead to <b>mission creep</b> and expanded completion time, which is not ideal because the value of WOW could become volatile.
@ -139,7 +139,7 @@
<div class="col-md-8"> <div class="col-md-8">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h5 class="card-title">Failed to raise funds</h5> <h5 class="card-title">Adjustments</h5>
<p class="card-text"> <p class="card-text">
Minor amendments may be made to proposals <b>as long it is within the general spirit of the original Minor amendments may be made to proposals <b>as long it is within the general spirit of the original
proposal</b>. However, for major changes, the developer should bring up the proposed change on IRC and proposal</b>. However, for major changes, the developer should bring up the proposed change on IRC and

View file

@ -12,8 +12,6 @@
{% if proposals['proposed'] %} {% if proposals['proposed'] %}
{{ proposal_table(title='Proposals', _proposals=proposals['proposed']) }} {{ proposal_table(title='Proposals', _proposals=proposals['proposed']) }}
<hr> <hr>
{% else %}
{% endif %} {% endif %}
</div> </div>
</div> </div>
@ -21,8 +19,14 @@
<div class="col-lg-12"> <div class="col-lg-12">
{% if proposals['funding'] %} {% if proposals['funding'] %}
{{ proposal_table(title='Funding required', _proposals=proposals['funding']) }} {{ proposal_table(title='Funding required', _proposals=proposals['funding']) }}
{% else %} <hr>
No proposals here yet. {% endif %}
</div>
</div>
<div class="row">
<div class="col-lg-12">
{% if proposals['wip'] %}
{{ proposal_table(title='Work in progress', _proposals=proposals['wip']) }}
{% endif %} {% endif %}
</div> </div>
</div> </div>