Commit d1f13bf9 by Alexander Kryklia

removed debug state in js and done workaround in poll_module

parent 1b52c6f3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
define('PollMain', ['logme'], function (logme) { define('PollMain', ['logme'], function (logme) {
var debugMode; var debugMode;
debugMode = true; debugMode = false;
if (debugMode === true) { if (debugMode === true) {
logme('We are in debug mode.'); logme('We are in debug mode.');
} }
......
...@@ -45,9 +45,8 @@ class PollModule(XModule): ...@@ -45,9 +45,8 @@ class PollModule(XModule):
js = { js = {
'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee')], 'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee')],
'js': [resource_string(__name__, 'js/src/poll/logme.js'), 'js': [resource_string(__name__, 'js/src/poll/logme.js'),
resource_string(__name__, 'js/src/poll/poll.js'), resource_string(__name__, 'js/src/poll/poll.js'),
resource_string(__name__, 'js/src/poll/poll_main.js') resource_string(__name__, 'js/src/poll/poll_main.js')]
]
} }
css = {'scss': [resource_string(__name__, 'css/poll/display.scss')]} css = {'scss': [resource_string(__name__, 'css/poll/display.scss')]}
js_module_name = "Poll" js_module_name = "Poll"
...@@ -63,19 +62,23 @@ class PollModule(XModule): ...@@ -63,19 +62,23 @@ class PollModule(XModule):
def handle_ajax(self, dispatch, get): def handle_ajax(self, dispatch, get):
''' ''' """Ajax handler.
# import ipdb; ipdb.set_trace()
if dispatch in self.poll_answers: # and not self.voted: Args:
# self.poll_answers[dispatch] += 1 dispatch: request slug
# workaround get: request get parameters
Returns:
dict
"""
if dispatch in self.poll_answers and not self.voted:
tmp = {} tmp = {}
for key in self.poll_answers: for key in self.poll_answers:
tmp[key] = self.poll_answers[key] tmp[key] = self.poll_answers[key]
tmp[dispatch] += 1 tmp[dispatch] += 1
self.poll_answers = tmp
#end of workaround
self.voted = True self.voted = True
self.poll_answer = dispatch self.poll_answer = dispatch
self.poll_answers = tmp
return json.dumps({'poll_answers': self.poll_answers, return json.dumps({'poll_answers': self.poll_answers,
'total': sum(self.poll_answers.values()), 'total': sum(self.poll_answers.values()),
'callback': {'objectName': 'Conditional'} 'callback': {'objectName': 'Conditional'}
...@@ -107,7 +110,7 @@ class PollModule(XModule): ...@@ -107,7 +110,7 @@ class PollModule(XModule):
answer = element_answer.get('id', None) answer = element_answer.get('id', None)
if answer: if answer:
if answer not in tmp: if answer not in tmp:
tmp = 0 tmp[answer] = 0
answers_to_json[answer] = \ answers_to_json[answer] = \
cgi.escape(stringify_children(element_answer)) cgi.escape(stringify_children(element_answer))
xml_object_copy.remove(element_answer) xml_object_copy.remove(element_answer)
...@@ -115,8 +118,8 @@ class PollModule(XModule): ...@@ -115,8 +118,8 @@ class PollModule(XModule):
return json.dumps({'answers': answers_to_json, return json.dumps({'answers': answers_to_json,
'question': cgi.escape(stringify_children(xml_object_copy)), 'question': cgi.escape(stringify_children(xml_object_copy)),
# to show answered poll after reload: # to show answered poll after reload:
'poll_answer': self.poll_answer, 'poll_answer': '', # self.poll_answer,
'poll_answers:': self.poll_answers if self.voted else {}, 'poll_answers': self.poll_answers if self.voted else {},
'total': sum(self.poll_answers.values()) if self.voted else ''}) 'total': sum(self.poll_answers.values()) if self.voted else ''})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment