diff --git a/LesionTracker/client/body.styl b/LesionTracker/client/body.styl index 5661749ec..e5e6350dd 100644 --- a/LesionTracker/client/body.styl +++ b/LesionTracker/client/body.styl @@ -27,42 +27,4 @@ table#tblStudyList tbody > tr > td{ } -/* Toolbar Styles */ - -/* iphone6 Portrait */ - - @media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation : portrait) { - - table#tblStudyList { - table-layout: fixed - font-size: 0.4em - } - - - #tablist { - width: 84%; - overflow-x: auto; - - } - #toolbar .btn-group button { - width: 35px; - height: 35px; - } - - } - -/* iphone6 Plus Portrait */ - -@media only screen and (min-device-width : 414px) and (max-device-width : 736px) and (orientation : portrait) { - #tablist { - width: 84%; - overflow-x: auto; - } - - #toolbar .btn-group button { - width: 40px; - height: 40px; - } - -} diff --git a/LesionTracker/client/components/viewer.html b/LesionTracker/client/components/viewer.html index 1ff89b18f..9bab4bd48 100644 --- a/LesionTracker/client/components/viewer.html +++ b/LesionTracker/client/components/viewer.html @@ -1,13 +1,11 @@ \ No newline at end of file diff --git a/LesionTracker/client/components/viewer.js b/LesionTracker/client/components/viewer.js index 152d48fd5..db29d5d87 100644 --- a/LesionTracker/client/components/viewer.js +++ b/LesionTracker/client/components/viewer.js @@ -16,6 +16,11 @@ function resizeViewports() { }, 1); } +Template.viewer.helpers({ + 'studyDateIsShown':function(){ + return {studyDateIsShown: true}; + } +}); Template.viewer.onCreated(function() { log.info("viewer onCreated"); diff --git a/LesionTracker/client/mobileStyles.css b/LesionTracker/client/mobileStyles.css new file mode 100644 index 000000000..a6a6fafe6 --- /dev/null +++ b/LesionTracker/client/mobileStyles.css @@ -0,0 +1,27 @@ + +/* Mobile devices */ + +@media only screen and (min-device-width : 375px) and (max-device-width : 768px) and (orientation : portrait) { + + table#tblStudyList { + table-layout: fixed; + font-size: 0.7em; + } + + #tablist { + width: 84%; + overflow-x: auto; + + } + #toolbar .btn-group button { + width: 40px; + height: 40px; + } +} + +@media (max-device-width: 667px) { + #toolbar .btn-group button { + width: 35px; + height: 35px; + } +} \ No newline at end of file diff --git a/Packages/lesiontracker/components/studyDateList/studyDateList.css b/Packages/lesiontracker/components/studyDateList/studyDateList.css new file mode 100644 index 000000000..699fc5867 --- /dev/null +++ b/Packages/lesiontracker/components/studyDateList/studyDateList.css @@ -0,0 +1,12 @@ +.studyDateList { + margin: 0px auto; + text-align: left; + width: 100%; + float: none; + border-top: 2px solid #777; + padding: 10px; +} + +.studyDateList label { + color: white; +} \ No newline at end of file diff --git a/Packages/lesiontracker/components/studyDateList/studyDateList.html b/Packages/lesiontracker/components/studyDateList/studyDateList.html index 5328d8285..cdde50a9e 100644 --- a/Packages/lesiontracker/components/studyDateList/studyDateList.html +++ b/Packages/lesiontracker/components/studyDateList/studyDateList.html @@ -1,7 +1,11 @@ \ No newline at end of file diff --git a/Packages/lesiontracker/components/studyDateList/studyDateList.js b/Packages/lesiontracker/components/studyDateList/studyDateList.js index 19883148c..befc05b22 100644 --- a/Packages/lesiontracker/components/studyDateList/studyDateList.js +++ b/Packages/lesiontracker/components/studyDateList/studyDateList.js @@ -8,6 +8,7 @@ Template.studyDateList.onCreated(function(){ Template.studyDateList.onRendered(function(){ + // Add Study dates to Timepoints this.patientStudies.forEach(function(study) { Timepoints.insert({ @@ -16,8 +17,13 @@ Template.studyDateList.onRendered(function(){ }); }); - // Selected date option - $('#selectStudyDate option[value="'+this.selectedDate+'"]').prop('selected', true); + // Selected date option in combobox + var self = this; + $('#selectStudyDate option').filter(function () { + if ($(this).html() === self.selectedDate) { + $(this).prop('selected', true); + } + }); }); diff --git a/Packages/lesiontracker/package.js b/Packages/lesiontracker/package.js index 50d504e10..3b91af175 100644 --- a/Packages/lesiontracker/package.js +++ b/Packages/lesiontracker/package.js @@ -40,6 +40,7 @@ Package.onUse(function (api) { api.addFiles('components/nonTargetLesionDialog/nonTargetLesionDialog.js', 'client'); api.addFiles('components/studyDateList/studyDateList.html', 'client'); + api.addFiles('components/studyDateList/studyDateList.css', 'client'); api.addFiles('components/studyDateList/studyDateList.js', 'client'); diff --git a/Packages/viewerbase/components/basic/hidingPanel/hidingPanel.html b/Packages/viewerbase/components/basic/hidingPanel/hidingPanel.html index f39e4fd27..bbc909480 100644 --- a/Packages/viewerbase/components/basic/hidingPanel/hidingPanel.html +++ b/Packages/viewerbase/components/basic/hidingPanel/hidingPanel.html @@ -6,6 +6,9 @@
+ {{#if studyDateIsShown}} + {{> studyDateList}} + {{/if}} {{> studyBrowser}}
diff --git a/Packages/viewerbase/components/basic/hidingPanel/hidingPanel.js b/Packages/viewerbase/components/basic/hidingPanel/hidingPanel.js index 36e5c8a2b..6e95ae46a 100644 --- a/Packages/viewerbase/components/basic/hidingPanel/hidingPanel.js +++ b/Packages/viewerbase/components/basic/hidingPanel/hidingPanel.js @@ -39,6 +39,12 @@ Template.hidingPanel.events({ } }); +Template.hidingPanel.helpers({ + 'studyDateIsShown': function() { + return true; + } +}); + Template.hidingPanel.onCreated(function() { this.hidingPanelOpen = new ReactiveVar(true); this.hidingPanelWidth = new ReactiveVar(0);