othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed rebasing error

Browse Source
This commit is contained in:
Erik Ziegler 2015-10-30 12:27:30 +01:00
parent a10f149b4b
commit 7a958c3513
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Packages/lesiontracker/components/lesionTable/lesionTable.js
View File

@ -3,22 +3,12 @@ TabsTimepoints = new Meteor.Collection(null);
Template.lesionTable.helpers({ Template.lesionTable.helpers({
'measurement': function() { 'measurement': function() {
<<<<<<< HEAD var contentId = this.contentId;
var contentId = Session.get("activeContentId");
return Measurements.find({contentId: contentId}); return Measurements.find({contentId: contentId});
}, },
'tabTimepoints': function() { 'tabTimepoints': function() {
var contentId = Session.get("activeContentId"); var contentId = this.contentId;
return TabsTimepoints.find({contentId: contentId}); return TabsTimepoints.find({contentId: contentId});
=======
var contentId = this.contentId;
console.log(Measurements.find({contentId: contentId}));
return Measurements.find({contentId: contentId});
},
'timepointNames': function() {
var contentId = this.contentId;
return Template.instance().timepointNamesDictionary.get(contentId);
>>>>>>> Updates to improve reactivity, session storage, logging
}, },
'lesionData': function() { 'lesionData': function() {
var array = []; var array = [];
@ -37,6 +27,7 @@ Template.lesionTable.onRendered(function() {
var totalViewports = viewportColumns * viewportRows; var totalViewports = viewportColumns * viewportRows;
var timepointsArray = [];
for(var i=0; i< totalViewports; i++) { for(var i=0; i< totalViewports; i++) {
var timepointID = contentId.toString() + i.toString(); var timepointID = contentId.toString() + i.toString();
var timepointName = "Baseline"; var timepointName = "Baseline";