Skip to content
This repository was archived by the owner on Jun 30, 2024. It is now read-only.

Commit 1901063

Browse files
committed
Merge branch 'master' of github.com:RunestoneInteractive/RunestoneServer
2 parents 76ee4af + 6d25fe0 commit 1901063

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

conf.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,10 @@
337337
# This config value contains the locations and names of other projects that should be linked to in this documentation.
338338
intersphinx_mapping = {
339339
"RunestoneServer": (
340-
"https://runestonecomponents.readthedocs.io/en/latest/",
341-
None,
342-
# An optional local file location -- useful when updating both Sphinx builds before the updates are pushed to the server.
343-
##"F:/Runestone/RunestoneComponents/build/RunestoneComponents/objects.inv",
340+
"https://runestonecomponents.readthedocs.io/en/latest/", (
341+
None,
342+
# An optional local file location -- useful when updating both Sphinx builds before the updates are pushed to the server.
343+
##"C:/Users/bjones/Documents/git/RunestoneComponents/build/RunestoneComponents/objects.inv",
344+
)
344345
)
345346
}

controllers/ajax.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,15 @@ def compareAndUpdateCookieData(sid: str):
6868
)
6969

7070

71+
# Endpoints
72+
# =========
73+
#
74+
# .. _hsblog endpoint:
75+
#
76+
# hsblog endpoint
77+
# ---------------
7178
# Given a JSON record of a clickstream event record the event in the ``useinfo`` table.
72-
# If the event is an answer to a runestone qustion record that answer in the database in
79+
# If the event is an answer to a runestone question record that answer in the database in
7380
# one of the xxx_answers tables.
7481
#
7582
def hsblog():
@@ -327,6 +334,11 @@ def hsblog():
327334
return json.dumps(res)
328335

329336

337+
# .. _runlog endpoint:
338+
#
339+
# runlog endpoint
340+
# ---------------
341+
# The `logRunEvent` client-side function calls this endpoint to record TODO...
330342
def runlog(): # Log errors and runs with code
331343
# response.headers['content-type'] = 'application/json'
332344
setCookie = False

models/grouped_assignments.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# *************************************
2+
# |docname| - assignment-related tables
3+
# *************************************
4+
15
db.define_table(
26
"assignments",
37
Field("course", db.courses),
@@ -39,7 +43,7 @@
3943
Field("lis_result_sourcedid", "string", length=1024),
4044
# web service endpoint where you send signed xml messages to insert into gradebook; guid above will be one parameter you send in that xml; the actual grade and comment will be others
4145
#
42-
# Per the ``LTI spec v1.1.1 <https://www.imsglobal.org/specs/ltiv1p1p1/implementation-guide>`_ in section 6, the maximum length of the ``lis_outcome_url`` field is 1023 characters.
46+
# Per the `LTI spec v1.1.1 <https://www.imsglobal.org/specs/ltiv1p1p1/implementation-guide>`_ in section 6, the maximum length of the ``lis_outcome_url`` field is 1023 characters.
4347
Field("lis_outcome_url", "string", length=1024),
4448
migrate=table_migrate_prefix + "grades.table",
4549
)
@@ -57,6 +61,10 @@
5761
)
5862

5963

64+
# .. _question_grades table:
65+
#
66+
# question_grades
67+
# ===============
6068
db.define_table(
6169
"question_grades",
6270
# This table records grades on individual gradeable items

tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ def selenium_driver(selenium_driver_session):
952952

953953
yield driver
954954

955-
# Clear as much as possible, to present an almost-fresh instance of a browser for the next test. (Shutting down then starting up a browswer is very slow.)
955+
# Clear as much as possible, to present an almost-fresh instance of a browser for the next test. (Shutting down then starting up a browser is very slow.)
956956
driver.execute_script("window.localStorage.clear();")
957957
driver.execute_script("window.sessionStorage.clear();")
958958
driver.delete_all_cookies()

0 commit comments

Comments
 (0)