diff --git a/Packages/lesiontracker/client/components/lesionTable/lesionTable.html b/Packages/lesiontracker/client/components/lesionTable/lesionTable.html
index d2b5c4e7d..65f90a9a1 100644
--- a/Packages/lesiontracker/client/components/lesionTable/lesionTable.html
+++ b/Packages/lesiontracker/client/components/lesionTable/lesionTable.html
@@ -10,21 +10,6 @@
{{ >lesionTableTimepointHeader }}
{{ /each }}
-
- {{ >lesionTableHeaderRow id="target" type="Targets" measurements=targets}}
- {{ #each targets }}
- {{ >lesionTableRow }}
- {{ /each }}
-
- {{ >lesionTableHeaderRow id="nonTarget" type="Non-targets" measurements=nonTargets}}
- {{ #each nonTargets }}
- {{ >lesionTableRow }}
- {{ /each }}
-
- {{ >lesionTableHeaderRow id="newLesions" type="New lesions" measurements=newLesions}}
- {{ #each nonTargets }}
- {{ >lesionTableRow }}
- {{ /each }}
-
+ {{ >lesionTableView }}
\ No newline at end of file
diff --git a/Packages/lesiontracker/client/components/lesionTable/lesionTable.js b/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
index afffe1c18..337517c83 100644
--- a/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
+++ b/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
@@ -1,34 +1,4 @@
Template.lesionTable.helpers({
- targets: function() {
- // All Targets shall be listed first followed by Non-Targets
- return Measurements.find({
- isTarget: true
- }, {
- sort: {
- lesionNumberAbsolute: 1
- }
- });
- },
- nonTargets: function() {
- // All Targets shall be listed first followed by Non-Targets
- return Measurements.find({
- isTarget: false
- }, {
- sort: {
- lesionNumberAbsolute: 1
- }
- });
- },
- newLesions: function() {
- // All Targets shall be listed first followed by Non-Targets
- return Measurements.find({
- saved: false
- }, {
- sort: {
- lesionNumberAbsolute: 1
- }
- });
- },
timepoints: function() {
return Timepoints.find({}, {
sort: {
diff --git a/Packages/lesiontracker/client/components/lesionTable/lesionTable.styl b/Packages/lesiontracker/client/components/lesionTable/lesionTable.styl
index 883ce3f65..11cf03130 100644
--- a/Packages/lesiontracker/client/components/lesionTable/lesionTable.styl
+++ b/Packages/lesiontracker/client/components/lesionTable/lesionTable.styl
@@ -2,15 +2,9 @@
#lesionTableContainer
width: 100%
- height: 16%
+ height: calc(100% - 105px)
background-color: #000000
- #lesionTableWrapper
- position: relative
- width: 100%
- height: 100%
- margin: 0 auto
-
.lesionTableTimepointHeaderRow
display: flex
diff --git a/Packages/lesiontracker/client/components/lesionTableHUD/lesionTableHUD.html b/Packages/lesiontracker/client/components/lesionTableHUD/lesionTableHUD.html
new file mode 100644
index 000000000..5a0970d39
--- /dev/null
+++ b/Packages/lesiontracker/client/components/lesionTableHUD/lesionTableHUD.html
@@ -0,0 +1,13 @@
+
@@ -32,4 +32,5 @@
{{ >lastLoginModal }}
{{ >studyContextMenu }}
{{ >progressDialog}}
+ {{ >lesionTableHUD }}
\ No newline at end of file
diff --git a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.js b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.js
index d2153f7c8..b4ed7e43a 100644
--- a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.js
+++ b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.js
@@ -49,6 +49,9 @@ Template.lesionTracker.events({
switchToTab(contentId);
},
'click #loadStudyList': function() {
+ // TODO: Make some set of 'closing study' callbacks
+ $('#lesionTableHUD').display('none');
+
switchToTab('worklistTab');
}
});
diff --git a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html
index 244aa320b..cc85feafb 100644
--- a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html
+++ b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html
@@ -55,7 +55,7 @@
-