Merge branch '0909-dicomUploaderDashboard-yuzheng'

* 0909-dicomUploaderDashboard-yuzheng:
  BUG: Refs #0909. Dicom uploader module is currently not supported in Windows. Show this information to Windows users.

Author: zachmullen

modules/dicomuploader/constant/module.php

@@ -13,5 +13,6 @@
 // Uploader status
 define("MIDAS_DICOM_UPLOADER_IS_RUNNING", "running");
 define("MIDAS_DICOM_UPLOADER_NOT_RUNNING", "not running");
+define("MIDAS_DICOM_UPLOADER_NOT_SUPPORTED", "This module is currently not supported in Windows.");
 
 ?>

modules/dicomuploader/controllers/components/ApiComponent.php

@@ -183,7 +183,15 @@ function status($args)
       }
 
     $ret = array();
-    $ret['status'] = MIDAS_DICOM_UPLOADER_NOT_RUNNING;
+    if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
+      { // currently not supported in windows
+      $ret['status'] = MIDAS_DICOM_UPLOADER_NOT_SUPPORTED;
+      return $ret;
+      }
+    else
+      {
+      $ret['status'] = MIDAS_DICOM_UPLOADER_NOT_RUNNING;
+      }
     $ps_cmd = 'ps';
     $cmd_params = array();
     $cmd_params[] = 'ax';

modules/dicomuploader/controllers/components/UploaderComponent.php

@@ -38,11 +38,11 @@ public function isDICOMUploaderWorking()
     $status_results = $apiComponent->status($status_args);
     if ($status_results['status'] == MIDAS_DICOM_UPLOADER_IS_RUNNING)
       {
-      $ret['Status'] = array(true, MIDAS_DICOM_UPLOADER_IS_RUNNING);
+      $ret['Status'] = array(true, $status_results['status']);
       }
     else
       {
-      $ret['Status'] = array(false, MIDAS_DICOM_UPLOADER_NOT_RUNNING);
+      $ret['Status'] = array(false, $status_results['status']);
       }
 
     return $ret;

modules/dicomuploader/public/css/config/config.index.css

@@ -8,6 +8,11 @@ span#not_running_status{
   color: #C80000;
 }
 
+span#not_supported_status{
+  font-weight: bold;
+  color: #C80000;
+}
+
 textarea#apicall_failure_reason{
   font-weight: bold;
   color: #C80000;

modules/dicomuploader/public/js/config/config.index.js

@@ -111,17 +111,26 @@ midas.dicomuploader.checkStatus = function () {
         args: 'storescp_cmd=' + storescp_val,
         log: $('<p></p>'),
         success: function (retVal) {
-           if(retVal.data.status === 'running') {
+          if(retVal.data.status === 'running') {
              $('span#not_running_status').hide();
              $('span#running_status').show();
              $('span#span_start_uploader_user').html(retVal.data.user_email);
              $('div#start_uploader_user').show();
              }
-           else {
+          else if(retVal.data.status === 'not running') {
              $('span#running_status').hide();
              $('span#not_running_status').show();
              $('div#start_uploader_user').hide();
              }
+          else { // this module is not supported
+             $('span#running_status').hide();
+             $('span#not_running_status').hide();
+             $('span#not_supported_status').show();
+             $('div#startUploader').hide();
+             $('div#stopUploader').hide();
+             $('div#start_uploader_user').hide();
+             $('div#manualCommandsWrapper').hide();
+             }
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {
             midas.createNotice(XMLHttpRequest.message, 3000, 'error');

modules/dicomuploader/views/config/index.phtml

@@ -104,6 +104,7 @@ $this->headScript()->appendFile($this->moduleWebroot . '/public/js/config/config
         <h3>Status:
           <span class="running_status" id="running_status" style="display:none">Running</span>
           <span class="not_running_status" id="not_running_status" style="display:none">Not Running</span>
+          <span class="not_supported_status" id="not_supported_status" style="display:none">This module is currently not supported in Windows</span>
         </h3>
       </div>
       <div id="start_uploader_user" class="start_uploader_user" style="display:none">
@@ -115,8 +116,8 @@ $this->headScript()->appendFile($this->moduleWebroot . '/public/js/config/config
          <textarea id="apicall_failure_reason" rows="5" cols="80" readonly> </textarea>
       </div>
     </div>
+    <div class="manualCommandsWrapper" id="manualCommandsWrapper"  style="display: none">
     In some platforms, the above start/stop buttons may not work because the web server user is lack of permissions. The following commands can be used to start/stop DICOM Uploader in command line.
-    <div class="manualCommandsWrapper" style="display: none">
     <h3 class="sectionHeader"><a href="#">Start/Stop DICOM Uploader in command line</a></h3>
     <ul>
       <li>