- fix regression with allow_all button

- simplified log messages

- fix regression with allow_all button
- simplified log messages
Miguel Barão
1 parent fda752eb
Showing 4 changed files with 39 additions and 25 deletions Show diff stats
perguntations/__init__.py
perguntations/app.py
perguntations/serve.py
perguntations/static/js/admin.js
@@ -32,7 +32,7 @@ proof of submission and for review.
 '''
  
 APP_NAME = 'perguntations'
-APP_VERSION = '2020.05.dev4'
+APP_VERSION = '2020.05.dev5'
 APP_DESCRIPTION = __doc__
  
 __author__ = 'Miguel Barão'
@@ -85,7 +85,7 @@ class App():
     # ------------------------------------------------------------------------
     def __init__(self, conf):
         self.online = dict()    # {uid: {'student':{...}, 'test': {...}}, ...}
-        self.allowed = set([])  # '0' is hardcoded to allowed elsewhere
+        self.allowed = set()    # '0' is hardcoded to allowed elsewhere
  
         logger.info('Loading test configuration "%s".', conf["testfile"])
         try:
@@ -138,7 +138,7 @@ class App():
     async def login(self, uid, try_pw):
         '''login authentication'''
         if uid not in self.allowed and uid != '0':      # not allowed
-            logger.warning('Student %s: not allowed to login.', uid)
+            logger.warning('"%s" not allowed to login.', uid)
             return False
  
         # get name+password from db
@@ -157,34 +157,34 @@ class App():
         if pw_ok:      # success
             self.allowed.discard(uid)  # remove from set of allowed students
             if uid in self.online:
-                logger.warning('Student %s: already logged in.', uid)
+                logger.warning('"%s" already logged in.', uid)
             else:                      # make student online
                 self.online[uid] = {'student': {'name': name, 'number': uid}}
-                logger.info('Student %s: logged in.', uid)
+                logger.info('"%s" logged in.', uid)
             return True
                         # wrong password
-        logger.info('Student %s: wrong password.', uid)
+        logger.info('"%s" wrong password.', uid)
         return False
  
     # ------------------------------------------------------------------------
     def logout(self, uid):
         '''student logout'''
         self.online.pop(uid, None)  # remove from dict if exists
-        logger.info('Student %s: logged out.', uid)
+        logger.info('"%s" logged out.', uid)
  
     # ------------------------------------------------------------------------
     async def generate_test(self, uid):
         '''generate a test for a given student'''
         if uid in self.online:
-            logger.info('Student %s: generating new test.', uid)
+            logger.info('"%s" generating new test.', uid)
             student_id = self.online[uid]['student']  # {number, name}
             test = await self.testfactory.generate(student_id)
             self.online[uid]['test'] = test
-            logger.info('Student %s: test is ready.', uid)
+            logger.info('"%s" test is ready.', uid)
             return self.online[uid]['test']
  
         # this implies an error in the code. should never be here!
-        logger.critical('Student %s: offline, cant generate test', uid)
+        logger.critical('"%s" offline, cant generate test', uid)
  
     # ------------------------------------------------------------------------
     async def correct_test(self, uid, ans):
@@ -198,10 +198,10 @@ class App():
  
         # --- submit answers and correct test
         test.update_answers(ans)
-        logger.info('Student %s: %d answers submitted.', uid, len(ans))
+        logger.info('"%s" submitted %d answers.', uid, len(ans))
  
         grade = await test.correct()
-        logger.info('Student %s: grade = %g points.', uid, grade)
+        logger.info('"%s" grade = %g points.', uid, grade)
  
         # --- save test in JSON format
         fields = (uid, test['ref'], str(test['finish_time']))
@@ -210,7 +210,7 @@ class App():
         with open(path.expanduser(fpath), 'w') as file:
             # default=str required for datetime objects
             json.dump(test, file, indent=2, default=str)
-        logger.info('Student %s: saved JSON.', uid)
+        logger.info('"%s" saved JSON.', uid)
  
         # --- insert test and questions into database
         with self.db_session() as sess:
@@ -233,7 +233,7 @@ class App():
                 test_id=test['ref'])
                           for q in test['questions'] if 'grade' in q])
  
-        logger.info('Student %s: database updated.', uid)
+        logger.info('"%s" database updated.', uid)
         return grade
  
     # ------------------------------------------------------------------------
@@ -261,18 +261,18 @@ class App():
                           state=test['state'],
                           comment=''))
  
-        logger.info('Student %s: gave up.', uid)
+        logger.info('"%s" gave up.', uid)
         return test
  
     # ------------------------------------------------------------------------
     def event_test(self, uid, cmd, value):
         '''handles browser events the occur during the test'''
         if cmd == 'focus':
-            logger.info('Student %s: focus %s', uid, value)
+            logger.info('"%s": focus %s', uid, value)
         elif cmd == 'size':
             scr_y, scr_x, win_y, win_x = value
             area = win_x * win_y / (scr_x * scr_y) * 100
-            logger.info('Student %s: area=%g%%, window=%dx%d, screen=%dx%d',
+            logger.info('"%s": area=%g%%, window=%dx%d, screen=%dx%d',
                         uid, area, win_x, win_y, scr_x, scr_y)
  
     # ------------------------------------------------------------------------
@@ -396,12 +396,22 @@ class App():
     def allow_student(self, uid):
         '''allow a single student to login'''
         self.allowed.add(uid)
-        logger.info('Student %s: allowed to login.', uid)
+        logger.info('"%s" allowed to login.', uid)
  
     def deny_student(self, uid):
         '''deny a single student to login'''
         self.allowed.discard(uid)
-        logger.info('Student %s: denied to login', uid)
+        logger.info('"%s" denied to login', uid)
+
+    def allow_all_students(self):
+        '''allow all students to login'''
+        logger.info('Allowing all students...')
+        self.allowed = set(s[0] for s in self.get_all_students())
+
+    def deny_all_students(self):
+        '''deny all students to login'''
+        logger.info('Denying all students...')
+        self.allowed = set()
  
     async def update_student_password(self, uid, password=''):
         '''change password on the database'''
@@ -410,7 +420,7 @@ class App():
         with self.db_session() as sess:
             student = sess.query(Student).filter_by(id=uid).one()
             student.password = password
-        logger.info('Student %s: password updated.', uid)
+        logger.info('"%s" password updated.', uid)
  
     def insert_new_student(self, uid, name):
         '''insert new student into the database'''
@@ -420,4 +430,4 @@ class App():
         except exc.SQLAlchemyError:
             logger.error('Insert failed: student %s already exists?', uid)
         else:
-            logger.info('New student inserted: %s, %s', uid, name)
+            logger.info('New student: "%s", "%s"', uid, name)
@@ -241,10 +241,12 @@ class AdminHandler(BaseHandler):
  
         if cmd == 'allow':
             self.testapp.allow_student(value)
-
         elif cmd == 'deny':
             self.testapp.deny_student(value)
-
+        elif cmd == 'allow_all':
+            self.testapp.allow_all_students()
+        elif cmd == 'deny_all':
+            self.testapp.deny_all_students()
         elif cmd == 'reset_password':
             await self.testapp.update_student_password(uid=value, password='')
  
@@ -15,10 +15,12 @@ $(document).ready(function() {
     function button_handlers() {
         // button handlers (runs once)
         $("#allow_all").click(function() {
-            $(":checkbox").prop("checked", true).trigger('change');
+            $.postJSON("/admin", {"cmd": "allow_all"});
+            // $(":checkbox").prop("checked", true).trigger('change');
         });
         $("#deny_all").click(function() {
-            $(":checkbox").prop("checked", false).trigger('change');
+            $.postJSON("/admin", {"cmd": "deny_all"});
+            // $(":checkbox").prop("checked", false).trigger('change');
         });
         $("#reset_password").click(function () {
             $.postJSON("/admin", {
...	...	@@ -32,7 +32,7 @@ proof of submission and for review.
32	32	'''
33	33
34	34	APP_NAME = 'perguntations'
35		-APP_VERSION = '2020.05.dev4'
	35	+APP_VERSION = '2020.05.dev5'
36	36	APP_DESCRIPTION = __doc__
37	37
38	38	__author__ = 'Miguel Barão'
...	...
...	...	@@ -85,7 +85,7 @@ class App():
85	85	# ------------------------------------------------------------------------
86	86	def __init__(self, conf):
87	87	self.online = dict() # {uid: {'student':{...}, 'test': {...}}, ...}
88		- self.allowed = set([]) # '0' is hardcoded to allowed elsewhere
	88	+ self.allowed = set() # '0' is hardcoded to allowed elsewhere
89	89
90	90	logger.info('Loading test configuration "%s".', conf["testfile"])
91	91	try:
...	...	@@ -138,7 +138,7 @@ class App():
138	138	async def login(self, uid, try_pw):
139	139	'''login authentication'''
140	140	if uid not in self.allowed and uid != '0': # not allowed
141		- logger.warning('Student %s: not allowed to login.', uid)
	141	+ logger.warning('"%s" not allowed to login.', uid)
142	142	return False
143	143
144	144	# get name+password from db
...	...	@@ -157,34 +157,34 @@ class App():
157	157	if pw_ok: # success
158	158	self.allowed.discard(uid) # remove from set of allowed students
159	159	if uid in self.online:
160		- logger.warning('Student %s: already logged in.', uid)
	160	+ logger.warning('"%s" already logged in.', uid)
161	161	else: # make student online
162	162	self.online[uid] = {'student': {'name': name, 'number': uid}}
163		- logger.info('Student %s: logged in.', uid)
	163	+ logger.info('"%s" logged in.', uid)
164	164	return True
165	165	# wrong password
166		- logger.info('Student %s: wrong password.', uid)
	166	+ logger.info('"%s" wrong password.', uid)
167	167	return False
168	168
169	169	# ------------------------------------------------------------------------
170	170	def logout(self, uid):
171	171	'''student logout'''
172	172	self.online.pop(uid, None) # remove from dict if exists
173		- logger.info('Student %s: logged out.', uid)
	173	+ logger.info('"%s" logged out.', uid)
174	174
175	175	# ------------------------------------------------------------------------
176	176	async def generate_test(self, uid):
177	177	'''generate a test for a given student'''
178	178	if uid in self.online:
179		- logger.info('Student %s: generating new test.', uid)
	179	+ logger.info('"%s" generating new test.', uid)
180	180	student_id = self.online[uid]['student'] # {number, name}
181	181	test = await self.testfactory.generate(student_id)
182	182	self.online[uid]['test'] = test
183		- logger.info('Student %s: test is ready.', uid)
	183	+ logger.info('"%s" test is ready.', uid)
184	184	return self.online[uid]['test']
185	185
186	186	# this implies an error in the code. should never be here!
187		- logger.critical('Student %s: offline, cant generate test', uid)
	187	+ logger.critical('"%s" offline, cant generate test', uid)
188	188
189	189	# ------------------------------------------------------------------------
190	190	async def correct_test(self, uid, ans):
...	...	@@ -198,10 +198,10 @@ class App():
198	198
199	199	# --- submit answers and correct test
200	200	test.update_answers(ans)
201		- logger.info('Student %s: %d answers submitted.', uid, len(ans))
	201	+ logger.info('"%s" submitted %d answers.', uid, len(ans))
202	202
203	203	grade = await test.correct()
204		- logger.info('Student %s: grade = %g points.', uid, grade)
	204	+ logger.info('"%s" grade = %g points.', uid, grade)
205	205
206	206	# --- save test in JSON format
207	207	fields = (uid, test['ref'], str(test['finish_time']))
...	...	@@ -210,7 +210,7 @@ class App():
210	210	with open(path.expanduser(fpath), 'w') as file:
211	211	# default=str required for datetime objects
212	212	json.dump(test, file, indent=2, default=str)
213		- logger.info('Student %s: saved JSON.', uid)
	213	+ logger.info('"%s" saved JSON.', uid)
214	214
215	215	# --- insert test and questions into database
216	216	with self.db_session() as sess:
...	...	@@ -233,7 +233,7 @@ class App():
233	233	test_id=test['ref'])
234	234	for q in test['questions'] if 'grade' in q])
235	235
236		- logger.info('Student %s: database updated.', uid)
	236	+ logger.info('"%s" database updated.', uid)
237	237	return grade
238	238
239	239	# ------------------------------------------------------------------------
...	...	@@ -261,18 +261,18 @@ class App():
261	261	state=test['state'],
262	262	comment=''))
263	263
264		- logger.info('Student %s: gave up.', uid)
	264	+ logger.info('"%s" gave up.', uid)
265	265	return test
266	266
267	267	# ------------------------------------------------------------------------
268	268	def event_test(self, uid, cmd, value):
269	269	'''handles browser events the occur during the test'''
270	270	if cmd == 'focus':
271		- logger.info('Student %s: focus %s', uid, value)
	271	+ logger.info('"%s": focus %s', uid, value)
272	272	elif cmd == 'size':
273	273	scr_y, scr_x, win_y, win_x = value
274	274	area = win_x * win_y / (scr_x * scr_y) * 100
275		- logger.info('Student %s: area=%g%%, window=%dx%d, screen=%dx%d',
	275	+ logger.info('"%s": area=%g%%, window=%dx%d, screen=%dx%d',
276	276	uid, area, win_x, win_y, scr_x, scr_y)
277	277
278	278	# ------------------------------------------------------------------------
...	...	@@ -396,12 +396,22 @@ class App():
396	396	def allow_student(self, uid):
397	397	'''allow a single student to login'''
398	398	self.allowed.add(uid)
399		- logger.info('Student %s: allowed to login.', uid)
	399	+ logger.info('"%s" allowed to login.', uid)
400	400
401	401	def deny_student(self, uid):
402	402	'''deny a single student to login'''
403	403	self.allowed.discard(uid)
404		- logger.info('Student %s: denied to login', uid)
	404	+ logger.info('"%s" denied to login', uid)
	405	+
	406	+ def allow_all_students(self):
	407	+ '''allow all students to login'''
	408	+ logger.info('Allowing all students...')
	409	+ self.allowed = set(s[0] for s in self.get_all_students())
	410	+
	411	+ def deny_all_students(self):
	412	+ '''deny all students to login'''
	413	+ logger.info('Denying all students...')
	414	+ self.allowed = set()
405	415
406	416	async def update_student_password(self, uid, password=''):
407	417	'''change password on the database'''
...	...	@@ -410,7 +420,7 @@ class App():
410	420	with self.db_session() as sess:
411	421	student = sess.query(Student).filter_by(id=uid).one()
412	422	student.password = password
413		- logger.info('Student %s: password updated.', uid)
	423	+ logger.info('"%s" password updated.', uid)
414	424
415	425	def insert_new_student(self, uid, name):
416	426	'''insert new student into the database'''
...	...	@@ -420,4 +430,4 @@ class App():
420	430	except exc.SQLAlchemyError:
421	431	logger.error('Insert failed: student %s already exists?', uid)
422	432	else:
423		- logger.info('New student inserted: %s, %s', uid, name)
	433	+ logger.info('New student: "%s", "%s"', uid, name)
...	...
...	...	@@ -241,10 +241,12 @@ class AdminHandler(BaseHandler):
241	241
242	242	if cmd == 'allow':
243	243	self.testapp.allow_student(value)
244		-
245	244	elif cmd == 'deny':
246	245	self.testapp.deny_student(value)
247		-
	246	+ elif cmd == 'allow_all':
	247	+ self.testapp.allow_all_students()
	248	+ elif cmd == 'deny_all':
	249	+ self.testapp.deny_all_students()
248	250	elif cmd == 'reset_password':
249	251	await self.testapp.update_student_password(uid=value, password='')
250	252
...	...
...	...	@@ -15,10 +15,12 @@ $(document).ready(function() {
15	15	function button_handlers() {
16	16	// button handlers (runs once)
17	17	$("#allow_all").click(function() {
18		- $(":checkbox").prop("checked", true).trigger('change');
	18	+ $.postJSON("/admin", {"cmd": "allow_all"});
	19	+ // $(":checkbox").prop("checked", true).trigger('change');
19	20	});
20	21	$("#deny_all").click(function() {
21		- $(":checkbox").prop("checked", false).trigger('change');
	22	+ $.postJSON("/admin", {"cmd": "deny_all"});
	23	+ // $(":checkbox").prop("checked", false).trigger('change');
22	24	});
23	25	$("#reset_password").click(function () {
24	26	$.postJSON("/admin", {
...	...