Repository: nifi Updated Branches: refs/heads/master 76e31dfd1 -> e4cee7ee0
NIFI-3427 Fix Provenance DateTime Sorting This closes #1465. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e4cee7ee Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e4cee7ee Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e4cee7ee Branch: refs/heads/master Commit: e4cee7ee0d9ee4dfe3dcd2ba99f7bd1f6b3d38e4 Parents: 76e31df Author: James Wing <[email protected]> Authored: Wed Feb 1 17:52:28 2017 -0800 Committer: Pierre Villard <[email protected]> Committed: Mon Feb 6 18:06:58 2017 +0100 ---------------------------------------------------------------------- .../nifi-web-ui/src/main/webapp/js/nf/nf-common.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e4cee7ee/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js index 7ae237a..395b5c8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js @@ -1040,14 +1040,20 @@ if (date.length !== 3 || time.length !== 3) { return new Date(); } + var year = parseInt(date[2], 10); + var month = parseInt(date[0], 10) - 1; // new Date() accepts months 0 - 11 + var day = parseInt(date[1], 10); + var hours = parseInt(time[0], 10); + var minutes = parseInt(time[1], 10); // detect if there is millis - var seconds = time[2].split(/\./); - if (seconds.length === 2) { - return new Date(parseInt(date[2], 10), parseInt(date[0], 10), parseInt(date[1], 10), parseInt(time[0], 10), parseInt(time[1], 10), parseInt(seconds[0], 10), parseInt(seconds[1], 10)); - } else { - return new Date(parseInt(date[2], 10), parseInt(date[0], 10), parseInt(date[1], 10), parseInt(time[0], 10), parseInt(time[1], 10), parseInt(time[2], 10), 0); + var secondsSpec = time[2].split(/\./); + var seconds = parseInt(secondsSpec[0], 10); + var milliseconds = 0; + if (secondsSpec.length === 2) { + milliseconds = parseInt(secondsSpec[1], 10); } + return new Date(year, month, day, hours, minutes, seconds, milliseconds); }, /**
