Imaging Browser: Add DICOM download: Redmine 12580

modules/imaging_browser/README.md

@@ -59,7 +59,7 @@ tblScanTypes - This setting determines which scan types are considered "NEW" for
         main imaging browser menu page.
 
 ImagingBrowserLinkedInstruments - This setting defines which instruments to 
-        include a link to on the viewsession page.
+        include a link to on the "View Session" page.
 
 useProjects - This setting determines whether "project" filtering dropdowns exist
         on the menu page.
@@ -68,7 +68,7 @@ useEDC - This setting determines whether "EDC" filtering dropdowns exist
         on the menu page.
 
 mantis_url - This setting defines a URL for LORIS to include a link to for bug reporting
-        on the viewsession page.
+        on the "View Session" page.
 
 ## Interactions with LORIS
 
@@ -78,7 +78,10 @@ mantis_url - This setting defines a URL for LORIS to include a link to for bug r
   `$LORIS/tools/CouchDB_Import_MRI.php` alongside all other CouchDB
   import scripts, but should logically be considered part of this module.)
 - The imaging browser module includes links to BrainBrowser to visualize data.
-- The control panel on the viewsession page includes links to the instruments
+- The control panel on the "View Session" page includes links to instruments
+  named "mri_parameter_form" and "radiologyreview" if they exist for the
+  currently viewed session.
+- The control panel on the "View Session" page includes links to the instruments
   as configured by the study.
-- The control panel on the viewsession page includes links to the DICOM Archive
-  for any DICOM tars associated with the given session.
+- The control panel on the "View Session" page includes links to the DICOM Archive 
+  and download capabilities for any DICOM tars associated with the given session.

modules/imaging_browser/php/imaging_session_controlpanel.class.inc

@@ -105,13 +105,20 @@ class Imaging_Session_ControlPanel
             $params['PCandID'] = $timePoint->getCandID();
             $params['PVL']     = $timePoint->getVisitLabel();
         }
-        $tarchiveIDs = $DB->pselect(
-            "SELECT TarchiveID
+        // To enable DICOM download: Add pair: tarchiveID, ArchiveLocation
+        $qresult = $DB->pselect(
+            "SELECT TarchiveID, ArchiveLocation 
             FROM tarchive 
             WHERE PatientName LIKE $ID",
             $params
         );
-        $subjectData['tarchiveids'] = $tarchiveIDs;
+
+        $tarIDToTarLoc =array();
+        foreach ($qresult as $v) {
+            $tarchiveID = $v['TarchiveID'];
+            $tarIDToTarLoc[$tarchiveID] = $v['ArchiveLocation'];
+        }
+        $subjectData['tarchiveIDLoc'] = $tarIDToTarLoc;
 
         $config =& \NDB_Config::singleton();
 

modules/imaging_browser/templates/imaging_session_controlpanel.tpl

@@ -35,8 +35,13 @@
         {foreach from=$subject.links item=link}
             <li><a href="{$baseurl}/{$subject.candid}/{$subject.sessionID}/{$link.BEName}/?commentID={$link.CommentID}">{$link.FEName}</a></li>
         {/foreach}
-        {foreach from=$subject.tarchiveids item=tarchive}
-            <li><a href="{$baseurl}/dicom_archive/viewDetails/?tarchiveID={$tarchive.TarchiveID}&backURL={$backURL|escape:"url"}">DICOM Archive {$tarchive.TarchiveID}</a></li>{/foreach}
+        {foreach from=$subject.tarchiveIDLoc key=tarchive item=tarchiveLoc}
+            <li><a href="{$baseurl}/dicom_archive/viewDetails/?tarchiveID={$tarchive}&backURL={$backURL|escape:"url"}">DICOM Archive {$tarchive}</a></li>
+            <li><a href="/mri/jiv/get_file.php?file={$tarchiveLoc}" class="btn btn-primary btn-small">
+                    <span class="glyphicon glyphicon-cloud-download"></span><span class="hidden-xs"> Download DICOM {$tarchive}</span>
+                </a>
+            </li>
+        {/foreach}
         {if $mantis}
             <li><a target="mantis" href="{$mantis}">Report a Bug (Mantis)</a></li>
         {/if}

modules/imaging_browser/test/imaging_browser_test_plan.md

@@ -11,7 +11,7 @@
 
 ### B. ViewSession / Volume List
 
-8. Sidebar:  all links work. Ensure that projects can customize (add/remove) their list of instruments that can be linked to from the Configuration/Imaging Modules/Imaging Browser Links to Insruments
+8. Sidebar:  all links work, including the Download DICOM option. Ensure that projects can customize (add/remove) their list of instruments that can be linked to from the Configuration/Imaging Modules/Imaging Browser Links to Insruments
 9. 3d panel overlay etc - they work.  Add panel checkbox works. 3D only or 3D+Overlay loads files if at least one image exists and is selected
 10. "Visit Level Feedback" - pops up QC window (see section E below)
 11. Visit level QC controls (Pass/Fail, Pending, Visit Level Caveat) viewable to all, editable IFF permission imaging_browser_qc