# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1438961008 -7200
# Node ID aaf368280f5a39a8f688bf26be8fea63997cd7ea
# Parent  a11281698db90e342f36f62c73740c2cc94181c5
C-Echo testing can be triggered from Orthanc Explorer (in the query/retrieve page)

diff -r a11281698db9 -r aaf368280f5a NEWS
--- a/NEWS	Fri Aug 07 16:50:38 2015 +0200
+++ b/NEWS	Fri Aug 07 17:23:28 2015 +0200
@@ -1,8 +1,9 @@
 Pending changes in the mainline
 ===============================
 
-* Orthanc uses its internal logger, and not Google Log anymore
-  (use -DENABLE_GOOGLE_LOG=ON to re-enable it)
+* C-Echo testing can be triggered from Orthanc Explorer (in the query/retrieve page)
+* Removal of the dependency upon Google Log, Orthanc now uses its internal logger 
+  (use -DENABLE_GOOGLE_LOG=ON to re-enable Google Log)
 
 
 Version 0.9.2 (2015/08/02)
diff -r a11281698db9 -r aaf368280f5a OrthancExplorer/explorer.html
--- a/OrthancExplorer/explorer.html	Fri Aug 07 16:50:38 2015 +0200
+++ b/OrthancExplorer/explorer.html	Fri Aug 07 17:23:28 2015 +0200
@@ -353,7 +353,14 @@
             </div>
           </div>
 
-          <button id="qr-submit" type="submit" data-theme="b">Search studies</button>
+          <fieldset class="ui-grid-a">
+	    <div class="ui-block-a">
+              <button id="qr-echo" data-theme="a">Test Echo</button>
+            </div>
+	    <div class="ui-block-b">
+              <button id="qr-submit" type="submit" data-theme="b">Search studies</button>
+            </div>
+	  </fieldset>
         </form>
       </div>
     </div>
diff -r a11281698db9 -r aaf368280f5a OrthancExplorer/query-retrieve.js
--- a/OrthancExplorer/query-retrieve.js	Fri Aug 07 16:50:38 2015 +0200
+++ b/OrthancExplorer/query-retrieve.js	Fri Aug 07 17:23:28 2015 +0200
@@ -45,6 +45,35 @@
 });
 
 
+$('#qr-echo').live('click', function() {
+  var server = $('#qr-server').val();
+  var message = 'Error: The C-Echo has failed!';
+
+  $.ajax({
+    url: '../modalities/' + server + '/echo',
+    type: 'POST', 
+    cache: false,
+    async: false,
+    success: function() {
+      message = 'The C-Echo has succeeded!';
+    }
+  });
+
+  $('<div>').simpledialog2({
+    mode: 'button',
+    headerText: 'Echo result',
+    headerClose: true,
+    buttonPrompt: message,
+    animate: false,
+    buttons : {
+      'OK': { click: function () { } }
+    }
+  });
+
+  return false;
+});
+
+
 $('#qr-submit').live('click', function() {
   var query = {
     'Level' : 'Study',