equal
deleted
inserted
replaced
28 return '' |
28 return '' |
29 |
29 |
30 def render_POST(self, request): |
30 def render_POST(self, request): |
31 newstr = request.content.getvalue() |
31 newstr = request.content.getvalue() |
32 newdata = json.loads(newstr) |
32 newdata = json.loads(newstr) |
33 args = newdata[u'args'] |
33 args = newdata['args'] |
34 range_feedback = newdata[u'range'] |
34 range_feedback = newdata['range'] |
35 slider_position = newdata[u'position'] |
35 slider_position = newdata['position'] |
36 visible = newdata[u'visible'] |
36 visible = newdata['visible'] |
37 extra = newdata[u'extra'] |
37 extra = newdata['extra'] |
38 options = newdata[u'options'] |
38 options = newdata['options'] |
39 |
39 |
40 if len(options) == 1 : |
40 if len(options) == 1 : |
41 action, = options |
41 action, = options |
42 if action == "action_reset": |
42 if action == "action_reset": |
43 del Alarms[:] |
43 del Alarms[:] |
47 if action == "onClick[acknowledge]": |
47 if action == "onClick[acknowledge]": |
48 AlarmIndex[int(alarmid)][2] = "ack" |
48 AlarmIndex[int(alarmid)][2] = "ack" |
49 |
49 |
50 answer = self.renderTable(range_feedback, slider_position, visible, extra) |
50 answer = self.renderTable(range_feedback, slider_position, visible, extra) |
51 janswer = json.dumps(answer) |
51 janswer = json.dumps(answer) |
52 return janswer |
52 return janswer.encode() |
53 |
53 |
54 def renderTable(self, old_range, old_position, visible, extra): |
54 def renderTable(self, old_range, old_position, visible, extra): |
55 if len(extra) > 0 and extra[0] != "": |
55 if len(extra) > 0 and extra[0] != "": |
56 fAlarms = [alrm for alrm in Alarms if alrm[1].find(extra[0])!=-1] |
56 fAlarms = [alrm for alrm in Alarms if alrm[1].find(extra[0])!=-1] |
57 else: |
57 else: |