Created new Poll Interface.

mikemintz · May 24, 2012 · 4ceac28 · 4ceac28
1 parent 72ba6fd
commit 4ceac28
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 25 deletions.
diff --git a/deme_django/modules/poll/templates/poll/approvenpoll.html b/deme_django/modules/poll/templates/poll/approvenpoll.html
@@ -296,12 +296,50 @@ <h3>----------Results Page for Participants----------</h3>
 
     {% for dict in vote_numbers_list %}
     <div>
-	    <p style="margin-bottom:0em;"><strong>{{dict.proposition.body|safe}}</strong></p>
-	    <div style= "width:505px">
-		    <div style="height:1em; width: {{dict.agreeProp}}%; background-color: green; float:left; margin:0px"></div>
-		    <div style="height:1em; margin-right:0px margin-left:5px; width: {{dict.disagreeProp}}%; background-color:gray; float:right;"></div>
-		</div>
-	    <span>{{dict.agree}}</span>  agree,  <span>{{dict.disagree}} </span>  disagree 
+	    <p style="margin-bottom:0em;">Statement {{ forloop.counter }}: <strong>{{dict.proposition.body|safe}}</strong></p>
+	    <table border="0"  >
+			  <tr>
+			    <th width = "150px">Statement Responses</th>
+			    <th width = "5px"></th>
+			    <th width = "20px" style="padding-left:0">0</th>
+			    <th width = "20px" style="padding-left:0">1</th>
+			    <th width = "20px" style="padding-left:0">2</th>
+			    <th width = "20px" style="padding-left:0">3</th>
+			    <th width = "20px" style="padding-left:0">4</th>
+			    <th width = "20px" style="padding-left:0">5</th>
+			    <th width = "20px" style="padding-left:0">6</th>
+			    <th width = "20px" style="padding-left:0">7</th>
+			    <th width = "20px" style="padding-left:0">8</th>
+			    <th width = "20px" style="padding-left:0">9</th>
+			    <th width = "20px" style="padding-left:0">10</th>
+			    <th width = "20px" style="padding-left:0">11</th>
+			    <th width = "20px" style="padding-left:0">12</th>
+			    <th>responses</th>
+			  </tr>
+			  <tr>
+			    <td width = "70px" align="right">{{dict.agree}} Agree</td>
+			    <td></td>
+			    {% for i in dict.agreeList %}
+			    <td bgcolor="blue"></td>
+			    {% endfor %}
+			  </tr>
+			  <tr height = "5px"></tr>
+			  <tr>
+			    <td align="right">{{dict.disagree}} Disagree</td>
+			    <td></td>
+			    {% for i in dict.disagreeList %}
+			    <td  bgcolor="blue"></td>
+			    {% endfor %}
+			  </tr>
+			  <tr height = "5px"></tr>
+			  <tr>
+			    <td align="right">{{dict.no_vote}} Haven't Voted</td>
+			    <td></td>
+			    {% for i in dict.no_voteList %}
+			    <td  bgcolor="blue"></td>
+			    {% endfor %}
+			  </tr>
+			</table>
 
 	</div>
 	<br>

diff --git a/deme_django/modules/poll/views.py b/deme_django/modules/poll/views.py
@@ -151,21 +151,9 @@ def item_show_html(self):
             disagree = PropositionResponseApprove.objects.filter(poll=self.item, value='disapprove', proposition=proposition).count()
             #no_vote = PropositionResponseApprove.objects.filter(poll=self.item, value='not sure', proposition=proposition).count()
             #maxTemp = max([agree, disagree, no_vote])
-            totalVotes = agree + disagree + 0.0
-            if totalVotes == 0:
-                totalVotes = 1.0
-            agreeProp = 100.0*agree/totalVotes
-            agreeProp = int(agreeProp * 1000)/1000.0
-            disagreeProp = 100.0 - agreeProp
-            if totalVotes == 0:
-                agreeProp, disagreeProp = 0
-            totalPixels = 505.0
-            agreeProp = agreeProp*500.0/totalPixels
-            disagreeProp = disagreeProp *500.0/totalPixels
-            agreeProp = int(agreeProp * 1000)/1000.0
-            disagreeProp = int(disagreeProp * 1000)/1000.0
+            no_vote = 12-agree-disagree
             #if(maxTemp > maxNumber): maxNumber = maxTemp
-            vote_numbers.append({'agree': agree, 'disagree': disagree, 'agreeProp': agreeProp, 'disagreeProp': disagreeProp, 'proposition': proposition})
+            vote_numbers.append({'agree': agree, 'agreeList': range(agree), 'disagree': disagree, 'disagreeList': range(disagree), 'no_vote':no_vote, 'no_voteList':range(no_vote), 'proposition': proposition})
 
         #self.context['maxVal'] = maxNumber
         self.context['vote_numbers_list'] = vote_numbers
@@ -208,7 +196,8 @@ def item_respondtopropositions_html(self):
         #       counter=counter+1
         #        if counter>self.item.n: #this needs to be changed for chooseN
         #            return self.render_error('Too many votes', "Approve "+str(self.item.n)+" or fewer propositions.")
-
+        if len(propositionResponses) != 3:
+            return self.render_error('Not all statements responded to.', "Please agree or disagree with each statement")            
         #delete old response (even if one doesn't exist)
         #PropositionResponseApprove.objects.filter(poll=self.item, participant=self.cur_agent).delete()
         #make a new response
@@ -242,11 +231,9 @@ def item_respondtopropositions_html(self):
             #no_vote = PropositionResponseApprove.objects.filter(poll=self.item, value='not sure', proposition=proposition).count()
             #maxTemp = max([agree, disagree, no_vote])
             #if(maxTemp > maxNumber): maxNumber = maxTemp
-            totalVotes = agree + disagree + 0.0
-            agreeProp = 100.0*float(agree)/float(totalVotes)
-            disagreeProp = 100.0 - agreeProp
+            no_vote = 12-agree-disagree
             #if(maxTemp > maxNumber): maxNumber = maxTemp
-            vote_numbers.append({'agree': agree, 'disagree': disagree, 'agreeProp': agreeProp, 'disagreeProp': disagreeProp, 'proposition': proposition})
+            vote_numbers.append({'agree': agree, 'agreeList': range(agree), 'disagree': disagree, 'disagreeList': range(disagree), 'no_vote':no_vote, 'no_voteList':range(no_vote), 'proposition': proposition})
 
         #self.context['maxVal'] = maxNumber
         self.context['vote_numbers_list'] = vote_numbers