New: question bank search updates

* add selection for language
* display author on search preview

Author: bnmnetp

controllers/admin.py

@@ -1127,8 +1127,15 @@ def questionBank():
     query_clauses = []
 
     # should we search the question by term?
+    term_list = []
     if request.vars.term:
         term_list = [x.strip() for x in request.vars.term.split()]
+
+    # this will not be perfect but is an ok start.
+    if request.vars["language"] != "python" and request.vars["language"] != "any":
+        term_list.append(f':language: {request.vars["language"]}')
+
+    if term_list:
         query_clauses.append(db.questions.question.contains(term_list, all=True))
 
     if request.vars["chapter"]:

static/js/admin.js

@@ -1433,7 +1433,7 @@ function assignmentInfo() {
             $("#nopause").val(assignmentData.nopause);
             $("#nofeedback").val(assignmentData.nofeedback);
             $("#assign_is_peer").val(assignmentData.is_peer);
-            $("#peer_async_visible").val(assignmentData.peer_async_visible);            
+            $("#peer_async_visible").val(assignmentData.peer_async_visible);
             if (assignmentData.visible === true) {
                 $("#assign_visible").prop("checked", true);
             } else {
@@ -1897,6 +1897,11 @@ async function renderRunestoneComponent(componentSrc, whereDiv, moreOpts) {
     if (typeof moreOpts === "undefined") {
         moreOpts = {};
     }
+    var author = null;
+    if ("author" in moreOpts) {
+        author = moreOpts.author;
+        delete moreOpts.author;
+    }
     patt = /..\/_images/g;
     componentSrc = componentSrc.replace(
         patt,
@@ -1911,7 +1916,7 @@ async function renderRunestoneComponent(componentSrc, whereDiv, moreOpts) {
     let componentKind = $($(`#${whereDiv} [data-component]`)[0]).data("component");
     // webwork problems do not have a data-component attribute so we have to try to figure it out.
     //
-    if (! componentKind && 
+    if (! componentKind &&
         (componentSrc.indexOf("handleWW") >= 0) || (componentSrc.indexOf("webwork") >= 0)) {
         componentKind = "webwork";
     }
@@ -1963,6 +1968,11 @@ async function renderRunestoneComponent(componentSrc, whereDiv, moreOpts) {
                 "orig_divid",
                 opt.acid || moreOpts.acid || opt.orig.id
             ); // save the original divid
+            if (author) {
+                let authorInfo = document.createElement("p");
+                authorInfo.innerHTML = `Written by: ${author}`
+                $(`#${whereDiv}`).append(authorInfo);
+            }
             let editButton = document.createElement("button");
             let constrainbc = document.getElementById("qbankform").constrainbc.checked;
             $(editButton).text("Edit Question");
@@ -2038,6 +2048,7 @@ function questionBank(form) {
     var cbc = form.constrainbc.checked;
     var obj = new XMLHttpRequest();
     var url = "/runestone/admin/questionBank";
+    var qlanguage = form.language.value;
     var data = {
         variable: "variable",
         chapter: chapter,
@@ -2049,6 +2060,7 @@ function questionBank(form) {
         term: term,
         competency: competency,
         isprim: isprim,
+        language: qlanguage,
     };
     jQuery.post(url, data, function (resp, textStatus, whatever) {
         if (resp == "Error") {
@@ -2135,6 +2147,7 @@ function getQuestionInfo() {
 
         await renderRunestoneComponent(data.htmlsrc, "component-preview", {
             acid: question_name,
+            author: data.author,
         });
 
         var q_author = document.getElementById("q_author");

views/admin/assignments.html

@@ -1,4 +1,4 @@
-{{extend 'admin/instructors.html'}} 
+{{extend 'admin/instructors.html'}}
 
 {{ block tabcontent }}
 
@@ -63,9 +63,9 @@ <h4 style="text-align: center;">Assignment</h4>
 				</div>
 				<div class="form-group form-check peer-group">
 					<label for="assign_is_peer" class="form-check-label">Peer Instruction Activity</label>
-					<input id="assign_is_peer" class="form-check-input" type="checkbox" name="is_peer" value="T" /> (Do not use with timed exam!) 
+					<input id="assign_is_peer" class="form-check-input" type="checkbox" name="is_peer" value="T" /> (Do not use with timed exam!)
           <label for="peer_async_visible">Show Async </label>
-          <input id="peer_async_visible" class="form-check-input" type="checkbox" name="peer_async_visible" value="F" /> 
+          <input id="peer_async_visible" class="form-check-input" type="checkbox" name="peer_async_visible" value="F" />
           <br />
 				</div>
 				<label for="assignment_description">Description: </label>
@@ -246,6 +246,19 @@ <h5 style="text-align: center">Search Question Bank</h5>
 												</label>
 											</div>
 										</div>
+										<div class="form-group">
+											<labael for="language">Language</labael>
+											<select name="language" id="language">
+												<option value="any">Any</option>
+												<option value="c">C</option>
+												<option value="cpp">C++</option>
+												<option value="html">HTML</option>
+												<option value="java">Java</option>
+												<option value="javascript">Javascript</option>
+												<option value="python">Python</option>
+												<option value="sql">SQL</option>
+											</select>
+										</div>
 										<div class="form-group">
 											<label for="competencyselector">Competency</label>
 											<div id="competencyselector">