Fixes for picking local time than UTC time in experiment statistics
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/00396836 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/00396836 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/00396836 Branch: refs/heads/master Commit: 003968364607db4720f1478eb29f94f51784c5d3 Parents: bbafbcc Author: Nipurn Doshi <[email protected]> Authored: Tue Feb 2 11:58:33 2016 -0500 Committer: Nipurn Doshi <[email protected]> Committed: Tue Feb 2 11:58:33 2016 -0500 ---------------------------------------------------------------------- app/views/admin/manage-experiments.blade.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/00396836/app/views/admin/manage-experiments.blade.php ---------------------------------------------------------------------- diff --git a/app/views/admin/manage-experiments.blade.php b/app/views/admin/manage-experiments.blade.php index 3bc6d5b..d417032 100644 --- a/app/views/admin/manage-experiments.blade.php +++ b/app/views/admin/manage-experiments.blade.php @@ -324,14 +324,13 @@ to be uncommented when actually in use. --> <!-- Flot Charts JavaScript --> +<!-- {{ HTML::script('js/flot/jquery.flot.js')}} {{ HTML::script('js/flot/jquery.flot.tooltip.min.js')}} {{ HTML::script('js/flot/jquery.flot.resize.js')}} {{ HTML::script('js/flot/jquery.flot.pie.js')}} {{ HTML::script('js/flot/flot-data.js')}} - -{{ HTML::script('js/moment.js')}} -{{ HTML::script('js/datetimepicker.js')}} +--> {{ HTML::script('js/time-conversion.js')}} <script> @@ -418,7 +417,7 @@ to be uncommented when actually in use. $fromTime = $("#datetimepicker9").find("input").val(); $fromTime = moment($fromTime).format('MM/DD/YYYY hh:mm A'); $toTime = $("#datetimepicker10").find("input").val(); - $toTime = moment($toTime).utc().format('MM/DD/YYYY hh:mm A'); + $toTime = moment($toTime).format('MM/DD/YYYY hh:mm A'); if ($fromTime == '' || $toTime == '') { alert("Please Select Valid Date Inputs!"); } else { @@ -430,6 +429,9 @@ to be uncommented when actually in use. $(".oneDayExp").click(); function getExperiments( startTime, endTime, msg){ + + console.log( startTime); + console.log( endTime); $(".experiment-statistics").html(""); $(".loading-img-statistics").removeClass("hide"); $.ajax({
