Commit d414dc51 by Piotr Mitros

Defaults; saner dnd

parent 94b19d8e
...@@ -18,12 +18,14 @@ class ConceptXBlock(XBlock): ...@@ -18,12 +18,14 @@ class ConceptXBlock(XBlock):
server = String( server = String(
scope = Scope.settings, scope = Scope.settings,
help = "Concept map server URL" help = "Concept map server URL",
default = "http://pmitros.edx.org:7000/"
) )
concept_map = String( concept_map = String(
scope = Scope.user_state_summary, # User scope: Global. Block scope: Usage scope = Scope.user_state_summary, # User scope: Global. Block scope: Usage
help = "Concept map" help = "Concept map",
default = '{"required":[], "exercised":[], "taught":[]}'
) )
@XBlock.json_handler @XBlock.json_handler
...@@ -35,6 +37,7 @@ class ConceptXBlock(XBlock): ...@@ -35,6 +37,7 @@ class ConceptXBlock(XBlock):
def relay_handler(self, request, suffix): def relay_handler(self, request, suffix):
url = self.server+request['suffix'] url = self.server+request['suffix']
r = requests.get(url, params=request) r = requests.get(url, params=request)
print url, r.text[:80]
return json.loads(r.text) return json.loads(r.text)
def resource_string(self, path): def resource_string(self, path):
...@@ -74,7 +77,7 @@ class ConceptXBlock(XBlock): ...@@ -74,7 +77,7 @@ class ConceptXBlock(XBlock):
return [ return [
("ConceptXBlock", ("ConceptXBlock",
"""<vertical_demo> """<vertical_demo>
<Concept server="http://pmitros.edx.org:8000/"> </Concept> <Concept server="http://pmitros.edx.org:7000/"> </Concept>
</vertical_demo> </vertical_demo>
"""), """),
] ]
...@@ -27,20 +27,22 @@ function create_item(slug, full) ...@@ -27,20 +27,22 @@ function create_item(slug, full)
var html = template({title:slug, render:full}); var html = template({title:slug, render:full});
var domitem = $(html); var domitem = $(html);
update_item(domitem, slug, full); update_item(domitem, slug, full);
domitem.draggable({
appendTo: "body",
helper: function(event) {return create_item(slug, full);},
connectToSortable: ".obj_drop",
drop : function(event, ui) { console.log(ui.helper); console.log(ui.draggable); }
});
return domitem; return domitem;
} }
function add_search_item(slug, full) function add_search_item(slug, full)
{ {
$(".search_results").append(create_item(slug, full)); item = create_item(slug, full)
item.draggable({
// appendTo: "body",
helper: function(event) {return create_item(slug, full);},
connectToSortable: ".obj_drop",
// drop : function(event, ui) { console.log(ui.helper); console.log(ui.draggable); }
});
$(".search_results").append(item);
//item.draggable("option", "helper", function(event) {return create_item(slug, full);});
} }
function dump_state() function dump_state()
...@@ -70,7 +72,7 @@ function refresh_search(search_string) ...@@ -70,7 +72,7 @@ function refresh_search(search_string)
var slug = data[i]; var slug = data[i];
url = xblock_runtime.handlerUrl(xblock_element, 'relay_handler') url = xblock_runtime.handlerUrl(xblock_element, 'relay_handler')
$.post(url, JSON.stringify({'suffix':'get_concept/'+slug}), function(render) { $.post(url, JSON.stringify({'suffix':'get_concept/'+slug}), function(render) {
add_search_item(slug, render.article); add_search_item(render.slug, render.article);
}) })
} }
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment