equal
deleted
inserted
replaced
141 proposal.save() |
141 proposal.save() |
142 |
142 |
143 return HttpResponseRedirect( |
143 return HttpResponseRedirect( |
144 reverse('app.projrev.views.proposal.submit', args=(micr_code,))) |
144 reverse('app.projrev.views.proposal.submit', args=(micr_code,))) |
145 |
145 |
146 return HttpResponseRedirect('') |
146 return submitGet(request, micr_code, prop_form) |
147 |
147 |
148 def submitGet(request, micr_code=None): |
148 def submitGet(request, micr_code=None, prop_form=None): |
149 """Handles GET request for the submission of proposal form. |
149 """Handles GET request for the submission of proposal form. |
150 """ |
150 """ |
151 |
151 |
152 context = {} |
152 context = {} |
153 project = None |
153 project = None |
159 initial_vals = { |
159 initial_vals = { |
160 'line_item': Project.getLineItemCode(project.line_item), |
160 'line_item': Project.getLineItemCode(project.line_item), |
161 'state': Project.getStateCode(project.state), |
161 'state': Project.getStateCode(project.state), |
162 'district': Project.getDistrictCode(project.district), |
162 'district': Project.getDistrictCode(project.district), |
163 } |
163 } |
164 prop_form = projrev_forms.ProposalForm( |
164 if not prop_form: |
165 initial=initial_vals, instance=project) |
165 prop_form = projrev_forms.ProposalForm( |
|
166 initial=initial_vals, instance=project) |
166 |
167 |
167 proposal = project.proposal_set.all().order_by('-submitted_on')[0] |
168 proposal = project.proposal_set.all().order_by('-submitted_on')[0] |
168 |
169 |
169 if proposal: |
170 if proposal: |
170 proposal_path = str(proposal.document) |
171 proposal_path = str(proposal.document) |
191 if reviews: |
192 if reviews: |
192 context['last_reviewed'] = reviews[0].reviewed_on |
193 context['last_reviewed'] = reviews[0].reviewed_on |
193 context['nr_reviews'] = len(reviews) |
194 context['nr_reviews'] = len(reviews) |
194 |
195 |
195 else: |
196 else: |
196 prop_form = projrev_forms.ProposalForm() |
197 if not prop_form: |
|
198 prop_form = projrev_forms.ProposalForm() |
197 |
199 |
198 context['form'] = prop_form |
200 context['form'] = prop_form |
199 |
201 |
200 template = 'projrev/proposal/submit.html' |
202 template = 'projrev/proposal/submit.html' |
201 |
203 |