From dac91857f0588a399b0db5747d0a9426d54a668f Mon Sep 17 00:00:00 2001 From: Evren Ozkan Date: Tue, 17 Nov 2015 19:02:53 -0500 Subject: [PATCH] Accession#, # Images and Modality columns are invisible on mobile versions --- .../worklistResult/worklistResult.html | 12 ++++++--- .../worklistResult/worklistResult.js | 4 +++ .../worklistStudy/worklistStudy.html | 25 ++++++++++++------- .../components/worklistStudy/worklistStudy.js | 6 +++++ 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/Packages/worklist/components/worklistResult/worklistResult.html b/Packages/worklist/components/worklistResult/worklistResult.html index ecab9fda3..14c59a4f1 100644 --- a/Packages/worklist/components/worklistResult/worklistResult.html +++ b/Packages/worklist/components/worklistResult/worklistResult.html @@ -5,11 +5,17 @@ Patient Name Patient ID - Accession # + {{#unless isTouchDevice}} + Accession # + {{/unless}} Study Date - Modality + {{#unless isTouchDevice}} + Modality + {{/unless}} Study Description - # Images + {{#unless isTouchDevice}} + # Images + {{/unless}} diff --git a/Packages/worklist/components/worklistResult/worklistResult.js b/Packages/worklist/components/worklistResult/worklistResult.js index 5b47f9c41..d5933ee26 100644 --- a/Packages/worklist/components/worklistResult/worklistResult.js +++ b/Packages/worklist/components/worklistResult/worklistResult.js @@ -11,5 +11,9 @@ Template.worklistResult.helpers({ */ studies : function() { return WorklistStudies.find({}, {sort: {patientName : 1, studyDate : 1}}); + }, + + isTouchDevice: function() { + return isTouchDevice(); } }); diff --git a/Packages/worklist/components/worklistStudy/worklistStudy.html b/Packages/worklist/components/worklistStudy/worklistStudy.html index fd244e6c9..cf2bc2592 100644 --- a/Packages/worklist/components/worklistStudy/worklistStudy.html +++ b/Packages/worklist/components/worklistStudy/worklistStudy.html @@ -6,20 +6,27 @@ {{patientId}} - - {{accessionNumber}} - + {{#unless isTouchDevice}} + + {{accessionNumber}} + + {{/unless}} + {{formatDA studyDate}} - - {{modalities}} - + {{#unless isTouchDevice}} + + {{modalities}} + + {{/unless}} {{studyDescription}} - - {{imageCount}} - + {{#unless isTouchDevice}} + + {{imageCount}} + + {{/unless}} \ No newline at end of file diff --git a/Packages/worklist/components/worklistStudy/worklistStudy.js b/Packages/worklist/components/worklistStudy/worklistStudy.js index 70b7f717f..f1d51b4b1 100644 --- a/Packages/worklist/components/worklistStudy/worklistStudy.js +++ b/Packages/worklist/components/worklistStudy/worklistStudy.js @@ -4,4 +4,10 @@ Template.worklistStudy.events({ var title = Blaze._globalHelpers['formatPN'](this.patientName); openNewTab(this.studyInstanceUid, title); } +}); + +Template.worklistStudy.helpers({ + isTouchDevice: function() { + return isTouchDevice(); + } }); \ No newline at end of file