# HG changeset patch
# User bgo-osimis
# Date 1551103047 -3600
# Node ID f09b9e14e995f9d91ee74a5313f11d4c0cda90c4
# Parent  66745b9039aa6ec509bd5a52dc05e7dc65d854ee
Changed field default values from '*' to '' (empty string) in the Query/Retrieve query construction

diff -r 66745b9039aa -r f09b9e14e995 OrthancExplorer/query-retrieve.js
--- a/OrthancExplorer/query-retrieve.js	Mon Feb 25 12:40:43 2019 +0100
+++ b/OrthancExplorer/query-retrieve.js	Mon Feb 25 14:57:27 2019 +0100
@@ -1,337 +1,337 @@
-function JavascriptDateToDicom(date)
-{
-  var s = date.toISOString();
-  return s.substring(0, 4) + s.substring(5, 7) + s.substring(8, 10);
-}
-
-function GenerateDicomDate(days)
-{
-  var today = new Date();
-  var other = new Date(today);
-  other.setDate(today.getDate() + days);
-  return JavascriptDateToDicom(other);
-}
-
-
-$('#query-retrieve').live('pagebeforeshow', function() {
-  var targetDate;
-
-  $.ajax({
-    url: '../modalities',
-    dataType: 'json',
-    async: false,
-    cache: false,
-    success: function(modalities) {
-      var targetServer = $('#qr-server');
-      var option;
-
-      $('option', targetServer).remove();
-
-      for (var i = 0; i < modalities.length; i++) {
-        option = $('<option>').text(modalities[i]);
-        targetServer.append(option);
-      }
-
-      targetServer.selectmenu('refresh');
-    }
-  });
-
-  targetDate = $('#qr-date');
-  $('option', targetDate).remove();
-  targetDate.append($('<option>').attr('value', '*').text('Any date'));
-  targetDate.append($('<option>').attr('value', GenerateDicomDate(0)).text('Today'));
-  targetDate.append($('<option>').attr('value', GenerateDicomDate(-1)).text('Yesterday'));
-  targetDate.append($('<option>').attr('value', GenerateDicomDate(-7) + '-').text('Last 7 days'));
-  targetDate.append($('<option>').attr('value', GenerateDicomDate(-31) + '-').text('Last 31 days'));
-  targetDate.append($('<option>').attr('value', GenerateDicomDate(-31 * 3) + '-').text('Last 3 months'));
-  targetDate.append($('<option>').attr('value', GenerateDicomDate(-365) + '-').text('Last year'));
-  targetDate.selectmenu('refresh');
-});
-
-
-$('#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, server, modalities, field;
-
-  query = {
-    'Level' : 'Study',
-    'Query' : {
-      'AccessionNumber' : '*',
-      'PatientBirthDate' : '*',
-      'PatientID' : '*',
-      'PatientName' : '*',
-      'PatientSex' : '*',
-      'StudyDate' : $('#qr-date').val(),
-      'StudyDescription' : '*'
-    }
-  };
-
-  modalities = '';
-
-  field = $('#qr-fields input:checked').val();
-  query['Query'][field] = $('#qr-value').val().toUpperCase();
-
-  $('#qr-modalities input:checked').each(function() {
-    var s = $(this).attr('name');
-    if (modalities == '')
-      modalities = s;
-    else
-      modalities += '\\' + s;
-  });
-
-  if (modalities.length > 0) {
-    query['Query']['ModalitiesInStudy'] = modalities;
-  }
-
-
-  server = $('#qr-server').val();
-  $.ajax({
-    url: '../modalities/' + server + '/query',
-    type: 'POST', 
-    data: JSON.stringify(query),
-    dataType: 'json',
-    async: false,
-    error: function() {
-      alert('Error during query (C-Find)');
-    },
-    success: function(result) {
-      ChangePage('query-retrieve-2', {
-        'server' : server,
-        'uuid' : result['ID']
-      });
-    }
-  });
-
-  return false;
-});
-
-
-
-$('#query-retrieve-2').live('pagebeforeshow', function() {
-  var pageData, uri;
-  
-  if ($.mobile.pageData) {
-    pageData = DeepCopy($.mobile.pageData);
-
-    uri = '../queries/' + pageData.uuid + '/answers';
-
-    $.ajax({
-      url: uri,
-      dataType: 'json',
-      async: false,
-      success: function(answers) {
-        var target = $('#query-retrieve-2 ul');
-        $('li', target).remove();
-
-        for (var i = 0; i < answers.length; i++) {
-          $.ajax({
-            url: uri + '/' + answers[i] + '/content?simplify',
-            dataType: 'json',
-            async: false,
-            success: function(study) {
-              var series = '#query-retrieve-3?server=' + pageData.server + '&uuid=' + study['StudyInstanceUID'];
-
-              var content = ($('<div>')
-                             .append($('<h3>').text(study['PatientID'] + ' - ' + study['PatientName']))
-                             .append($('<p>').text('Accession number: ')
-                                     .append($('<b>').text(study['AccessionNumber'])))
-                             .append($('<p>').text('Birth date: ')
-                                     .append($('<b>').text(study['PatientBirthDate'])))
-                             .append($('<p>').text('Patient sex: ')
-                                     .append($('<b>').text(study['PatientSex'])))
-                             .append($('<p>').text('Study description: ')
-                                     .append($('<b>').text(study['StudyDescription'])))
-                             .append($('<p>').text('Study date: ')
-                                     .append($('<b>').text(FormatDicomDate(study['StudyDate'])))));
-
-              var info = $('<a>').attr('href', series).html(content);
-              
-              var answerId = answers[i];
-              var retrieve = $('<a>').text('Retrieve all study').click(function() {
-                ChangePage('query-retrieve-4', {
-                  'query' : pageData.uuid,
-                  'answer' : answerId,
-                  'server' : pageData.server
-                });
-              });
-
-              target.append($('<li>').append(info).append(retrieve));
-            }
-          });
-        }
-
-        target.listview('refresh');
-      }
-    });
-  }
-});
-
-
-$('#query-retrieve-3').live('pagebeforeshow', function() {
-  var pageData, query;
-
-  if ($.mobile.pageData) {
-    pageData = DeepCopy($.mobile.pageData);
-
-    query = {
-      'Level' : 'Series',
-      'Query' : {
-        'Modality' : '*',
-        'ProtocolName' : '*',
-        'SeriesDescription' : '*',
-        'SeriesInstanceUID' : '*',
-        'StudyInstanceUID' : pageData.uuid
-      }
-    };
-
-    $.ajax({
-      url: '../modalities/' + pageData.server + '/query',
-      type: 'POST', 
-      data: JSON.stringify(query),
-      dataType: 'json',
-      async: false,
-      error: function() {
-        alert('Error during query (C-Find)');
-      },
-      success: function(answer) {
-        var queryUuid = answer['ID'];
-        var uri = '../queries/' + answer['ID'] + '/answers';
-
-        $.ajax({
-          url: uri,
-          dataType: 'json',
-          async: false,
-          success: function(answers) {
-            
-            var target = $('#query-retrieve-3 ul');
-            $('li', target).remove();
-
-            for (var i = 0; i < answers.length; i++) {
-              $.ajax({
-                url: uri + '/' + answers[i] + '/content?simplify',
-                dataType: 'json',
-                async: false,
-                success: function(series) {
-                  var content = ($('<div>')
-                                 .append($('<h3>').text(series['SeriesDescription']))
-                                 .append($('<p>').text('Modality: ')
-                                         .append($('<b>').text(series['Modality'])))
-                                 .append($('<p>').text('ProtocolName: ')
-                                         .append($('<b>').text(series['ProtocolName']))));
-
-                  var info = $('<a>').html(content);
-
-                  var answerId = answers[i];
-                  info.click(function() {
-                    ChangePage('query-retrieve-4', {
-                      'query' : queryUuid,
-                      'study' : pageData.uuid,
-                      'answer' : answerId,
-                      'server' : pageData.server
-                    });
-                  });
-
-                  target.append($('<li>').attr('data-icon', 'arrow-d').append(info));
-                }
-              });
-            }
-
-            target.listview('refresh');
-          }
-        });
-      }
-    });
-  }
-});
-
-
-
-$('#query-retrieve-4').live('pagebeforeshow', function() {
-  var pageData, uri;
-  
-  if ($.mobile.pageData) {
-    var pageData = DeepCopy($.mobile.pageData);
-    var uri = '../queries/' + pageData.query + '/answers/' + pageData.answer + '/retrieve';
-
-    $.ajax({
-      url: '../system',
-      dataType: 'json',
-      async: false,
-      cache: false,
-      success: function(system) {
-        $('#retrieve-target').val(system['DicomAet']);
-
-        $('#retrieve-form').submit(function(event) {
-          var aet;
-
-          event.preventDefault();
-
-          aet = $('#retrieve-target').val();
-          if (aet.length == 0) {
-            aet = system['DicomAet'];
-          }
-
-          $.ajax({
-            url: uri,
-            type: 'POST',
-            async: true,  // Necessary to block UI
-            dataType: 'text',
-            data: aet,
-            beforeSend: function() {
-              $.blockUI({ message: $('#info-retrieve') });
-            },
-            complete: function(s) {
-              $.unblockUI();
-            },
-            success: function() {
-              if (pageData.study) {
-                // Go back to the list of series
-                ChangePage('query-retrieve-3', {
-                  'server' : pageData.server,
-                  'uuid' : pageData.study
-                });
-              } else {
-                // Go back to the list of studies
-                ChangePage('query-retrieve-2', {
-                  'server' : pageData.server,
-                  'uuid' : pageData.query
-                });
-              }
-            },
-            error: function() {
-              alert('Error during retrieve');
-            }
-          });
-        });
-      }
-    });
-  }
-});
+function JavascriptDateToDicom(date)
+{
+  var s = date.toISOString();
+  return s.substring(0, 4) + s.substring(5, 7) + s.substring(8, 10);
+}
+
+function GenerateDicomDate(days)
+{
+  var today = new Date();
+  var other = new Date(today);
+  other.setDate(today.getDate() + days);
+  return JavascriptDateToDicom(other);
+}
+
+
+$('#query-retrieve').live('pagebeforeshow', function() {
+  var targetDate;
+
+  $.ajax({
+    url: '../modalities',
+    dataType: 'json',
+    async: false,
+    cache: false,
+    success: function(modalities) {
+      var targetServer = $('#qr-server');
+      var option;
+
+      $('option', targetServer).remove();
+
+      for (var i = 0; i < modalities.length; i++) {
+        option = $('<option>').text(modalities[i]);
+        targetServer.append(option);
+      }
+
+      targetServer.selectmenu('refresh');
+    }
+  });
+
+  targetDate = $('#qr-date');
+  $('option', targetDate).remove();
+  targetDate.append($('<option>').attr('value', '*').text('Any date'));
+  targetDate.append($('<option>').attr('value', GenerateDicomDate(0)).text('Today'));
+  targetDate.append($('<option>').attr('value', GenerateDicomDate(-1)).text('Yesterday'));
+  targetDate.append($('<option>').attr('value', GenerateDicomDate(-7) + '-').text('Last 7 days'));
+  targetDate.append($('<option>').attr('value', GenerateDicomDate(-31) + '-').text('Last 31 days'));
+  targetDate.append($('<option>').attr('value', GenerateDicomDate(-31 * 3) + '-').text('Last 3 months'));
+  targetDate.append($('<option>').attr('value', GenerateDicomDate(-365) + '-').text('Last year'));
+  targetDate.selectmenu('refresh');
+});
+
+
+$('#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, server, modalities, field;
+
+  query = {
+    'Level' : 'Study',
+    'Query' : {
+      'AccessionNumber' : '',
+      'PatientBirthDate' : '',
+      'PatientID' : '',
+      'PatientName' : '',
+      'PatientSex' : '',
+      'StudyDate' : $('#qr-date').val(),
+      'StudyDescription' : ''
+    }
+  };
+
+  modalities = '';
+
+  field = $('#qr-fields input:checked').val();
+  query['Query'][field] = $('#qr-value').val().toUpperCase();
+
+  $('#qr-modalities input:checked').each(function() {
+    var s = $(this).attr('name');
+    if (modalities == '')
+      modalities = s;
+    else
+      modalities += '\\' + s;
+  });
+
+  if (modalities.length > 0) {
+    query['Query']['ModalitiesInStudy'] = modalities;
+  }
+
+
+  server = $('#qr-server').val();
+  $.ajax({
+    url: '../modalities/' + server + '/query',
+    type: 'POST', 
+    data: JSON.stringify(query),
+    dataType: 'json',
+    async: false,
+    error: function() {
+      alert('Error during query (C-Find)');
+    },
+    success: function(result) {
+      ChangePage('query-retrieve-2', {
+        'server' : server,
+        'uuid' : result['ID']
+      });
+    }
+  });
+
+  return false;
+});
+
+
+
+$('#query-retrieve-2').live('pagebeforeshow', function() {
+  var pageData, uri;
+  
+  if ($.mobile.pageData) {
+    pageData = DeepCopy($.mobile.pageData);
+
+    uri = '../queries/' + pageData.uuid + '/answers';
+
+    $.ajax({
+      url: uri,
+      dataType: 'json',
+      async: false,
+      success: function(answers) {
+        var target = $('#query-retrieve-2 ul');
+        $('li', target).remove();
+
+        for (var i = 0; i < answers.length; i++) {
+          $.ajax({
+            url: uri + '/' + answers[i] + '/content?simplify',
+            dataType: 'json',
+            async: false,
+            success: function(study) {
+              var series = '#query-retrieve-3?server=' + pageData.server + '&uuid=' + study['StudyInstanceUID'];
+
+              var content = ($('<div>')
+                             .append($('<h3>').text(study['PatientID'] + ' - ' + study['PatientName']))
+                             .append($('<p>').text('Accession number: ')
+                                     .append($('<b>').text(study['AccessionNumber'])))
+                             .append($('<p>').text('Birth date: ')
+                                     .append($('<b>').text(study['PatientBirthDate'])))
+                             .append($('<p>').text('Patient sex: ')
+                                     .append($('<b>').text(study['PatientSex'])))
+                             .append($('<p>').text('Study description: ')
+                                     .append($('<b>').text(study['StudyDescription'])))
+                             .append($('<p>').text('Study date: ')
+                                     .append($('<b>').text(FormatDicomDate(study['StudyDate'])))));
+
+              var info = $('<a>').attr('href', series).html(content);
+              
+              var answerId = answers[i];
+              var retrieve = $('<a>').text('Retrieve all study').click(function() {
+                ChangePage('query-retrieve-4', {
+                  'query' : pageData.uuid,
+                  'answer' : answerId,
+                  'server' : pageData.server
+                });
+              });
+
+              target.append($('<li>').append(info).append(retrieve));
+            }
+          });
+        }
+
+        target.listview('refresh');
+      }
+    });
+  }
+});
+
+
+$('#query-retrieve-3').live('pagebeforeshow', function() {
+  var pageData, query;
+
+  if ($.mobile.pageData) {
+    pageData = DeepCopy($.mobile.pageData);
+
+    query = {
+      'Level' : 'Series',
+      'Query' : {
+        'Modality' : '*',
+        'ProtocolName' : '*',
+        'SeriesDescription' : '*',
+        'SeriesInstanceUID' : '*',
+        'StudyInstanceUID' : pageData.uuid
+      }
+    };
+
+    $.ajax({
+      url: '../modalities/' + pageData.server + '/query',
+      type: 'POST', 
+      data: JSON.stringify(query),
+      dataType: 'json',
+      async: false,
+      error: function() {
+        alert('Error during query (C-Find)');
+      },
+      success: function(answer) {
+        var queryUuid = answer['ID'];
+        var uri = '../queries/' + answer['ID'] + '/answers';
+
+        $.ajax({
+          url: uri,
+          dataType: 'json',
+          async: false,
+          success: function(answers) {
+            
+            var target = $('#query-retrieve-3 ul');
+            $('li', target).remove();
+
+            for (var i = 0; i < answers.length; i++) {
+              $.ajax({
+                url: uri + '/' + answers[i] + '/content?simplify',
+                dataType: 'json',
+                async: false,
+                success: function(series) {
+                  var content = ($('<div>')
+                                 .append($('<h3>').text(series['SeriesDescription']))
+                                 .append($('<p>').text('Modality: ')
+                                         .append($('<b>').text(series['Modality'])))
+                                 .append($('<p>').text('ProtocolName: ')
+                                         .append($('<b>').text(series['ProtocolName']))));
+
+                  var info = $('<a>').html(content);
+
+                  var answerId = answers[i];
+                  info.click(function() {
+                    ChangePage('query-retrieve-4', {
+                      'query' : queryUuid,
+                      'study' : pageData.uuid,
+                      'answer' : answerId,
+                      'server' : pageData.server
+                    });
+                  });
+
+                  target.append($('<li>').attr('data-icon', 'arrow-d').append(info));
+                }
+              });
+            }
+
+            target.listview('refresh');
+          }
+        });
+      }
+    });
+  }
+});
+
+
+
+$('#query-retrieve-4').live('pagebeforeshow', function() {
+  var pageData, uri;
+  
+  if ($.mobile.pageData) {
+    var pageData = DeepCopy($.mobile.pageData);
+    var uri = '../queries/' + pageData.query + '/answers/' + pageData.answer + '/retrieve';
+
+    $.ajax({
+      url: '../system',
+      dataType: 'json',
+      async: false,
+      cache: false,
+      success: function(system) {
+        $('#retrieve-target').val(system['DicomAet']);
+
+        $('#retrieve-form').submit(function(event) {
+          var aet;
+
+          event.preventDefault();
+
+          aet = $('#retrieve-target').val();
+          if (aet.length == 0) {
+            aet = system['DicomAet'];
+          }
+
+          $.ajax({
+            url: uri,
+            type: 'POST',
+            async: true,  // Necessary to block UI
+            dataType: 'text',
+            data: aet,
+            beforeSend: function() {
+              $.blockUI({ message: $('#info-retrieve') });
+            },
+            complete: function(s) {
+              $.unblockUI();
+            },
+            success: function() {
+              if (pageData.study) {
+                // Go back to the list of series
+                ChangePage('query-retrieve-3', {
+                  'server' : pageData.server,
+                  'uuid' : pageData.study
+                });
+              } else {
+                // Go back to the list of studies
+                ChangePage('query-retrieve-2', {
+                  'server' : pageData.server,
+                  'uuid' : pageData.query
+                });
+              }
+            },
+            error: function() {
+              alert('Error during retrieve');
+            }
+          });
+        });
+      }
+    });
+  }
+});