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

Commit 9b939b3

Browse files
zihan21206zihan21206
committed
🔥 Removing unused code for horizontal parsons sql.
1 parent 60145ef commit 9b939b3

File tree

3 files changed

+10
-155
lines changed

3 files changed

+10
-155
lines changed

‎runestone/hparsons/hparsons.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def setup(app):
5757
<textarea data-lang="%(language)s" id="%(divid)s_editor"
5858
%(optional)s
5959
%(dburl)s
60-
%(showlastsql)s style="visibility: hidden;">
60+
style="visibility: hidden;">
6161
%(initialcode)s
6262
</textarea>
6363
</div>
@@ -190,11 +190,6 @@ def run(self):
190190
else:
191191
self.options["dburl"] = ""
192192

193-
if "showlastsql" in self.options:
194-
self.options["showlastsql"] = 'data-showlastsql="true"'
195-
else:
196-
self.options["showlastsql"] = ""
197-
198193
course_name = env.config.html_context["course_id"]
199194
divid = self.options["divid"]
200195

‎runestone/hparsons/js/hparsons-sql.js‎

Lines changed: 8 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,6 @@ import Handsontable from "handsontable";
33
import initSqlJs from "sql.js/dist/sql-wasm.js";
44
import RunestoneBase from "../../common/js/runestonebase.js";
55

6-
// temporary code mirror stuff copied from activecode
7-
import CodeMirror from "codemirror";
8-
import "codemirror/mode/python/python.js";
9-
import "codemirror/mode/css/css.js";
10-
import "codemirror/mode/htmlmixed/htmlmixed.js";
11-
import "codemirror/mode/xml/xml.js";
12-
import "codemirror/mode/javascript/javascript.js";
13-
import "codemirror/mode/sql/sql.js";
14-
import "codemirror/mode/clike/clike.js";
15-
import "codemirror/mode/octave/octave.js";
16-
// import "./../../activecode/css/activecode.css";
17-
// import "codemirror/lib/codemirror.css";
18-
19-
// copied from activecode
20-
// Used by Skulpt.
21-
import embed from "vega-embed";
22-
// Adapt for use outside webpack -- see https://github.com/vega/vega-embed.
23-
window.vegaEmbed = embed;
24-
256
var allDburls = {};
267

278
export var hpList;
@@ -40,29 +21,18 @@ export default class SQLHParons extends RunestoneBase {
4021
this.divid = opts.orig.id;
4122
this.containerDiv = opts.orig;
4223
this.useRunestoneServices = opts.useRunestoneServices;
43-
this.python3 = opts.python3;
44-
this.alignVertical = opts.vertical;
4524
this.origElem = orig;
4625
this.origText = this.origElem.textContent;
4726
this.code = $(orig).text() || "\n\n\n\n\n";
48-
this.language = $(orig).data("lang");
49-
this.includes = $(orig).data("include");
5027
this.question = $(opts.orig).find(`#${this.divid}_question`)[0];
51-
this.tie = $(orig).data("tie");
5228
this.dburl = $(orig).data("dburl");
5329
this.runButton = null;
5430
this.saveButton = null;
5531
this.loadButton = null;
5632
this.outerDiv = null;
57-
this.partner = "";
5833
this.logResults = true;
5934
this.output = null; // create pre for output
6035
this.controlDiv = null;
61-
this.timestamps = ["Original"];
62-
this.autorun = $(orig).data("autorun");
63-
if (this.includes) {
64-
this.includes = this.includes.split(/\s+/);
65-
}
6636
let prefixEnd = this.code.indexOf("^^^^");
6737
if (prefixEnd > -1) {
6838
this.prefix = this.code.substring(0, prefixEnd);
@@ -82,16 +52,6 @@ export default class SQLHParons extends RunestoneBase {
8252
this.caption = "ActiveCode";
8353
}
8454
this.addCaption("runestone");
85-
// setTimeout(
86-
// function () {
87-
// // this.editor.refresh();
88-
// }.bind(this),
89-
// 1000
90-
// );
91-
if (this.autorun) {
92-
// Simulate pressing the run button, since this will also prevent the user from clicking it until the initial run is complete, and also help the user understand why they're waiting.
93-
$(this.runButtonHandler.bind(this));
94-
}
9555
this.indicate_component_ready();
9656

9757
// copied from activecode-sql
@@ -108,7 +68,6 @@ export default class SQLHParons extends RunestoneBase {
10868
this.config = {
10969
locateFile: (filename) => `${fnprefix}/${filename}`,
11070
};
111-
this.showLast = $(this.origElem).data("showlastsql");
11271
var self = this;
11372
initSqlJs(this.config).then(function (SQL) {
11473
// set up call to load database asynchronously if given
@@ -177,104 +136,18 @@ export default class SQLHParons extends RunestoneBase {
177136
this.runButton.disabled = false;
178137
}
179138

180-
// copied from activecode
181-
createEditor(index) {
139+
// copied from activecode, already modified to add parsons
140+
createEditor() {
182141
this.outerDiv = document.createElement("div");
183-
var linkdiv = document.createElement("div");
184-
linkdiv.id = this.divid.replace(/_/g, "-").toLowerCase(); // :ref: changes _ to - so add this as a target
185142
$(this.outerDiv).addClass("ac_section alert alert-warning");
186-
this.outerDiv.lang = this.language;
187143
$(this.origElem).replaceWith(this.outerDiv);
188144
this.outerDiv.innerHTML = `<horizontal-parsons input-type='parsons' id='${this.divid}-hparsons'>`;
189145
this.hparsons = $(this.outerDiv).find("horizontal-parsons")[0];
190146
this.hparsons.parsonsData = ['select', '*', 'from', 'test', ';'];
191-
// this.outerDiv.appendChild(codeDiv);
192-
var edmode = this.outerDiv.lang;
193-
if (edmode === "sql") {
194-
edmode = "text/x-sql";
195-
} else if (edmode === "java") {
196-
edmode = "text/x-java";
197-
} else if (edmode === "cpp") {
198-
edmode = "text/x-c++src";
199-
} else if (edmode === "c") {
200-
edmode = "text/x-csrc";
201-
} else if (edmode === "python3") {
202-
edmode = "python";
203-
} else if (edmode === "octave" || edmode === "MATLAB") {
204-
edmode = "text/x-octave";
205-
}
206-
// var editor = CodeMirror(codeDiv, {
207-
// value: this.code,
208-
// lineNumbers: true,
209-
// mode: edmode,
210-
// indentUnit: 4,
211-
// matchBrackets: true,
212-
// autoMatchParens: true,
213-
// extraKeys: {
214-
// Tab: "indentMore",
215-
// "Shift-Tab": "indentLess",
216-
// },
217-
// });
218-
// Make the editor resizable
219-
// $(editor.getWrapperElement()).resizable({
220-
// resize: function () {
221-
// editor.setSize($(this).width(), $(this).height());
222-
// editor.refresh();
223-
// },
224-
// });
225-
// give the user a visual cue that they have changed but not saved
226-
// editor.on(
227-
// "change",
228-
// function (ev) {
229-
// if (
230-
// editor.acEditEvent == false ||
231-
// editor.acEditEvent === undefined
232-
// ) {
233-
// // change events can come before any real changes for various reasons, some unknown
234-
// // this avoids unneccsary log events and updates to the activity counter
235-
// if (this.origText === editor.getValue()) {
236-
// return;
237-
// }
238-
// $(editor.getWrapperElement()).css(
239-
// "border-top",
240-
// "2px solid #b43232"
241-
// );
242-
// $(editor.getWrapperElement()).css(
243-
// "border-bottom",
244-
// "2px solid #b43232"
245-
// );
246-
// this.isAnswered = true;
247-
// this.logBookEvent({
248-
// event: "activecode",
249-
// act: "edit",
250-
// div_id: this.divid,
251-
// });
252-
// }
253-
// editor.acEditEvent = true;
254-
// }.bind(this)
255-
// ); // use bind to preserve *this* inside the on handler.
256-
// //Solving Keyboard Trap of ActiveCode: If user use tab for navigation outside of ActiveCode, then change tab behavior in ActiveCode to enable tab user to tab out of the textarea
257-
// $(window).keydown(function (e) {
258-
// var code = e.keyCode ? e.keyCode : e.which;
259-
// if (code == 9 && $("textarea:focus").length === 0) {
260-
// editor.setOption("extraKeys", {
261-
// Tab: function (cm) {
262-
// $(document.activeElement)
263-
// .closest(".tab-content")
264-
// .nextSibling.focus();
265-
// },
266-
// "Shift-Tab": function (cm) {
267-
// $(document.activeElement)
268-
// .closest(".tab-content")
269-
// .previousSibling.focus();
270-
// },
271-
// });
272-
// }
273-
// });
274-
// this.editor = editor;
275147
}
276148

277149
// copied from activecode
150+
// seems pretty clear, and do not need to modify
278151
createOutput() {
279152
// Create a parent div with two elements: pre for standard output and a div
280153
// to hold turtle graphics output. We use a div in case the turtle changes from
@@ -309,6 +182,7 @@ export default class SQLHParons extends RunestoneBase {
309182
this.runButton.onclick = this.runButtonHandler.bind(this);
310183
$(butt).attr("type", "button");
311184

185+
// TODO: maybe remove the question part
312186
$(this.outerDiv).prepend(ctrlDiv);
313187
if (this.question) {
314188
if ($(this.question).html().match(/^\s+$/)) {
@@ -320,6 +194,7 @@ export default class SQLHParons extends RunestoneBase {
320194
this.controlDiv = ctrlDiv;
321195
}
322196

197+
// copied from activecode-sql
323198
async runProg(noUI, logResults) {
324199
if (typeof logResults === "undefined") {
325200
this.logResults = true;
@@ -410,9 +285,6 @@ export default class SQLHParons extends RunestoneBase {
410285
// other activecodes In that case the showlastsql flag can be set
411286
// so we only show the last result
412287
let resultArray = this.results;
413-
if (this.showLast) {
414-
resultArray = this.results.slice(-1);
415-
}
416288
for (let r of resultArray) {
417289
let section = document.createElement("div");
418290
section.setAttribute("class", "ac_sql_result");
@@ -477,34 +349,22 @@ export default class SQLHParons extends RunestoneBase {
477349
this.pretext = "";
478350
this.pretextLines = 0;
479351
this.progLines = prog.match(/\n/g).length + 1;
480-
if (this.includes) {
481-
// iterate over the includes, in-order prepending to prog
482-
pretext = "";
483-
for (var x = 0; x < this.includes.length; x++) {
484-
let iCode = await this.getIncludedCode(this.includes[x]);
485-
pretext = pretext + iCode + "\n";
486-
}
487-
this.pretext = pretext;
488-
if (this.pretext) {
489-
this.pretextLines = (this.pretext.match(/\n/g) || "").length;
490-
}
491-
prog = pretext + prog;
492-
}
493352
if (useSuffix && this.suffix) {
494353
prog = prog + this.suffix;
495354
}
496355
return Promise.resolve(prog);
497356
}
357+
358+
// copied from activecode-sql
498359
async logCurrentAnswer(sid) {
499360
let data = {
500361
div_id: this.divid,
501362
// code: this.editor.getValue(),
502-
language: this.language,
363+
language: "sql",
503364
// errinfo: this.results[this.results.length - 1].status,
504365
to_save: this.saveCode,
505366
prefix: this.pretext,
506367
suffix: this.suffix,
507-
partner: this.partner,
508368
}; // Log the run event
509369
if (typeof sid !== "undefined") {
510370
data.sid = sid;

‎runestone/hparsons/test/_sources/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Horizontal Parsons Test
44

55
.. Testing horizontal Parsons problems.
66
7-
Horizontal Parsons + SQL
7+
Horizontal Parsons + SQL
88
--------------------------------------
99
.. hparsons:: test_activecode_6
1010
:language: sql

0 commit comments

Comments
 (0)