Skip to content

Commit 106aa3d

Browse files
committed
Adding study-details
1 parent 8d8e417 commit 106aa3d

2 files changed

Lines changed: 63 additions & 20 deletions

File tree

assets/js/ISATabViewer.js

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,31 @@ hashCode = function (s) {
2929

3030
ISATabViewer.rendering = {
3131

32+
process_study_details: function(study_index) {
33+
var study = ISATabViewer.investigation.STUDY[study_index];
34+
var study_details = [];//{"designs": [], "measurements": [], "technologies": []};
35+
36+
var record = {"name": "Designs", "values": study["STUDY DESIGN DESCRIPTORS"]["Study Design Type"]};
37+
study_details.push(record);
38+
39+
record = {"name": "Measurements", "values": study["STUDY ASSAYS"]["Study Assay Measurement Type"]};
40+
study_details.push(record);
41+
42+
record = {"name": "Technologies", "values": study["STUDY ASSAYS"]["Study Assay Technology Type"]};
43+
study_details.push(record);
44+
45+
return study_details;
46+
},
47+
48+
render_study_details: function () {
49+
var source = $("#study-details-template").html();
50+
var template = Handlebars.compile(source);
51+
var html = template({"study_details": ISATabViewer.rendering.study_details});
52+
53+
console.log("html---->", html);
54+
55+
$("#study-details").html(html);
56+
},
3257

3358
render_sample_statistics: function () {
3459
var source = $("#sample-distribution-template").html();
@@ -67,9 +92,13 @@ ISATabViewer.rendering = {
6792
for (var study_index in ISATabViewer.investigation.STUDY) {
6893

6994
var study_information = ISATabViewer.investigation.STUDY[study_index];
95+
7096
var study_file = ISATabViewer.rendering.replace_str("\"", "", study_information.STUDY["Study File Name"][0]);
7197
var base_directory = file_name.substr(0, file_name.lastIndexOf("/") + 1);
7298

99+
ISATabViewer.rendering.study_details = ISATabViewer.rendering.process_study_details(study_index);
100+
ISATabViewer.rendering.render_study_details();
101+
73102
var assays = ISATabViewer.rendering.generate_records(study_information, "STUDY ASSAYS");
74103

75104
$.ajax({
@@ -85,6 +114,7 @@ ISATabViewer.rendering = {
85114

86115
ISATabViewer.rendering.render_sample_statistics();
87116
}
117+
88118
}
89119
});
90120

@@ -178,6 +208,7 @@ ISATabViewer.rendering = {
178208
}
179209
}
180210
}
211+
181212
return {current_study: current_study, current_section: current_section, parts: parts};
182213
},
183214

@@ -294,7 +325,7 @@ ISATabViewer.rendering = {
294325

295326
render_assay: function (study_id, file_name) {
296327

297-
$("#isa-breadcrumb-items").html('<li onclick="Transition.functions.hideContent();" class="active"><i class="fa fa-chevron-left"></i> Back to Studies</li><li onclick="ISATabViewer.rendering.render_study(\'' + study_id + '\')" class="active"><span class="fa fa-align-justify"></span> Study Details </li><li><span class="fa fa-table"></span> ' + file_name + '</li>');
328+
$("#isa-breadcrumb-items").html('<li onclick="Transition.functions.hideContent();" class="active"><i class="fa fa-chevron-left"></i> Back to Datasets</li><li onclick="ISATabViewer.rendering.render_study(\'' + study_id + '\')" class="active"><span class="fa fa-align-justify"></span> Dataset Details </li><li><span class="fa fa-table"></span> ' + file_name + '</li>');
298329

299330
var spreadsheet = ISATabViewer.spreadsheets.files[file_name];
300331

index.html

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<div class="clearfix"></div>
5959

6060
<div class="filter">
61-
<p><span title="Filter by measurements used in the studies">Measurement Types></span></p>
61+
<p><span title="Filter by measurements used in the studies">Measurement Types</span></p>
6262
<ul id="popular-assays" class="filter-list"></ul>
6363
<span id="popular-assays-reset" class="reset hidden" data-target="popular-assays">Reset</span>
6464
<span class="show-next-5" data-target="popular-assays">Show next 5</span>
@@ -322,7 +322,6 @@ <h2 class="title title--preview"><span title="Data Descriptor Article Title">{{t
322322

323323

324324
<script id="study-list-template" type="text/x-handlebars-template">
325-
326325
{{#each studies}}
327326
<li id="list-{{this.hash}}" onclick="ISATabViewer.rendering.render_study('{{this.id}}', '{{this.hash}}')">
328327
{{this.id}}
@@ -331,6 +330,16 @@ <h2 class="title title--preview"><span title="Data Descriptor Article Title">{{t
331330

332331
</script>
333332

333+
<script id="study-details-template" type="text/x-handlebars-template">
334+
<ul>
335+
{{#each study_details}}
336+
337+
<li><p class="characteristic_type">{{this.name}}: </p> {{this.values}}
338+
</li>
339+
340+
{{/each}}
341+
</ul>
342+
</script>
334343

335344
<script id="sample-distribution-template" type="text/x-handlebars-template">
336345
<ul>
@@ -360,13 +369,12 @@ <h2 class="title title--preview"><span title="Data Descriptor Article Title">{{t
360369
<div class="cf"></div>
361370
<br/>
362371

363-
<div id="investigation">
364-
<div class="section-header">Investigation Details</div>
372+
<div id="study">
373+
<div class="section-header">Study Details</div>
365374

366375
<div class="clearfix"></div>
367376

368-
<div id="investigation-details">
369-
377+
<div id="study-details">
370378
</div>
371379

372380
</div>
@@ -383,6 +391,19 @@ <h2 class="title title--preview"><span title="Data Descriptor Article Title">{{t
383391

384392
</div>
385393

394+
<div id="factors">
395+
396+
<span class="section-header">Factors</span>
397+
<ul>
398+
{{#each factors}}
399+
<li>
400+
<p class="protocol-name">{{[Study Factor Name]}} </p>
401+
</li>
402+
{{/each}}
403+
</ul>
404+
</div>
405+
406+
386407
<div id="protocols">
387408
<span class="section-header">Methods Details</span>
388409
<ul>
@@ -429,31 +450,22 @@ <h2 class="title title--preview"><span title="Data Descriptor Article Title">{{t
429450
</ul>
430451
</div>
431452

453+
<!--
432454
<div id="funders">
433455

434456
<span class="section-header">Funders</span>
435-
<ul>
457+
<ul>
436458
{{#each contacts}}
437459
<li>
438460
<p class="publication-title">{{[Study Person First Name]}} {{[Study Person Last Name]}} <span
439461
class="publication-pubmed-id">{{[Study Person Affiliation]}}</span></p>
440462
</li>
441463
{{/each}}
442464
</ul>
443-
</div>
444-
445-
446-
<div id="factors">
447465

448-
<span class="section-header">Factors</span>
449-
<ul>
450-
{{#each factors}}
451-
<li>
452-
<p class="protocol-name">{{[Study Factor Name]}} </p>
453-
</li>
454-
{{/each}}
455-
</ul>
456466
</div>
467+
-->
468+
457469

458470

459471
</script>

0 commit comments

Comments
 (0)