Changeset - cc032da2887a
[Not reviewed]
0 3 0
Luke Hatcher - 12 years ago 2012-10-03 22:41:35
lukeman@gmail.com
include user rating in reviews
3 files changed with 9 insertions and 4 deletions:
0 comments (0 inline, 0 general)
symposion/reviews/views.py
Show inline comments
...
 
@@ -40,35 +40,37 @@ def proposals_generator(request, queryset, user_pk=None, check_speaker=True):
 
            ProposalResult.objects.get_or_create(proposal=obj)
 
        
 
        obj.comment_count = obj.result.comment_count
 
        obj.total_votes = obj.result.vote_count
 
        obj.plus_one = obj.result.plus_one
 
        obj.plus_zero = obj.result.plus_zero
 
        obj.minus_zero = obj.result.minus_zero
 
        obj.minus_one = obj.result.minus_one
 
        lookup_params = dict(proposal=obj)
 
        
 
        if user_pk:
 
            lookup_params["user__pk"] = user_pk
 
        else:
 
            lookup_params["user"] = request.user
 
        
 
        try:
 
            obj.latest_vote = LatestVote.objects.get(**lookup_params).css_class()
 
            obj.user_vote = LatestVote.objects.get(**lookup_params).vote
 
            obj.user_vote_css = LatestVote.objects.get(**lookup_params).css_class()
 
        except LatestVote.DoesNotExist:
 
            obj.latest_vote = "no-vote"
 
            obj.user_vote = None
 
            obj.user_vote_css = "no-vote"
 
        
 
        yield obj
 

	
 

	
 
@login_required
 
def review_section(request, section_slug, assigned=False):
 
    
 
    if not request.user.has_perm("reviews.can_review_%s" % section_slug):
 
        return access_not_permitted(request)
 
    
 
    section = get_object_or_404(ProposalSection, section__slug=section_slug)
 
    queryset = ProposalBase.objects.filter(kind__section=section)
 
    
 
    if assigned:
 
        assignments = ReviewAssignment.objects.filter(user=request.user).values_list("proposal__id")
 
        queryset = queryset.filter(id__in=assignments)
symposion/templates/reviews/_review_table.html
Show inline comments
 
{% load i18n %}
 

	
 
<table class="table table-striped table-bordered table-reviews">
 
    <thead>
 
        <th>#</th>
 
        <th>{% trans "Speaker / Title" %}</th>
 
        <th>{% trans "Category" %}</th>
 
        <th><i class="icon-comment-alt"></i></th>
 
        <th>{% trans "+1" %}</th>
 
        <th>{% trans "+0" %}</th>
 
        <th>{% trans "-0" %}</th>
 
        <th>{% trans "-1" %}</th>
 
        <th><a href="#" class="tip" title="{% trans "Your Rating" %}"><i class="icon-user"></i></a></th>
 
    </thead>
 
    
 
    <tbody>
 
        {% for proposal in proposals %}
 
            <tr>
 
            <tr class="{{ proposal.user_vote_css }}">
 
                <td>{{ proposal.number }}</td>
 
                <td>
 
                    <a href="{% url review_detail proposal.pk %}">
 
                        <small><strong>{{ proposal.speaker }}</strong></small>
 
                        <br />
 
                        {{ proposal.title }}
 
                    </a>
 
                </td>
 
                <td>{{ proposal.track }}</td>
 
                <td>{{ proposal.comment_count }}</td>
 
                <td>{{ proposal.plus_one }}</td>
 
                <td>{{ proposal.plus_zero }}</td>
 
                <td>{{ proposal.minus_zero }}</td>
 
                <td>{{ proposal.minus_one }}</td>
 
                <td>{{ proposal.user_vote|default:"" }}</td>
 
            </tr>
 
        {% endfor %}
 
    </tbody>
 
</table>
symposion/templates/reviews/base.html
Show inline comments
...
 
@@ -84,33 +84,34 @@
 
                    {% endfor %}
 
                </ul>
 
            {% endblock %}
 
        </div>
 
        <div class="span10">
 
            {% block body %}
 
            {% endblock %}
 
        </div>
 
    </div>
 
{% endblock %}
 

	
 
{% block extra_script %}
 
    <script src="{{ STATIC_URL }}datatables/js/jquery.dataTables.min.js" type="text/javascript"></script>
 
    <script src="{{ STATIC_URL }}tabletools/js/TableTools.min.js" type="text/javascript"></script>
 
    <script src="{{ STATIC_URL }}datatables/js/dataTables.bootstrap.js" type="text/javascript"></script>
 
    <script type="text/javascript">
 
        $(function() {            
 
        $(function() {
 
            $(".tip").tooltip();
 
            $("table.table-reviews").dataTable({
 
                "sDom": "<'row'<'span3'l><'span3'T><'span4'f>r>t<'row'<'span3'i><'span5'p>>",
 
                "sPaginationType": "bootstrap",
 
                "bStateSave": true,
 
                "oTableTools": {
 
                    "aButtons": [
 
                        "copy",
 
                        "csv",
 
                        "print"
 
                    ],
 
                    "sSwfPath": "{{ STATIC_URL }}tabletools/swf/copy_csv_xls.swf"
 
                }
 
            });
 
        });
 
    </script>
 
{% endblock %}
0 comments (0 inline, 0 general)