diff --git a/browser/test/QUnit/QUnit-Manual.txt b/browser/test/QUnit/QUnit-Manual.txt deleted file mode 100644 index 74e9cd7bac3e7adeaa06a02b8f25471fe5e77940..0000000000000000000000000000000000000000 --- a/browser/test/QUnit/QUnit-Manual.txt +++ /dev/null @@ -1,33 +0,0 @@ -— -Redacted by Carette Antonin - the Vidjil Project -— - - -usage: - - with browser: - -> open test_Qunit.html - with phantomjs: - -> install phantomJS (apt-get phantomjs) - -> phantomjs phantom_test.js - - - -QUnit tests: - - dbscan (dbscan_test.js) - model (model.js) - ------ - - DONE: - -> Existing DBSCAN object - -> Not null - -> Good clustering - -> 2 nodes - -> multiple nodes - - - -> Model object - -> load/parse json data - -> timepoint - diff --git a/server/web2py/applications/vidjil/controllers/sample_set.py b/server/web2py/applications/vidjil/controllers/sample_set.py index aa724c4fc53108a3d53abbdfb8c9541ba5d135c0..43b6dcee84c73c3b303d22d6c394dd0d2391a0aa 100644 --- a/server/web2py/applications/vidjil/controllers/sample_set.py +++ b/server/web2py/applications/vidjil/controllers/sample_set.py @@ -332,7 +332,8 @@ def custom(): request.vars["custom_list"] = [] if type(request.vars["custom_list"]) is str : request.vars["custom_list"] = [request.vars["custom_list"]] - + + factory = ModelFactory() myGroupBy = None if request.vars["id"] and auth.can_view_sample_set(request.vars["id"]): q = ((auth.vidjil_accessible_query(PermissionEnum.read_config.value, db.config)) @@ -343,6 +344,7 @@ def custom(): & (db.results_file.data_file != '') & (db.config.id==db.results_file.config_id) ) + helper = factory.get_instance(type=db.sample_set[request.vars["id"]].sample_type) else: q = ((auth.vidjil_accessible_query(PermissionEnum.read.value, db.patient) @@ -356,6 +358,7 @@ def custom(): & (db.config.id==db.results_file.config_id) ) myGroupBy = db.sequence_file.id|db.patient.id|db.run.id|db.generic.id|db.results_file.config_id + helper = factory.get_instance(type=defs.SET_TYPE_GENERIC) query = db(q).select( db.patient.id, db.patient.info, db.patient.first_name, db.patient.last_name, @@ -403,7 +406,8 @@ def custom(): return dict(query=query, config_id=config_id, - config=config) + config=config, + helper=helper) def confirm(): if auth.can_modify_sample_set(request.vars["id"]): diff --git a/server/web2py/applications/vidjil/views/sample_set/custom.html b/server/web2py/applications/vidjil/views/sample_set/custom.html index 4ed0c28f6ee0f877845fb3b5c6253ff0e5d1aa09..f9fd93b978c7a190158fa9089c35288b0db62fd4 100644 --- a/server/web2py/applications/vidjil/views/sample_set/custom.html +++ b/server/web2py/applications/vidjil/views/sample_set/custom.html @@ -6,9 +6,9 @@
Select up to 10 samples to be compared.
@@ -50,7 +50,7 @@- | patient | +{{=helper.get_type_display()}} | file name | sampling date | info | diff --git a/server/web2py/applications/vidjil/views/sample_set/permission.html b/server/web2py/applications/vidjil/views/sample_set/permission.html index ac8d79b04a7053fbb62e028fdfd32cd7129b9c61..6bf05eb6b104aee1821425aad8cf956fb790a229 100644 --- a/server/web2py/applications/vidjil/views/sample_set/permission.html +++ b/server/web2py/applications/vidjil/views/sample_set/permission.html @@ -38,5 +38,5 @@ {{if not auth.can_modify_patient(request.vars["id"]) :}} -