diff --git a/vinosite/sharekernel/templates/sharekernel/visualizeresult.html b/vinosite/sharekernel/templates/sharekernel/visualizeresult.html index fb8973b65eee69497355f399b61c59be96c2c2c2..4e4e6c62b00f8de91aac9c680462b06e696bc94f 100644 --- a/vinosite/sharekernel/templates/sharekernel/visualizeresult.html +++ b/vinosite/sharekernel/templates/sharekernel/visualizeresult.html @@ -269,7 +269,8 @@ function bargridPlot(url, x, container, colormarker, colorline, fillcolor){ text = "Input not valid : " + x; container.innerHTML = text; } else { - url = url.replace("0", x); + url = url.replace("/0/", "/" + x + "/"); +// url = url.replace("NN", x); loadAndPlot(url, function (data) { var items = {x:[], y:[], mode:'markers', type: 'scatter', marker: { size : 2, color: colormarker }, hoverinfo:'none' }; var trace = []; diff --git a/vinosite/sharekernel/views.py b/vinosite/sharekernel/views.py index 62fdcf5caeca66c333657ee9f789b52609bfdc88..e0d77db290eb28990cdaae651712f36565589e84 100644 --- a/vinosite/sharekernel/views.py +++ b/vinosite/sharekernel/views.py @@ -1471,6 +1471,15 @@ def kerneluploadfile(request): if kernel: if not file: file = open(tmpfilename,'r') + passage = "youyou" + else: + passage = "yaya" + #pique a populatedatabase + tmpfiletobesaved = tempfile.NamedTemporaryFile(prefix=slugify("youyou"),suffix=".h5") + filenametobesaved = tmpfiletobesaved.name + tmpfiletobesaved.close() + hdf5manager.writeKernel(kernel, filenametobesaved) + # kernel loaded, we bring the metadata to the user # we take care to not ask metadata about the results before to be sure to be able to read the file # for preventing bad experience if the user take time to complete useless forms @@ -1479,7 +1488,8 @@ def kerneluploadfile(request): "submissiondate": timezone.now(), } fields = { - "datafile": File(file) +#avant "datafile": File(file) + "datafile": File(open(filenametobesaved), name=filenametobesaved), } if metadata.has_key('submitter'): if not User.objects.filter(username=metadata['submitter']).exists(): @@ -1545,6 +1555,7 @@ def kerneluploadfile(request): 'status': 'success', # TODO displays warnings 'warnings': warnings, - 'pk': result.pk + 'pk': result.pk, + 'passage':passage }) return UploadResponse( request, {'error':'No file provided'})