Merge branch 'master' into dev

fixes initdb error where csv was being initialized twice.

Merge branch 'master' into dev
fixes initdb error where csv was being initialized twice.
Miguel Barão
2 parents b573c044 62e66219
Showing 4 changed files with 19 additions and 2 deletions Show diff stats
perguntations/__init__.py
perguntations/main.py
perguntations/templates/test.html
perguntations/test.py
@@ -32,7 +32,7 @@ proof of submission and for review.
 '''
  
 APP_NAME = 'perguntations'
-APP_VERSION = '2022.01.dev1'
+APP_VERSION = '2022.03.dev1'
 APP_DESCRIPTION = str(__doc__)
  
 __author__ = 'Miguel Barão'
@@ -101,7 +101,7 @@ def get_logger_config(debug=False) -&gt; dict:
         }
  
 # ----------------------------------------------------------------------------
-def main():
+def main() -> None:
     '''
     Tornado web server
     '''
@@ -158,6 +158,13 @@
       viewportMargin: Infinity,
       matchBrackets: true,
       styleActiveLine: true,
+      indentUnit: 4,
+      indentWithTabs: false,
+      smartIndent: true,
+      extraKeys: {
+        "Tab": (cm) => cm.execCommand("indentMore"),
+        "Shift-Tab": (cm) => cm.execCommand("indentLess"),
+      },
     });
   });
 </script>
@@ -16,6 +16,16 @@ logger = logging.getLogger(__name__)
 class Test(dict):
     '''
     Each instance Test() is a concrete test of a single student.
+    A test can be in one of the states: ACTIVE, SUBMITTED, CORRECTED, QUIT
+    Methods:
+        t.start(student) - marks start of test (register time and state)
+        t.reset_answers() - remove all answers from the test
+        t.update_answer(ref, ans) - update answer of a given question
+        t.submit(answers_dict) - update answers, register time and state
+        t.correct_async()
+        t.correct() - corrects questions and compute grade, register state
+        t.giveup() - register the test as given up, answers are not corrected
+        t.save_json(filename) - save the current test to file in JSON format
     '''
  
     # ------------------------------------------------------------------------
...	...	@@ -32,7 +32,7 @@ proof of submission and for review.
32	32	'''
33	33
34	34	APP_NAME = 'perguntations'
35		-APP_VERSION = '2022.01.dev1'
	35	+APP_VERSION = '2022.03.dev1'
36	36	APP_DESCRIPTION = str(__doc__)
37	37
38	38	__author__ = 'Miguel Barão'
...	...
...	...	@@ -101,7 +101,7 @@ def get_logger_config(debug=False) -> dict:
101	101	}
102	102
103	103	# ----------------------------------------------------------------------------
104		-def main():
	104	+def main() -> None:
105	105	'''
106	106	Tornado web server
107	107	'''
...	...
...	...	@@ -158,6 +158,13 @@
158	158	viewportMargin: Infinity,
159	159	matchBrackets: true,
160	160	styleActiveLine: true,
	161	+ indentUnit: 4,
	162	+ indentWithTabs: false,
	163	+ smartIndent: true,
	164	+ extraKeys: {
	165	+ "Tab": (cm) => cm.execCommand("indentMore"),
	166	+ "Shift-Tab": (cm) => cm.execCommand("indentLess"),
	167	+ },
161	168	});
162	169	});
163	170	</script>
...	...
...	...	@@ -16,6 +16,16 @@ logger = logging.getLogger(__name__)
16	16	class Test(dict):
17	17	'''
18	18	Each instance Test() is a concrete test of a single student.
	19	+ A test can be in one of the states: ACTIVE, SUBMITTED, CORRECTED, QUIT
	20	+ Methods:
	21	+ t.start(student) - marks start of test (register time and state)
	22	+ t.reset_answers() - remove all answers from the test
	23	+ t.update_answer(ref, ans) - update answer of a given question
	24	+ t.submit(answers_dict) - update answers, register time and state
	25	+ t.correct_async()
	26	+ t.correct() - corrects questions and compute grade, register state
	27	+ t.giveup() - register the test as given up, answers are not corrected
	28	+ t.save_json(filename) - save the current test to file in JSON format
19	29	'''
20	30
21	31	# ------------------------------------------------------------------------
...	...