orthanc: OrthancExplorer/explorer.js comparison

comparison OrthancExplorer/explorer.js @ 3023:c9c2faf76bec

replaced 'var' by 'let' in Orthanc Explorer's JavaScript

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 17 Dec 2018 10:22:51 +0100
parents	e0c620f964e5
children	b89a4288d605

comparison

equal deleted inserted replaced

-:2cbafb5d5a62
+:c9c2faf76bec
 }
 function ChangePage(page, options)
 {
-var first = true;
+let first = true;
 if (options) {
-for (var key in options) {
+for (let key in options) {
-var value = options[key];
+let value = options[key];
 if (first) {
 page += '?';
 first = false;
 } else {
 page += '&';
 RefreshInstance();
 }
 $(document).ready(function() {
-var $tree = $('#dicom-tree');
+let $tree = $('#dicom-tree');
 $tree.tree({
 autoEscape: false
 });
 $('#dicom-tree').bind(
 function FormatDicomDate(s)
 {
 if (s == undefined)
 return "No date";
-var d = ParseDicomDate(s);
+let d = ParseDicomDate(s);
 if (d == null)
 return '?';
 else
 return d.toString('dddd, MMMM d, yyyy');
 }
 function Sort(arr, fieldExtractor, isInteger, reverse)
 {
-var defaultValue;
+let defaultValue;
 if (isInteger)
 defaultValue = 0;
 else
 defaultValue = '';
 arr.sort(function(a, b) {
-var ta = fieldExtractor(a);
+let ta = fieldExtractor(a);
-var tb = fieldExtractor(b);
+let tb = fieldExtractor(b);
-var order;
+let order;
 if (ta == undefined)
 ta = defaultValue;
 if (tb == undefined)
 }
 function FormatMainDicomTags(target, tags, tagsToIgnore)
 {
-for (var i in tags)
+for (let i in tags)
 {
 if (tagsToIgnore.indexOf(i) == -1)
 {
-var v = tags[i];
+let v = tags[i];
 if (i == "PatientBirthDate" ||
 i == "StudyDate" ||
 i == "SeriesDate")
 {
 }
 function FormatPatient(patient, link, isReverse)
 {
-var node = $('<div>').append($('<h3>').text(patient.MainDicomTags.PatientName));
+let node = $('<div>').append($('<h3>').text(patient.MainDicomTags.PatientName));
 FormatMainDicomTags(node, patient.MainDicomTags, [
 "PatientName"
 // "OtherPatientIDs"
 ]);
 function FormatStudy(study, link, isReverse, includePatient)
 {
-var label;
+let label;
 if (includePatient) {
 label = study.Label;
 } else {
 label = study.MainDicomTags.StudyDescription;
 }
-var node = $('<div>').append($('<h3>').text(label));
+let node = $('<div>').append($('<h3>').text(label));
 if (includePatient) {
 FormatMainDicomTags(node, study.PatientMainDicomTags, [
 'PatientName'
 ]);
 function FormatSeries(series, link, isReverse)
 {
-var c;
+let c;
 if (series.ExpectedNumberOfInstances == null ||
 series.Instances.length == series.ExpectedNumberOfInstances)
 {
 c = series.Instances.length;
 }
 else
 {
 c = series.Instances.length + '/' + series.ExpectedNumberOfInstances;
 }
-var node = $('<div>')
+let node = $('<div>')
 .append($('<h3>').text(series.MainDicomTags.SeriesDescription))
 .append($('<p>').append($('<em>')
 .text('Status: ')
 .append($('<strong>').text(series.Status))));
 }
 function FormatInstance(instance, link, isReverse)
 {
-var node = $('<div>').append($('<h3>').text('Instance: ' + instance.IndexInSeries));
+let node = $('<div>').append($('<h3>').text('Instance: ' + instance.IndexInSeries));
 FormatMainDicomTags(node, instance.MainDicomTags, [
 "AcquisitionNumber",
 "InstanceNumber",
 "InstanceCreationDate",
 $('#lookup').live('pagebeforeshow', function() {
 // NB: "GenerateDicomDate()" is defined in "query-retrieve.js"
-var target = $('#lookup-study-date');
+let target = $('#lookup-study-date');
 $('option', target).remove();
 target.append($('<option>').attr('value', '*').text('Any date'));
 target.append($('<option>').attr('value', GenerateDicomDate(0)).text('Today'));
 target.append($('<option>').attr('value', GenerateDicomDate(-1)).text('Yesterday'));
 target.append($('<option>').attr('value', GenerateDicomDate(-7) + '-').text('Last 7 days'));
 $('#lookup-submit').live('click', function() {
 $('#lookup-result').hide();
-var lookup = {
+let lookup = {
 'Level' : 'Study',
 'Expand' : true,
 'Limit' : LIMIT_RESOURCES + 1,
 'Query' : {
 'StudyDate' : $('#lookup-study-date').val()
 });
 $('#find-patients').live('pagebeforeshow', function() {
 GetResource('/patients?expand&since=0&limit=' + (LIMIT_RESOURCES + 1), function(patients) {
-var target = $('#all-patients');
+let target = $('#all-patients');
 $('li', target).remove();
 SortOnDicomTag(patients, 'PatientName', false, false);
-var count, showAlert;
+let count, showAlert;
 if (patients.length <= LIMIT_RESOURCES) {
 count = patients.length;
 showAlert = false;
 }
 else {
 count = LIMIT_RESOURCES;
 showAlert = true;
 }
-for (var i = 0; i < count; i++) {
+for (let i = 0; i < count; i++) {
-var p = FormatPatient(patients[i], '#patient?uuid=' + patients[i].ID);
+let p = FormatPatient(patients[i], '#patient?uuid=' + patients[i].ID);
 target.append(p);
 }
 target.listview('refresh');
 function FormatListOfStudies(targetId, alertId, countId, studies)
 {
-var target = $(targetId);
+let target = $(targetId);
 $('li', target).remove();
-for (var i = 0; i < studies.length; i++) {
+for (let i = 0; i < studies.length; i++) {
-var patient = studies[i].PatientMainDicomTags.PatientName;
+let patient = studies[i].PatientMainDicomTags.PatientName;
-var study = studies[i].MainDicomTags.StudyDescription;
+let study = studies[i].MainDicomTags.StudyDescription;
-var s;
+let s;
 if (typeof patient === 'string') {
 s = patient;
 }
 if (typeof study === 'string') {
 }
 Sort(studies, function(a) { return a.Label }, false, false);
-var count, showAlert;
+let count, showAlert;
 if (studies.length <= LIMIT_RESOURCES) {
 count = studies.length;
 showAlert = false;
 }
 else {
 count = LIMIT_RESOURCES;
 showAlert = true;
 }
-for (var i = 0; i < count; i++) {
+for (let i = 0; i < count; i++) {
-var p = FormatStudy(studies[i], '#study?uuid=' + studies[i].ID, false, true);
+let p = FormatStudy(studies[i], '#study?uuid=' + studies[i].ID, false, true);
 target.append(p);
 }
 target.listview('refresh');
 function RefreshPatient()
 {
 if ($.mobile.pageData) {
-var pageData = DeepCopy($.mobile.pageData);
+let pageData = DeepCopy($.mobile.pageData);
 GetResource('/patients/' + pageData.uuid, function(patient) {
 GetResource('/patients/' + pageData.uuid + '/studies', function(studies) {
 SortOnDicomTag(studies, 'StudyDate', false, true);
 $('#patient-info')
 .append('<li data-role="list-divider">Patient</li>')
 .append(FormatPatient(patient))
 .listview('refresh');
-var target = $('#list-studies');
+let target = $('#list-studies');
 $('li', target).remove();
-for (var i = 0; i < studies.length; i++) {
+for (let i = 0; i < studies.length; i++) {
 if (i == 0 || studies[i].MainDicomTags.StudyDate != studies[i - 1].MainDicomTags.StudyDate)
 {
 target.append($('<li>')
 .attr('data-role', 'list-divider')
 .text(FormatDicomDate(studies[i].MainDicomTags.StudyDate)));
 type: 'GET',
 dataType: 'text',
 async: false,
 cache: false,
 success: function (s) {
-var v = (s == '1') ? 'on' : 'off';
+let v = (s == '1') ? 'on' : 'off';
 $('#protection').val(v).slider('refresh');
 }
 });
 currentPage = 'patient';
 function RefreshStudy()
 {
 if ($.mobile.pageData) {
-var pageData = DeepCopy($.mobile.pageData);
+let pageData = DeepCopy($.mobile.pageData);
 GetResource('/studies/' + pageData.uuid, function(study) {
 GetResource('/patients/' + study.ParentPatient, function(patient) {
 GetResource('/studies/' + pageData.uuid + '/series', function(series) {
 SortOnDicomTag(series, 'SeriesDate', false, true);
 .listview('refresh');
 SetupAnonymizedOrModifiedFrom('#study-anonymized-from', study, 'study', 'AnonymizedFrom');
 SetupAnonymizedOrModifiedFrom('#study-modified-from', study, 'study', 'ModifiedFrom');
-var target = $('#list-series');
+let target = $('#list-series');
 $('li', target).remove();
-for (var i = 0; i < series.length; i++) {
+for (let i = 0; i < series.length; i++) {
 if (i == 0 || series[i].MainDicomTags.SeriesDate != series[i - 1].MainDicomTags.SeriesDate)
 {
 target.append($('<li>')
 .attr('data-role', 'list-divider')
 .text(FormatDicomDate(series[i].MainDicomTags.SeriesDate)));
 function RefreshSeries()
 {
 if ($.mobile.pageData) {
-var pageData = DeepCopy($.mobile.pageData);
+let pageData = DeepCopy($.mobile.pageData);
 GetResource('/series/' + pageData.uuid, function(series) {
 GetResource('/studies/' + series.ParentStudy, function(study) {
 GetResource('/patients/' + study.ParentPatient, function(patient) {
 GetResource('/series/' + pageData.uuid + '/instances', function(instances) {
 .listview('refresh');
 SetupAnonymizedOrModifiedFrom('#series-anonymized-from', series, 'series', 'AnonymizedFrom');
 SetupAnonymizedOrModifiedFrom('#series-modified-from', series, 'series', 'ModifiedFrom');
-var target = $('#list-instances');
+let target = $('#list-instances');
 $('li', target).remove();
-for (var i = 0; i < instances.length; i++) {
+for (let i = 0; i < instances.length; i++) {
 target.append(FormatInstance(instances[i], '#instance?uuid=' + instances[i].ID));
 }
 target.listview('refresh');
 currentPage = 'series';
 }
 function EscapeHtml(value)
 {
-var ENTITY_MAP = {
+let ENTITY_MAP = {
 '&': '&amp;',
 '<': '&lt;',
 '>': '&gt;',
 '"': '&quot;',
 "'": '&#39;',
 }
 function ConvertForTree(dicom)
 {
-var result = [];
+let result = [];
-for (var i in dicom) {
+for (let i in dicom) {
 if (dicom[i] != null) {
-var label = (i + '<span class="tag-name"> (<i>' +
+let label = (i + '<span class="tag-name"> (<i>' +
 EscapeHtml(dicom[i]["Name"]) +
 '</i>)</span>: ');
 if (dicom[i]["Type"] == 'String')
 {
 children: []
 });
 }
 else if (dicom[i]["Type"] == 'Sequence')
 {
-var c = [];
+let c = [];
-for (var j = 0; j < dicom[i]["Value"].length; j++) {
+for (let j = 0; j < dicom[i]["Value"].length; j++) {
 c.push({
 label: 'Item ' + j,
 children: ConvertForTree(dicom[i]["Value"][j])
 });
 }
 function RefreshInstance()
 {
 if ($.mobile.pageData) {
-var pageData = DeepCopy($.mobile.pageData);
+let pageData = DeepCopy($.mobile.pageData);
 GetResource('/instances/' + pageData.uuid, function(instance) {
 GetResource('/series/' + instance.ParentSeries, function(series) {
 GetResource('/studies/' + series.ParentStudy, function(study) {
 GetResource('/patients/' + study.ParentPatient, function(patient) {
 url: path,
 type: 'DELETE',
 dataType: 'json',
 async: false,
 success: function(s) {
-var ancestor = s.RemainingAncestor;
+let ancestor = s.RemainingAncestor;
 if (ancestor == null)
 $.mobile.changePage('#lookup');
 else
 $.mobile.changePage('#' + ancestor.Type.toLowerCase() + '?uuid=' + ancestor.ID);
 }
 $('#instance-preview').live('click', function(e) {
 if ($.mobile.pageData) {
-var pageData = DeepCopy($.mobile.pageData);
+let pageData = DeepCopy($.mobile.pageData);
-var pdf = '../instances/' + pageData.uuid + '/pdf';
+let pdf = '../instances/' + pageData.uuid + '/pdf';
 $.ajax({
 url: pdf,
 cache: false,
 success: function(s) {
 window.location.assign(pdf);
 }
 else
 {
 // Viewing a multi-frame image
-var images = [];
+let images = [];
-for (var i = 0; i < frames.length; i++) {
+for (let i = 0; i < frames.length; i++) {
 images.push([ '../instances/' + pageData.uuid + '/frames/' + i + '/preview' ]);
 }
 jQuery.slimbox(images, 0, {
 overlayFadeDuration : 1,
 $('#series-preview').live('click', function(e) {
 if ($.mobile.pageData) {
-var pageData = DeepCopy($.mobile.pageData);
+let pageData = DeepCopy($.mobile.pageData);
 GetResource('/series/' + pageData.uuid, function(series) {
 GetResource('/series/' + pageData.uuid + '/instances', function(instances) {
 Sort(instances, function(x) { return x.IndexInSeries; }, true, false);
-var images = [];
+let images = [];
-for (var i = 0; i < instances.length; i++) {
+for (let i = 0; i < instances.length; i++) {
 images.push([ '../instances/' + instances[i].ID + '/preview',
 (i + 1).toString() + '/' + instances.length.toString() ])
 }
 jQuery.slimbox(images, 0, {
 function ChooseDicomModality(callback)
 {
-var clickedModality = '';
+let clickedModality = '';
-var clickedPeer = '';
+let clickedPeer = '';
-var items = $('<ul>')
+let items = $('<ul>')
 .attr('data-divider-theme', 'd')
 .attr('data-role', 'listview');
 // Retrieve the list of the known DICOM modalities
 $.ajax({
 success: function(modalities) {
 if (modalities.length > 0)
 {
 items.append('<li data-role="list-divider">DICOM modalities</li>');
-for (var i = 0; i < modalities.length; i++) {
+for (let i = 0; i < modalities.length; i++) {
-var name = modalities[i];
+let name = modalities[i];
-var item = $('<li>')
+let item = $('<li>')
 .html('<a href="#" rel="close">' + name + '</a>')
 .attr('name', name)
 .click(function() {
 clickedModality = $(this).attr('name');
 });
 success: function(peers) {
 if (peers.length > 0)
 {
 items.append('<li data-role="list-divider">Orthanc peers</li>');
-for (var i = 0; i < peers.length; i++) {
+for (let i = 0; i < peers.length; i++) {
-var name = peers[i];
+let name = peers[i];
-var item = $('<li>')
+let item = $('<li>')
 .html('<a href="#" rel="close">' + name + '</a>')
 .attr('name', name)
 .click(function() {
 clickedPeer = $(this).attr('name');
 });
 headerClose: true,
 forceInput: false,
 width: '100%',
 blankContent: items,
 callbackClose: function() {
-var timer;
+let timer;
 function WaitForDialogToClose() {
 if (!$('#dialog').is(':visible')) {
 clearInterval(timer);
 callback(clickedModality, clickedPeer);
 }
 }
 $('#instance-store,#series-store,#study-store,#patient-store').live('click', function(e) {
 ChooseDicomModality(function(modality, peer) {
-var pageData = DeepCopy($.mobile.pageData);
+let pageData = DeepCopy($.mobile.pageData);
-var url;
+let url;
-var loading;
+let loading;
 if (modality != '')
 {
 url = '../modalities/' + modality + '/store';
 loading = '#dicom-store';
 });
 });
 $('#show-tag-name').live('change', function(e) {
-var checked = e.currentTarget.checked;
+let checked = e.currentTarget.checked;
 if (checked)
 $('.tag-name').show();
 else
 $('.tag-name').hide();
 });
 });
 $('#protection').live('change', function(e) {
-var isProtected = e.target.value == "on";
+let isProtected = e.target.value == "on";
 $.ajax({
 url: '../patients/' + $.mobile.pageData.uuid + '/protected',
 type: 'PUT',
 dataType: 'text',
 data: isProtected ? '1' : '0',
 url: '../plugins',
 dataType: 'json',
 async: false,
 cache: false,
 success: function(plugins) {
-var target = $('#all-plugins');
+let target = $('#all-plugins');
 $('li', target).remove();
 plugins.map(function(id) {
 return $.ajax({
 url: '../plugins/' + id,
 dataType: 'json',
 async: false,
 cache: false,
 success: function(plugin) {
-var li = $('<li>');
+let li = $('<li>');
-var item = li;
+let item = li;
 if ('RootUri' in plugin)
 {
 item = $('<a>');
 li.append(item);
 function ParseJobTime(s)
 {
-var t = (s.substr(0, 4) + '-' +
+let t = (s.substr(0, 4) + '-' +
 s.substr(4, 2) + '-' +
 s.substr(6, 5) + ':' +
 s.substr(11, 2) + ':' +
 s.substr(13));
-var utc = new Date(t);
+let utc = new Date(t);
 // Convert from UTC to local time
 return new Date(utc.getTime() - utc.getTimezoneOffset() * 60000);
 }
 url: '../jobs?expand',
 dataType: 'json',
 async: false,
 cache: false,
 success: function(jobs) {
-var target = $('#all-jobs');
+let target = $('#all-jobs');
 $('li', target).remove();
-var running = $('<li>')
+let running = $('<li>')
 .attr('data-role', 'list-divider')
 .text('Currently running');
-var pending = $('<li>')
+let pending = $('<li>')
 .attr('data-role', 'list-divider')
 .text('Pending jobs');
-var inactive = $('<li>')
+let inactive = $('<li>')
 .attr('data-role', 'list-divider')
 .text('Inactive jobs');
 target.append(running);
 target.append(pending);
 target.append(inactive);
 jobs.map(function(job) {
-var li = $('<li>');
+let li = $('<li>');
-var item = $('<a>');
+let item = $('<a>');
 li.append(item);
 item.attr('href', '#job?uuid=' + job.ID);
 item.append($('<h1>').text(job.Type));
 item.append($('<span>').addClass('ui-li-count').text(job.State));
 AddJobField(item, 'ID: ', job.ID);
 });
 $('#job').live('pagebeforeshow', function() {
 if ($.mobile.pageData) {
-var pageData = DeepCopy($.mobile.pageData);
+let pageData = DeepCopy($.mobile.pageData);
 $.ajax({
 url: '../jobs/' + pageData.uuid,
 dataType: 'json',
 async: false,
 cache: false,
 success: function(job) {
-var target = $('#job-info');
+let target = $('#job-info');
 $('li', target).remove();
 target.append($('<li>')
 .attr('data-role', 'list-divider')
 .text('General information about the job'));
-var block = $('<li>');
+let block = $('<li>');
-for (var i in job) {
+for (let i in job) {
 if (i == 'CreationTime' ||
 i == 'CompletionTime' ||
 i == 'EstimatedTimeOfArrival') {
 AddJobDateField(block, i + ': ', job[i]);
 } else if (i != 'InternalContent' &&
 target.append($('<li>')
 .attr('data-role', 'list-divider')
 .text('Detailed information'));
-var block = $('<li>');
+let block = $('<li>');
-for (var item in job.Content) {
+for (let item in job.Content) {
-var value = job.Content[item];
+let value = job.Content[item];
 if (typeof value !== 'string') {
 value = JSON.stringify(value);
 }
 AddJobField(block, item + ': ', value);