Mercurial > hg > orthanc

changeset 2336:a95beca72e99 dcmtk-3.6.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix header and query/retrieve in Orthanc Explorer
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 17 Jul 2017 11:49:54 +0200
parents 174c3616ab6d
children ad6b669ca08c
files OrthancExplorer/explorer.js OrthancExplorer/query-retrieve.js
diffstat 2 files changed, 28 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancExplorer/explorer.js	Mon Jul 17 10:25:25 2017 +0200
+++ b/OrthancExplorer/explorer.js	Mon Jul 17 11:49:54 2017 +0200
@@ -334,11 +334,11 @@
     cache: false,
     success: function(s) {
       if (s.Name != "") {
-        $('.orthanc-name').append($('<a>')
-                                  .addClass('ui-link')
-                                  .attr('href', 'explorer.html')
-                                  .text(s.Name)
-                                  .append(' &raquo; '));
+        $('.orthanc-name').html($('<a>')
+                                .addClass('ui-link')
+                                .attr('href', 'explorer.html')
+                                .text(s.Name)
+                                .append(' &raquo; '));
       }
     }
   });
--- a/OrthancExplorer/query-retrieve.js	Mon Jul 17 10:25:25 2017 +0200
+++ b/OrthancExplorer/query-retrieve.js	Mon Jul 17 11:49:54 2017 +0200
@@ -149,21 +149,22 @@
             async: false,
             success: function(study) {
               var series = '#query-retrieve-3?server=' + pageData.server + '&uuid=' + study['StudyInstanceUID'];
-              var info = $('<a>').attr('href', series).html(
-                ('<h3>{0} - {1}</h3>' + 
-                 '<p>Accession number: <b>{2}</b></p>' +
-                 '<p>Birth date: <b>{3}</b></p>' +
-                 '<p>Patient sex: <b>{4}</b></p>' +
-                 '<p>Study description: <b>{5}</b></p>' +
-                 '<p>Study date: <b>{6}</b></p>').format(
-                   study['PatientID'],
-                   study['PatientName'],
-                   study['AccessionNumber'],
-                   FormatDicomDate(study['PatientBirthDate']),
-                   study['PatientSex'],
-                   study['StudyDescription'],
-                   FormatDicomDate(study['StudyDate'])));
 
+              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', {
@@ -228,15 +229,14 @@
                 dataType: 'json',
                 async: false,
                 success: function(series) {
-                  var info = $('<a>').html(
-                    ('<h3>{0}</h3>'  + 
-                     '<p>Modality: <b>{1}</b></p>' +
-                     '<p>Protocol name: <b>{2}</b></p>'
-                    ).format(
-                      series['SeriesDescription'],
-                      series['Modality'],
-                      series['ProtocolName']
-                    ));
+                  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() {