# HG changeset patch # User Madhusudan.C.S # Date 1250097081 -19800 # Node ID 55e650bb9dbea99e6f427ecb43ffcd0bf4e2818b # Parent 4cf4c1f0e5bb756cb9ae045e63ad804171f1ebc7 Star values recalled. diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/projrev/models.py --- a/app/projrev/models.py Wed Aug 12 19:30:12 2009 +0530 +++ b/app/projrev/models.py Wed Aug 12 22:41:21 2009 +0530 @@ -873,6 +873,9 @@ #: Field representing the relation to the corresponding project. project = models.ForeignKey(Project) + #: Field representing the relation to the corresponding proposal. + proposal = models.ForeignKey(Proposal) + #: Field containing the comment entered along with the review. comment = models.TextField() comment.verbose_name = 'Overall Comment' diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/projrev/views/helpers/forms.py --- a/app/projrev/views/helpers/forms.py Wed Aug 12 19:30:12 2009 +0530 +++ b/app/projrev/views/helpers/forms.py Wed Aug 12 22:41:21 2009 +0530 @@ -11,8 +11,10 @@ from django.contrib.auth.models import User from projrev.models import Project +from projrev.models import Proposal from projrev.models import Review + class ProposalForm(forms.ModelForm): """Creates a form for the project. """ @@ -38,6 +40,11 @@ project = forms.ModelChoiceField(queryset=Project.objects.all(), widget=forms.HiddenInput(), required=False) + + proposal = forms.ModelChoiceField(queryset=Proposal.objects.all(), + widget=forms.HiddenInput(), + required=False) + reviewer = forms.ModelChoiceField(queryset=User.objects.all(), widget=forms.HiddenInput(), required=False) diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/projrev/views/helpers/templatetags/review_helpers.py --- a/app/projrev/views/helpers/templatetags/review_helpers.py Wed Aug 12 19:30:12 2009 +0530 +++ b/app/projrev/views/helpers/templatetags/review_helpers.py Wed Aug 12 22:41:21 2009 +0530 @@ -52,14 +52,26 @@ return review_context +@register.inclusion_tag('projrev/templatetags/_as_star_for_score.html', + takes_context=True) +def as_star_for_score(context, name): + """ + """ + context['name'] = name + if 'prev_data' in context and name in context['prev_data']: + context['value'] = context['prev_data'][name] + else: + context['value'] = 0 + + return context + @register.filter() def serial_no(project, arg): """Returns the latest serial number of the project's proposal """ proposals = project.proposal_set.all().order_by('-submitted_on') - import logging - logging.error(proposals) + if proposals: if arg == 'new': proposal = proposals[0] diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/projrev/views/proposal.py --- a/app/projrev/views/proposal.py Wed Aug 12 19:30:12 2009 +0530 +++ b/app/projrev/views/proposal.py Wed Aug 12 22:41:21 2009 +0530 @@ -239,7 +239,11 @@ if rev_form.is_valid(): cleaned_data = rev_form.cleaned_data - cleaned_data['project'] = Project.objects.get(micr_code=micr_code) + project = Project.objects.get(micr_code=micr_code) + proposal = project.proposal_set.all().order_by('-submitted_on')[0] + + cleaned_data['project'] = project + cleaned_data['proposal'] = proposal cleaned_data['reviewer'] = request.user # If the form is valid create a new project or update the project @@ -266,6 +270,10 @@ if not rev_form: rev_form = projrev_forms.ReviewForm() + else: + context['prev_data'] = rev_form.data + import logging + logging.error(rev_form.data) project = Project.objects.get(micr_code=micr_code) context['form'] = rev_form diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/site-content/proposals/2009/08/10/arm.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/site-content/proposals/2009/08/10/arm.py Wed Aug 12 22:41:21 2009 +0530 @@ -0,0 +1,6 @@ +for i in range(100, 1000): + a = i % 10 + b = (i / 10) % 10 + c = (i / 100) % 10 + if i == a ** 3 + b ** 3 + c ** 3: + print "Armstrong Number: ", i diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/site-content/proposals/2009/08/10/c.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/site-content/proposals/2009/08/10/c.c Wed Aug 12 22:41:21 2009 +0530 @@ -0,0 +1,27 @@ +#include + +main() +{ + + int n, count = 1; + float x, sum = 0,average; + do { + printf("how many numbers? "); + scanf("%d", &n); + sum = 0; + count = 1; + while (count <= n) { + printf("x = "); + printf("\n(to end program, enter 0 for x): "); + scanf("%f", &x); + if (x == 0) + break; + sum += x; + ++count; + } + average = sum/n; + printf("\nthe average is %f\n", average); + } while (x != 0); +} + + diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/site-content/proposals/2009/08/10/c_.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/site-content/proposals/2009/08/10/c_.c Wed Aug 12 22:41:21 2009 +0530 @@ -0,0 +1,27 @@ +#include + +main() +{ + + int n, count = 1; + float x, sum = 0,average; + do { + printf("how many numbers? "); + scanf("%d", &n); + sum = 0; + count = 1; + while (count <= n) { + printf("x = "); + printf("\n(to end program, enter 0 for x): "); + scanf("%f", &x); + if (x == 0) + break; + sum += x; + ++count; + } + average = sum/n; + printf("\nthe average is %f\n", average); + } while (x != 0); +} + + diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/site-content/proposals/2009/08/10/c__.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/site-content/proposals/2009/08/10/c__.c Wed Aug 12 22:41:21 2009 +0530 @@ -0,0 +1,27 @@ +#include + +main() +{ + + int n, count = 1; + float x, sum = 0,average; + do { + printf("how many numbers? "); + scanf("%d", &n); + sum = 0; + count = 1; + while (count <= n) { + printf("x = "); + printf("\n(to end program, enter 0 for x): "); + scanf("%f", &x); + if (x == 0) + break; + sum += x; + ++count; + } + average = sum/n; + printf("\nthe average is %f\n", average); + } while (x != 0); +} + + diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/site-content/proposals/2009/08/10/c___.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/site-content/proposals/2009/08/10/c___.c Wed Aug 12 22:41:21 2009 +0530 @@ -0,0 +1,27 @@ +#include + +main() +{ + + int n, count = 1; + float x, sum = 0,average; + do { + printf("how many numbers? "); + scanf("%d", &n); + sum = 0; + count = 1; + while (count <= n) { + printf("x = "); + printf("\n(to end program, enter 0 for x): "); + scanf("%f", &x); + if (x == 0) + break; + sum += x; + ++count; + } + average = sum/n; + printf("\nthe average is %f\n", average); + } while (x != 0); +} + + diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/site-content/proposals/2009/08/10/c____.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/site-content/proposals/2009/08/10/c____.c Wed Aug 12 22:41:21 2009 +0530 @@ -0,0 +1,27 @@ +#include + +main() +{ + + int n, count = 1; + float x, sum = 0,average; + do { + printf("how many numbers? "); + scanf("%d", &n); + sum = 0; + count = 1; + while (count <= n) { + printf("x = "); + printf("\n(to end program, enter 0 for x): "); + scanf("%f", &x); + if (x == 0) + break; + sum += x; + ++count; + } + average = sum/n; + printf("\nthe average is %f\n", average); + } while (x != 0); +} + + diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/site-content/proposals/2009/08/10/collatz.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/site-content/proposals/2009/08/10/collatz.py Wed Aug 12 22:41:21 2009 +0530 @@ -0,0 +1,7 @@ +a = 343 +while a > 1: + print a + if a % 2: + a = a * 3 + 1 + else: + a /= 2 diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/site-content/proposals/2009/08/10/collatz_.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/site-content/proposals/2009/08/10/collatz_.py Wed Aug 12 22:41:21 2009 +0530 @@ -0,0 +1,7 @@ +a = 343 +while a > 1: + print a + if a % 2: + a = a * 3 + 1 + else: + a /= 2 diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/site-content/proposals/2009/08/10/gcd.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/site-content/proposals/2009/08/10/gcd.py Wed Aug 12 22:41:21 2009 +0530 @@ -0,0 +1,6 @@ +def gcd(a, b): + if a % b == 0: + return b + return gcd(b, a %b) + +print gcd (10, 20) diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/site-content/proposals/2009/08/11/arm.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/site-content/proposals/2009/08/11/arm.py Wed Aug 12 22:41:21 2009 +0530 @@ -0,0 +1,6 @@ +for i in range(100, 1000): + a = i % 10 + b = (i / 10) % 10 + c = (i / 100) % 10 + if i == a ** 3 + b ** 3 + c ** 3: + print "Armstrong Number: ", i diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/site-content/proposals/2009/08/11/c.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/site-content/proposals/2009/08/11/c.c Wed Aug 12 22:41:21 2009 +0530 @@ -0,0 +1,27 @@ +#include + +main() +{ + + int n, count = 1; + float x, sum = 0,average; + do { + printf("how many numbers? "); + scanf("%d", &n); + sum = 0; + count = 1; + while (count <= n) { + printf("x = "); + printf("\n(to end program, enter 0 for x): "); + scanf("%f", &x); + if (x == 0) + break; + sum += x; + ++count; + } + average = sum/n; + printf("\nthe average is %f\n", average); + } while (x != 0); +} + + diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/templates/projrev/proposal/review.html --- a/app/templates/projrev/proposal/review.html Wed Aug 12 19:30:12 2009 +0530 +++ b/app/templates/projrev/proposal/review.html Wed Aug 12 22:41:21 2009 +0530 @@ -1,15 +1,6 @@ {% extends "projrev/base.html" %} {% load review_helpers %} -{% block scripts %} -{{ block.super }} - -{% endblock scripts %} - {% block content %}
@@ -97,11 +88,7 @@

{{ form.attribute1.errors }} {{ form.attribute1.label }}
- - - - - + {% as_star_for_score "attribute1" %} {% if form.attribute1.field.required %}  (required){% endif %}

@@ -111,11 +98,7 @@

{{ form.attribute2.errors }} {{ form.attribute2.label }}
- - - - - + {% as_star_for_score "attribute2" %} {% if form.attribute2.field.required %}  (required){% endif %}

@@ -125,11 +108,7 @@

{{ form.attribute3.errors }} {{ form.attribute3.label }}
- - - - - + {% as_star_for_score "attribute3" %} {% if form.attribute3.field.required %}  (required){% endif %}

@@ -139,11 +118,7 @@

{{ form.attribute4.errors }} {{ form.attribute4.label }}
- - - - - + {% as_star_for_score "attribute4" %} {% if form.attribute4.field.required %}  (required){% endif %}

@@ -153,11 +128,7 @@

{{ form.attribute5.errors }} {{ form.attribute5.label }}
- - - - - + {% as_star_for_score "attribute5" %} {% if form.attribute5.field.required %}  (required){% endif %}

@@ -167,11 +138,7 @@

{{ form.attribute6.errors }} {{ form.attribute6.label }}
- - - - - + {% as_star_for_score "attribute6" %} {% if form.attribute6.field.required %}  (required){% endif %}

@@ -181,11 +148,7 @@

{{ form.attribute7.errors }} {{ form.attribute7.label }}
- - - - - + {% as_star_for_score "attribute7" %} {% if form.attribute7.field.required %}  (required){% endif %}

@@ -195,11 +158,7 @@

{{ form.attribute8.errors }} {{ form.attribute8.label }}
- - - - - + {% as_star_for_score "attribute8" %} {% if form.attribute8.field.required %}  (required){% endif %}

@@ -209,11 +168,7 @@

{{ form.attribute9.errors }} {{ form.attribute9.label }}
- - - - - + {% as_star_for_score "attribute9" %} {% if form.attribute9.field.required %}  (required){% endif %}

diff -r 4cf4c1f0e5bb -r 55e650bb9dbe app/templates/projrev/templatetags/_as_star_for_score.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/templates/projrev/templatetags/_as_star_for_score.html Wed Aug 12 22:41:21 2009 +0530 @@ -0,0 +1,11 @@ +{% load review_helpers %} + + + + + + \ No newline at end of file