From 9d279e8626a5b7d796235f35b66d8570e2e8e891 Mon Sep 17 00:00:00 2001
From: Evren Ozkan <evren217@gmail.com>
Date: Mon, 24 Oct 2016 22:41:10 -0400
Subject: [PATCH] OHIF-118 Fix the issue with retrieving AcquisitionDateTime or
 any DT DICOM attribute via DIMSE

---
 Packages/dimseservice/server/DIMSE.js      |  1 +
 Packages/dimseservice/server/Data.js       | 17 ++++++++++-------
 Packages/viewerbase/lib/helpers/sorting.js |  2 --
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Packages/dimseservice/server/DIMSE.js b/Packages/dimseservice/server/DIMSE.js
index 883ce92bd..b5d6c890a 100755
--- a/Packages/dimseservice/server/DIMSE.js
+++ b/Packages/dimseservice/server/DIMSE.js
@@ -37,6 +37,7 @@ var getInstanceRetrievalParams = function(studyInstanceUID, seriesInstanceUID) {
         0x00280102: '', // highBit
         0x00280103: '', // pixelRepresentation
         0x00280004: '', // photometricInterpretation
+        0x0008002A: '', // acquisitionDatetime
         0x00280008: '', // numFrames
         0x00181063: '', // frameTime
         0x00281052: '', // rescaleIntercept
diff --git a/Packages/dimseservice/server/Data.js b/Packages/dimseservice/server/Data.js
index 22a51dc62..e19dee3a2 100755
--- a/Packages/dimseservice/server/Data.js
+++ b/Packages/dimseservice/server/Data.js
@@ -283,13 +283,16 @@ DateTime = function() {
 util.inherits(DateTime, ValueRepresentation);
 
 DateTime.prototype.getFields = function(value) {
-    var year = date.getUTCFullYear(),
-   month = paddingLeft('00', date.getUTCMonth()), 
-        day = paddingLeft('00', date.getUTCDate()),
-   hour = paddingLeft('00', date.getUTCHours()),
-        minute = paddingLeft('00', date.getUTCMinutes()),
-   second = paddingLeft('00', date.getUTCSeconds()),
-        millisecond = paddingLeft('000', date.getUTCMilliseconds());
+    if (!value)
+        return DateTime.super_.prototype.getFields.call(this, [new StringField("")]);
+
+    var year = value.getUTCFullYear(),
+        month = paddingLeft('00', value.getUTCMonth()),
+        day = paddingLeft('00', value.getUTCDate()),
+        hour = paddingLeft('00', value.getUTCHours()),
+        minute = paddingLeft('00', value.getUTCMinutes()),
+        second = paddingLeft('00', value.getUTCSeconds()),
+        millisecond = paddingLeft('000', value.getUTCMilliseconds());
 
     return DateTime.super_.prototype.getFields.call(this, [new StringField(year + month + day + hour + minute + second + '.' + millisecond + '+0000')]);
 };
diff --git a/Packages/viewerbase/lib/helpers/sorting.js b/Packages/viewerbase/lib/helpers/sorting.js
index 7a1475dc7..d7374cae3 100644
--- a/Packages/viewerbase/lib/helpers/sorting.js
+++ b/Packages/viewerbase/lib/helpers/sorting.js
@@ -11,8 +11,6 @@ Template.registerHelper('sort', (array, sortBy, sortType) => {
         return array;
     }
 
-    console.log(array);
-
     //  To keep the order for the same values of the field which is used to sort:
     //      1. Group the array by the field
     //      2. Sort the grouped array