diff --git a/beat/web/common/serializers.py b/beat/web/common/serializers.py
index 60904c6f8a48f60a4269d4ef0fa6c3d2604f674c..e58aca79a5e07b778babd2a00cacd9e2c9853ce2 100644
--- a/beat/web/common/serializers.py
+++ b/beat/web/common/serializers.py
@@ -43,6 +43,7 @@ from .fields import JSONSerializerField, StringListField
import simplejson as json
import difflib
+import ast
#----------------------------------------------------------
@@ -274,6 +275,35 @@ class ContributionSerializer(VersionableSerializer):
#----------------------------------------------------------
+class MapDot(dict):
+ def __init__(self, *args, **kwargs):
+ super(MapDot, self).__init__(*args, **kwargs)
+ for arg in args:
+ if isinstance(arg, dict):
+ for k, v in arg.iteritems():
+ self[k] = v
+
+ if kwargs:
+ for k, v in kwargs.iteritems():
+ self[k] = v
+
+ def __getattr__(self, attr):
+ return self.get(attr)
+
+ def __setattr__(self, key, value):
+ self.__setitem__(key, value)
+
+ def __setitem__(self, key, value):
+ super(MapDot, self).__setitem__(key, value)
+ self.__dict__.update({key: value})
+
+ def __delattr__(self, item):
+ self.__delitem__(item)
+
+ def __delitem__(self, key):
+ super(MapDot, self).__delitem__(key)
+ del self.__dict__[key]
+
class ContributionCreationSerializer(serializers.ModelSerializer):
declaration = JSONSerializerField(required=False)
@@ -298,18 +328,33 @@ class ContributionCreationSerializer(serializers.ModelSerializer):
data['name'] = name
if data.has_key('previous_version'):
- previous_version_id = self.Meta.beat_core_class.Storage(settings.PREFIX,
- data['previous_version'])
- if previous_version_id.username is None:
- previous_version_id.username = user.username
+ if self.Meta.beat_core_class is not None:
+ previous_version_id = self.Meta.beat_core_class.Storage(settings.PREFIX,
+ data['previous_version'])
+ if previous_version_id.username is None:
+ previous_version_id.username = user.username
+ else:
+ previous_version_id = MapDot()
+ previous_version_id["username"] = user.username
+ previous_version_id["name"] = name
+ previous_version_id["version"] = data['previous_version']
+ data['data'] = json.dumps(ast.literal_eval(json.loads(json.dumps(data['data']))))
else:
previous_version_id = None
if data.has_key('fork_of'):
- fork_of_id = self.Meta.beat_core_class.Storage(settings.PREFIX,
- data['fork_of'])
- if fork_of_id.username is None:
- fork_of_id.username = user.username
+ if self.Meta.beat_core_class is not None:
+ fork_of_id = self.Meta.beat_core_class.Storage(settings.PREFIX,
+ data['fork_of'])
+ if fork_of_id.username is None:
+ fork_of_id.username = user.username
+ else:
+ fork_of_id = MapDot()
+ fork_elem = json.loads(json.dumps(ast.literal_eval(json.loads(json.dumps(data['fork_of'])))))
+ fork_of_id["username"] = fork_elem['username']
+ fork_of_id["name"] = fork_elem['name']
+ fork_of_id["version"] = fork_elem['version']
+ data['data'] = json.dumps(ast.literal_eval(json.loads(json.dumps(data['data']))))
else:
fork_of_id = None
diff --git a/beat/web/experiments/static/experiments/js/utils.js b/beat/web/experiments/static/experiments/js/utils.js
index ac71620ef6ed60efe53c7fc3247ae1e0d003caf1..5f9bef84624325b9248078af735476487f187df0 100644
--- a/beat/web/experiments/static/experiments/js/utils.js
+++ b/beat/web/experiments/static/experiments/js/utils.js
@@ -71,6 +71,19 @@ beat.experiments.utils.displayPlot = function(prefix, container, value, availabl
{
var data = JSON.parse(JSON.stringify(value));
+ //sample data plot or real plot required?
+ var default_post_prefix = '/plotters/plot/';
+ var sampledata_post_prefix = '/plotters/plot_sample/';
+ var sampledatawithparams_post_prefix = '/plotters/plot_sample_with_params/';
+ var post_prefix = default_post_prefix;
+ if('sample_data' in data)
+ {
+ post_prefix = sampledata_post_prefix;
+
+ if('dynamic_params' in data)
+ post_prefix = sampledatawithparams_post_prefix;
+ }
+
data.content_type = 'image/png';
data.base64 = true;
@@ -83,7 +96,7 @@ beat.experiments.utils.displayPlot = function(prefix, container, value, availabl
$.ajax({
type: "POST",
- url: prefix + '/plotters/plot/',
+ url: prefix + post_prefix,
data: data,
success: function(data) {
diff --git a/beat/web/plotters/admin.py b/beat/web/plotters/admin.py
index 99ef9f8738e4486d68f006172b4b7456aa9ff491..8ec74eab6f08cbc7d0055ebbb303e6e9fb1c87f0 100644
--- a/beat/web/plotters/admin.py
+++ b/beat/web/plotters/admin.py
@@ -90,6 +90,11 @@ class PlotterModelForm(forms.ModelForm):
required=False,
)
+ sample_data = CodeMirrorJSONCharField(
+ readonly=True,
+ required=False,
+ )
+
class Meta:
model = Plotter
exclude = []
@@ -153,7 +158,8 @@ class PlotterAdmin(admin.ModelAdmin):
list_display_links = ('id', 'name')
list_filter = ('author',)
- readonly_fields = ('hash', 'short_description', 'dataformat', 'referenced_libraries')
+ readonly_fields = ('hash', 'short_description', 'dataformat',
+ 'referenced_libraries')
actions = [
rehash_plotter,
@@ -194,7 +200,8 @@ class PlotterAdmin(admin.ModelAdmin):
('Cached Information (read-only)',
dict(
classes=('collapse',),
- fields=('dataformat', 'parameters', 'referenced_libraries'),
+ fields=('dataformat', 'parameters', 'referenced_libraries',
+ 'sample_data'),
),
),
('Definition',
@@ -243,11 +250,17 @@ class PlotterParameterAdmin(admin.ModelAdmin):
'creation_date',
'sharing',
'short_description',
+ 'previous_version',
+ 'fork_of',
)
search_fields = ['author__username',
'name',
'short_description',
'plotter__name',
+ 'previous_version__author__username',
+ 'previous_version__name',
+ 'fork_of__author__username',
+ 'fork_of__name',
]
list_display_links = ('id', 'name')
list_filter = ('sharing', )
diff --git a/beat/web/plotters/api.py b/beat/web/plotters/api.py
index a0960a9a4b234cd34989fe596b26ae612a7b19d2..6f15acb94b1a420974bb9fb6c9b25ad4600e5a03 100644
--- a/beat/web/plotters/api.py
+++ b/beat/web/plotters/api.py
@@ -51,6 +51,8 @@ from django.shortcuts import get_object_or_404
from django.utils import six
from django.core.exceptions import ValidationError
+import json
+
class ListPlotterView(ListContributionView):
"""
List all available plotters
@@ -89,7 +91,21 @@ class ListPlotterParameterView(ListContributionView):
dataformat__name = name,
dataformat__version = version)
else:
- return self.model.objects.all()
+ #return self.model.objects.all()
+ #from author and public and get latest version only
+ objects = self.model.objects.from_author_and_public(self.request.user, self.request.user.username).order_by('-version')
+ filtered_list = []
+ filtered_list_id = []
+ for the_item in objects:
+ check = False
+ for filtered_item in filtered_list:
+ if the_item.author == filtered_item.author and the_item.name == filtered_item.name:
+ check = True
+ if check == False:
+ filtered_list.append(the_item)
+ filtered_list_id.append(the_item.id)
+ objects = self.model.objects.from_author_and_public(self.request.user, self.request.user.username).order_by('-version').filter(id__in=filtered_list_id)
+ return objects
class ListDefaultPlotterView(generics.ListAPIView):
"""
@@ -123,12 +139,12 @@ class CheckPlotterNameView(CheckContributionNameView):
#----------------------------------------------------------
-class SharePlotterView(ShareCodeView):
+class SharePlotterParameterView(ShareCodeView):
"""
- This view allows to share a plotter with
+ This view allows to share a plotterparameter with
other users and/or teams
"""
- model = Plotter
+ model = PlotterParameter
#----------------------------------------------------------
@@ -251,7 +267,6 @@ class RetrieveUpdateDestroyPlotterParametersView(RetrieveUpdateDestroyContributi
model = PlotterParameter
serializer_class = FullPlotterParameterSerializer
-
def put(self, request, author_name, object_name, version=None):
if version is None:
return BadRequestResponse('A version number must be provided')
@@ -301,6 +316,9 @@ class RetrieveUpdateDestroyPlotterParametersView(RetrieveUpdateDestroyContributi
if (short_description is not None) and (len(short_description) > self.model._meta.get_field('short_description').max_length):
raise serializers.ValidationError({'short_description': 'Short description too long'})
+ customdata = None
+ if data.has_key('customdata'):
+ customdata = json.dumps(data['customdata'])
# Process the query string
if request.GET.has_key('fields'):
@@ -337,6 +355,10 @@ class RetrieveUpdateDestroyPlotterParametersView(RetrieveUpdateDestroyContributi
if plotter is not None:
dbplotterparameter.plotter = plotter
+ # Modification of the parameters
+ if customdata is not None:
+ dbplotterparameter.data = customdata
+
# Save the plotterparameter model
try:
dbplotterparameter.save()
diff --git a/beat/web/plotters/api_urls.py b/beat/web/plotters/api_urls.py
index 34f18e85ab0e1991a072179d4b71434f952d909f..4f954893948159b685b3270b1d3b813b294cc9a1 100644
--- a/beat/web/plotters/api_urls.py
+++ b/beat/web/plotters/api_urls.py
@@ -32,31 +32,23 @@ from . import api
urlpatterns = [
url(r'^$', api.ListPlotterView.as_view(), name='all'),
url(r'^format/(?P<author_name>\w+)/(?P<dataformat_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/$', api.ListFormatPlotterView.as_view(), name='object'),
- url(r'^plotterparameter/$', api.ListPlotterParameterView.as_view(), name='all_plotterparameter'),
+
+ url(r'^plotterparameters/(?P<author_name>\w+)/(?P<object_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/share/$',
+ api.SharePlotterParameterView.as_view(),
+ name='share',
+ ),
+
url(r'^plotterparameters/(?P<author_name>\w+)/(?P<object_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/$', api.RetrieveUpdateDestroyPlotterParametersView.as_view(), name='view'),
url(r'^plotterparameters/(?P<author_name>\w+)/$', api.ListPlotterParametersView.as_view(), name='view'),
+ url(r'^plotterparameters/$', api.ListPlotterParameterView.as_view(), name='all_plotterparameter'),
url(r'^plotterparameter/(?P<author_name>\w+)/(?P<dataformat_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/$', api.ListPlotterParameterView.as_view(), name='plotterparameter'),
url(r'^defaultplotters/$', api.ListDefaultPlotterView.as_view(), name='all_defaultplotters'),
- #url(r'^$',
- # api.ListPlottersView.as_view(),
- # name='all_plotters',
- # ),
-
url(r'^check_name/$',
api.CheckPlotterNameView.as_view(),
name='check_name',
),
- #url(r'^diff/(?P<author1>\w+)/(?P<name1>[-\w]+)/(?P<version1>\d+)/(?P<author2>\w+)/(?P<name2>[-\w]+)/(?P<version2>\d+)/$',
- # api.DiffPlotterView.as_view(),
- # name='diff',
- # ),
-
- url(r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/share/$',
- api.SharePlotterView.as_view(),
- name='share',
- ),
url(r'^(?P<author_name>\w+)/$',
api.ListCreatePlottersView.as_view(),
@@ -67,10 +59,4 @@ urlpatterns = [
api.RetrieveUpdateDestroyPlottersView.as_view(),
name='object',
),
-
- #url(r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/$',
- # api.RetrieveUpdateDestroyPlottersView.as_view(),
- # name='object',
- # ),
-
]
diff --git a/beat/web/plotters/apps.py b/beat/web/plotters/apps.py
index a4f7a101dfcdd331438dbec9ddb559172c3f4e22..337c13161194efcd829bddaf99c1286a4be60279 100644
--- a/beat/web/plotters/apps.py
+++ b/beat/web/plotters/apps.py
@@ -36,3 +36,4 @@ class PlottersConfig(CommonAppConfig):
super(PlottersConfig, self).ready()
from actstream import registry
registry.register(self.get_model('Plotter'))
+ registry.register(self.get_model('PlotterParameter'))
diff --git a/beat/web/plotters/migrations/0002_plotter_sample_data.py b/beat/web/plotters/migrations/0002_plotter_sample_data.py
new file mode 100644
index 0000000000000000000000000000000000000000..8b82f7c4dd9ea5ef03d72ff03528a582f8b87e84
--- /dev/null
+++ b/beat/web/plotters/migrations/0002_plotter_sample_data.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+import json
+
+plot_bar_data = { "data": [ { "y": [ 4.0, 7.0, 25.0, 24.0, 30.0, 82.0, 83.0, 100.0, 116.0, 119.0, 173.0, 193.0, 179.0, 195.0, 142.0, 169.0, 131.0, 70.0, 42.0, 16.0 ], "x": [ -5673.502545751196, -5417.040747386832, -5160.578949022467, -4904.117150658103, -4647.655352293739, -4391.193553929375, -4134.731755565012, -3878.269957200647, -3621.808158836283, -3365.346360471919, -3108.8845621075548, -2852.4227637431904, -2595.9609653788266, -2339.4991670144627, -2083.0373686500984, -1826.575570285734, -1570.1137719213702, -1313.6519735570064, -1057.1901751926425, -800.7283768282778 ], "label": "negative scores" }, { "y": [ 1.0, 3.0, 2.0, 0.0, 0.0, 1.0, 1.0, 3.0, 3.0, 2.0, 2.0, 7.0, 13.0, 7.0, 11.0, 13.0, 11.0, 11.0, 6.0, 3.0 ], "x": [ -1675.9012965728323, -1597.174480302131, -1518.44766403143, -1439.7208477607287, -1360.9940314900277, -1282.2672152193263, -1203.5403989486254, -1124.8135826779242, -1046.086766407223, -967.3599501365218, -888.6331338658206, -809.9063175951195, -731.1795013244183, -652.4526850537171, -573.725868783016, -494.99905251231485, -416.27223624161365, -337.54541997091246, -258.81860370021127, -180.09178742951008 ], "label": "positive scores" } ] }
+
+plot_isoroc_data = { "data": [ { "number_of_negatives": 1900, "false_positives": [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.01, 0.03, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.07, 0.08, 0.11, 0.12, 0.14, 0.16, 0.18, 0.21, 0.27, 0.36, 0.41, 0.46, 0.56, 0.67, 0.74, 0.82, 0.91, 0.94, 0.99, 1.0 ], "number_of_positives": 100, "false_negatives": [ 1.0, 0.9994736842105263, 0.9994736842105263, 0.9989473684210526, 0.998421052631579, 0.9973684210526316, 0.9968421052631579, 0.9957894736842106, 0.9952631578947368, 0.9942105263157894, 0.9921052631578947, 0.99, 0.988421052631579, 0.9831578947368421, 0.9805263157894737, 0.978421052631579, 0.9747368421052631, 0.9726315789473684, 0.97, 0.9631578947368421, 0.9594736842105264, 0.958421052631579, 0.9552631578947368, 0.9510526315789474, 0.9431578947368421, 0.9342105263157895, 0.9210526315789473, 0.911578947368421, 0.9042105263157895, 0.8968421052631579, 0.8878947368421053, 0.8773684210526316, 0.8631578947368421, 0.8515789473684211, 0.8410526315789474, 0.8310526315789474, 0.8194736842105264, 0.8042105263157895, 0.7936842105263158, 0.7789473684210526, 0.7626315789473684, 0.7521052631578947, 0.738421052631579, 0.7221052631578947, 0.7094736842105264, 0.6952631578947368, 0.6805263157894736, 0.6631578947368421, 0.6452631578947369, 0.6242105263157894, 0.6, 0.5821052631578948, 0.5573684210526316, 0.5336842105263158, 0.5131578947368421, 0.49105263157894735, 0.4668421052631579, 0.4457894736842105, 0.42526315789473684, 0.4047368421052632, 0.38473684210526315, 0.35947368421052633, 0.3352631578947368, 0.31526315789473686, 0.2968421052631579, 0.27789473684210525, 0.2615789473684211, 0.24894736842105264, 0.23105263157894737, 0.20894736842105263, 0.18894736842105264, 0.17210526315789473, 0.1531578947368421, 0.13473684210526315, 0.12052631578947369, 0.10473684210526316, 0.08842105263157894, 0.07263157894736842, 0.061052631578947365, 0.05263157894736842, 0.045789473684210526, 0.038421052631578946, 0.030526315789473683, 0.027894736842105264, 0.017894736842105262, 0.013157894736842105, 0.009473684210526316, 0.007368421052631579, 0.005263157894736842, 0.003157894736842105, 0.002105263157894737, 0.0005263157894736842, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ], "label": "roc" } ] }
+
+plot_scatter_data = { "data": [ { "y": [ 1.0, 0.9994736842105263, 0.9989473684210526, 0.9989473684210526, 0.9989473684210526, 0.998421052631579, 0.9973684210526316, 0.9963157894736843, 0.9942105263157894, 0.9910526315789474, 0.9894736842105263, 0.988421052631579, 0.9863157894736843, 0.9831578947368421, 0.9810526315789474, 0.9752631578947368, 0.9721052631578947, 0.9652631578947368, 0.9589473684210527, 0.9536842105263158, 0.9494736842105264, 0.9421052631578948, 0.9342105263157895, 0.9205263157894736, 0.91, 0.8957894736842106, 0.8789473684210526, 0.8673684210526316, 0.8510526315789474, 0.8321052631578948, 0.8089473684210526, 0.7942105263157895, 0.7789473684210526, 0.7578947368421053, 0.738421052631579, 0.7231578947368421, 0.7063157894736842, 0.6884210526315789, 0.6610526315789473, 0.64, 0.6163157894736843, 0.5936842105263158, 0.5652631578947368, 0.5405263157894736, 0.5073684210526316, 0.47947368421052633, 0.45789473684210524, 0.4263157894736842, 0.39, 0.3563157894736842, 0.32421052631578945, 0.29947368421052634, 0.2731578947368421, 0.2463157894736842, 0.22157894736842104, 0.2005263157894737, 0.17842105263157895, 0.15736842105263157, 0.13526315789473684, 0.1163157894736842, 0.10157894736842105, 0.08526315789473685, 0.0731578947368421, 0.06368421052631579, 0.05421052631578947, 0.04368421052631579, 0.03631578947368421, 0.028421052631578948, 0.022105263157894735, 0.016842105263157894, 0.012105263157894737, 0.011052631578947368, 0.009473684210526316, 0.00631578947368421, 0.003157894736842105, 0.002631578947368421, 0.002105263157894737, 0.0005263157894736842, 0.0005263157894736842, 0.0005263157894736842, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ], "x": [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.01, 0.02, 0.03, 0.04, 0.04, 0.04, 0.05, 0.06, 0.07, 0.07, 0.08, 0.09, 0.09, 0.1, 0.11, 0.11, 0.12, 0.12, 0.12, 0.13, 0.13, 0.15, 0.18, 0.19, 0.21, 0.24, 0.27, 0.28, 0.33, 0.34, 0.38, 0.44, 0.47, 0.52, 0.61, 0.64, 0.68, 0.7, 0.74, 0.8, 0.88, 0.91, 0.94, 0.96, 0.97, 0.98, 0.99, 0.99, 1.0 ], "label": "roc" } ] }
+
+def add_plotter_sample_data(apps, schema_editor):
+ Plotter = apps.get_model("plotters", "Plotter")
+
+ for plotter in Plotter.objects.iterator():
+
+ if plotter.name == 'bar':
+ plotter.sample_data = json.dumps(plot_bar_data)
+
+ elif plotter.name == 'isoroc':
+ plotter.sample_data = json.dumps(plot_isoroc_data)
+
+ elif plotter.name == 'scatter':
+ plotter.sample_data = json.dumps(plot_scatter_data)
+
+ plotter.save()
+
+
+
+def backward_dummy(apps, schema_editor):
+ pass
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('plotters', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='plotter',
+ name='sample_data',
+ field=models.TextField(default=b'{}', blank=True),
+ ),
+ migrations.RunPython(add_plotter_sample_data,
+ backward_dummy)
+ ]
diff --git a/beat/web/plotters/migrations/0004_merge.py b/beat/web/plotters/migrations/0004_merge.py
new file mode 100644
index 0000000000000000000000000000000000000000..d43a69cb1715497d372de56ccd9c790aaece6d79
--- /dev/null
+++ b/beat/web/plotters/migrations/0004_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2017-02-07 15:49
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('plotters', '0003_auto_20161123_1218'),
+ ('plotters', '0002_plotter_sample_data'),
+ ]
+
+ operations = [
+ ]
diff --git a/beat/web/plotters/models.py b/beat/web/plotters/models.py
index e8189d042769a60086fe0d3755569675b814deda..2e5a9f8a9f92c7d8353b129e8c235f23675a3f3b 100755
--- a/beat/web/plotters/models.py
+++ b/beat/web/plotters/models.py
@@ -50,6 +50,7 @@ from ..common.models import get_contribution_description_filename
from ..code.models import Code
from ..code.models import CodeManager
from ..code.models import get_contribution_source_code_filename
+from ..common.models import Shareable
import simplejson
import collections
@@ -167,6 +168,7 @@ class Plotter(Code):
db_column='source_code'
)
+ sample_data = models.TextField(default='{}', blank=True)
# Read-only parameters that are updated at every save(), if required
referenced_libraries = models.ManyToManyField(Library, blank=True,
related_name='used_by_plotters',
@@ -274,6 +276,44 @@ class PlotterParameter(Contribution):
description = models.TextField(default='', blank=True, null=True, help_text=Messages['description'])
plotter = models.ForeignKey(Plotter, related_name='plotting_parameters', null=True)
+ #_____ Methods __________
+
+ def modifiable(self):
+ """Can be modified if nobody points at me"""
+ return super(PlotterParameter, self).modifiable() and (self.defaults.count() == 0)
+
+ def deletable(self):
+ """Can be deleted if nobody points at me"""
+ return super(PlotterParameter, self).deletable() and (self.defaults.count() == 0) and (self.sharing == Shareable.PRIVATE) and (len(self.reports.all()) == 0)
+
+ #_____ Utilities __________
+
+ def get_absolute_url(self):
+
+ return reverse(
+ 'plotters:plotterparameter-author-view',
+ args=(self.author.username, self.name, self.version,),
+ )
+
+
+ def get_api_update_url(self):
+ '''Returns the endpoint to update this object'''
+
+ return reverse(
+ 'api_plotters:view',
+ args=(self.author.username, self.name, self.version,),
+ )
+
+
+ def get_api_share_url(self):
+ '''Returns the endpoint to share this object'''
+
+ return reverse(
+ 'api_plotters:share',
+ args=(self.author.username, self.name, self.version,),
+ )
+
+
class DefaultPlotter(models.Model):
'''Describes the default dataformat -> plotter relationships to use'''
diff --git a/beat/web/plotters/serializers.py b/beat/web/plotters/serializers.py
index 11459820b9e56bf3cbd98dcb764334b0b1951574..13df01f3c71b75d1a4f3f87fdd6e4e382a14f698 100644
--- a/beat/web/plotters/serializers.py
+++ b/beat/web/plotters/serializers.py
@@ -33,6 +33,7 @@ from ..code.serializers import CodeSerializer, CodeCreationSerializer
from ..libraries.serializers import LibraryReferenceSerializer
from ..dataformats.serializers import ReferencedDataFormatSerializer
+from django.utils.encoding import smart_unicode, smart_str
import beat.core.plotter
import simplejson as json
@@ -44,7 +45,8 @@ class PlotterSerializer(ContributionSerializer):
class Meta(ContributionSerializer.Meta):
model = Plotter
default_fields = [
- 'name', 'dataformat',
+ #'name', 'dataformat',
+ 'id', 'accessibility', 'modifiable', 'deletable', 'is_owner', 'name', 'dataformat', 'fork_of', 'last_version', 'previous_version', 'short_description', 'description', 'version', 'creation_date', 'data', 'sample_data', 'declaration',
]
class PlotterParameterSerializer(ContributionSerializer):
@@ -53,7 +55,7 @@ class PlotterParameterSerializer(ContributionSerializer):
model = PlotterParameter
exclude = []
default_fields = [
- 'name',
+ 'name', 'plotter',
]
class DefaultPlotterSerializer(DynamicFieldsSerializer):
@@ -107,30 +109,62 @@ class PlotterParameterCreationFailedException(Exception):
pass
class PlotterParameterCreationSerializer(ContributionCreationSerializer):
+
class Meta(ContributionCreationSerializer.Meta):
model = PlotterParameter
+ fields = ['name', 'plotter', 'data', 'version', 'previous_version', 'short_description', 'description', 'fork_of']
#beat_core_class = beat.core.PlotterParameter
+
def create(self, validated_data):
plotterparameter = None
-
+
if not validated_data.has_key("name"):
raise serializers.ValidationError('No name provided')
try:
- plotterparameter = PlotterParameter.objects.get(author=self.context['request'].user, name=validated_data['name'])
+ plotterparameter = PlotterParameter.objects.get(author=self.context['request'].user, name=validated_data['name'], version=validated_data['version'])
except:
pass
if plotterparameter is not None:
raise serializers.ValidationError('A plotterparameter with this name already exists')
- validated_data['data'] = {}
+ if not self.data.has_key("plotter"):
+ raise serializers.ValidationError('No plotter provided')
+
+ plotter = None
+ try:
+ plotter = Plotter.objects.get(id=self.data['plotter'])
+ except:
+ pass
+
+ if plotter is None:
+ raise serializers.ValidationError('Required plotter does not exist')
+
+ if not validated_data.has_key("data"):
+ validated_data['data'] = {}
+
+ #Only create new version for latest version
+ if validated_data.has_key("previous_version"):
+ if validated_data['previous_version'].version < validated_data['version'] - 1:
+ raise serializers.ValidationError('A new version for this plotterparameter version already exist')
+
+ #add description/short_description to new version
+ validated_data['short_description'] = validated_data['previous_version'].short_description
+ validated_data['description'] = validated_data['previous_version'].description
+
+ #Create fork
+ if validated_data.has_key("fork_of"):
+ #add description/short_description to new version
+ validated_data['short_description'] = validated_data['fork_of'].short_description
+ validated_data['description'] = validated_data['fork_of'].description
+
+
plotterparameter = PlotterParameter.objects.create(**validated_data)
if plotterparameter is None:
raise PlotterParameterCreationFailedException()
return plotterparameter
-
#----------------------------------------------------------
@@ -160,14 +194,20 @@ class PlotterParameterAllSerializer(ContributionSerializer):
#----------------------------------------------------------
-
class FullPlotterParameterSerializer(PlotterParameterAllSerializer):
+ plotters = serializers.SerializerMethodField()
class Meta(PlotterParameterAllSerializer.Meta):
#exclude = ['declaration']
exclude = []
#default_fields = PlotterParameterAllSerializer.Meta.default_fields + PlotterParameterAllSerializer.Meta.extra_fields
- default_fields = ['id', 'accessibility', 'modifiable', 'deletable', 'is_owner', 'name', 'fork_of', 'last_version', 'previous_version', 'short_description', 'description', 'version', 'creation_date', 'data', 'plotter']
+ default_fields = ['id', 'accessibility', 'modifiable', 'deletable', 'is_owner', 'name', 'fork_of', 'last_version', 'previous_version', 'short_description', 'description', 'version', 'creation_date', 'data', 'plotter', 'plotters']
+
+ def get_description(self, obj):
+ return smart_unicode(obj.description, encoding='utf-8', strings_only=False, errors='strict')
+
+ def get_short_description(self, obj):
+ return smart_unicode(obj.short_description, encoding='utf-8', strings_only=False, errors='strict')
def get_data(self, obj):
return json.loads(obj.data)
@@ -178,6 +218,17 @@ class FullPlotterParameterSerializer(PlotterParameterAllSerializer):
else:
return "undefined plotter"
+ def get_plotters(self, obj):
+ all_plotters = Plotter.objects.all()
+ serializer = FullPlotterSerializer
+ results = {}
+ for plotter in all_plotters.iterator():
+ serializer = FullPlotterSerializer(plotter, fields=['id', 'accessibility', 'modifiable', 'deletable', 'is_owner', 'name', 'fork_of', 'last_version', 'previous_version', 'short_description', 'description', 'version', 'creation_date', 'data', 'sample_data', 'declaration'])
+ results[plotter.fullname()] = serializer.data
+
+ return results
+
+
#def get_plotter(self, obj):
# return obj.author.username
diff --git a/beat/web/plotters/static/plotters/app/app.config.js b/beat/web/plotters/static/plotters/app/app.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..d3915a49737bb76e62bda9798fdc56b61e249557
--- /dev/null
+++ b/beat/web/plotters/static/plotters/app/app.config.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+*/
+var app = angular.module('plotterparameterApp');
+
+app.config(function configureStartEndSymbol($interpolateProvider) {
+ $interpolateProvider.startSymbol('{$').endSymbol('$}');
+ }
+);
+
+app.config(function configHttp($httpProvider) {
+ $httpProvider.defaults.xsrfCookieName = 'csrftoken';
+ $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
+ $httpProvider.defaults.withCredentials = true;
+ }
+);
diff --git a/beat/web/plotters/static/plotters/app/app.js b/beat/web/plotters/static/plotters/app/app.js
new file mode 100644
index 0000000000000000000000000000000000000000..58a518fb940735e52ab3b423dc682ec7c19661c0
--- /dev/null
+++ b/beat/web/plotters/static/plotters/app/app.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+*/
+var app = angular.module('plotterparameterApp', ['ui.router', 'angular.filter']);
+
+
+app.config(function ($stateProvider, $urlRouterProvider){
+
+ $urlRouterProvider
+ .otherwise('/');
+
+ $stateProvider
+ .state('plotterparameter', {
+ url: '/',
+ views: {
+ }
+ })
+});
diff --git a/beat/web/plotters/static/plotters/app/controllers/plotterparameterController.js b/beat/web/plotters/static/plotters/app/controllers/plotterparameterController.js
new file mode 100644
index 0000000000000000000000000000000000000000..462a73a7f61bfecb0586829ecfe9de16ca455fba
--- /dev/null
+++ b/beat/web/plotters/static/plotters/app/controllers/plotterparameterController.js
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+*/
+//This controller retrieves data from the reportFactory/experimentFactory through the REST API and associates it with the $scope
+//The $scope is ultimately bound to the report view
+//app.controller('plotterparameterController',['$scope', 'reportFactory', 'experimentFactory', 'plotterFactory', 'dataFactory', '$q', function ($scope, reportFactory, experimentFactory, plotterFactory, dataFactory, $q)
+app.controller('plotterparameterController',['$scope', 'plotterFactory', 'plotterparameterFactory', '$q', function ($scope, plotterFactory, plotterparameterFactory, $q)
+{
+ $scope.q = $q;
+ $scope.user;
+ $scope.plotterparameter_id;
+ $scope.url_prefix;
+ $scope.plotterFactory = plotterFactory;
+ $scope.plotterparameterFactory = plotterparameterFactory;
+ $scope.plotters = {};
+ $scope.plotters.selected = undefined;
+ $scope.plotterparameterData = {};
+ $scope.textdata = [];
+ $scope.plotterparams_update = {};
+ $scope.plotterparams_newversion = {};
+ $scope.plotterparams_fork = {};
+ $scope.plotterparameter_forking = undefined;
+
+ $scope.init = function(user, plotterparameter, url_prefix, data_itemcontent_file, data_table_itemcontent_file)
+ {
+ $scope.user = user;
+ $scope.plotterparameter = plotterparameter;
+ $scope.plotterparameter_user = plotterparameter.split("/")[0];
+ $scope.plotterparameter_name = plotterparameter.split("/")[1];
+ $scope.plotterparameter_version = plotterparameter.split("/")[2];
+ $scope.url_prefix = url_prefix;
+
+ if($scope.plotterparameter == 'CREATION_MODE')
+ {
+ getPlottersData($scope.user);
+ }
+ else
+ {
+ getPlotterParameterData($scope.user, $scope.plotterparameter_user, $scope.plotterparameter_name, $scope.plotterparameter_version);
+ }
+ }
+
+ function getPlottersData(user)
+ {
+ plotterFactory.getPlottersInformation(user, $scope.url_prefix)
+ .success(function (plottersData)
+ {
+ $scope.plotters = plottersData;
+ for(var init_selected_plotter in plottersData)
+ {
+ $scope.plotters.selected = init_selected_plotter.name;
+ }
+ })
+ .error(function (error)
+ {
+ $scope.status = 'Unable to load report data: ' + error.message;
+ });
+
+ $('#tabs_progress').hide();
+ }
+
+ function getPlotterParameterData(user, plotterparameter_user, plotterparameter_name, plotterparameter_version)
+ {
+ plotterparameterFactory.getPlotterParameterInformation(user, plotterparameter_user, plotterparameter_name, plotterparameter_version, $scope.url_prefix)
+ .success(function (plotterparameterData)
+ {
+ $scope.plotters = plotterparameterData.plotters;
+ for(var init_selected_plotter in plotterparameterData.plotters)
+ {
+ $scope.plotters.selected = init_selected_plotter;
+ }
+ $scope.plotterparameterData = plotterparameterData;
+
+ if(plotterparameterData.plotter != "undefined plotter")
+ {
+ //Find selected plotter
+ $.each(plotterparameterData.plotters, function( key, value ) {
+
+ if(key == plotterparameterData.plotter)
+ {
+ $scope.plotters.selected = value;
+ //break
+ return false;
+ }
+ });
+
+ $.each($scope.plotters.selected.declaration.parameters, function( key, value ) {
+ //push all keys in array
+ $scope.textdata.push(key);
+
+ //check if already saved key/values for this plotterparameter and add
+ $.each($scope.plotterparameterData.data, function(keysaved, valuesaved){
+ if(key == keysaved)
+ {
+ $scope.plotterparams_update[keysaved] = valuesaved;
+ return false;
+ }
+
+ });
+ });
+ //$scope.textdata = $scope.plotters.selected.declaration.parameters;
+
+ addParametersToEditor();
+ }
+ })
+ .error(function (error)
+ {
+ $scope.status = 'Unable to load report data: ' + error.message;
+ });
+
+ $('#tabs_progress').hide();
+ }
+
+ function addParametersToEditor()
+ {
+ $scope.$broadcast("addParametersElement");
+ }
+}]);
diff --git a/beat/web/plotters/static/plotters/app/directives/plotterparameterItemView.js b/beat/web/plotters/static/plotters/app/directives/plotterparameterItemView.js
new file mode 100644
index 0000000000000000000000000000000000000000..bd2039bf4d879dcd309ad3d6b3af4a54ccafb201
--- /dev/null
+++ b/beat/web/plotters/static/plotters/app/directives/plotterparameterItemView.js
@@ -0,0 +1,697 @@
+/*
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+*/
+//Directive that returns an element which adds buttons on click which adds items
+var app = angular.module('plotterparameterApp');
+
+//Directive used to plot a graph
+app.directive("plotinfo", function(){
+
+ return {
+ restrict: 'E',
+ scope: true,
+ replace: true,
+ Â Â Â Â //templateUrl: "/reports/partials/reportTable/",
+ Â Â Â Â templateUrl: function(scope, elem, attrs)
+ {
+ var prefix = elem['urlprefix'];
+ Â Â Â Â var the_url = prefix + "/plotters/partials/plotinfo/";
+ return the_url;
+ },
+ link: function(scope, elem, attrs)
+ {
+ var data_to_plot = scope.plotters.selected.sample_data;
+ $('td#td_' + scope.plotterparameter.name).ready(function(){
+ if(scope.plotterparameter != "CREATION_MODE")
+ {
+ beat.experiments.utils.displayPlot(
+ scope.url_prefix,
+ $('td#td_figure_plot')[0],
+ {
+ output: scope.plotterparameter,
+ plotter: scope.plotters.selected.name,
+ parameter: scope.plotterparameter,
+ merged: true,
+ sample_data: scope.plotters.selected.sample_data,
+ },
+ [scope.plotters.selected], // available plotters
+ true, // replace contents of tag above?
+ function(){$(this).find('i.fa-spin').hide();});
+ }
+ else
+ {
+ beat.experiments.utils.displayPlot(
+ scope.url_prefix,
+ $('td#td_figure_plot')[0],
+ {
+ output: scope.plotterparameter,
+ plotter: scope.plotters.selected.name,
+ merged: true,
+ sample_data: scope.plotters.selected.sample_data,
+ },
+ [scope.plotters.selected], // available plotters
+ true, // replace contents of tag above?
+ function(){$(this).find('i.fa-spin').hide();});
+ }
+ });
+
+ },
+ controller: ['$scope', function ($scope) {
+ }],
+ };
+});
+
+//Directive used to plot a graph with dynamic params
+app.directive("plotinfodynamicparams", function(){
+
+ return {
+ restrict: 'E',
+ scope: true,
+ replace: true,
+ Â Â Â Â //templateUrl: "/reports/partials/reportTable/",
+ Â Â Â Â templateUrl: function(scope, elem, attrs)
+ {
+ var prefix = elem['urlprefix'];
+ Â Â Â Â var the_url = prefix + "/plotters/partials/plotinfo/";
+ return the_url;
+ },
+ link: function(scope, elem, attrs)
+ {
+ var data_to_plot = scope.plotters.selected.sample_data;
+ $('td#td_' + scope.plotterparameter.name).ready(function(){
+ beat.experiments.utils.displayPlot(
+ scope.url_prefix,
+ $('td#td_figure_plot')[0],
+ {
+ output: scope.plotterparameter,
+ plotter: scope.plotters.selected.name,
+ parameter: scope.plotterparameter,
+ merged: true,
+ sample_data: scope.plotters.selected.sample_data,
+ dynamic_params: JSON.stringify(scope.plotterparams_update),
+ },
+ [scope.plotters.selected], // available plotters
+ true, // replace contents of tag above?
+ function(){$(this).find('i.fa-spin').hide();});
+ });
+
+ },
+ controller: ['$scope', function ($scope) {
+ }],
+ };
+});
+
+//Directive used to generate the selector for plotting graph
+app.directive("selectplotter", function($compile)
+{
+ return {
+ link:function(scope, element, attrs)
+ {
+ element.bind("change", function()
+ {
+ var plotter_graph_element = document.getElementById('space-for-plotterparameter-graph');
+ generate_graph(plotter_graph_element);
+
+ });
+
+ function generate_graph(head_id)
+ {
+ var html_div_code = "<plotinfo urlprefix=" + scope.url_prefix +"></plotinfo>"
+ $(head_id ).empty();
+ angular.element(head_id).append($compile(html_div_code)(scope));
+ }
+
+ }
+ };
+});
+
+//Directive used to generate the selected plotting graph
+app.directive("selectedplotter", function($compile)
+{
+ return {
+ link:function(scope, element, attrs)
+ {
+ var plotter_graph_element = document.getElementById('space-for-plotterparameter-graph');
+ generate_graph(plotter_graph_element);
+
+ function generate_graph(head_id)
+ {
+ var html_div_code = "<plotinfo urlprefix=" + scope.url_prefix +"></plotinfo>"
+ $(head_id ).empty();
+ angular.element(head_id).append($compile(html_div_code)(scope));
+ }
+
+ }
+ };
+});
+
+//Directive used to handle save plotterparameter click
+app.directive("saveplotterparameter", function()
+{
+ return {
+ link:function(scope, element, attrs)
+ {
+ element.bind("click", function()
+ {
+ //No plotter is selected
+ if(attrs.plotter == "None")
+ {
+ if($("#plotter-selection :selected").text().length == 0)
+ {
+ //console.log("Please select a plotter first")
+ }
+ else
+ {
+ scope.plotterparameterData.plotter = scope.plotters.selected.id;
+
+ updatePlotterParameter();
+ }
+ }
+ else
+ {
+ //plotter is selected: parameter tuning
+ scope.plotterparameterData.plotter = scope.plotters.selected.id;
+ scope.plotterparameterData.customdata = scope.plotterparams_update;
+
+ updatePlotterParameter();
+ }
+ });
+
+ function updatePlotterParameter()
+ {
+ scope.plotterparameterFactory.updatePlotterParameter(scope.user, scope.plotterparameter_user, scope.plotterparameter_name, scope.plotterparameter_version, scope.plotterparameterData, scope.url_prefix)
+ .success(function (returnedData)
+ {
+ //alert("The report "+ scope.report_id +" has been saved.");
+
+ beat.ui.plotterparameter.plotterparameter_saved('plotterparameter_saved', scope);
+ })
+ .error(function (error)
+ {
+ scope.status = 'Unable to update plotterparameter data: ' + error.message;
+
+ });
+
+ }
+
+ }
+ };
+});
+
+//Directive used to handle save plotterparameter click
+app.directive("createplotterparameter", function()
+{
+ return {
+ link:function(scope, element, attrs)
+ {
+ element.bind("click", function()
+ {
+ //No plotter is selected
+ if(attrs.plotter == "None" || attrs.plotter=="")
+ {
+ if($("#plotter-selection :selected").text().length == 0)
+ {
+ alert("Please select a plotter first")
+ }
+ else
+ {
+ scope.plotterparams_update.plotter = scope.plotters.selected.id;
+
+ createPlotterParameter();
+ }
+ }
+ else
+ {
+ //plotter is selected: parameter tuning
+ //should actually never fall here
+ createPlotterParameter();
+ }
+ });
+
+ function createPlotterParameter()
+ {
+ scope.plotterparameterFactory.createPlotterParameter(scope.user, scope.plotterparams_update, scope.url_prefix)
+ .success(function (returnedData)
+ {
+
+ beat.ui.plotterparameter.plotterparameter_created('plotterparameter_created', scope);
+ })
+ .error(function (error)
+ {
+ var error_text = "";
+ $.each(error, function( key, value ) {
+
+ error_text += key + ": " + value;
+ });
+ scope.status = 'Unable to create plotterparameter:\n' + error_text;
+
+ alert(scope.status);
+ });
+
+ }
+ }
+ };
+});
+
+//Directive used to handle save plotterparameter click
+app.directive("createplotterparameternewversion", function()
+{
+ return {
+ link:function(scope, element, attrs)
+ {
+ element.bind("click", function()
+ {
+ //No plotter is selected
+ if(attrs.plotter == "None" || attrs.plotter=="")
+ {
+ //plotter is selected: parameter tuning
+ //should actually never fall here
+
+ if($("#plotter-selection :selected").text().length == 0)
+ {
+ alert("Please select a plotter first")
+ }
+ else
+ {
+ scope.plotterparams_update.plotter = scope.plotters.selected.id;
+
+ createPlotterParameter();
+ }
+ }
+ else
+ {
+ scope.plotterparams_newversion.plotter = scope.plotters.selected.id;
+ scope.plotterparams_newversion.name = scope.plotterparameter_name;
+ scope.plotterparams_newversion.version = (parseInt(scope.plotterparameter_version) + 1).toString();
+ scope.plotterparams_newversion.previous_version = parseInt(scope.plotterparameter_version).toString();
+ scope.plotterparams_newversion.data = scope.plotterparams_update;
+
+ createPlotterParameter();
+ }
+ });
+
+ function createPlotterParameter()
+ {
+ scope.plotterparameterFactory.createPlotterParameter(scope.user, scope.plotterparams_newversion, scope.url_prefix)
+ .success(function (returnedData)
+ {
+
+ beat.ui.plotterparameter.plotterparameter_created('plotterparameter_created', scope);
+ })
+ .error(function (error)
+ {
+ var error_text = "";
+ $.each(error, function( key, value ) {
+
+ error_text += key + ": " + value;
+ });
+ scope.status = 'Unable to create plotterparameter:\n' + error_text;
+
+ alert(scope.status);
+ });
+
+ }
+ }
+ };
+});
+
+//Directive used to handle save plotterparameter click
+app.directive("createplotterparameterfork", function()
+{
+ return {
+ link:function(scope, element, attrs)
+ {
+ element.bind("click", function()
+ {
+ //No plotter is selected
+ if(attrs.plotter == "None" || attrs.plotter=="")
+ {
+ //plotter is selected: parameter tuning
+ //should actually never fall here
+
+ if($("#plotter-selection :selected").text().length == 0)
+ {
+ alert("Please select a plotter first")
+ }
+ else
+ {
+ scope.plotterparams_update.plotter = scope.plotters.selected.id;
+
+ createPlotterParameter();
+ }
+ }
+ else
+ {
+ scope.plotterparams_fork.plotter = scope.plotters.selected.id;
+ scope.plotterparams_fork.name = scope.plotterparams_update.name;
+ scope.plotterparams_newversion.version = "1";
+ scope.plotterparams_fork.fork_of = {};
+ scope.plotterparams_fork.fork_of['username'] = scope.plotterparameter_user;
+ scope.plotterparams_fork.fork_of['name'] = scope.plotterparameter_name;
+ scope.plotterparams_fork.fork_of['version'] = scope.plotterparameter_version;
+ scope.plotterparams_fork.data = scope.plotterparams_update;
+
+ scope.plotterparameter_forking = true;
+
+ createPlotterParameter();
+ }
+ });
+
+ function createPlotterParameter()
+ {
+ scope.plotterparameterFactory.createPlotterParameter(scope.user, scope.plotterparams_fork, scope.url_prefix)
+ .success(function (returnedData)
+ {
+
+ beat.ui.plotterparameter.plotterparameter_created('plotterparameter_created', scope);
+ })
+ .error(function (error)
+ {
+ var error_text = "";
+ $.each(error, function( key, value ) {
+
+ error_text += key + ": " + value;
+ });
+ scope.status = 'Unable to create plotterparameter:\n' + error_text;
+
+ alert(scope.status);
+ });
+
+ }
+ }
+ };
+});
+
+
+//Directive used to append parameters
+app.directive("plotparams", function($compile){
+
+ return {
+ restrict: 'E',
+ scope: true,
+ replace: true,
+ Â Â Â Â //templateUrl: "/reports/partials/reportTable/",
+ Â Â Â Â templateUrl: function(scope, elem, attrs)
+ {
+ var prefix = elem['urlprefix'];
+ Â Â Â Â var the_url = prefix + "/plotters/partials/plotparamsinfo/";
+ return the_url;
+ },
+ link: function(scope, elem, attrs)
+ {
+ $('#table_plotparams tr:last').ready(function(){
+ var params_from_plotter = scope.$parent.plotters.selected.declaration.parameters;
+
+ //Iterate through each plotter parameters and add them
+ $.each(params_from_plotter, function( key, value ) {
+
+ if(key != "content_type" )
+ {
+ //index in table
+ var tag_id = (scope.textdata).indexOf(key);
+ var html_div_code = '';
+
+ var current_value = value.default;
+ if(key in scope.plotterparams_update)
+ {
+ current_value = scope.plotterparams_update[key];
+ }
+
+ if(value.type == "string")
+ {
+ html_div_code = '<tr><td>'+ key +'</td><td><input id="tag_input_'+ key +'" class="form-control input-sm" type="'+value.type+'" value="' + current_value + '" key="' + key + '" textinput></td><td>'+value.type+'</td><td>'+value.description+'</td></tr>';
+ }
+ else if(value.type == "float64")
+ {
+ var minus_button_plus = '<div style="width:15em" class="input-group"><span class="input-group-btn" id="tag_button_' + key + '" defaultvalue="' + current_value + '" type="'+ value.type +'" key="' + key + '" action="minus" buttonplusminus><button type="button" class="btn btn-danger btn-number" data-type="minus" data-field="quant[2]"><span class="glyphicon glyphicon-minus"></span></button></span><input style="text-align:center" id="tag_input_'+ key +'" class="form-control input-number" type="'+value.type+'" value="' + current_value + '" key="' + key + '" textinput><span class="input-group-btn" id="tag_button_' + key + '" defaultvalue="' + current_value + '" type="'+ value.type +'" key="' + key + '" action="plus" buttonplusminus><button type="button" class="btn btn-success btn-number" data-type="plus" data-field="quant[2]"><span class="glyphicon glyphicon-plus"></span></button></span></div>';
+ html_div_code = '<tr><td>'+ key +'</td><td>'+ minus_button_plus +'</td><td>'+value.type+'</td><td>'+value.description+'</td></tr>';
+ }
+ else if(value.type == "uint16")
+ {
+ var minus_button_plus = '<div style="width:15em" class="input-group"><span class="input-group-btn" id="tag_button_' + key + '" defaultvalue="' + current_value + '" type="'+ value.type +'" key="' + key + '" action="minus" buttonplusminus><button type="button" class="btn btn-danger btn-number" data-type="minus" data-field="quant[2]"><span class="glyphicon glyphicon-minus"></span></button></span><input style="text-align:center" id="tag_input_'+ key +'" class="form-control input-number" type="'+value.type+'" value="' + current_value + '" key="' + key + '" textinput><span class="input-group-btn" id="tag_button_' + key + '" defaultvalue="' + current_value + '" type="'+ value.type +'" key="' + key + '" action="plus" buttonplusminus><button type="button" class="btn btn-success btn-number" data-type="plus" data-field="quant[2]"><span class="glyphicon glyphicon-plus"></span></button></span></div>';
+ html_div_code = '<tr><td>'+ key +'</td><td>'+ minus_button_plus +'</td><td>'+value.type+'</td><td>'+value.description+'</td></tr>';
+ }
+ else if(value.type == "bool")
+ {
+ var bool_param = '';
+ if(current_value)
+ {
+ bool_param ='<fieldset class="toggle" id="tag_bool_'+ key +'" type="'+value.type+'" value="' + current_value + '" key="' + key + '" toggleparam><input id="data-policy_'+key+'" type="checkbox" checked="checked"><label for="data-policy"><div class="toggle-button"><div class="toggle-tab"></div></div></label></fieldset>';
+ }
+ else
+ {
+ bool_param ='<fieldset class="toggle" id="tag_bool_'+ key +'" type="'+value.type+'" value="' + current_value + '" key="' + key + '" toggleparam><input id="data-policy_'+key+'" type="checkbox"><label for="data-policy"><div class="toggle-button"><div class="toggle-tab"></div></div></label></fieldset>';
+ }
+ html_div_code = '<tr><td>'+ key +'</td><td>'+ bool_param +'</td><td>'+value.type+'</td><td>'+value.description+'</td></tr>';
+
+ }
+ else
+ {
+ $('#table_plotparams > tbody:last-child').append('<tr><td>'+ key +'</td><td>'+value.default+'</td><td>'+value.type+'</td><td>'+value.description+'</td></tr>');
+ }
+
+ angular.element('#table_plotparams > tbody:last-child').append($compile(html_div_code)(scope));
+
+ }
+ });
+
+
+
+
+ });
+
+ //var data_to_plot = scope.plotters.selected.sample_data;
+ //$('td#td_' + scope.plotterparameter.name).ready(function(){
+ // beat.experiments.utils.displayPlot(
+ // scope.url_prefix,
+ // $('td#td_figure_plot')[0],
+ // {
+ // output: scope.plotterparameter,
+ // plotter: scope.plotters.selected.name,
+ // parameter: scope.plotterparameter,
+ // merged: true,
+ // sample_data: scope.plotters.selected.sample_data,
+ // },
+ // [scope.plotters.selected], // available plotters
+ // true, // replace contents of tag above?
+ // function(){$(this).find('i.fa-spin').hide();});
+ //});
+
+ },
+ controller: ['$scope', function ($scope) {
+ }],
+ };
+});
+
+//Directive used to handle textinput
+app.directive("textinput", function()
+{
+ return {
+ link:function(scope, element, attrs)
+ {
+ // on blur, update the value in scope
+ element.bind('propertychange keyup paste', function (blurEvent) {
+
+ var isValid = false;
+
+ if (element.data('old-value') != element.val()) {
+
+ var updateValue = element.val();
+ //string check
+ if(attrs.type == "string")
+ {
+ isValid = true;
+ updateValue = element.val();
+ }
+
+ //integer check
+ else if(attrs.type == "uint16")
+ {
+ //convert value to integer
+ updateValue = parseInt(element.val());
+ if(isNaN(updateValue))
+ {
+ isValid = false;
+ alert("Entered value is not a integer");
+ }
+ else
+ {
+ isValid = true;
+ updateValue = parseInt(element.val());
+ }
+
+ }
+
+ //float check
+ else if(attrs.type == "float64")
+ {
+ //convert value to float
+ updateValue = parseFloat(element.val());
+ if(isNaN(updateValue))
+ {
+ isValid = false;
+ alert("Entered value is not a float");
+ }
+ else
+ {
+ isValid = true;
+ updateValue = parseFloat(element.val());
+ }
+ }
+ //check if value is float
+ //updated models
+ if(isValid)
+ {
+ scope.plotterparams_update[attrs.key] = updateValue;
+ }
+
+ //scope.$apply(function () {
+ // scope.textdirective = element.val();
+ // element.data('old-value', element.val());
+ //});
+ }
+ });
+
+ }
+ };
+});
+
+//Directive used to handle bool toggle
+app.directive("toggleparam", function()
+{
+ return {
+ link:function(scope, element, attrs)
+ {
+ element.bind("click", function()
+ {
+ if($("#data-policy_"+attrs.key).prop("checked") == true)
+ {
+ $("#data-policy_"+attrs.key).prop("checked", false);
+ }
+ else
+ {
+ $("#data-policy_"+attrs.key).prop("checked", true);
+ }
+
+ scope.plotterparams_update[attrs.key] = $("#data-policy_"+attrs.key).prop("checked");
+ });
+ }
+ };
+});
+
+//Directive used to handle button plus/minus
+app.directive("buttonplusminus", function()
+{
+ return {
+ link:function(scope, element, attrs)
+ {
+ element.bind("click", function()
+ {
+ var tomodify = $("#tag_input_"+attrs.key).val();
+
+ if(attrs.type == "uint16")
+ {
+ tomodify = parseInt(tomodify);
+ if(attrs.action == "plus")
+ {
+ tomodify = tomodify +1;
+ }
+ else if(attrs.action == "minus")
+ {
+ tomodify = tomodify -1;
+ }
+ }
+ else if(attrs.type == "float64")
+ {
+ tomodify = parseFloat(tomodify);
+ if(attrs.action == "plus")
+ {
+ tomodify = tomodify +0.1;
+ }
+ else if(attrs.action == "minus")
+ {
+ tomodify = tomodify -0.1;
+ }
+ tomodify = tomodify.toFixed(1);
+ }
+ $("#tag_input_"+attrs.key).val(tomodify);
+ scope.plotterparams_update[attrs.key] = tomodify;
+ });
+ }
+ };
+});
+
+//Directive used to handle save plotterparameter click
+app.directive("plotterparameteritems", function($compile)
+{
+ return function(scope, element, attrs)
+ {
+ scope.$on("addParametersElement", function(event)
+ {
+ //add the plot
+ var plotter_graph_element = document.getElementById('space-for-plotterparameter-plot');
+ generate_graph(plotter_graph_element);
+
+ //add the parameters
+ var parameter_elements = document.getElementById('space-for-plotterparameter-items');
+ append_plotterparameters(parameter_elements)
+
+ //functions to operate on graph and parameters
+
+ function generate_graph(head_id)
+ {
+ var html_div_code = "<plotinfo urlprefix=" + scope.url_prefix +"></plotinfo>"
+ $(head_id ).empty();
+ angular.element(head_id).append($compile(html_div_code)(scope));
+ }
+
+ function append_plotterparameters(head_id)
+ {
+ var html_div_code = "<plotparams urlprefix=" + scope.url_prefix +"></plotparams>"
+ $(head_id ).empty();
+ angular.element(head_id).append($compile(html_div_code)(scope));
+ }
+
+ });
+ };
+});
+
+//Directive used to handle dynamic testing on graph display
+app.directive("testplotterparameters", function($compile)
+{
+ return function(scope, element, attrs)
+ {
+ element.bind("click", function()
+ {
+ //update the plot
+ var plotter_graph_element = document.getElementById('space-for-plotterparameter-plot');
+ generate_graph(plotter_graph_element);
+
+ //functions to operate on graph and parameters
+ function generate_graph(head_id)
+ {
+ var html_div_code = "<plotinfodynamicparams urlprefix=" + scope.url_prefix +"></plotinfodynamicparams>"
+ $(head_id ).empty();
+ angular.element(head_id).append($compile(html_div_code)(scope));
+ }
+ });
+ };
+});
diff --git a/beat/web/plotters/static/plotters/app/factories/plotterFactory.js b/beat/web/plotters/static/plotters/app/factories/plotterFactory.js
new file mode 100644
index 0000000000000000000000000000000000000000..9babc79f3031c1d6fd58fd1405fefce1dce3ed33
--- /dev/null
+++ b/beat/web/plotters/static/plotters/app/factories/plotterFactory.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+*/
+//This factory retrieves data from the REST API and associates it with the $scope
+app.factory('plotterFactory', ['$http', function($http)
+{
+ var plotterFactory = {};
+
+ plotterFactory.getPlottersInformation = function (user, url_prefix)
+ {
+ urlBase = url_prefix + '/api/v1/plotters';
+
+ return $http({
+ headers: {'Content-Type': 'application/json'},
+ url: urlBase + '/',
+ method: "GET",
+ })
+
+
+ };
+
+ return plotterFactory;
+}]);
diff --git a/beat/web/plotters/static/plotters/app/factories/plotterparameterFactory.js b/beat/web/plotters/static/plotters/app/factories/plotterparameterFactory.js
new file mode 100644
index 0000000000000000000000000000000000000000..d6292c515f27646969a63c3f2448dcca1fa9d8b1
--- /dev/null
+++ b/beat/web/plotters/static/plotters/app/factories/plotterparameterFactory.js
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+*/
+//This factory retrieves data from the REST API and associates it with the $scope
+app.factory('plotterparameterFactory', ['$http', function($http)
+{
+ var plotterparameterFactory = {};
+
+ plotterparameterFactory.getPlotterParameterInformation = function (user, plotterparameter_user, plotterparameter_name, plotterparameter_version, url_prefix)
+ {
+ urlBase = url_prefix + '/api/v1/plotters/plotterparameters';
+
+ return $http({
+ headers: {'Content-Type': 'application/json'},
+ url: urlBase + '/' + plotterparameter_user + '/' + plotterparameter_name + '/' + plotterparameter_version + '/',
+ method: "GET",
+ })
+
+
+ };
+
+ plotterparameterFactory.updatePlotterParameter = function (user, plotterparameter_user, plotterparameter_name, plotterparameter_version, plotterparameterData, url_prefix)
+ {
+ urlBase = url_prefix + '/api/v1/plotters/plotterparameters';
+
+ return $http({
+ headers: {'Content-Type': 'application/json'},
+ url: urlBase + '/' + user + '/' + plotterparameter_name + '/' + plotterparameter_version + '/',
+ method: "PUT",
+ data: plotterparameterData,
+ })
+
+ };
+
+ plotterparameterFactory.createPlotterParameter = function (user, plotterparameterData, url_prefix)
+ {
+ urlBase = url_prefix + '/api/v1/plotters/plotterparameters';
+
+ return $http({
+ headers: {'Content-Type': 'application/json'},
+ url: urlBase + '/' + user + '/',
+ method: "POST",
+ data: plotterparameterData,
+ })
+
+ };
+
+ return plotterparameterFactory;
+}]);
diff --git a/beat/web/plotters/static/plotters/css/style.css b/beat/web/plotters/static/plotters/css/style.css
new file mode 100644
index 0000000000000000000000000000000000000000..aafef85e0a53df8544da3e173b297249203b135d
--- /dev/null
+++ b/beat/web/plotters/static/plotters/css/style.css
@@ -0,0 +1,64 @@
+.toggle label {
+ color: #444;
+ float: left;
+ line-height: 26px;
+}
+.toggle .toggle-button {
+ margin: 0px 10px 0px 0px;
+ float: left;
+ width: 70px;
+ height: 26px;
+ background-color: #eeeeee;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#fafafa));
+ background-image: -webkit-linear-gradient(top, #eeeeee, #fafafa);
+ background-image: -moz-linear-gradient(top, #eeeeee, #fafafa);
+ background-image: -o-linear-gradient(top, #eeeeee, #fafafa);
+ background-image: -ms-linear-gradient(top, #eeeeee, #fafafa);
+ background-image: linear-gradient(top, #eeeeee, #fafafa);
+ filter: progid:dximagetransform.microsoft.gradient(GradientType=0, StartColorStr='#eeeeee', EndColorStr='#fafafa');
+ border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border: 1px solid #D1D1D1;
+}
+.toggle .toggle-button .toggle-tab {
+ width: 30px;
+ height: 26px;
+ background-color: #fafafa;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fafafa), to(#eeeeee));
+ background-image: -webkit-linear-gradient(top, #fafafa, #eeeeee);
+ background-image: -moz-linear-gradient(top, #fafafa, #eeeeee);
+ background-image: -o-linear-gradient(top, #fafafa, #eeeeee);
+ background-image: -ms-linear-gradient(top, #fafafa, #eeeeee);
+ background-image: linear-gradient(top, #fafafa, #eeeeee);
+ filter: progid:dximagetransform.microsoft.gradient(GradientType=0, StartColorStr='#fafafa', EndColorStr='#eeeeee');
+ border: 1px solid #CCC;
+ margin-left: -1px;
+ margin-top: -1px;
+ border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-box-shadow: 5px 0px 4px -5px #000000, 0px 0px 0px 0px #000000;
+ -moz-box-shadow: 5px 0px 4px -5px rgba(0, 0, 0, 0.3), 0px 0px 0px 0px #000000;
+ box-shadow: 5px 0px 4px -5px rgba(0, 0, 0, 0.3), 0px 0px 0px 0px #000000;
+}
+.toggle input[type=checkbox] {
+ display: none;
+}
+.toggle input[type=checkbox]:checked ~ label .toggle-button {
+ background-color: #2d71c2;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#2d71c2), to(#4ea1db));
+ background-image: -webkit-linear-gradient(top, #2d71c2, #4ea1db);
+ background-image: -moz-linear-gradient(top, #2d71c2, #4ea1db);
+ background-image: -o-linear-gradient(top, #2d71c2, #4ea1db);
+ background-image: -ms-linear-gradient(top, #2d71c2, #4ea1db);
+ background-image: linear-gradient(top, #2d71c2, #4ea1db);
+ filter: progid:dximagetransform.microsoft.gradient(GradientType=0, StartColorStr='#2d71c2', EndColorStr='#4ea1db');
+}
+.toggle input[type=checkbox]:checked ~ label .toggle-button .toggle-tab {
+ margin-left: 39px;
+ background-color: green;
+ -webkit-box-shadow: -5px 0px 4px -5px #000000, 0px 0px 0px 0px #000000;
+ -moz-box-shadow: -5px 0px 4px -5px rgba(0, 0, 0, 0.3), 0px 0px 0px 0px #000000;
+ box-shadow: -5px 0px 4px -5px rgba(0, 0, 0, 0.3), 0px 0px 0px 0px #000000;
+}
diff --git a/beat/web/plotters/static/plotters/js/dialogs.js b/beat/web/plotters/static/plotters/js/dialogs.js
new file mode 100644
index 0000000000000000000000000000000000000000..59fa6bc647b617d4f31b740d1933faf044f483db
--- /dev/null
+++ b/beat/web/plotters/static/plotters/js/dialogs.js
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+*/
+
+/**
+ * beat.plotterparameters.dialogs.js
+ * Implementation of experiment-related dialogs
+ */
+
+/**
+ * Setup an input box so that it does automatic experiment name completion, so
+ * the user knows what **not** to choose.
+ *
+ * This function requires 'bootstrap3-typeahead' to be installed
+ *
+ * Parameters:
+ *
+ * selector (str): A jQuery selector for the input box to rig
+ * data (Array): A JS array containing the existing names for the user
+ * experiments
+ * own (str): My own name, if one was set, so we don't mistakenly highlight
+ * my own (previously set) experiment, which continues to be a valid
+ * choice.
+ */
+
+if (beat === undefined) var beat = {};
+if (beat.plotterparameters === undefined) beat.plotterparameters= {};
+if (beat.plotterparameters.dialogs === undefined) beat.plotterparameters.dialogs = {};
+
+beat.plotterparameters.dialogs.name_typeahead = function(selector, data, own) {
+
+ var element = $(selector);
+
+ var check_validity = function() {
+ var currval = element.val();
+ if (!currval.length) {
+ element.parent().removeClass('has-success').addClass('has-error');
+ element.siblings('span.glyphicon').removeClass('glyphicon-ok').addClass('glyphicon-remove');
+ return; //ok, we don't need to check the rest
+ }
+ if (own !== undefined && own == currval) {
+ element.parent().removeClass('has-error').addClass('has-success');
+ element.siblings('span.glyphicon').removeClass('glyphicon-remove').addClass('glyphicon-ok');
+ return; //ok, we don't need to check the rest
+ }
+ if ($.inArray(currval, data) >= 0) {
+ element.parent().removeClass('has-success').addClass('has-error');
+ element.siblings('span.glyphicon').removeClass('glyphicon-ok').addClass('glyphicon-remove');
+ }
+ else {
+ element.parent().removeClass('has-error').addClass('has-success');
+ element.siblings('span.glyphicon').removeClass('glyphicon-remove').addClass('glyphicon-ok');
+ }
+ }
+
+ check_validity(); //checks if the currently value set is OK
+ element.on('keyup', check_validity);
+
+ element.typeahead({
+ source: data,
+ items: 10, //how many to show at a time
+ minLength: 0, //show suggestions even if no text available
+ autoSelect: false, //user may want to leave it where it is
+ afterSelect: check_validity, //updates after the user selected an item
+ showHintOnFocus: true, //dropdown as soon as focus on
+ });
+
+}
diff --git a/beat/web/plotters/static/plotters/js/new_plotterparameter_dialog.js b/beat/web/plotters/static/plotters/js/new_plotterparameter_dialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..b527b723c544f5ea21edc9f46ceb53edfa05b970
--- /dev/null
+++ b/beat/web/plotters/static/plotters/js/new_plotterparameter_dialog.js
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+*/
+/* Implementation of the new plotterparameter dialog */
+
+// Declaration of our namespaces
+if (beat === undefined) var beat = {}
+if (beat.plotters === undefined) beat.plotters = {}
+
+
+/**
+ * Uses bootstrap3 to display a modal window to create a plotterparameter. The user is
+ * presented with a "typeahead" input box so they can choose a name for their
+ * plotterparameter. The typeahead auto-completion works for the list of plotterparameters the user
+ * current has on their portfoglio.
+ *
+ * Parameters:
+ *
+ * url (String): A string with the URL to retrieve existing plotterparameter
+ * names and to create plotterparameters
+ * username (String): The name of the user requesting the operation
+ *
+ **/
+beat.plotters.new_plotterparameter = function (url, username) {
+
+ //retrieve list of existing searches - if that succeeds, construct modal form
+ function create() {
+
+ return $.ajax({
+ type: 'GET',
+ url: url + '?fields=name',
+
+ }).pipe(function(data) {
+
+ var message = $(document.createElement('div'));
+ message.append($(document.createElement('p')).text('By clicking Save, you will create a new plotterparameter under the defined name. You can cancel the operation by clicking Cancel.'));
+ var form_group = $(document.createElement('div'));
+ form_group.addClass('form-group has-feedback');
+ message.append(form_group);
+ var input_group = $(document.createElement('div'));
+ input_group.addClass('input-group');
+ input_group.append($(document.createElement('span')).addClass('input-group-addon').text(username + ' /'));
+ var input = $(document.createElement('input')).addClass('form-control');
+ input.attr('type', 'text');
+ input.attr('placeholder', 'Start typing for auto-completion...');
+ if (name) input.val(name.split('/')[1]);
+ input_group.append(input);
+ glyph = $(document.createElement('span'));
+ glyph.addClass('glyphicon glyphicon-ok form-control-feedback');
+ glyph.attr('aria-hidden', 'true');
+ input_group.append(glyph);
+ form_group.append(input_group);
+
+ var available_names = {};
+ data.forEach(function(i){available_names[i.name.split('/')[1]]=i;});
+ var available_name_keys = Object.keys(available_names);
+
+ //visual feedback if new or overwriting...
+ var help = $(document.createElement('span')).addClass('help');
+ form_group.append(help);
+
+ var update_help = function() {
+ var currval = input.val();
+ if (!currval.length || available_name_keys.indexOf(currval) >= 0) {
+ help.text('plotterparameter name is invalid.');
+ form_group.removeClass('has-success');
+ form_group.addClass('has-error');
+ glyph.removeClass('glyphicon-ok');
+ glyph.addClass('glyphicon-remove');
+ }
+ else {
+ help.text('');
+ form_group.removeClass('has-error');
+ form_group.addClass('has-success');
+ glyph.removeClass('glyphicon-remove');
+ glyph.addClass('glyphicon-ok');
+ }
+ }
+ update_help(); //checks currently set value
+ input.on('keyup', update_help);
+
+ //using bootstrap3-typeahead
+ input.typeahead({
+ source: Object.keys(available_names),
+ items: 5, //how many to show at a time
+ minLength: 0, //show suggestions even if no text available
+ autoSelect: false, //user may want to leave it where it is
+ afterSelect: update_help, //updates after the user selected an item
+ showHintOnFocus: true, //dropdown as soon as focus on
+ });
+
+ BootstrapDialog.show({
+ title: '<i class="fa fa-floppy-o fa-lg"> Select a name',
+ message: message,
+ type: BootstrapDialog.TYPE_PRIMARY,
+ buttons: [
+ {
+ label: 'Cancel',
+ cssClass: 'btn-default',
+ action: function(the_dialog) {
+ the_dialog.close();
+ return false;
+ },
+ },
+ {
+ label: 'Create',
+ cssClass: 'btn-primary',
+ action: function(the_dialog) {
+ var val = input.val();
+ if (!val) {
+ BootstrapDialog.alert({
+ title: '<i class="fa fa-warning"></i> Error',
+ message: 'You must set a name to create your plotterparameter',
+ type: BootstrapDialog.TYPE_WARNING,
+ });
+ return false;
+ }
+ else if (available_name_keys.indexOf(val) >= 0) {
+ BootstrapDialog.alert({
+ title: '<i class="fa fa-warning"></i> Error',
+ message: 'You must use a non-existing plotterparameter name',
+ type: BootstrapDialog.TYPE_WARNING,
+ });
+ return false;
+ }
+ the_dialog.close();
+
+ if (val) {
+ var d = $.ajax({
+ type: 'POST',
+ url: url,
+ data: JSON.stringify({name: val}),
+ contentType: "application/json; charset=utf-8",
+ dataType: "json"
+ });
+
+ d.done(function(data, status) {
+ the_dialog.close();
+ location.reload();
+ return true;
+ });
+
+ d.fail(process_error);
+
+ } //val is set
+ },
+ },
+ ],
+ });
+ });
+ }
+
+ return create().fail(process_error);
+
+}
diff --git a/beat/web/plotters/templates/plotterparameters/dialogs/new_plotterparameter_dialog.html b/beat/web/plotters/templates/plotterparameters/dialogs/new_plotterparameter_dialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..0eb5e875e06bd9cea286b40032d9bf094a5b5aba
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/dialogs/new_plotterparameter_dialog.html
@@ -0,0 +1,24 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+<div id="{{ dialog_id }}" class="new_plotterparameter_dialog" title="Please enter a plotterparameter name..." style="display:none">
+ <input class="name"></input>
+</div>
diff --git a/beat/web/plotters/templates/plotterparameters/dialogs/plotterparameter_created.html b/beat/web/plotters/templates/plotterparameters/dialogs/plotterparameter_created.html
new file mode 100644
index 0000000000000000000000000000000000000000..8129d6101667ac873d7ac9a4ab8d106e7f0d684f
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/dialogs/plotterparameter_created.html
@@ -0,0 +1,29 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+<div id="{{ dialog_id }}" class="plotterparameter_create" title="Plotterparameter" style="display:none">
+ <p class="explanation">Plotterparameter status</p>
+
+
+ <div class="explanation_text">
+ <p>Your plotterparameter has been successfully created</p>
+ </div>
+</div>
diff --git a/beat/web/plotters/templates/plotterparameters/dialogs/plotterparameter_saved.html b/beat/web/plotters/templates/plotterparameters/dialogs/plotterparameter_saved.html
new file mode 100644
index 0000000000000000000000000000000000000000..fcd318b8a3d7574a4f2cb9b7049ad898fa40dba3
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/dialogs/plotterparameter_saved.html
@@ -0,0 +1,29 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+<div id="{{ dialog_id }}" class="plotterparameter_save" title="Plotterparameter" style="display:none">
+ <p class="explanation">Plotterparameter status</p>
+
+
+ <div class="explanation_text">
+ <p>Your plotterparameter has been successfully updated</p>
+ </div>
+</div>
diff --git a/beat/web/plotters/templates/plotterparameters/diff.html b/beat/web/plotters/templates/plotterparameters/diff.html
new file mode 100644
index 0000000000000000000000000000000000000000..609828345cfcc0abf6660eed66b0189f6d93d714
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/diff.html
@@ -0,0 +1,138 @@
+{% extends "base.html" %}
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+
+{% load dataformat_tags %}
+{% load ui_tags %}
+{% load fingerprint %}
+
+
+{% block title %}{{ block.super }} - Diff: {{ plotterparameter1.author }}/{{ plotterparameter1.name }}{% if plotterparameter1.version %}/{{ plotterparameter1.version }}{% endif%} - {{ plotterparameter2.author }}/{{ plotterparameter2.name }}{% if plotterparameter2.version %}/{{ plotterparameter2.version }}{% endif%}{% endblock %}
+
+
+{% block stylesheets %}
+{{ block.super }}
+{% code_editor_css %}
+{% endblock %}
+
+
+{% block scripts %}
+{{ block.super }}
+{% code_editor_scripts "javascript" %}
+{% endblock %}
+
+
+{% block content %}
+
+<div id="title" class="row">
+ <div class="col-sm-offset-1 col-sm-10">
+ <h3>
+ <span class="explanation">Plotterparameter diff:</span>
+
+ <span class="author"><a href="{% url 'plotters:plotterparameter-list' plotterparameter1.author %}">{{ plotterparameter1.author }}</a></span> /
+ <span><a href="{% url 'plotters:plotterparameter-view-latest' plotterparameter1.author plotterparameter1.name %}">{{ plotterparameter1.name }}</a></span> /
+ <span class="version"><a href="{% url 'plotters:plotterparameter-author-view' plotterparameter1.author plotterparameter1.name plotterparameter1.version %}">{{ plotterparameter1.version }}</a></span>
+
+ <a href="{% url 'plotters:diff' plotterparameter2.author plotterparameter2.name plotterparameter2.version plotterparameter1.author plotterparameter1.name plotterparameter1.version %}" title="Switch the two data formats"><i class="fa fa-exchange"></i></a>
+
+ <span class="author"><a href="{% url 'plotters:plotterparameter-list' plotterparameter2.author %}">{{ plotterparameter2.author }}</a></span> /
+ <span><a href="{% url 'plotters:plotterparameter-view-latest' plotterparameter2.author plotterparameter2.name %}">{{ plotterparameter2.name }}</a></span> /
+ <span class="version"><a href="{% url 'plotters:plotterparameter-author-view' plotterparameter2.author plotterparameter2.name plotterparameter2.version %}">{{ plotterparameter2.version }}</a></span>
+ </h3>
+ </div>
+</div>
+
+<div id="parameters-panel-1" class="panel panel-default">
+ <div class="panel-heading " role="tab" id="heading-parameters">
+ <h4 class="panel-title">
+ <a class="collapsed" role="button" data-toggle="collapse" data-parent="#parameters-panel-1" href="#collapse-parameters-1" aria-expanded="false" aria-controls="collapse-parameters-1">
+ Parameters for {{ plotterparameter1.author }}/{{ plotterparameter1.name }}/{{ plotterparameter1.version }}
+ </a> <span id="counter" class="badge">{{ plotterparameter1_data|length }}</span>
+ </h4>
+ </div>
+ <div id="collapse-parameters-1" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading-parameters">
+ <div class="panel-body">
+ <div class="col-sm-10">
+ <p class="help">Parameters allow users to change the configuration of the plotterparameter</p>
+ <table class="table table-responsive table-condensed table-hover">
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for key, value in plotterparameter1_data.items %}
+ <tr>
+ <td>{{ key }}</td>
+ <td>{{ value }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</div>
+
+<div id="parameters-panel-2" class="panel panel-default">
+ <div class="panel-heading" role="tab" id="heading-parameters">
+ <h4 class="panel-title">
+ <a class="collapsed" role="button" data-toggle="collapse" data-parent="#parameters-panel-2" href="#collapse-parameters-2" aria-expanded="false" aria-controls="collapse-parameters-2">
+ Parameters for {{ plotterparameter2.author }}/{{ plotterparameter2.name }}/{{ plotterparameter2.version }}
+ </a> <span id="counter" class="badge">{{ plotterparameter2_data|length }}</span>
+ </h4>
+ </div>
+ <div id="collapse-parameters-2" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading-parameters">
+ <div class="panel-body">
+ <div class="col-sm-10">
+ <p class="help">Parameters allow users to change the configuration of the plotterparameter</p>
+ <table class="table table-responsive table-condensed table-hover">
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for key, value in plotterparameter2_data.items %}
+ <tr>
+ <td>{{ key }}</td>
+ <td>{{ value }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+
+jQuery(document).ready(function() {
+
+});
+
+</script>
+
+{% endblock %}
diff --git a/beat/web/plotters/templates/plotterparameters/list.html b/beat/web/plotters/templates/plotterparameters/list.html
new file mode 100644
index 0000000000000000000000000000000000000000..3df84b93a13cb8e2f41774c5c525ec86e10244ea
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/list.html
@@ -0,0 +1,58 @@
+{% extends "base.html" %}
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+
+{% load plotter_tags %}
+{% load ui_tags %}
+{% load fingerprint %}
+
+{% block title %}{{ block.super }} - {% if author.is_anonymous %}Public{% else %}{{ author.username }}'s{% endif %} Plotterparameters{% endblock %}
+
+{% block scripts %}
+{{ block.super }}
+{% csrf_token %}
+<script src="{% fingerprint "bootstrap3-typeahead/bootstrap3-typeahead.min.js" %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% fingerprint "plotters/js/new_plotterparameter_dialog.js" %}" type="text/javascript" charset="utf-8"></script>
+{% endblock %}
+
+{% block content %}
+
+{% list_tabs author "plotterparameters" %}
+
+{% if not request.user.is_anonymous %}
+{% plotterparameter_table objects owner "plotterparameter-list" %}
+{% else %}
+{% plotterparameter_table objects owner "plotterparameter-public-list" %}
+{% endif %}
+
+<script type="text/javascript">
+$(document).ready(function() {
+ $.ajaxSetup({
+ beforeSend: function(xhr, settings) {
+ var csrftoken = $.cookie('csrftoken');
+ xhr.setRequestHeader('X-CSRFToken', csrftoken);
+ }
+ });
+});
+</script>
+
+{% endblock %}
diff --git a/beat/web/plotters/templates/plotterparameters/panels/actions.html b/beat/web/plotters/templates/plotterparameters/panels/actions.html
new file mode 100644
index 0000000000000000000000000000000000000000..4633445b7a96c46ce4b32dcdfed24fd47383a0c7
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/panels/actions.html
@@ -0,0 +1,106 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+{% load plotter_tags %}
+
+<div class="btn-group btn-group-sm action-buttons pull-right">
+
+ {% visible_reports object as reports %}
+
+ {% if display_count %}
+ <!-- Experiment count, works for all -->
+
+
+ <a class="btn btn-default btn-references" href="{{ object.get_absolute_url }}#reports" data-toggle="tooltip" data-placement="bottom" title="Reports using this plotterparameter"><span class="badge">{{ reports.count }}</span></a>
+ {% else %}
+
+ {% ifequal request.user.username object.author.username %}
+ {% ifequal object.get_sharing_display 'Private' %}
+ <a id="refresh-button" class="btn btn-default btn-save" data-toggle="tooltip" data-placement="bottom" data-plotter="{{object.plotter}}" title="Test parameters" testplotterparameters><i class="fa fa-refresh fa-lg"></i></a>
+ <a id="save-button" class="btn btn-default btn-save" data-toggle="tooltip" data-placement="bottom" data-plotter="{{object.plotter}}" title="Save" saveplotterparameter><i class="fa fa-floppy-o fa-lg"></i></a>
+ {% endifequal %}
+ {% endifequal %}
+ {% endif %}
+
+ {% ifequal request.user.username object.author.username %}
+
+ {% ifnotequal object.get_sharing_display 'Public' %}
+ <a class="btn btn-default btn-share" href="{{ object.get_absolute_url }}#sharing" data-toggle="tooltip" data-placement="bottom" title="Share"><i class="fa fa-share-square-o fa-lg"></i></a>
+ {% endifnotequal %}
+
+
+ <!-- Delete, needs to be the owner -->
+ {% if object.deletable and reports.count == 0 %}
+ <a class="btn btn-default btn-delete" onclick="modal_delete('plotterparameter', '{{ object.fullname }}', '{% url 'api_plotters:all_plotterparameter' %}', '{% url 'plotters:plotterparameter-list' request.user.username %}');" data-toggle="tooltip" data-placement="bottom" title="Delete"><i class="fa fa-times fa-lg"></i></a>
+
+ <!-- New version, needs to be the owner -->
+ <a class="btn btn-default btn-new-version" href="{% url 'plotters:new-version' object.author.username object.name object.version %}" data-toggle="tooltip" data-placement="bottom" title="New version"><i class="fa fa-copy fa-lg"></i></a>
+ {% endif %}
+
+ {% endifequal %}
+
+ {% if not request.user.is_anonymous %}
+ <!-- Fork button, needs to be logged in -->
+ <a class="btn btn-default btn-fork" href="{% url 'plotters:fork' object.author.username object.name object.version %}" data-toggle="tooltip" data-placement="bottom" title="Fork"><i class="fa fa-code-fork fa-lg"></i></a>
+ {% endif %}
+
+{%comment%}
+
+ <!-- Share, needs to be the owner and it may not be public already -->
+ {% ifnotequal object.get_sharing_display 'Public' %}
+ <a class="btn btn-default btn-share" href="{{ object.get_absolute_url }}#sharing" data-toggle="tooltip" data-placement="bottom" title="Share"><i class="fa fa-share-square-o fa-lg"></i></a>
+ {% endifnotequal %}
+
+ <!-- Delete, needs to be the owner -->
+ {% if object.deletable %}
+ <a class="btn btn-default btn-delete" onclick="modal_delete('plotterparameter', '{{ object.fullname }}', '{% url 'api_plotterparameters:all' %}', '{% url 'plotterparameters:list' request.user.username %}');" data-toggle="tooltip" data-placement="bottom" title="Delete"><i class="fa fa-times fa-lg"></i></a>
+ {% endif %}
+
+ <!-- New version, needs to be the owner -->
+ <a class="btn btn-default btn-new-version" href="{% url 'plotterparameters:new-version' object.name %}" data-toggle="tooltip" data-placement="bottom" title="New version"><i class="fa fa-copy fa-lg"></i></a>
+
+ <!-- Edit, needs to be modifiable -->
+ {% if object.modifiable %}
+ <a class="btn btn-default btn-edit" href="{% url 'plotterparameters:edit' object.author.username object.name object.version %}" data-toggle="tooltip" data-placement="bottom" title="Edit"><i class="fa fa-edit fa-lg"></i></a>
+ {% endif %}
+
+ {% endifequal %}
+
+ <!-- Edit, needs to be modifiable -->
+ {% if request.user.is_staff %}
+ <a class="btn btn-default btn-edit" href="{% url 'admin:plotterparameters_plotterparameter_change' object.id %}" data-toggle="tooltip" data-placement="bottom" title="Edit as admin"><i class="fa fa-cogs fa-lg"></i></a>
+ {% endif %}
+
+ {% if not request.user.is_anonymous %}
+
+ <!-- New experiment button, needs to be logged in -->
+ <a class="btn btn-default btn-new-experiment" href="{% url 'experiments:new-from-plotterparameter' object.author.username object.name object.version %}" data-toggle="tooltip" data-placement="bottom" title="New experiment"><i class="fa fa-cog fa-lg"></i></a>
+
+ <!-- Fork button, needs to be logged in -->
+ <a class="btn btn-default btn-fork" href="{% url 'plotterparameters:fork' object.author.username object.name object.version %}" data-toggle="tooltip" data-placement="bottom" title="Fork"><i class="fa fa-code-fork fa-lg"></i></a>
+
+ {% endif %}
+
+ <!-- Search, works for logged-in and anonymous users -->
+ <a class="btn btn-default btn-search" href="{% url 'search:search' %}?query=type:results%20tc:{{ object.fullname }}" data-toggle="tooltip" data-placement="bottom" title="Search experiments"><i class="fa fa-search fa-lg"></i></a>
+{%endcomment%}
+
+</div>
diff --git a/beat/web/plotters/templates/plotterparameters/panels/merged_parameters.html b/beat/web/plotters/templates/plotterparameters/panels/merged_parameters.html
new file mode 100644
index 0000000000000000000000000000000000000000..9456f46e6b861cafa57fd06c38a5babbb83f666b
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/panels/merged_parameters.html
@@ -0,0 +1,69 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+{% load ui_tags %}
+<div class="row">
+ <div class="col-sm-12">
+ {% with parameters=object.json_parameters %}
+ {% if parameters %}
+ <div id="parameters-panel" class="panel panel-default">
+ <div class="panel-heading" role="tab" id="heading-parameters">
+ <h4 class="panel-title">
+ <a class="collapsed" role="button" data-toggle="collapse" data-parent="#parameters-panel" href="#collapse-parameters" aria-expanded="false" aria-controls="collapse-parameters">
+ Parameters
+ </a> <span id="counter" class="badge">{{ parameters|length }}</span>
+ </h4>
+ </div>
+ <div id="collapse-parameters" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading-parameters">
+ <div class="panel-body">
+ <div class="col-sm-12">
+ <p class="help">Parameters allow users to change the
+ configuration of an plotter when scheduling an experiment</p>
+ <table class="table table-responsive table-condensed table-hover">
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Description</th>
+ <th>Type</th>
+ <th>Default</th>
+ <th>New value</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for key, value in parameters.items %}
+ <tr>
+ <td>{{ key }}</td>
+ <td class="help">{{ value.description }}</td>
+ <td>{{ value.type }}</td>
+ <td>{{ value.default }}</td>
+ <td style="color:#FF0000">{{ plotterparameter.data|get_item:key }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ {% endif %}{# parameters #}
+ {% endwith %}
+ </div>
+</div>
diff --git a/beat/web/plotters/templates/plotterparameters/panels/sample_plot.html b/beat/web/plotters/templates/plotterparameters/panels/sample_plot.html
new file mode 100644
index 0000000000000000000000000000000000000000..017dabba8978ead04fe49432f0de4a4c34b7f684
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/panels/sample_plot.html
@@ -0,0 +1,55 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+{% load ui_tags %}
+
+<div id="{{ panel_id }}">
+<h4>This is a sample data plot</h4>
+<table class="table table-hover table-striped table-responsive">
+ <tbody>
+
+ <tr><th class="results-header">Figure sample for {{ plotterparameter }}</th>
+ {# it is a plot, request data #}
+ <td id="td_{{ plotterparameter.name }}"><i class="fa fa-spin fa-refresh"</i></td>
+ <script type="text/javascript">
+ var data_to_plot = {{plotter_sample_data | safe }};
+
+ $('td#td_{{ plotterparameter.name }}').ready(function(){
+ beat.experiments.utils.displayPlot(
+ '{{ URL_PREFIX }}',
+ $('td#td_{{ plotterparameter.name }}')[0],
+ {
+ output: '{{ plotterparameter.name }}',
+ plotter: '{{ plotter }}',
+ parameter: '{{ plotterparameter }}',
+ merged: true,
+ sample_data: '{{ plotter_sample_data | safe }}',
+ },
+ ['{{ plotter }}'], {# available plotters #}
+ {{ plotter_sample_data |safe }}, {# plotter parameters #}
+ true, {# replace contents of tag above? #}
+ function(){$(this).find('i.fa-spin').hide();});
+ });
+ </script>
+ </tr>
+ </tbody>
+</table>
+</div>
diff --git a/beat/web/plotters/templates/plotterparameters/panels/sharing.html b/beat/web/plotters/templates/plotterparameters/panels/sharing.html
new file mode 100644
index 0000000000000000000000000000000000000000..aac59518b75ee9365e9a20fab47add742ce6db4c
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/panels/sharing.html
@@ -0,0 +1,204 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+{% load gravatar %}
+{% load ui_tags %}
+
+{% with "Sharing at the platform is an <b>irreversible</b> procedure. For example, public objects cannot be made private again. If you share an object with a user or team and change your mind, you can still delete the object, for as long as it is not being used by you or another colleagues with access." as help_text %}
+{% with object.get_sharing_display as p %}
+<div class="row">
+
+ <div class="col-sm-10">
+ <div id="sharing-display">
+
+ <h4>
+ {% if p == 'Private' %}
+ <i data-toggle="tooltip" data-placement="bottom" title="{{ p }}" class="fa fa-user fa-lg"></i>
+ {% elif p == 'Public' %}
+ <i data-toggle="tooltip" data-placement="bottom" title="{{ p }}" class="fa fa-globe fa-lg"></i>
+ {% else %}<!-- shared specifically -->
+ <i data-toggle="tooltip" data-placement="bottom" title="Shared with some" class="fa fa-users fa-lg"></i>
+ {% endif %}
+ This plotterparameter is <b>{{ p }}</b></h4>
+
+ <p class="help">{{ help_text }}</p>
+
+ {% if p == 'Shared' %}
+ {% if object.shared_with.count %}
+ <div>
+ <p>Users with access:<p>
+ <ul>
+ {% for user in object.shared_with.all %}<li>{{ user.first_name }} {{ user.last_name }} ({{ user.username }}) <a data-toggle="tooltip" data-placement="top" title="Click to view other user plotterparameters" href="{% url 'api_plotters:view' user.username %}"><img class="img-circle" src="{{ user.email|gravatar_url }}?d=monsterid&r=pg&s=20"></img></a></li>{% endfor %}
+ </ul>
+ </div>
+ {% endif %}
+ {% if object.shared_with_team.count %}
+ <div>
+ <p>Teams with access:<p>
+ <ul>
+ {% for team in object.shared_with_team.all %}<li>{{ team.owner.username }} / <a data-toggle="tooltip" data-placement="top" title="Click to view details" href="{% url 'teams:view' team.owner.username team.name %}">{{ team.name }}</a> </li>{% endfor %}
+ </ul>
+ </div>
+ {% endif %}
+ {% endif %}
+
+ </div>
+
+ <div id="sharing-edition" style="display:none;">
+ <h4>Sharing properties (currently, this plotterparameter is <b>{{ p }}</b>)</h4>
+
+ <p class="help">{{ help_text }}</p>
+
+ <form id="sharing-form" method="post" action="" class="form">
+ {% csrf_token %}
+ <fieldset>
+ <div class="form-group">
+ <div class="radio">
+ <label class="control-label">
+ <input id="public-radio" type="radio" name="sharing" value="public" checked="checked" onClick="$('#sharing-options').disable()"/>
+ Public
+ <p class="help">All users will be able to see, use and fork this
+ plotterparameter</p>
+ </label>
+ </div>
+ <div class="radio">
+ <label class="control-label">
+ <input id="shared-radio" type="radio" name="sharing" value="shared" onClick="$('#sharing-options').enable()"/> Shared
+ <p class="help">The users and teams indicated below will be
+ able to see, use and fork this plotterparameter.</p>
+ </label>
+ </div>
+ </div>
+ </fieldset>
+ <fieldset id="sharing-options" disabled>
+ <div class="form-group">
+ <label for="sharing-users">Users</label>
+ <div class="form-group">
+ <select id="sharing-users" multiple disabled data-placeholder="Select users...">
+ {% for u in users %}<option value="{{ u.username }}"{% if u in object.shared_with.all or u in object.usable_by.all %} selected{% endif %}>{{ u.first_name }} {{ u.last_name }} ({{ u.username }})</option>{% endfor %}
+ </select>
+ <p class="help">Fill-in names of users allowed to access this object. Start typing for auto-completion.</p>
+ </div>
+ <div class="form-group">
+ <label for="sharing-teams">Teams</label>
+ <select id="sharing-teams" multiple disabled data-placeholder="Select teams...">
+ {% for t in teams %}<option value="{{ t.fullname }}"{% if t in object.shared_with_team.all or t in object.usable_by_team.all %} selected{% endif %}>{{ t.fullname }}</option>{% endfor %}
+ </select>
+ <p class="help">Fill-in names of teams allowed to access this object. Start typing for auto-completion.</p>
+ </div>
+ </div>
+ </fieldset>
+ </form>
+ </div><!-- edition -->
+ </div><!-- col -->
+
+ <div class="col-sm-2">
+ <div class="pull-right action-buttons">
+ <a id="btn-edit-sharing" class="btn btn-primary btn-sm"{% ifequal p 'Public' %} style="display:none;"{% endifequal %}><i class="fa fa-edit fa-lg"></i> Edit</a>
+ <a id="btn-save-sharing" class="btn btn-success btn-sm" style="display:none;"><i class="fa fa-save fa-lg"></i> Save</a>
+ <a id="btn-cancel-sharing" class="btn btn-danger btn-sm" style="display:none;"><i class="fa fa-times fa-lg"></i> Cancel</a>
+ </div>
+ </div>
+
+</div>
+{% endwith %}
+{% endwith %}
+
+<script type="text/javascript">
+$(document).ready(function() {
+
+ var display = $('#sharing-display');
+ var edition = $('#sharing-edition');
+ var edit_button = $('#btn-edit-sharing');
+ var save_button = $('#btn-save-sharing');
+ var cancel_button = $('#btn-cancel-sharing');
+
+ //chosen select boxes
+ $('#sharing-users').chosen({search_contains: true});
+ $('#sharing-teams').chosen({search_contains: true});
+
+ edit_button.click(function() {
+ //displays hidden form with codemirror textarea
+ display.hide();
+ edition.show();
+ edit_button.hide();
+ save_button.show();
+ cancel_button.show();
+ $('#sharing-users').trigger('chosen:updated');
+ $('#sharing-teams').trigger('chosen:updated');
+ });
+
+ cancel_button.click(function() {
+ edition.hide();
+ display.show();
+ save_button.hide();
+ cancel_button.hide();
+ edit_button.show();
+ });
+
+ //rigs the selector so the right set of people is shown
+ $('#public-radio').click(function(){
+ $('#sharing-options').disable();
+ $('#sharing-users').prop('disabled', true).trigger("chosen:updated");
+ $('#sharing-teams').prop('disabled', true).trigger("chosen:updated");
+ });
+ $('#shared-radio').click(function(){
+ $('#sharing-options').enable();
+ $('#sharing-users').prop('disabled', false).trigger("chosen:updated");
+ $('#sharing-teams').prop('disabled', false).trigger("chosen:updated");
+ });
+
+ save_button.click(function() {
+ //submit form. On success, reload page. On failure, show errors.
+ $.ajaxSetup({
+ beforeSend: function(xhr, settings) {
+ var csrftoken = $.cookie('csrftoken');
+ xhr.setRequestHeader('X-CSRFToken', csrftoken);
+ }
+ });
+
+ var post_data = {
+ 'status': $('input[name=sharing]:checked', '#sharing-form').val(),
+ };
+
+ if (post_data.status != 'public') {
+ var val = $('#sharing-users').val();
+ if (val) post_data['users'] = val;
+ val = $('#sharing-teams').val()
+ if (val) post_data['teams'] = val;
+ }
+
+ var d = $.ajax({
+ type: 'POST',
+ //url: '{{ object.get_api_share_url }}',
+ url: '{{ object.get_api_share_url }}',
+ data: JSON.stringify(post_data),
+ contentType: 'application/json; charset=utf-8',
+ dataType: 'json',
+ });
+
+ d.done(function(){location.reload();});
+ d.fail(process_error);
+
+ });
+
+});
+</script>
diff --git a/beat/web/plotters/templates/plotterparameters/panels/table.html b/beat/web/plotters/templates/plotterparameters/panels/table.html
new file mode 100644
index 0000000000000000000000000000000000000000..6d555ccedf1f1a56f554d43acec41687c8c6275b
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/panels/table.html
@@ -0,0 +1,117 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+{% load ui_tags %}
+{% load plotter_tags %}
+
+<div class="row filter">
+
+ <div class="col-sm-10 vertical-center">
+
+ {% if objects %}
+ <div id="filters" class="form-inline">
+
+ <div class="form-group form-group-sm">
+ <div class="input-group input-group-sm">
+ <span class="input-group-addon" id="basic-addon1"><i class="fa fa-search"></i></span>
+ <input type="text" tabindex="2" id="text-filter" class="form-control" placeholder="Filter rows..." aria-describedby="basic-addon1">
+ </div>
+ </div>
+
+ <div class="form-group form-group-sm">
+ <label for="privacy-filter" class="control-label">Privacy:</label>
+ <select id="privacy-filter" class="form-control">
+ <option selected>All</option>
+ <option>Public</option>
+ <option>Shared</option>
+ <option>Private</option>
+ </select>
+ </div>
+
+ </div>
+ {% endif %}
+
+ <!-- Notice there can be no div space if vertical-center is used -->
+ </div><div class="col-sm-2 vertical-center">
+
+ {% if owner %}
+ <a class="btn btn-success btn-sm pull-right" href="{% url 'plotters:new_plotterparameter' request.user.username %}"><i class="fa fa-plus fa-lg"></i> New</a>
+ {% endif %}
+
+ </div><!-- col -->
+
+</div><!-- row -->
+
+<div class="row">
+
+ <div class="col-sm-12">
+
+ {% if objects %}
+ <div class="scrollable table-responsive">
+ <table id="{{ panel_id }}" class="table table-hover table-condensed object-list plotterparameter-list">
+ <thead>
+ <tr>
+ <th class="privacy"></th>
+ <th class="date">Updated</th>
+ <th>Name</th>
+ <th class="actions">Actions</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for obj in objects %}
+ <tr>
+ <td class="privacy">
+ <a title="{{ obj.get_sharing_display }}" data-toggle="tooltip" data-placement="top">
+ {% if obj.get_sharing_display == 'Private' %}
+ <i class="fa fa-user fa-2x"></i>
+ {% elif obj.get_sharing_display == 'Shared' %}
+ <i class="fa fa-users fa-2x"></i>
+ {% else %}
+ <i class="fa fa-globe fa-2x"></i>
+ {% endif %}
+ </a>
+ </td>
+ <td class="date">{{ obj.creation_date|date }}</td>
+ <td class="name"><a href="{{ obj.get_absolute_url }}" data-toggle="tooltip" data-placement="top" title="Click to view">{{ obj.fullname }}{% if obj.short_description %} <span class='help'>({{ obj.short_description }})</span>{% endif %}</a></td>
+ <td class="actions">
+ {% plotterparameter_actions obj True %}
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+ {% endif %}
+
+ </div><!-- col -->
+
+</div><!-- row -->
+{% if not objects %}
+<div class="row">
+
+ <div class="col-sm-12 not-found">
+ No plotterparameter found
+ </div>
+
+</div><!-- row -->
+{% endif %} <!-- if not objects -->
+
+{% filter_script panel_id "text-filter" "privacy-filter" %}
diff --git a/beat/web/plotters/templates/plotterparameters/panels/viewer_editor.html b/beat/web/plotters/templates/plotterparameters/panels/viewer_editor.html
new file mode 100644
index 0000000000000000000000000000000000000000..b5e956cf515c62ca8e3175c70dc254bbcdac0521
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/panels/viewer_editor.html
@@ -0,0 +1,118 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+{% load ui_tags %}
+{% load plotter_tags %}
+
+{% load fingerprint %}
+
+<link rel="stylesheet" href="{% fingerprint "chosen-bootstrap/chosen.bootstrap.min.css" %}" type="text/css" media="screen" />
+<script src="{% fingerprint "plotters/js/dialogs.js" %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% fingerprint "bootstrap3-typeahead/bootstrap3-typeahead.min.js" %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% fingerprint "chosen/chosen.jquery.min.js" %}" type="text/javascript" charset="utf-8"></script>
+
+<div class="row">
+ <div class="col-sm-offset-1 col-sm-8 vertical-center">
+ <h3>
+ <ol class="breadcrumb">
+ <li>New plotterparameter</li>
+ </ol>
+ </h3>
+ </div><div class="col-sm-2 vertical-center">
+ <div class="action-buttons pull-right">
+ <button id="save" type="submit" class="btn btn-success btn-sm button_save" data-toggle="tooltip" data-placement="bottom" data-plotter="{{plotters.selected}}" createplotterparameter><i class="fa fa-save"></i> Save</button>
+ <a id="cancel" class="btn btn-danger btn-sm" onclick="window.history.back();"><i class="fa fa-times fa-lg"></i> Cancel</a>
+ </div>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-sm-offset-1 col-sm-10 vertical-center">
+ <div class="panel-group" id="information-accordion" role="tablist" aria-multiselectable="true">
+ <div id="settings_name-div" class="section">
+ <div class="form-group has-feedback">
+ <label class="control-label" for="settings_name">Name:</label>
+ <input class="form-control input-sm" id="settings_name" class="label" data-placeholder="Start typing a name..." autocomplete="off" autocorrect="off" autocapitalize="off" type="string" key="name" value="{{ plotterparameter.name }}" textinput></input>
+ <span class="glyphicon glyphicon-remove form-control-feedback" aria-hidden="true"></span>
+ <span class="help">Enter a meaningful name to help you recognize this plotterparameter. Auto-completion will help you in keeping your naming conventions tide. If a chosen name is <span class="text-danger">highlighted in red</span>, it is because it is already being used. In this case, choose another name.</span>
+ </div>
+ </div>
+
+ <div class="panel panel-default step1">
+ <div class="panel-heading" role="tab" id="info-heading">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#info-heading" href="#collapse-info" aria-expanded="true" aria-controls="collapse-info">Step 1: Select the plotter you wish to create a plotterparameter for and click the "Save" Button</a>
+ </h4>
+ </div>{# panel-heading #}
+ <div id="collapse-info" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="info-heading">
+ <div class="panel-body">
+ <select id="plotter-selection" ng-model="plotters.selected" class="form-control input-sm" ng-options="val.name for (key, val) in plotters" selectplotter>Select the plotter
+ </select>
+
+ <div id="space-for-plotterparameter-graph">
+ </div>
+
+ </div>{# panel-body #}
+ </div>{# collapse #}
+ </div>{# panel #}
+
+
+ </div>{# panel-group #}
+ </div>{# col-sm-12 #}
+</div>{# row #}
+
+{% plotterparameter_created "plotterparameter_created" %}
+
+<script type="text/javascript">
+getNames();
+ {# sets up the name input box so you can get auto-completion #}
+ function getNames() {
+ {% if action != 'pending' %} {# experiment name was not selected #}
+ var d = $.get('{% url "api_plotters:view" request.user.username %}?fields=name,author');
+ var duplicates = [];
+ d.done(function(data) {
+ //filter returned names to only keep author experiments' names
+ //remove duplicate names
+ finaldata = [];
+ for(var i=0; i<data.length; i++)
+ {
+ if(!duplicates.includes(data[i].name.split("/")[1]) && data[i].author == {{ request.user.id }})
+ {
+ finaldata.push(data[i]);
+ duplicates.push(data[i].name.split("/")[1]);
+ }
+ }
+ data = finaldata.filter(function(e) {
+ return (e.author == {{ request.user.id }});
+ }).map(function(e){ return e.name.split("/")[1]; });
+ beat.plotterparameters.dialogs.name_typeahead('input#settings_name', data);
+ });
+ {% else %}
+ var d = $.Deferred();
+ {# notice we cannot hide now, it is not meaningful #}
+ $('#ui').on('show', function(){$('#settings_name-div').hide()});
+ d.resolve();{# fires immediately #}
+ {% endif %}
+ return d.promise();
+ }
+
+
+</script>
diff --git a/beat/web/plotters/templates/plotterparameters/panels/viewer_editor_fork.html b/beat/web/plotters/templates/plotterparameters/panels/viewer_editor_fork.html
new file mode 100644
index 0000000000000000000000000000000000000000..aeac615ffa3e3c01b3db3719b4f2cbdcb6098820
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/panels/viewer_editor_fork.html
@@ -0,0 +1,169 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+{% load ui_tags %}
+{% load plotter_tags %}
+
+{% load fingerprint %}
+
+<link rel="stylesheet" href="{% fingerprint "chosen-bootstrap/chosen.bootstrap.min.css" %}" type="text/css" media="screen" />
+<script src="{% fingerprint "plotters/js/dialogs.js" %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% fingerprint "bootstrap3-typeahead/bootstrap3-typeahead.min.js" %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% fingerprint "chosen/chosen.jquery.min.js" %}" type="text/javascript" charset="utf-8"></script>
+
+<div class="row">
+ <div class="col-sm-8 vertical-center">
+ <h3>
+ <ol class="breadcrumb">
+ <li>Fork of plotterparameter: {{parameters.plotterparameter_author}}/{{parameters.plotterparameter_name}}/{{parameters.plotterparameter_version}}</li>
+ </ol>
+ </h3>
+ </div><div class="col-sm-4 vertical-center">
+ <div class="action-buttons pull-right">
+ <button id="save" type="submit" class="btn btn-success btn-sm button_save" data-toggle="tooltip" data-placement="bottom" data-plotter="{{plotter}}" data-parameters="{{parameters}}" createplotterparameterfork><i class="fa fa-save"></i> Save</button>
+ <a id="cancel" class="btn btn-danger btn-sm" onclick="window.history.back();"><i class="fa fa-times fa-lg"></i> Cancel</a>
+ </div>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-sm-12">
+ <div class="panel-group" id="information-accordion" role="tablist" aria-multiselectable="true">
+ <div id="settings_name-div" class="section">
+ <div class="form-group has-feedback">
+ <label class="control-label" for="settings_name">Name:</label>
+ <input class="form-control input-sm" id="settings_name" class="label" data-placeholder="Start typing a name..." autocomplete="off" autocorrect="off" autocapitalize="off" type="string" key="name" value="{{ plotterparameter.name }}" textinput></input>
+ <span class="glyphicon glyphicon-remove form-control-feedback" aria-hidden="true"></span>
+ <span class="help">Enter a meaningful name to help you recognize this plotterparameter. Auto-completion will help you in keeping your naming conventions tide. If a chosen name is <span class="text-danger">highlighted in red</span>, it is because it is already being used. In this case, choose another name.</span>
+ </div>
+ </div>
+ </div>{# panel-group #}
+ </div>{# col-sm-12 #}
+</div>{# row #}
+
+<div class="row">
+ <div class="col-sm-12">
+
+ {# Navigation Tabs #}
+ <ul id="object-tabs" class="nav nav-tabs" role="tablist">
+
+
+ <li role="presentation" class="active"><a href="#viewer" role="tab" data-toggle="tab" aria-controls="viewer">Plotterparameter</a></li>
+ {% if owner %}
+ <li role="presentation"><a href="#sharing" role="tab" data-toggle="tab" aria-controls="sharing">Sharing</a></li>
+ {% endif %}
+
+ {% visible_reports plotterparameter as reports %}
+
+ <li role="presentation"><a href="#history" role="tab" data-toggle="tab" aria-controls="history">History</a></li>
+ </ul>
+
+ {# Navigation Panes #}
+ <div class="tab-content">
+ <div role="tabpanel" class="tab-pane active" id="viewer">
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="panel-group" id="information-accordion" role="tablist" aria-multiselectable="true">
+
+ <div class="panel panel-default step1">
+ <div class="panel-heading" role="tab" id="info-heading">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#info-heading" href="#collapse-info" aria-expanded="true" aria-controls="collapse-info">Click the "Save" Button to create a fork of this plotterparameter</a>
+ </h4>
+ </div>{# panel-heading #}
+ <div id="collapse-info" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="info-heading">
+ <div class="panel-body">
+
+ <div id="plotterparameter_items" class="row" plotterparameteritems>
+ <div id="space-for-plotterparameter-plot">
+ </div>
+ </div>
+
+ </div>{# panel-body #}
+ </div>{# collapse #}
+ </div>{# panel #}
+
+
+ </div>{# panel-group #}
+ </div>{# col-sm-12 #}
+ </div>{# row #}
+
+ </div>
+ <div role="tabpanel" class="tab-pane" id="doc">
+ {%comment%}
+ {% doc_editor plotterparameter 'api_plotterparameters:object' %}
+ {%endcomment%}
+ {% doc_editor plotterparameter 'api_plotters:all' %}
+ </div>
+ {% if owner %}
+ <div role="tabpanel" class="tab-pane" id="sharing">
+ {% plotterparameter_sharing plotterparameter %}
+ </div>
+ {% endif %}
+ <div role="tabpanel" class="tab-pane" id="history">
+ {% history "plotters/plotterparameter" plotterparameter "history" 400 %}
+ </div>
+ </div>
+
+ </div>
+</div>
+
+
+{% plotterparameter_created "plotterparameter_created" %}
+
+<script type="text/javascript">
+
+getNames();
+ {# sets up the name input box so you can get auto-completion #}
+ function getNames() {
+ {% if action != 'pending' %} {# experiment name was not selected #}
+ var d = $.get('{% url "api_plotters:view" request.user.username %}?fields=name,author');
+ var duplicates = [];
+ d.done(function(data) {
+ //filter returned names to only keep author experiments' names
+ //remove duplicate names
+ finaldata = [];
+ for(var i=0; i<data.length; i++)
+ {
+ if(!duplicates.includes(data[i].name.split("/")[1]) && data[i].author == {{ request.user.id }})
+ {
+ finaldata.push(data[i]);
+ duplicates.push(data[i].name.split("/")[1]);
+ }
+ }
+ data = finaldata.filter(function(e) {
+ return (e.author == {{ request.user.id }});
+ }).map(function(e){
+ return e.name.split("/")[1];
+ });
+ beat.plotterparameters.dialogs.name_typeahead('input#settings_name', data);
+ });
+ {% else %}
+ var d = $.Deferred();
+ {# notice we cannot hide now, it is not meaningful #}
+ $('#ui').on('show', function(){$('#settings_name-div').hide()});
+ d.resolve();{# fires immediately #}
+ {% endif %}
+ return d.promise();
+ }
+
+</script>
diff --git a/beat/web/plotters/templates/plotterparameters/panels/viewer_editor_new_version.html b/beat/web/plotters/templates/plotterparameters/panels/viewer_editor_new_version.html
new file mode 100644
index 0000000000000000000000000000000000000000..928b54c3590303be6b1a2945ef4e1b38725626a9
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/panels/viewer_editor_new_version.html
@@ -0,0 +1,120 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+{% load ui_tags %}
+{% load plotter_tags %}
+
+{% load fingerprint %}
+
+<link rel="stylesheet" href="{% fingerprint "chosen-bootstrap/chosen.bootstrap.min.css" %}" type="text/css" media="screen" />
+<script src="{% fingerprint "plotters/js/dialogs.js" %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% fingerprint "bootstrap3-typeahead/bootstrap3-typeahead.min.js" %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% fingerprint "chosen/chosen.jquery.min.js" %}" type="text/javascript" charset="utf-8"></script>
+
+<div class="row">
+ <div class="col-sm-8 vertical-center">
+ <h3>
+ <ol class="breadcrumb">
+ <li>New version of plotterparameter: {{parameters.plotterparameter_author}}/{{parameters.plotterparameter_name}}/{{parameters.plotterparameter_version}}</li>
+ </ol>
+ </h3>
+ </div><div class="col-sm-4 vertical-center">
+ <div class="action-buttons pull-right">
+ <button id="save" type="submit" class="btn btn-success btn-sm button_save" data-toggle="tooltip" data-placement="bottom" data-plotter="{{plotter}}" data-parameters="{{parameters}}" createplotterparameternewversion><i class="fa fa-save"></i> Save</button>
+ <a id="cancel" class="btn btn-danger btn-sm" onclick="window.history.back();"><i class="fa fa-times fa-lg"></i> Cancel</a>
+ </div>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-sm-12">
+
+ {# Navigation Tabs #}
+ <ul id="object-tabs" class="nav nav-tabs" role="tablist">
+
+
+ <li role="presentation" class="active"><a href="#viewer" role="tab" data-toggle="tab" aria-controls="viewer">Plotterparameter</a></li>
+ {% if owner %}
+ <li role="presentation"><a href="#sharing" role="tab" data-toggle="tab" aria-controls="sharing">Sharing</a></li>
+ {% endif %}
+
+ {% visible_reports plotterparameter as reports %}
+
+ <li role="presentation"><a href="#history" role="tab" data-toggle="tab" aria-controls="history">History</a></li>
+ </ul>
+
+ {# Navigation Panes #}
+ <div class="tab-content">
+ <div role="tabpanel" class="tab-pane active" id="viewer">
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="panel-group" id="information-accordion" role="tablist" aria-multiselectable="true">
+
+ <div class="panel panel-default step1">
+ <div class="panel-heading" role="tab" id="info-heading">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#info-heading" href="#collapse-info" aria-expanded="true" aria-controls="collapse-info">Click the "Save" Button to create a new version of this plotterparameter</a>
+ </h4>
+ </div>{# panel-heading #}
+ <div id="collapse-info" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="info-heading">
+ <div class="panel-body">
+
+ <div id="plotterparameter_items" class="row" plotterparameteritems>
+ <div id="space-for-plotterparameter-plot">
+ </div>
+ </div>
+
+ </div>{# panel-body #}
+ </div>{# collapse #}
+ </div>{# panel #}
+
+
+ </div>{# panel-group #}
+ </div>{# col-sm-12 #}
+ </div>{# row #}
+
+ </div>
+ <div role="tabpanel" class="tab-pane" id="doc">
+ {%comment%}
+ {% doc_editor plotterparameter 'api_plotterparameters:object' %}
+ {%endcomment%}
+ {% doc_editor plotterparameter 'api_plotters:all' %}
+ </div>
+ {% if owner %}
+ <div role="tabpanel" class="tab-pane" id="sharing">
+ {% plotterparameter_sharing plotterparameter %}
+ </div>
+ {% endif %}
+ <div role="tabpanel" class="tab-pane" id="history">
+ {% history "plotters/plotterparameter" plotterparameter "history" 400 %}
+ </div>
+ </div>
+
+ </div>
+</div>
+
+
+{% plotterparameter_created "plotterparameter_created" %}
+
+<script type="text/javascript">
+
+</script>
diff --git a/beat/web/plotters/templates/plotterparameters/partials/plotgraphicinfo.html b/beat/web/plotters/templates/plotterparameters/partials/plotgraphicinfo.html
new file mode 100644
index 0000000000000000000000000000000000000000..ea97f3e84f2193caf869f71fc727b05bd2cbed51
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/partials/plotgraphicinfo.html
@@ -0,0 +1,34 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+{% load ui_tags %}
+
+<div id="{{ panel_id }}">
+<h4>This is a sample data plot</h4>
+<table class="table table-hover table-striped table-responsive">
+ <tbody>
+ <tr><th class="results-header">Figure sample for {$ plotterparameter $}{$ plotterparameter.name $}</th>
+ {# it is a plot, request data #}
+ <td id="td_figure_plot"><i class="fa fa-spin fa-refresh"</i></td>
+ </tr>
+ </tbody>
+</table>
+</div>
diff --git a/beat/web/plotters/templates/plotterparameters/partials/plotparamsinfo.html b/beat/web/plotters/templates/plotterparameters/partials/plotparamsinfo.html
new file mode 100644
index 0000000000000000000000000000000000000000..dc2555298254f4ea36dc53cff9ee740edc7fe034
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/partials/plotparamsinfo.html
@@ -0,0 +1,72 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+{% load ui_tags %}
+
+{%comment%}
+<div id="{{ panel_id }}">
+<h4>Tune your plotterparmaeters and click the TEST button</h4>
+<table id="table_plotparams" class="table table-hover table-striped table-responsive">
+ <tbody>
+ <tr><th class="params-header">Modifiable parameters for {$ plotterparameter $}{$ plotterparameter.name $}</th>
+ {# it is a plot, request data #}
+ <td id="td_params_element"><i class="fa fa-spin fa-refresh"</i></td>
+ </tr>
+ </tbody>
+</table>
+</div>
+{%endcomment%}
+
+<div id="{{ panel_id }}" class="row table-responsive">
+ <div class="col-sm-12">
+ <table id="table_plotparams" class="table table-hover table-striped table-condensed">
+ Tune your plotterparameters and click the wrench button icon to see how it looks on the plotter
+
+ <thead>
+ <tr>
+ <th>
+ <span style="white-space:nowrap">
+ key
+ </span>
+ </th>
+ <th>
+ <span style="white-space:nowrap">
+ value
+ </span>
+ </th>
+ <th>
+ <span style="white-space:nowrap">
+ type
+ </span>
+ </th>
+ <th>
+ <span style="white-space:nowrap">
+ description
+ </span>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
+ </div>
+</div>
+
diff --git a/beat/web/plotters/templates/plotterparameters/plotterparameter.html b/beat/web/plotters/templates/plotterparameters/plotterparameter.html
new file mode 100644
index 0000000000000000000000000000000000000000..a62a5c9f424c61f20648a83024f44c74bcc21a8c
--- /dev/null
+++ b/beat/web/plotters/templates/plotterparameters/plotterparameter.html
@@ -0,0 +1,291 @@
+{% extends "base.html" %}
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+
+{% load fingerprint %}
+{% load ui_tags %}
+{% load humanize %}
+
+{% load search_tags %}
+{% load report_tags %}
+{% load plotter_tags %}
+{% load markup %}
+
+{% load fingerprint %}
+
+{% block title %}{{ block.super }} - {{ plotterparameter.fullname }}{% endblock %}
+
+
+{% block stylesheets %}
+{{ block.super }}
+ <link rel="stylesheet" href="{% fingerprint "experiments/css/style.css" %}" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{% fingerprint "plotters/css/style.css" %}" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{% fingerprint "chosen-bootstrap/chosen.bootstrap.min.css" %}" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{% fingerprint "ui/css/rst.css" %}" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{% fingerprint "spectrum/spectrum.css" %}" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{% fingerprint "ui/css/save-as-dialog.css" %}" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{% fingerprint "chosen-bootstrap/chosen.bootstrap.min.css" %}" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{% fingerprint "datatables/media/css/dataTables.bootstrap.min.css" %}" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{% fingerprint "jquery-ui/themes/base/minified/jquery-ui.min.css" %}" type="text/css" media="screen" />
+
+{% if owner %}
+{% code_editor_css %}
+{% endif %}
+{% endblock %}
+
+
+{% block scripts %}
+{{ block.super }}
+ <script src="{% fingerprint "chosen/chosen.jquery.min.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "experiments/js/utils.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "ui/js/history.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "raphael/raphael-min.js" %}" type="text/javascript" charset="utf-8"></script>
+
+ <!-- Use Google's CDN for angular-js with a local fallback -->
+ <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular.min.js"></script>
+ <script>window.angular || document.write('<script src="{% fingerprint "angular/angular.min.js" %}"><\/script>');</script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-filter/0.5.8/angular-filter.min.js"></script>
+ <script src="{% fingerprint "angular-ui-router/release/angular-ui-router.min.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "jquery-ui/ui/minified/jquery.ui.core.min.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "jquery-ui/ui/minified/jquery.ui.position.min.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "jquery-ui/ui/minified/jquery.ui.widget.min.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "jquery-ui/ui/minified/jquery.ui.button.min.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "jquery-ui/ui/minified/jquery.ui.dialog.min.js" %}" type="text/javascript" charset="utf-8"></script>
+
+ <!-- other js imports from beat.web -->
+ <script src="{% fingerprint "ui/js/plotterparameterdialog.js" %}" type="text/javascript" charset="utf-8"></script>
+
+ <!-- angularjs plotterparameter app related imports -->
+ <script src="{% fingerprint "plotters/app/app.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "plotters/app/app.config.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "plotters/app/controllers/plotterparameterController.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "plotters/app/factories/plotterparameterFactory.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "plotters/app/directives/plotterparameterItemView.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "plotters/app/factories/plotterFactory.js" %}" type="text/javascript" charset="utf-8"></script>
+
+{% if owner %}
+{% code_editor_scripts "rst" %}
+{% endif %}
+{% endblock %}
+
+
+{% block content %}
+<div class="col-sm-12" ng-app="plotterparameterApp" ng-controller="plotterparameterController" ng-init="init('{{ author }}', '{{plotterparameter}}', '{{ URL_PREFIX }}', '{% fingerprint "reports/app/data/itemcontent.json" %}', '{% fingerprint "reports/app/data/table_itemcontent.json" %}')">
+
+{% if plotterparameter == 'CREATION_MODE' %}
+
+ {% plotterparameter_viewer_editor plotterparameter%}
+
+{% elif plotterparameter_mode == 'NEW_VERSION_MODE' %}
+
+ {% plotterparameter_viewer_editor_new_version plotterparameter%}
+
+{% elif plotterparameter_mode == 'FORK_MODE' %}
+
+ {% plotterparameter_viewer_editor_fork plotterparameter%}
+
+{% else %}
+
+
+
+<div id="title" class="row">
+
+ <div class="col-sm-9 vertical-center" onmouseover="expand_breadcrumb(this, 9, 3);" onmouseout="reset_breadcrumb(this, 9, 3);">
+ {% contribution_breadcrumb_plotterparameter plotterparameter %}
+ <!-- Note: keep no space between divs here! -->
+ </div><div class="col-sm-3 vertical-center">
+ {% plotterparameter_actions plotterparameter False %}
+ </div>
+
+</div>
+
+
+{% if plotterparameter.short_description %}
+<div class="row">
+ <div class="col-sm-12">
+ <p class="help-block"><i class="fa fa-file-text"></i> {{ plotterparameter.short_description }}</p>
+ </div>
+</div>
+{% endif %}
+
+
+{% if plotterparameter.fork_of %}
+<div class="row">
+ <div class="col-sm-12">
+ <p class="help-block"><i class="fa fa-code-fork"></i> Forked from <a href="{{ plotterparameter.fork_of.get_absolute_url }}">{{ plotterparameter.fork_of.fullname }}</a></p>
+ </div>
+</div>
+{% endif %}
+
+{% if plotterparameter.get_sharing_display != 'Private' %}
+
+<div class="row">
+ <div class="col-sm-12">
+
+ {# Navigation Tabs #}
+ <ul id="object-tabs" class="nav nav-tabs" role="tablist">
+
+
+ <li role="presentation" class="active"><a href="#viewer" role="tab" data-toggle="tab" aria-controls="viewer">Plotterparameter</a></li>
+ <li role="presentation"><a {% if not plotterparameter.description %}title="No documentation available" {% endif %}href="#doc" role="tab" data-toggle="tab" aria-controls="doc">Documentation{% if not plotterparameter.description %} <i class="fa fa-warning"></i>{% endif %}</a></li>
+ {% if owner %}
+ <li role="presentation"><a href="#sharing" role="tab" data-toggle="tab" aria-controls="sharing">Sharing</a></li>
+ {% endif %}
+
+ {% visible_reports plotterparameter as reports %}
+
+ <li role="presentation"><a href="#reports" role="tab" data-toggle="tab" aria-controls="reports">Reports <span class="badge">{{ reports.count }}</span></a></li>
+ <li role="presentation"><a href="#history" role="tab" data-toggle="tab" aria-controls="history">History</a></li>
+ </ul>
+
+
+ {# Navigation Panes #}
+ <div class="tab-content">
+ <div role="tabpanel" class="tab-pane active" id="viewer">
+ {% plotterparameter_sampleplot plotterparameter %}
+ {% plotterparameter_merged_parameters plotter_origin plotterparameter %}
+ </div>
+ <div role="tabpanel" class="tab-pane" id="doc">
+ {% doc_editor plotterparameter 'api_plotterparameters:object' False %}
+ </div>
+ {% if owner %}
+ <div role="tabpanel" class="tab-pane" id="sharing">
+ {% plotterparameter_sharing plotterparameter %}
+ </div>
+ {% endif %}
+ <div role="tabpanel" class="tab-pane" id="reports">
+
+ {% if reports.count %}
+ <h4>Reports</h4>
+ {% report_table reports.all owner "report-list" %}
+ {% else %}
+ No reports are using this plotterparameter.
+ {% endif %}
+
+ </div>
+ <div role="tabpanel" class="tab-pane" id="history">
+ {% history "plotters/plotterparameter" plotterparameter "history" 400 %}
+ </div>
+ </div>
+
+ </div>
+</div>
+
+{% else %}
+
+{% if plotterparameter.plotter == None %}
+ {% plotterparameter_viewer_editor plotterparameter%}
+{% else %}
+
+<div class="row">
+ <div class="col-sm-12">
+
+ {# Navigation Tabs #}
+ <ul id="object-tabs" class="nav nav-tabs" role="tablist">
+
+
+ <li role="presentation" class="active"><a href="#viewer" role="tab" data-toggle="tab" aria-controls="viewer">Plotterparameter</a></li>
+ <li role="presentation"><a {% if not plotterparameter.description %}title="No documentation available" {% endif %}href="#doc" role="tab" data-toggle="tab" aria-controls="doc">Documentation{% if not plotterparameter.description %} <i class="fa fa-warning"></i>{% endif %}</a></li>
+ {% if owner %}
+ <li role="presentation"><a href="#sharing" role="tab" data-toggle="tab" aria-controls="sharing">Sharing</a></li>
+ {% endif %}
+
+ {% visible_reports plotterparameter as reports %}
+
+ <li role="presentation"><a href="#reports" role="tab" data-toggle="tab" aria-controls="reports">Reports <span class="badge">{{ reports.count }}</span></a></li>
+ <li role="presentation"><a href="#history" role="tab" data-toggle="tab" aria-controls="history">History</a></li>
+ </ul>
+
+ {# Navigation Panes #}
+ <div class="tab-content">
+ <div role="tabpanel" class="tab-pane active" id="viewer">
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="panel-group" id="information-accordion" role="tablist" aria-multiselectable="true">
+
+ <div class="panel panel-default step1">
+ <div class="panel-heading" role="tab" id="info-heading">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#info-heading" href="#collapse-info" aria-expanded="true" aria-controls="collapse-info">Step 2: Tune your plotterparameters, test and click the "Save" Button</a>
+ </h4>
+ </div>{# panel-heading #}
+ <div id="collapse-info" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="info-heading">
+ <div class="panel-body">
+
+ <div id="plotterparameter_items" class="row" plotterparameteritems>
+ <div id="space-for-plotterparameter-plot">
+ </div>
+ <div id="space-for-plotterparameter-items">
+ </div>
+ </div>
+
+ </div>{# panel-body #}
+ </div>{# collapse #}
+ </div>{# panel #}
+
+
+ </div>{# panel-group #}
+ </div>{# col-sm-12 #}
+ </div>{# row #}
+
+ </div>
+ <div role="tabpanel" class="tab-pane" id="doc">
+ {% doc_editor plotterparameter 'api_plotters:all' %}
+ </div>
+ {% if owner %}
+ <div role="tabpanel" class="tab-pane" id="sharing">
+ {% plotterparameter_sharing plotterparameter %}
+ </div>
+ {% endif %}
+ <div role="tabpanel" class="tab-pane" id="reports">
+
+ {% if reports.count %}
+ <h4>Reports</h4>
+ {% report_table reports.all owner "report-list" %}
+ {% else %}
+ No reports are using this plotterparameter.
+ {% endif %}
+
+ </div>
+ <div role="tabpanel" class="tab-pane" id="history">
+ {% history "plotters/plotterparameter" plotterparameter "history" 400 %}
+ </div>
+ </div>
+
+ </div>
+</div>
+
+{% endif %}
+
+{% endif %}
+
+{% plotterparameter_saved "plotterparameter_saved" %}
+
+<script type="text/javascript">
+
+$(document).ready(function(){manage_tabs('ul#object-tabs');})
+
+</script>
+{% endif %}
+
+{% endblock %}
diff --git a/beat/web/plotters/templatetags/plotter_tags.py b/beat/web/plotters/templatetags/plotter_tags.py
index 71f9ec97fd16b5f96606641d838aaa97daa622d1..5612146e928ac378300768a3aa25f8d26d516fe8 100644
--- a/beat/web/plotters/templatetags/plotter_tags.py
+++ b/beat/web/plotters/templatetags/plotter_tags.py
@@ -60,6 +60,220 @@ def plotter_table(context, objects, owner, id):
panel_id=id,
)
+@register.inclusion_tag('plotterparameters/panels/table.html', takes_context=True)
+def plotterparameter_table(context, objects, owner, id):
+ '''Composes a plotterparameter list table
+
+ This panel primarily exists for user's plotterparameter list page.
+
+ Parameters:
+
+ objects (iterable): An iterable containing plotterparameter objects
+ owner (bool): A flag indicating if the list is being created for the
+ owner of his personal list page on the user-microsite or not.
+ id: The HTML id to set on the generated table. This is handy for the
+ filter functionality normally available on list pages.
+
+ '''
+
+ return dict(
+ request=context['request'],
+ objects=objects,
+ owner=owner,
+ panel_id=id,
+ )
+
+
+@register.inclusion_tag('plotterparameters/panels/sample_plot.html', takes_context=True)
+def plotterparameter_sampleplot(context, plotterparameter):
+ '''Composes a plotterparameter list table
+
+ This panel primarily exists for user's plotterparameter list page.
+
+ Parameters:
+
+ objects (iterable): An iterable containing plotterparameter objects
+ owner (bool): A flag indicating if the list is being created for the
+ owner of his personal list page on the user-microsite or not.
+ id: The HTML id to set on the generated table. This is handy for the
+ filter functionality normally available on list pages.
+
+ '''
+
+ plotter = plotterparameter.plotter
+ plotter_sample_data = plotterparameter.plotter.sample_data
+
+ return dict(
+ request=context['request'],
+ plotterparameter=plotterparameter,
+ plotter=plotter,
+ plotter_sample_data=plotter_sample_data.replace("\n",""),
+ panel_id=id,
+ )
+
+@register.inclusion_tag('plotterparameters/panels/sample_plot.html', takes_context=True)
+def plotterparameter_sampleplot_display(context, plotter):
+ '''Composes a plotterparameter list table
+
+ This panel primarily exists for user's plotterparameter list page.
+
+ Parameters:
+
+ objects (iterable): An iterable containing plotterparameter objects
+ owner (bool): A flag indicating if the list is being created for the
+ owner of his personal list page on the user-microsite or not.
+ id: The HTML id to set on the generated table. This is handy for the
+ filter functionality normally available on list pages.
+
+ '''
+
+ return dict(
+ request=context['request'],
+ plotterparameter=plotterparameter,
+ plotter=plotter,
+ plotter_sample_data=plotter_sample_data.replace("\n",""),
+ panel_id=id,
+ )
+
+@register.inclusion_tag('plotterparameters/panels/viewer_editor_fork.html', takes_context=True)
+def plotterparameter_viewer_editor_fork(context, plotterparameter):
+ '''Composes a plotterparameter viewer and editor
+
+ This panel primarily exists for user's plotterparameter list page.
+
+ Parameters:
+
+ objects (iterable): An iterable containing plotterparameter objects
+ owner (bool): A flag indicating if the list is being created for the
+ owner of his personal list page on the user-microsite or not.
+ id: The HTML id to set on the generated table. This is handy for the
+ filter functionality normally available on list pages.
+
+ '''
+ plotter = plotterparameter.plotter
+ plotter_sample_data = plotterparameter.plotter.sample_data
+ plotterparameter = plotterparameter
+ parameters = context['parameters']
+
+ return dict(
+ request=context['request'],
+ parameters=parameters,
+ plotterparameter=plotterparameter,
+ plotter=plotter,
+ plotter_sample_data=plotter_sample_data,
+ panel_id=id,
+ URL_PREFIX=context['URL_PREFIX'],
+ )
+
+
+
+@register.inclusion_tag('plotterparameters/panels/viewer_editor_new_version.html', takes_context=True)
+def plotterparameter_viewer_editor_new_version(context, plotterparameter):
+ '''Composes a plotterparameter viewer and editor
+
+ This panel primarily exists for user's plotterparameter list page.
+
+ Parameters:
+
+ objects (iterable): An iterable containing plotterparameter objects
+ owner (bool): A flag indicating if the list is being created for the
+ owner of his personal list page on the user-microsite or not.
+ id: The HTML id to set on the generated table. This is handy for the
+ filter functionality normally available on list pages.
+
+ '''
+ plotter = plotterparameter.plotter
+ plotter_sample_data = plotterparameter.plotter.sample_data
+ plotterparameter = plotterparameter
+ parameters = context['parameters']
+
+ return dict(
+ request=context['request'],
+ parameters=parameters,
+ plotterparameter=plotterparameter,
+ plotter=plotter,
+ plotter_sample_data=plotter_sample_data,
+ panel_id=id,
+ URL_PREFIX=context['URL_PREFIX'],
+ )
+
+
+@register.inclusion_tag('plotterparameters/panels/viewer_editor.html', takes_context=True)
+def plotterparameter_viewer_editor(context, plotterparameter):
+ '''Composes a plotterparameter viewer and editor
+
+ This panel primarily exists for user's plotterparameter list page.
+
+ Parameters:
+
+ objects (iterable): An iterable containing plotterparameter objects
+ owner (bool): A flag indicating if the list is being created for the
+ owner of his personal list page on the user-microsite or not.
+ id: The HTML id to set on the generated table. This is handy for the
+ filter functionality normally available on list pages.
+
+ '''
+
+ if plotterparameter == "CREATION_MODE":
+ plotter = plotterparameter
+ plotterparameter = plotterparameter
+ plotter_sample_data = None
+
+ return dict(
+ request=context['request'],
+ plotterparameter=plotterparameter,
+ plotter=plotter,
+ plotter_sample_data=plotter_sample_data,
+ panel_id=id,
+ URL_PREFIX=context['URL_PREFIX'],
+ )
+
+ else:
+ plotter = plotterparameter.plotter
+ plotter_sample_data = None
+ if plotter is not None:
+ plotter_sample_data = plotterparameter.plotter.sample_data
+
+ return dict(
+ request=context['request'],
+ plotterparameter=plotterparameter,
+ plotter=plotter,
+ plotter_sample_data=plotter_sample_data,
+ panel_id=id,
+ URL_PREFIX=context['URL_PREFIX'],
+ )
+
+
+@register.inclusion_tag('plotterparameters/panels/viewer_editor_tuner.html', takes_context=True)
+def plotterparameter_viewer_editor_tuner(context, plotterparameter):
+ '''Composes a plotterparameter viewer and editor
+
+ This panel primarily exists for user's plotterparameter list page.
+
+ Parameters:
+
+ objects (iterable): An iterable containing plotterparameter objects
+ owner (bool): A flag indicating if the list is being created for the
+ owner of his personal list page on the user-microsite or not.
+ id: The HTML id to set on the generated table. This is handy for the
+ filter functionality normally available on list pages.
+
+ '''
+
+ plotter = plotterparameter.plotter
+ plotter_sample_data = None
+ if plotter is not None:
+ plotter_sample_data = plotterparameter.plotter.sample_data
+
+ return dict(
+ request=context['request'],
+ plotterparameter=plotterparameter,
+ plotter=plotter,
+ plotter_sample_data=plotter_sample_data,
+ panel_id=id,
+ URL_PREFIX=context['URL_PREFIX'],
+ )
+
@register.inclusion_tag('plotters/panels/actions.html', takes_context=True)
def plotter_actions(context, object, display_count):
@@ -83,6 +297,47 @@ def plotter_actions(context, object, display_count):
)
+@register.inclusion_tag('plotterparameters/panels/actions.html', takes_context=True)
+def plotterparameter_actions(context, object, display_count):
+ '''Composes the action buttons for a particular plotter
+
+ This panel primarily exists for showing action buttons for a given
+ plotter taking into consideration it is being displayed for a given user.
+
+ Parameters:
+
+ object (plotter): The plotter object concerned for which the
+ buttons will be drawn.
+ display_count (bool): If the set of buttons should include one with the
+ number of experiments using this plotter.
+
+ '''
+ return dict(
+ request=context['request'],
+ object=object,
+ display_count=display_count,
+ )
+
+
+@register.inclusion_tag('plotterparameters/panels/sharing.html', takes_context=True)
+def plotterparameter_sharing(context, obj):
+ '''Composes the current sharing properties and a form to change them
+
+ Parameters:
+
+ obj (plotter): The plotter object concerned for which the
+ sharing panel will be drawn
+
+ '''
+ return {
+ 'request': context['request'],
+ 'object': obj,
+ 'owner': context['request'].user == obj.author,
+ 'users': context['users'],
+ 'teams': context['teams'],
+ }
+
+
@register.inclusion_tag('plotters/panels/sharing.html', takes_context=True)
def plotter_sharing(context, obj):
'''Composes the current sharing properties and a form to change them
@@ -173,3 +428,39 @@ def plotter_editor(context, obj):
def plotter_import_settings(id):
return { 'dialog_id': id,
}
+
+#--------------------------------------------------
+
+
+def plotterparameter_saved(id):
+ return { 'dialog_id': id,
+ 'URL_PREFIX': settings.URL_PREFIX
+ }
+
+
+register.inclusion_tag('plotterparameters/dialogs/plotterparameter_saved.html')(plotterparameter_saved)
+
+
+#--------------------------------------------------
+
+def plotterparameter_created(id):
+ return { 'dialog_id': id,
+ 'URL_PREFIX': settings.URL_PREFIX
+ }
+
+
+register.inclusion_tag('plotterparameters/dialogs/plotterparameter_created.html')(plotterparameter_created)
+
+
+#----------------------------------------------------------------
+
+
+@register.inclusion_tag('plotterparameters/panels/merged_parameters.html', takes_context=True)
+def plotterparameter_merged_parameters(context, plotter, plotterparameter):
+ request = context['request']
+ return {
+ 'owner': request.user == plotter.author,
+ 'object': plotter,
+ 'plotterparameter': plotterparameter,
+ 'open_source': plotter.open_source(request.user),
+ }
diff --git a/beat/web/plotters/tests.py b/beat/web/plotters/tests.py
index a1ba9245f83ce725837436e77353233148a45c1a..454169914e26565c2581f89bb42d3daf41d4954d 100644
--- a/beat/web/plotters/tests.py
+++ b/beat/web/plotters/tests.py
@@ -35,6 +35,7 @@ from django.contrib.auth.models import User
from django.conf import settings
from django.core.urlresolvers import reverse
+from ..dataformats.models import DataFormat
from .models import Plotter, PlotterParameter
from ..common.models import Shareable
@@ -59,7 +60,33 @@ class PlotterParameterTestCase(APITestCase):
self.jackdoe = User.objects.create_user('jackdoe', 'jackdoe@test.org', self.password)
self.plot = User.objects.create_user('plot', 'plotdoe@test.org', self.password)
-
+ # Create a dataformat
+ (dataformat, errors) = DataFormat.objects.create_dataformat(
+ author=self.plot,
+ name='text',
+ short_description='description',
+ declaration={
+ "text": "string"
+ },
+ )
+
+ assert dataformat, errors
+
+ # Create a plotter
+ self.client.login(username=self.plot.username, password=self.password)
+ self.url_plotter = reverse('api_plotters:list_create', kwargs={'author_name': self.plot.username})
+
+ self.data_plotter = {\
+ 'author':self.plot.username,\
+ 'name':'plotter_test',\
+ 'short_description':'some description plotter',\
+ 'description':'some longer description plotter',\
+ 'declaration':{"language": "python","parameters":{},"dataformat":"plot/text/1"},\
+ 'code':'#test'\
+ }
+ response = self.client.post(self.url_plotter, self.data_plotter, format='json')
+ self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+ self.plotter = Plotter.objects.get(name='plotter_test')
def tearDown(self):
for path in [settings.TOOLCHAINS_ROOT, settings.EXPERIMENTS_ROOT,
@@ -83,13 +110,14 @@ class PlotterParameterCreationTestCase(PlotterParameterTestCase):
#'author':self.johndoe,\
'name':'plotterparameter1',\
'short_description':'some description',\
- 'description':'some longer description'\
+ 'description':'some longer description',\
+ 'plotter':self.plotter.id\
}
def test_anonymous_user(self):
response = self.client.post(self.url, self.data, format='json')
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
- self.assertEqual(response.content, '{"detail":"Authentication credentials were not provided."}')
+ self.assertEqual(response.content, '{"detail":"You do not have permission to perform this action."}')
def test_logged_in_user(self):
@@ -125,14 +153,16 @@ class PlotterParameterListTestCase(PlotterParameterTestCase):
#'author':self.johndoe,\
'name':'plotterparameter1',\
'short_description':'some description',\
- 'description':'some longer description'\
+ 'description':'some longer description',\
+ 'plotter':self.plotter.id\
}
self.data2 = {\
#'author':self.johndoe,\
'name':'plotterparameter2',\
'short_description':'some description2',\
- 'description':'some longer description2'\
+ 'description':'some longer description2',\
+ 'plotter':self.plotter.id\
}
def test_anonymous_user(self):
@@ -199,14 +229,16 @@ class PlotterParameterRetrievalTestCase(PlotterParameterTestCase):
#'author':self.johndoe,\
'name':'plotterparameter1',\
'short_description':'some description',\
- 'description':'some longer description'\
+ 'description':'some longer description',\
+ 'plotter':self.plotter.id\
}
self.data2 = {\
#'author':self.johndoe,\
'name':'plotterparameter2',\
'short_description':'some description2',\
- 'description':'some longer description2'\
+ 'description':'some longer description2',\
+ 'plotter':self.plotter.id\
}
def test_anonymous_user(self):
@@ -276,14 +308,16 @@ class PlotterParameterUpdateTestCase(PlotterParameterTestCase):
#'author':self.johndoe,\
'name':'plotterparameter1',\
'short_description':'some description',\
- 'description':'some longer description'\
+ 'description':'some longer description',\
+ 'plotter':self.plotter.id\
}
self.data2 = {\
#'author':self.johndoe,\
'name':'plotterparameter2',\
'short_description':'some description2',\
- 'description':'some longer description2'\
+ 'description':'some longer description2',\
+ 'plotter':self.plotter.id\
}
def test_anonymous_user(self):
@@ -353,26 +387,34 @@ class PlotterParameterDeletionTestCase(PlotterParameterTestCase):
#'author':self.johndoe,\
'name':'plotterparameter1',\
'short_description':'some description',\
- 'description':'some longer description'\
+ 'description':'some longer description',\
+ 'plotter':self.plotter.id\
}
self.data2 = {\
#'author':self.johndoe,\
'name':'plotterparameter2',\
'short_description':'some description2',\
- 'description':'some longer description2'\
+ 'description':'some longer description2',\
+ 'plotter':self.plotter.id\
}
def test_anonymous_user(self):
response = self.client.get(self.url_single_plotterparameter, format='json')
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+ response = self.client.delete(self.url_single_plotterparameter, format='json')
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
def test_logged_in_user_no_plotterparameter(self):
self.client.login(username=self.johndoe.username, password=self.password)
response = self.client.get(self.url_single_plotterparameter, format='json')
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+ response = self.client.delete(self.url_single_plotterparameter, format='json')
+ self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
def test_logged_in_user_single_plotterparameter(self):
self.client.login(username=self.johndoe.username, password=self.password)
@@ -384,6 +426,9 @@ class PlotterParameterDeletionTestCase(PlotterParameterTestCase):
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(json.loads(response.content)['name'], self.johndoe.username+'/'+self.data['name']+'/1')
+ response = self.client.delete(self.url_single_plotterparameter, format='json')
+ self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+
def test_logged_in_user_multiple_plotterparameter(self):
self.client.login(username=self.johndoe.username, password=self.password)
@@ -402,3 +447,9 @@ class PlotterParameterDeletionTestCase(PlotterParameterTestCase):
response = self.client.get(self.url_single_plotterparameter2, format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(json.loads(response.content)['name'], self.johndoe.username+'/'+self.data2['name']+'/1')
+
+ response = self.client.delete(self.url_single_plotterparameter, format='json')
+ self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+
+ response = self.client.delete(self.url_single_plotterparameter2, format='json')
+ self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
diff --git a/beat/web/plotters/urls.py b/beat/web/plotters/urls.py
index ffb9b18097681b75413f648ffae0ea0777aa8a2f..44b2f2a2353fd8decaa7a5da39b0931a8665e167 100644
--- a/beat/web/plotters/urls.py
+++ b/beat/web/plotters/urls.py
@@ -25,11 +25,37 @@
# #
###############################################################################
-from django.conf.urls import url
+from django.conf.urls import include, url
from . import views
+partial_patterns = [
+
+ url(r'^plotinfo/$',
+ views.PartialGroupView.as_view(
+ template_name='plotterparameters/partials/plotgraphicinfo.html',
+ ),
+ name='plotinfo',
+ ),
+
+ url(r'^plotparamsinfo/$',
+ views.PartialGroupView.as_view(
+ template_name='plotterparameters/partials/plotparamsinfo.html',
+ ),
+ name='plotinfo',
+ ),
+
+ url(r'^(?P<template_name>[a-zA-Z_]+\.html)$',
+ views.PartialGroupView.as_view(),
+ ),
+
+]
+
urlpatterns = [
+ url(r'^partials/',
+ include(partial_patterns, namespace='partials'),
+ ),
+
url(
r'^$',
views.list_plotters,
@@ -43,15 +69,40 @@ urlpatterns = [
),
url(
- r'^(?P<author>\w+)/(?P<name>[-\w]+)/(?P<version>\d+)/$',
- views.view,
- name='view',
+ r'^plot_sample/$',
+ views.plot_sample,
+ name='plot_sample',
),
url(
- r'^(?P<author>\w+)/(?P<name>[-\w]+)/$',
- views.view,
- name='plotter-view-latest',
+ r'^plot_sample_with_params/$',
+ views.plot_sample_with_params,
+ name='plot_sample_with_params',
+ ),
+
+
+ url(
+ r'^plotterparameter/(?P<author_name>\w+)/new_plotterparameter/$',
+ views.create_plotterparameter,
+ name='new_plotterparameter',
+ ),
+
+ url(
+ r'^plotterparameter/(?P<author_name>\w+)/(?P<plotterparameter_name>[-\w]+)/(?P<version>\d+)/new/$',
+ views.create_new_version,
+ name='new-version',
+ ),
+
+ url(
+ r'^plotterparameter/(?P<author_name>\w+)/(?P<plotterparameter_name>[-\w]+)/(?P<version>\d+)/fork/$',
+ views.fork,
+ name='fork',
+ ),
+
+ url(
+ r'^plotterparameter/diff/(?P<author1>\w+)/(?P<name1>[-\w]+)/(?P<version1>\d+)/(?P<author2>\w+)/(?P<name2>[-\w]+)/(?P<version2>\d+)/$',
+ views.diff,
+ name='diff',
),
url(
@@ -60,4 +111,35 @@ urlpatterns = [
name='plotterparameter-list',
),
+ url(
+ r'^plotterparameter/$',
+ views.list_plotterparameters_public,
+ name='plotterparameter-public-list',
+ ),
+
+ url(
+ r'^plotterparameter/(?P<author_name>\w+)/(?P<plotterparameter_name>[-\w]+)/(?P<version>\d+)/$',
+ views.plotterparameter_for_author,
+ name='plotterparameter-author-view',
+ ),
+
+ url(
+ r'^(?P<author>\w+)/(?P<name>[-\w]+)/(?P<version>\d+)/$',
+ views.view,
+ name='view',
+ ),
+
+ url(
+ r'^plotterparameter/(?P<author>\w+)/(?P<name>[-\w]+)/$',
+ views.plotterparameter_latest,
+ name='plotterparameter-view-latest',
+ ),
+
+
+ url(
+ r'^(?P<author>\w+)/(?P<name>[-\w]+)/$',
+ views.view,
+ name='plotter-view-latest',
+ ),
+
]
diff --git a/beat/web/plotters/views.py b/beat/web/plotters/views.py
index eab4599a71d4d4db259b5b04ba95b48a5a41d748..b7af439eff020cdaea8888d0424ba3b3d4f6d055 100644
--- a/beat/web/plotters/views.py
+++ b/beat/web/plotters/views.py
@@ -40,7 +40,9 @@ from django.conf import settings
from django.shortcuts import render_to_response
from django.shortcuts import get_object_or_404
from django.template import RequestContext, Context
+from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User
+from django.views.generic import TemplateView
from ..experiments.models import Experiment, Block, Result
from ..dataformats.models import DataFormat
@@ -297,6 +299,287 @@ def plot(request):
if do_b64_encode: fig = base64.b64encode(fig)
return HttpResponse(fig, content_type=final_parameters['content_type'])
+
+#----------------------------------------------------------
+
+
+def plot_sample(request):
+ """Plots sample data given as input plotter/plotterparameter/sample data
+
+ This view receives a single data payload with a GET or POST request
+ containing multiple keys.
+ We'll cycle through (with :py:func:`itertools.cycle`) them to recover a
+ dictionary like this::
+
+ {
+ 'user/user/toolchain/1/label': {
+ "analyzer": "my_analysis",
+ "output" : "my_plot"
+ },
+ 'user/user/toolchain/1/another': {
+ "analyzer": "my_analysis",
+ "output" : "my_plot"
+ },
+ 'user/user/toolchain/3/xxx': {
+ "analyzer": "the_greatest_analysis",
+ "output" : "scatter"
+ }
+ }
+
+ A single ``plotter``, if passed, should reference the plotter to use. It
+ may be omitted, in which case we use the default plotter for the first
+ experiment in the list.
+
+
+ Returns:
+
+ A response with a single image inside, following the plotter
+ specifications.
+
+ """
+
+ if request.GET: use = request.GET
+ elif request.POST: use = request.POST
+ else:
+ return HttpResponseBadRequest('This view must be called with either a GET or POST request')
+
+ keywords = [
+ 'experiment',
+ 'experiment[]',
+ 'analyzer',
+ 'analyzer[]',
+ 'output',
+ 'output[]',
+ 'plotter',
+ 'parameter',
+ 'report_number',
+ ]
+
+ extra_parameters = {}
+ for key in [k for k in use.keys() if k not in keywords]:
+ extra_parameters[key] = '&'.join(use.getlist(key))
+
+ # Get the plotter and parameter, resolve if empty
+ final_plotter = None #use the default
+ user_parameter = None #use the default
+ corefmt = None
+
+ if 'plotter' in use:
+ username, name, version = use['plotter'].split('/')
+ try:
+ final_plotter = Plotter.objects.get(author__username=username,
+ name=name, version=version)
+ except Plotter.DoesNotExist as e:
+ message = "Plotter `%s' is not accessible" % \
+ '/'.join((username, name, version))
+ logger.warn(message)
+ return HttpResponseBadRequest(message)
+
+ if 'parameter' in use and use['parameter'].strip():
+ username, name, version = use['parameter'].split('/')
+ try:
+ user_parameter = PlotterParameter.objects.get(
+ author__username=username,
+ name=name,
+ version=version,
+ )
+ except PlotterParameter.DoesNotExist as e:
+ message = "Parameter `%s' is not accessible" % \
+ '/'.join((username, name, version))
+ logger.warn(message)
+ return HttpResponseBadRequest(message)
+
+
+ # Collect the data for the plot, check compatibility
+ default = None
+
+ # check compatibility, fill up defaults
+ if default is None:
+ default = DefaultPlotter.objects.filter(plotter=final_plotter)
+
+ if not default and not final_plotter:
+ message = 'No plotter specified and no default for plot format %s' % final_plotter.fullname()
+ return HttpResponseBadRequest(message)
+
+ default = default[0] #get the first and only
+
+ # set defaults, if specific values have not already been set
+ if not final_plotter: final_plotter = default.plotter
+
+ if corefmt is None: #loads it once
+ corefmt = final_plotter.core_format()
+
+ ## loads the data, for that particular result
+ parsed = simplejson.loads(use['sample_data'])
+ sample_data = corefmt.type().from_dict(parsed, casting='unsafe')
+
+
+ # checks the plotter is valid
+ core_plotter = final_plotter.core()
+ if not core_plotter.valid:
+ message = 'Plotter %s is invalid' % final_plotter.fullname()
+ return HttpResponseBadRequest(message)
+
+
+ # resolves parameters, in order of priority
+ final_parameters = {}
+ if default.parameter: #fills-up defaults for the type
+ final_parameters.update(simplejson.loads(default.parameter.data))
+ if user_parameter: #fills-up defaults from the user set
+ final_parameters.update(simplejson.loads(user_parameter.data))
+ if extra_parameters: #fills-up defaults specified on the query
+ final_parameters.update(extra_parameters)
+
+ extra_parameters.setdefault('content_type', 'image/png') #in case not set
+
+ # for HTML display, you need to set this correctly
+ do_b64_encode = bool(extra_parameters.get('base64', False))
+
+ # we filter out parameters we can't handle
+ for key in final_parameters.keys():
+ if key not in core_plotter.parameters: del final_parameters[key]
+
+ runnable = core_plotter.runner()
+ runnable.setup(final_parameters)
+ assert runnable.ready
+ data_to_plot = [('sample_plot', sample_data)]
+ fig = runnable.process(data_to_plot)
+ if do_b64_encode: fig = base64.b64encode(fig)
+ return HttpResponse(fig, content_type=final_parameters['content_type'])
+
+
+#----------------------------------------------------------
+
+
+def plot_sample_with_params(request):
+ """Plots sample data given as input plotter/plotterparameter/sample data
+
+ This view receives a single data payload with a GET or POST request
+ containing multiple keys.
+ We'll cycle through (with :py:func:`itertools.cycle`) them to recover a
+ dictionary like this::
+
+ {
+ 'user/user/toolchain/1/label': {
+ "analyzer": "my_analysis",
+ "output" : "my_plot"
+ },
+ 'user/user/toolchain/1/another': {
+ "analyzer": "my_analysis",
+ "output" : "my_plot"
+ },
+ 'user/user/toolchain/3/xxx': {
+ "analyzer": "the_greatest_analysis",
+ "output" : "scatter"
+ }
+ }
+
+ A single ``plotter``, if passed, should reference the plotter to use. It
+ may be omitted, in which case we use the default plotter for the first
+ experiment in the list.
+
+
+ Returns:
+
+ A response with a single image inside, following the plotter
+ specifications.
+
+ """
+
+ if request.GET: use = request.GET
+ elif request.POST: use = request.POST
+ else:
+ return HttpResponseBadRequest('This view must be called with either a GET or POST request')
+
+ keywords = [
+ 'experiment',
+ 'experiment[]',
+ 'analyzer',
+ 'analyzer[]',
+ 'output',
+ 'output[]',
+ 'plotter',
+ #'parameter',
+ 'report_number',
+ ]
+
+ extra_parameters = {}
+ for key in [k for k in use.keys() if k not in keywords]:
+ extra_parameters[key] = '&'.join(use.getlist(key))
+
+ # Get the plotter and parameter, resolve if empty
+ final_plotter = None #use the default
+ #user_parameter = None #use the default
+ corefmt = None
+
+ if 'plotter' in use:
+ username, name, version = use['plotter'].split('/')
+ try:
+ final_plotter = Plotter.objects.get(author__username=username,
+ name=name, version=version)
+ except Plotter.DoesNotExist as e:
+ message = "Plotter `%s' is not accessible" % \
+ '/'.join((username, name, version))
+ logger.warn(message)
+ return HttpResponseBadRequest(message)
+
+ # Collect the data for the plot, check compatibility
+ default = None
+
+ # check compatibility, fill up defaults
+ if default is None:
+ default = DefaultPlotter.objects.filter(plotter=final_plotter)
+
+ if not default and not final_plotter:
+ message = 'No plotter specified and no default for plot format %s' % final_plotter.fullname()
+ return HttpResponseBadRequest(message)
+
+ default = default[0] #get the first and only
+
+ # set defaults, if specific values have not already been set
+ if not final_plotter: final_plotter = default.plotter
+
+ if corefmt is None: #loads it once
+ corefmt = final_plotter.core_format()
+
+ ## loads the data, for that particular result
+ parsed = simplejson.loads(use['sample_data'])
+ sample_data = corefmt.type().from_dict(parsed, casting='unsafe')
+
+ # checks the plotter is valid
+ core_plotter = final_plotter.core()
+ if not core_plotter.valid:
+ message = 'Plotter %s is invalid' % final_plotter.fullname()
+ return HttpResponseBadRequest(message)
+
+
+ # resolves parameters, in order of priority
+ final_parameters = {}
+ if default.parameter: #fills-up defaults for the type
+ final_parameters.update(simplejson.loads(default.parameter.data))
+ #get dynamic plotter params
+ final_parameters.update(simplejson.loads(use['dynamic_params']))
+ if extra_parameters: #fills-up defaults specified on the query
+ final_parameters.update(extra_parameters)
+
+ extra_parameters.setdefault('content_type', 'image/png') #in case not set
+
+ # for HTML display, you need to set this correctly
+ do_b64_encode = bool(extra_parameters.get('base64', False))
+
+ # we filter out parameters we can't handle
+ for key in final_parameters.keys():
+ if key not in core_plotter.parameters: del final_parameters[key]
+
+ runnable= core_plotter.runner()
+ runnable.setup(final_parameters)
+ assert runnable.ready
+ data_to_plot = [('sample_plot', sample_data)]
+ fig = runnable.process(data_to_plot)
+ if do_b64_encode: fig = base64.b64encode(fig)
+ return HttpResponse(fig, content_type=final_parameters['content_type'])
+
+
#----------------------------------------------------------
@@ -390,8 +673,271 @@ def list_plotters_public(request):
def list_plotterparameters(request, author_name):
'''List all accessible plotters to the request user'''
- return render_to_response('plotters/list.html',
- dict(objects=Plotter.objects.from_author_and_public(request.user,
- author_name)),
+ # check that the user exists on the system
+ author = get_object_or_404(User, username=author_name)
+
+ objects = PlotterParameter.objects.from_author_and_public(request.user,author_name)
+ objects = PlotterParameter.filter_latest_versions(objects)
+
+ owner=(request.user==author)
+
+ return render_to_response('plotterparameters/list.html',
+ dict(
+ objects=objects,
+ author=author,
+ owner=owner,
+ ),
+ context_instance=RequestContext(request),
+ )
+
+
+#----------------------------------------------------------
+
+
+def list_plotterparameters_public(request):
+ '''List all accessible plotters to the request user'''
+
+ # check that the user exists on the system
+ objects = PlotterParameter.objects.public().order_by('-creation_date')
+ objects = PlotterParameter.filter_latest_versions(objects)
+
+ return render_to_response('plotterparameters/list.html',
+ dict(
+ objects=objects,
+ author=request.user, #anonymous
+ owner=False,
+ ),
+ context_instance=RequestContext(request),
+ )
+
+
+#----------------------------------------------------------
+
+
+def plotterparameter_latest(request, author, name):
+ '''Get latest plotterparameter for the request user'''
+
+ # check that the user exists on the system
+ objects = PlotterParameter.objects.filter(
+ author__username__iexact=author,
+ name__iexact=name,
+).order_by('-creation_date')
+
+ objects = PlotterParameter.filter_latest_versions(objects)
+
+ return render_to_response('plotterparameters/list.html',
+ dict(
+ objects=objects,
+ author=request.user, #anonymous
+ owner=False,
+ ),
+ context_instance=RequestContext(request),
+ )
+
+
+
+#------------------------------------------------
+
+
+def plotterparameter_for_author(request, author_name, plotterparameter_name, version):
+
+ # get the query from the DB
+ obj = get_object_or_404(PlotterParameter,
+ author__username = author_name,
+ name = plotterparameter_name,
+ version = version)
+
+ plotter_origin = Plotter.objects.get(id=obj.plotter.id)
+
+ (has_access, accessibility) = obj.accessibility_for(request.user)
+
+ if not has_access: raise Http404()
+
+ owner = (request.user == obj.author)
+
+ # Users the object can be shared with
+ users = User.objects.exclude(username__in=settings.ACCOUNTS_TO_EXCLUDE_FROM_TEAMS).order_by('username')
+
+ return render_to_response('plotterparameters/plotterparameter.html',
+ {
+ 'author' : author_name,
+ 'plotterparameter_name' : plotterparameter_name,
+ 'owner' : (request.user == obj.author),
+ 'users': users,
+ 'teams': Team.objects.for_user(request.user, True),
+ 'plotterparameter' : obj,
+ 'plotter_origin' : plotter_origin,
+ 'USE_HTTPS_GRAVATAR': settings.USE_HTTPS_GRAVATAR,
+ },
+ context_instance=RequestContext(request))
+
+
+#----------------------------------------------------------
+
+
+def diff(request, author1, name1, version1, author2, name2, version2):
+ """Shows the difference between two plotterparameters. The Web API is used to
+ retrieve the details about the plotterparameters and check the accessibility.
+ """
+
+ plotterparameter1 = get_object_or_404(
+ PlotterParameter,
+ author__username__iexact=author1,
+ name__iexact=name1,
+ version=int(version1),
+ )
+ has_access, _ = plotterparameter1.accessibility_for(request.user)
+ if not has_access: raise Http404()
+
+ plotterparameter2 = get_object_or_404(
+ PlotterParameter,
+ author__username__iexact=author2,
+ name__iexact=name2,
+ version=int(version2),
+ )
+ has_access, _ = plotterparameter2.accessibility_for(request.user)
+ if not has_access: raise Http404()
+
+ return render_to_response('plotterparameters/diff.html',
+ {
+ 'plotterparameter1': plotterparameter1,
+ 'plotterparameter1_data': simplejson.loads(plotterparameter1.data),
+ 'plotterparameter2': plotterparameter2,
+ 'plotterparameter2_data': simplejson.loads(plotterparameter2.data),
+ },
+ context_instance=RequestContext(request))
+
+
+#----------------------------------------------------------
+
+
+@login_required
+def create_plotterparameter(request, author_name):
+ '''Create a new plotterparameter to the request user'''
+
+ # check that the user exists on the system
+ author = get_object_or_404(User, username=author_name)
+
+ objects=PlotterParameter.objects.from_author_and_public(request.user,author_name)
+
+ owner=(request.user==author)
+
+ return render_to_response('plotterparameters/plotterparameter.html',
+ dict(
+ objects=objects,
+ author=author,
+ owner=owner,
+ plotterparameter_name="CREATION_MODE",
+ plotterparameter="CREATION_MODE",
+ USE_HTTPS_GRAVATAR=settings.USE_HTTPS_GRAVATAR,
+ ),
context_instance=RequestContext(request),
)
+
+#------------------------------------------------
+
+@login_required
+def create_new_version(request, author_name=None, plotterparameter_name=None, version=None):
+ """Creates a new plotterparameter or a new version of an existing plotterparameter
+
+ The user must be authenticated before it can add a new toolchain
+ """
+
+ parameters = {'plotterparameter_author': request.user.username,
+ 'plotterparameter_name': plotterparameter_name,
+ 'plotterparameter_version': version,
+ 'short_description': '',
+ 'description': '',
+ 'errors': '',
+ 'edition': False,
+ }
+
+ # Retrieves the existing toolchain (if necessary)
+ plotterparameter = None
+ if plotterparameter_name is not None:
+ previous_versions = PlotterParameter.objects.filter(
+ author=request.user,
+ name__iexact=plotterparameter_name,
+ version=version,
+ ).order_by('-version')
+ if len(previous_versions) == 0:
+ raise Http404()
+
+ previous_version = previous_versions[0]
+ plotterparameter = previous_version
+
+ description = previous_version.description
+
+ parameters['plotterparameter_version'] = previous_version.version + 1
+ parameters['short_description'] = previous_version.short_description
+ parameters['description'] = description.replace('\n', '\\n')
+ parameters['data'] = previous_version.data
+ parameters['plotter'] = previous_version.plotter.id
+ else:
+ declaration, errors = prototypes.load('toolchain')
+ parameters['declaration'] = simplejson.dumps(declaration)
+
+ return render_to_response('plotterparameters/plotterparameter.html',
+ dict(
+ author=request.user.username,
+ parameters=parameters,
+ plotterparameter_name=plotterparameter_name,
+ plotterparameter=plotterparameter,
+ owner=(request.user == plotterparameter.author),
+ plotterparameter_mode="NEW_VERSION_MODE",
+ ),
+ context_instance=RequestContext(request),
+ )
+
+
+@login_required
+def fork(request, author_name, plotterparameter_name, version):
+ """Creates a new plotterparameter by forking an existing plotterparameter
+
+ The user must be authenticated before it can add a new plotterparameter
+ """
+
+ # Retrieves the forked toolchain
+ fork_of = get_object_or_404(PlotterParameter.objects.for_user(request.user, True),
+ author__username__iexact=author_name,
+ name__iexact=plotterparameter_name,
+ version=int(version)
+ )
+
+ description = fork_of.description
+
+ parameters = {
+ 'plotterparameter_author': author_name,
+ 'plotterparameter_name': plotterparameter_name,
+ 'plotterparameter_version': version,
+ 'fork_of': fork_of,
+ 'short_description': fork_of.short_description,
+ 'description': description.replace('\n', '\\n'),
+ 'errors': '',
+ 'edition': False,
+ 'request_user': request.user.username,
+ }
+
+ return render_to_response('plotterparameters/plotterparameter.html',
+ dict(
+ author=request.user.username,
+ parameters=parameters,
+ plotterparameter_name=plotterparameter_name,
+ plotterparameter=fork_of,
+ owner=(request.user == fork_of.author),
+ plotterparameter_mode="FORK_MODE",
+ ),
+ context_instance=RequestContext(request),
+ )
+
+
+
+class PartialGroupView(TemplateView):
+ def get_template_names(self):
+ if 'template_name' in self.kwargs:
+ self.template_name = 'plotterparameters/partials/' + self.kwargs.get('template_name')
+ return super(PartialGroupView, self).get_template_names()
+
+ def get_context_data(self, **kwargs):
+ context = super(PartialGroupView, self).get_context_data(**kwargs)
+ return context
diff --git a/beat/web/reports/static/reports/app/directives/reportItemView.js b/beat/web/reports/static/reports/app/directives/reportItemView.js
index 23420bd102221c3295d2690c76cf38187457d510..68f67287153717e141d39bc1c87cd9e2c158df41 100644
--- a/beat/web/reports/static/reports/app/directives/reportItemView.js
+++ b/beat/web/reports/static/reports/app/directives/reportItemView.js
@@ -811,10 +811,30 @@ app.directive("addreportitem", function($compile)
}
var plotterparameter = [];
+ //get plotterparameters valid for requested plotter
+ var required_plotter_id = undefined;
+ for(var i = 0; i < scope.report.plotters.length; i++)
+ {
+ if(required_plotter[0] == scope.report.plotters[i].name)
+ {
+ required_plotter_id = scope.report.plotters[i].id
+ }
+ }
+
//Get other plotterparameter
for (var i = 0; i < scope.report.plotterparameter.length; i++)
{
- plotterparameter.push(scope.report.plotterparameter[i].name);
+ if(required_plotter_id == undefined)
+ {
+ plotterparameter.push(scope.report.plotterparameter[i].name);
+ }
+ else
+ {
+ if(scope.report.plotterparameter[i].plotter == required_plotter_id)
+ {
+ plotterparameter.push(scope.report.plotterparameter[i].name);
+ }
+ }
}
var chart_name = sub_content.name;
@@ -950,10 +970,30 @@ app.directive("addreportitem", function($compile)
}
var plotterparameter = [];
+ //get plotterparameters valid for requested plotter
+ var required_plotter_id = undefined;
+ for(var i = 0; i < scope.report.plotters.length; i++)
+ {
+ if(required_plotter[0] == scope.report.plotters[i].name)
+ {
+ required_plotter_id = scope.report.plotters[i].id
+ }
+ }
+
//Get other plotterparameter
for (var i = 0; i < scope.report.plotterparameter.length; i++)
{
- plotterparameter.push(scope.report.plotterparameter[i].name);
+ if(required_plotter_id == undefined)
+ {
+ plotterparameter.push(scope.report.plotterparameter[i].name);
+ }
+ else
+ {
+ if(scope.report.plotterparameter[i].plotter == required_plotter_id)
+ {
+ plotterparameter.push(scope.report.plotterparameter[i].name);
+ }
+ }
}
var chart_name = sub_content.name;
@@ -968,7 +1008,7 @@ app.directive("addreportitem", function($compile)
else
legend_experiments = legend_experiments+ "&" +scope.report_experiments_alias[scope.report.experiments[i]];
- if(Object.keys(scope.$parent.report_experiments_alias_from_content).length === 0)
+ if(Object.keys(scope.$parent.report_experiments_alias_from_content).length === 0 || scope.report_experiments_alias_from_content[scope.report.experiments[i]] == undefined )
alias_experiments.push(scope.report_experiments_alias[scope.report.experiments[i]]);
else
alias_experiments.push(scope.report_experiments_alias_from_content[scope.report.experiments[i]]);
@@ -1685,6 +1725,10 @@ app.directive("buttonexportitem", function()
{
content_detail["selected_template"] = scope.plots_details[chart_id].data.parameter;
}
+ else if(scope.plots_details[chart_id]["selected_template"] != undefined)
+ {
+ content_detail["selected_template"] = scope.plots_details[chart_id]["selected_template"];
+ }
if(scope.plots_details[chart_id].data.merged != undefined)
{
content_detail["merged"] = scope.plots_details[chart_id].data.merged;
@@ -1925,10 +1969,30 @@ app.directive("buttonexportitem", function()
}
var plotterparameter = [];
+ //get plotterparameters valid for requested plotter
+ var required_plotter_id = undefined;
+ for(var i = 0; i < scope.report.plotters.length; i++)
+ {
+ if(required_plotter[0] == scope.report.plotters[i].name)
+ {
+ required_plotter_id = scope.report.plotters[i].id
+ }
+ }
+
//Get other plotterparameter
for (var i = 0; i < scope.report.plotterparameter.length; i++)
{
- plotterparameter.push(scope.report.plotterparameter[i].name);
+ if(required_plotter_id == undefined)
+ {
+ plotterparameter.push(scope.report.plotterparameter[i].name);
+ }
+ else
+ {
+ if(scope.report.plotterparameter[i].plotter == required_plotter_id)
+ {
+ plotterparameter.push(scope.report.plotterparameter[i].name);
+ }
+ }
}
var chart_name = sub_content.name;
diff --git a/beat/web/reports/static/reports/app/factories/plotterFactory.js b/beat/web/reports/static/reports/app/factories/plotterFactory.js
index a84f5c0b6104a9b0d2762d7e3f12e861a253528a..fa1937528dab26c01a0016207f427a76e63e6c3f 100644
--- a/beat/web/reports/static/reports/app/factories/plotterFactory.js
+++ b/beat/web/reports/static/reports/app/factories/plotterFactory.js
@@ -38,7 +38,7 @@ app.factory('plotterFactory', ['$http', function($http)
plotterFactory.getPlotterParameter = function (url_prefix)
{
- urlBase = url_prefix + '/api/v1/plotters/plotterparameter';
+ urlBase = url_prefix + '/api/v1/plotters/plotterparameters';
return $http.get(urlBase + '/');
};
diff --git a/beat/web/statistics/templates/statistics/panels/status.html b/beat/web/statistics/templates/statistics/panels/status.html
index c99850e849ab23c7d87fe2b5cdb6dd336ab5d47a..4724ea241fe375c8c90628205384d21938a7adf6 100644
--- a/beat/web/statistics/templates/statistics/panels/status.html
+++ b/beat/web/statistics/templates/statistics/panels/status.html
@@ -1,21 +1,21 @@
{% comment %}
* Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
* Contact: beat.support@idiap.ch
- *
+ *
* This file is part of the beat.web module of the BEAT platform.
- *
+ *
* Commercial License Usage
* Licensees holding valid commercial BEAT licenses may use this file in
* accordance with the terms contained in a written agreement between you
* and Idiap. For further information contact tto@idiap.ch
- *
+ *
* Alternatively, this file may be used under the terms of the GNU Affero
* Public License version 3 as published by the Free Software and appearing
* in the file LICENSE.AGPL included in the packaging of this file.
* The BEAT platform is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE.
- *
+ *
* You should have received a copy of the GNU Affero Public License along
* with the BEAT platform. If not, see http://www.gnu.org/licenses/.
{% endcomment %}
@@ -31,6 +31,7 @@
<a class="list-group-item" href="{% if request.user.is_anonymous %}{% url 'search:public-list' %}{% else %}{% url 'search:list' request.user.username %}{% endif %}" title="Show searches" data-toggle="tooltip" data-placement="left">Searches <span class="badge">{{ totals.searches }}</span></a>
<a class="list-group-item" href="{% if request.user.is_anonymous %}{% url 'reports:public-list' %}{% else %}{% url 'reports:list' request.user.username %}{% endif %}" title="Show reports" data-toggle="tooltip" data-placement="left">Reports <span class="badge">{{ totals.reports }}</span></a>
<a class="list-group-item" href="{% if request.user.is_anonymous %}{% url 'plotters:list' %}{% else %}{% url 'plotters:list' %}{% endif %}" title="Show plotters" data-toggle="tooltip" data-placement="left">Plotters <span class="badge">{{ totals.plotters}}</span></a>
+ <a class="list-group-item" href="{% if request.user.is_anonymous %}{% url 'plotters:plotterparameter-public-list' %}{% else %}{% url 'plotters:plotterparameter-list' request.user.username %}{% endif %}" title="Show plotters" data-toggle="tooltip" data-placement="left">Plotterparameters <span class="badge">{{ totals.plotterparameters}}</span></a>
<a class="list-group-item" href="{% url 'databases:list' %}" title="Show databases" data-toggle="tooltip" data-placement="left">Databases <span class="badge">{{ totals.databases }}</span></a>
<div class="list-group-item">Users <span class="badge">{{ totals.users }}</span></div>
</div>
diff --git a/beat/web/statistics/views.py b/beat/web/statistics/views.py
index fa645d0d096873bfbf46ca73970dfa9edc218da3..d13a7e073a0087ec5d5c852117f528288bc2dbcb 100644
--- a/beat/web/statistics/views.py
+++ b/beat/web/statistics/views.py
@@ -54,6 +54,7 @@ def calculate_totals():
from ..attestations.models import Attestation
from ..reports.models import Report
from ..plotters.models import Plotter
+ from ..plotters.models import PlotterParameter
from ..search.models import Search
# for calculating the total cpu time, we use the HourlyStatistics and
@@ -104,6 +105,7 @@ def calculate_totals():
searches=Search.objects.count(),
reports=Report.objects.count(),
plotters=Plotter.objects.count(),
+ plotterparameters=PlotterParameter.objects.count(),
)
diff --git a/beat/web/ui/static/ui/js/plotterparameterdialog.js b/beat/web/ui/static/ui/js/plotterparameterdialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..1d9aba3c045dc0cfaa487acf2a228e17c6f906ac
--- /dev/null
+++ b/beat/web/ui/static/ui/js/plotterparameterdialog.js
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+*/
+/* beat.ui.reportdialog.js
+
+ Implementation of the 'reports' dialog
+*/
+
+
+// Declaration of our namespaces
+if (beat === undefined)
+ var beat = {}
+
+if (beat.ui === undefined)
+ beat.ui = {}
+
+if (beat.ui.plotterparameter === undefined)
+ beat.ui.plotterparameter = {}
+
+
+beat.ui.plotterparameter.plotterparameter_saved = function(dialog_id, scope)
+{
+ var num_click = 0;
+ // Create the dialog
+ $('#' + dialog_id).dialog({
+ autoOpen: false,
+ resizable: false,
+ width: Math.min($(window).width() * 0.6, 700),
+ position: { my: "center", at: "center", of: window },
+ modal: true,
+ closeOnEscape: true,
+ buttons: [
+ {
+ id: 'button-' + dialog_id + '-ok',
+ text: 'Ok',
+ click: function() {
+ var data = {};
+ $.ajaxSetup({
+ beforeSend: function(xhr, settings) {
+ xhr.setRequestHeader('X-CSRFToken', $.cookie('csrftoken'));
+ }
+ });
+
+ //$('#' + dialog_id).dialog("close");
+ if(num_click == 0)
+ {
+ num_click++;
+ $(".explanation_text").hide();
+ $('#' + dialog_id).dialog("close");
+ $(".explanation_text").show();
+ num_click = 0;
+ location.reload();
+ }
+ }
+ },
+ ]
+ });
+
+ // Display the dialog
+ $('#' + dialog_id).dialog("open");
+}
+
+beat.ui.plotterparameter.plotterparameter_created = function(dialog_id, scope)
+{
+ var num_click = 0;
+ // Create the dialog
+ $('#' + dialog_id).dialog({
+ autoOpen: false,
+ resizable: false,
+ width: Math.min($(window).width() * 0.6, 700),
+ position: { my: "center", at: "center", of: window },
+ modal: true,
+ closeOnEscape: true,
+ buttons: [
+ {
+ id: 'button-' + dialog_id + '-ok',
+ text: 'Ok',
+ click: function() {
+ var data = {};
+ $.ajaxSetup({
+ beforeSend: function(xhr, settings) {
+ xhr.setRequestHeader('X-CSRFToken', $.cookie('csrftoken'));
+ }
+ });
+
+ //$('#' + dialog_id).dialog("close");
+ if(num_click == 0)
+ {
+ num_click++;
+ $(".explanation_text").hide();
+ $('#' + dialog_id).dialog("close");
+ $(".explanation_text").show();
+ num_click = 0;
+ if(scope.plotterparameter_forking == undefined)
+ {
+ if(scope.plotterparameter_version == undefined)
+ {
+ window.location = scope.url_prefix + "/" + "plotters/plotterparameter/" + scope.user + "/"+ scope.plotterparams_update.name + "/1";
+ }
+ else
+ {
+ window.location = scope.url_prefix + "/" + "plotters/plotterparameter/" + scope.plotterparameter_user + "/"+ scope.plotterparameter_name + "/" + scope.plotterparams_newversion.version;
+ }
+ }
+ else
+ {
+ scope.plotterparameter_forking = undefined;
+ window.location = scope.url_prefix + "/" + "plotters/plotterparameter/" + scope.user + "/"+ scope.plotterparams_update.name + "/1";
+ }
+ }
+ }
+ },
+ ]
+ });
+
+ // Display the dialog
+ $('#' + dialog_id).dialog("open");
+}
diff --git a/beat/web/ui/templates/ui/contribution_breadcrumb_plotterparameter.html b/beat/web/ui/templates/ui/contribution_breadcrumb_plotterparameter.html
new file mode 100644
index 0000000000000000000000000000000000000000..72cad9e6ef7af6261e596d08c1f6e8b36ebc25a9
--- /dev/null
+++ b/beat/web/ui/templates/ui/contribution_breadcrumb_plotterparameter.html
@@ -0,0 +1,52 @@
+{% comment %}
+ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ * Contact: beat.support@idiap.ch
+ *
+ * This file is part of the beat.web module of the BEAT platform.
+ *
+ * Commercial License Usage
+ * Licensees holding valid commercial BEAT licenses may use this file in
+ * accordance with the terms contained in a written agreement between you
+ * and Idiap. For further information contact tto@idiap.ch
+ *
+ * Alternatively, this file may be used under the terms of the GNU Affero
+ * Public License version 3 as published by the Free Software and appearing
+ * in the file LICENSE.AGPL included in the packaging of this file.
+ * The BEAT platform is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero Public License along
+ * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
+{% endcomment %}
+<h3>
+
+<ol class="breadcrumb">
+ <li>
+ {% with p=object.get_sharing_display %}
+ {% if p == 'Private' %}
+ <i data-toggle="tooltip" data-placement="bottom" title="{{ p }}" class="fa fa-user fa-lg"></i>
+ {% elif p == 'Public' %}
+ <i data-toggle="tooltip" data-placement="bottom" title="{{ p }}" class="fa fa-globe fa-lg"></i>
+ {% elif p == 'Usable' %}
+ <i data-toggle="tooltip" data-placement="bottom" title="Usable, but no readable" class="fa fa-cog fa-lg"></i>
+ {% else %}<!-- shared specifically -->
+ <i data-toggle="tooltip" data-placement="bottom" title="Shared with some" class="fa fa-users fa-lg"></i>
+ {% endif %}
+ {% endwith %}
+
+ {% if not request.user.is_anonymous %}
+ <a data-toggle="tooltip" data-placement="bottom" title="View all your {{ name_plural }}" href="{% url listurl request.user.username %}">{{ name_plural }}</a>
+ {% else %}
+ <a data-toggle="tooltip" data-placement="bottom" title="View all public {{ name_plural }}" href="{% url public_listurl %}">{{ name_plural }}</a>
+ {% endif %}
+ </li>
+ {% if not request.user.is_anonymous %}
+ <li><a data-toggle="tooltip" data-placement="bottom" title="View all {{ object.author.username }}'s {{ name_plural }}" href="{% url listurl request.user.username %}">{{ object.author.username }}</a></li>
+ {% else %}
+ <li><a data-toggle="tooltip" data-placement="bottom" title="View all {{ object.author.username }}'s {{ name_plural }}" href="{% url public_listurl %}">{{ object.author.username }}</a></li>
+ {% endif %}
+ <li><a title="View the latest version" data-toggle="tooltip" data-placement="bottom" href="{% url viewurl object.author.username object.name %}">{{ object.name }}</a></li>
+ <li>{{ object.version }}</li>
+</ol>
+</h3>
diff --git a/beat/web/ui/templatetags/ui_tags.py b/beat/web/ui/templatetags/ui_tags.py
index 1f953f2e12812b9f9361c13a343cadf2be46ce52..adefe9f1dc64b5292f106e95edf8c9dd8a0e011d 100644
--- a/beat/web/ui/templatetags/ui_tags.py
+++ b/beat/web/ui/templatetags/ui_tags.py
@@ -32,6 +32,7 @@ from ...common.texts import Messages as Texts
from ... import __version__
from collections import OrderedDict
+import json
register = template.Library()
@@ -55,6 +56,7 @@ def navbar(context):
('reports', 'reports:public-list'),
('searches', 'search:public-list'),
('teams', 'teams:public-list'),
+ ('plotterparameters', 'plotters:plotterparameter-public-list'),
(False, ''),
('databases', 'databases:list'),
('environments', 'backend:list-environments'),
@@ -73,6 +75,7 @@ def navbar(context):
('reports', 'reports:list', True),
('searches', 'search:list', True),
('teams', 'teams:list', True),
+ ('plotterparameters', 'plotters:plotterparameter-list', True),
(False, '', False),
('databases', 'databases:list', False),
('environments', 'backend:list-environments', False),
@@ -117,6 +120,23 @@ def contribution_breadcrumb_plotter(context, obj):
#--------------------------------------------------
+@register.inclusion_tag('ui/contribution_breadcrumb_plotterparameter.html', takes_context=True)
+def contribution_breadcrumb_plotterparameter(context, obj):
+ name_plural = 'plotterparameters'
+ name_url = 'plotters'
+ return {
+ 'request': context['request'],
+ 'object': obj,
+ 'name_plural': name_plural,
+ 'listurl': name_url + ':plotterparameter-list',
+ 'public_listurl': name_url + ':plotterparameter-public-list',
+ 'viewurl': name_url + ':plotterparameter-view-latest',
+ }
+
+
+#--------------------------------------------------
+
+
@register.inclusion_tag('ui/filter_script.html')
def filter_script(panel_id, text_filter_id, privacy_filter_id):
return dict(
@@ -159,6 +179,7 @@ def list_tabs(context, user, tab):
('reports', 'reports:' + name),
('searches', 'search:' + name),
('teams', 'teams:' + name),
+ ('plotterparameters', 'plotters:plotterparameter-' + name),
]),
system_tabs=OrderedDict([
('databases', 'databases:list'),
@@ -318,3 +339,19 @@ def getkey(mapping, key):
@register.filter
def split_fullname(s):
return s.split('/')
+
+#----------------------------------------------------------------
+
+
+@register.filter
+def get_item(mapping, key):
+ output_value = ""
+ try:
+ data = json.loads(mapping)
+ if key in data.keys():
+ output_value = json.dumps(data[key])
+
+ except:
+ output_value = ""
+
+ return output_value
diff --git a/beat/web/utils/management/commands/install.py b/beat/web/utils/management/commands/install.py
index e5f753cfa1a5e009de3c7002cb5b3c7532cdfc9e..c863d605ade40598a0af0333e2f14327abb7005d 100755
--- a/beat/web/utils/management/commands/install.py
+++ b/beat/web/utils/management/commands/install.py
@@ -668,7 +668,8 @@ def upload_plotter(prefix, name, data):
description = storage.doc.load() if storage.doc.exists() else ''
code = storage.code.load() if storage.code and storage.code.exists() else ''
- from ....plotters.models import Plotter, DefaultPlotter
+ from ....plotters.models import Plotter, DefaultPlotter, PlotterParameter
+ from ....common.models import Shareable
author = data[name.split(os.sep)[0].replace('name', '')]
@@ -678,6 +679,12 @@ def upload_plotter(prefix, name, data):
version=int(storage.version),
)
+ sample_data_file_location = prefix + "/plotters/" + name.split("/")[0] + "/" + \
+ name.split("/")[1] + "/sample_data.txt"
+
+ with open(sample_data_file_location) as sample_data_file:
+ sample_data = simplejson.load(sample_data_file)
+
if not plotter:
(plotter, errors) = Plotter.objects.create_plotter(
author=author,
@@ -692,6 +699,8 @@ def upload_plotter(prefix, name, data):
logger.warn("Did not add plotter `%s', because: %s", name, errors)
return False
else:
+ plotter.sample_data = simplejson.dumps(sample_data, indent=4)
+ plotter.save()
logger.info("Added plotter `%s'", plotter)
else: #only updates documentation
@@ -701,6 +710,7 @@ def upload_plotter(prefix, name, data):
plotter.declaration = declaration
plotter.description = description
plotter.code = code
+ plotter.sample_data = simplejson.dumps(sample_data, indent=4)
plotter.save()
logger.info("Updated plotter `%s'", plotter)
@@ -708,22 +718,80 @@ def upload_plotter(prefix, name, data):
plotter.share(public=True)
logger.info("Set plotter `%s' as public", plotter)
-
# Make it the format default
if plotter.dataformat.author.username == author.username and \
plotter.dataformat.name == storage.name and \
plotter.dataformat.version == int(storage.version):
+ # Adding some plotter parameters
+ plotterparameter_data_file_location = prefix + "/plotters/" + name.split("/")[0] + "/" + \
+ name.split("/")[1] + "/default_plotterparameter.txt"
+
+ short_desc_file_location = prefix + "/plotters/" + name.split("/")[0] + "/" + \
+ name.split("/")[1] + "/default_plotterparameter_short_description.txt"
+
+ with open(plotterparameter_data_file_location) as plotterparameter_data_file:
+ plotterparameter_data = simplejson.load(plotterparameter_data_file)
+
+ with open(short_desc_file_location) as short_desc_data_file:
+ short_desc = short_desc_data_file.readline().split("\n")[0]
+
+ if plotter.dataformat.name != "scatter":
+ plotterparameter = PlotterParameter.objects.create(name=plotter.dataformat.name,
+ author=author, plotter=plotter, data=simplejson.dumps(plotterparameter_data,
+ indent=4), short_description=short_desc, sharing = Shareable.PUBLIC)
+ else:
+ plotterparameter = PlotterParameter.objects.create(name=plotter.dataformat.name,
+ author=author, plotter=plotter, data=simplejson.dumps(plotterparameter_data,
+ indent=4), short_description=short_desc)
+ plotterparameter.save()
+ logger.info("Add plotterparameter `%s' ", plotterparameter)
+
+
default = DefaultPlotter.objects.filter(dataformat=plotter.dataformat)
if default:
default.plotter = plotter
else:
- default = DefaultPlotter(dataformat=plotter.dataformat, plotter=plotter)
+ default = DefaultPlotter(dataformat=plotter.dataformat,
+ plotter=plotter, parameter=plotterparameter)
default.save()
- logger.info("Set plotter `%s' as default for `%s'", plotter, plotter.dataformat)
+ logger.info("Set plotter `%s' and plotterparameter `%s' as default for `%s'", plotter, plotterparameter, plotter.dataformat)
+
+ if plotter.dataformat.name == "isoroc":
+ # Adding extra plotterparameter if not already present for plotter isoroc
+ other_plotterparameter_location = prefix + "/plotters/" + name.split("/")[0] + "/" + \
+ "other_plotterparameters"
+
+ the_folders = filter(lambda x:\
+ os.path.isdir(os.path.join(other_plotterparameter_location, x)),\
+ os.listdir(other_plotterparameter_location))
+
+ for folder_name in the_folders:
+
+ others_plotterparameter = PlotterParameter.objects.filter(
+ author=author,
+ name=folder_name,
+ version=int(storage.version),
+ )
+
+ if others_plotterparameter is not None:
+ param_folder = other_plotterparameter_location + "/" + folder_name
+ data_file_location = param_folder + "/default_plotterparameter.txt"
+ short_desc_file_location = param_folder + "/default_plotterparameter_short_description.txt"
+
+ with open(data_file_location) as plotterparameter_data_file:
+ plotterparameter_data = simplejson.load(plotterparameter_data_file)
+
+ with open(short_desc_file_location) as short_desc_data_file:
+ short_desc = short_desc_data_file.readline().split("\n")[0]
+
+ plotterparameter = PlotterParameter.objects.create(name=folder_name,
+ author=author, plotter=plotter, data=simplejson.dumps(plotterparameter_data,
+ indent=4), short_description=short_desc, sharing = Shareable.PUBLIC)
+ logger.info("Add plotterparameter `%s' ", folder_name)
return True