fernando/luos
1
0
Fork 0
Code Releases Activity

period compare fix

Browse Source
This commit is contained in:
Dante
2015-05-25 15:55:13 -04:00
parent af56b369a3
commit 5057f9b776
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
workflow/engine/js/strategicDashboard/viewDashboardView.js
View File

@@ -442,8 +442,15 @@ var selectDefaultMonthAndYear = function () {
compareDate.setMonth(compareDate.getMonth() - 1); compareDate.setMonth(compareDate.getMonth() - 1);
var compareMonth = compareDate.getMonth() + 1; var compareMonth = compareDate.getMonth() + 1;
var compareYear = compareDate.getFullYear(); var compareYear = compareDate.getFullYear();
$('#month').val(compareMonth); $('#monthInit').val(compareMonth);
$('#year').val(compareYear); $('#yearInit').val(compareYear);
var today = new Date();
var todayMonth = today.getMonth();
var todayYear = today.getFullYear();
$('#month').val(todayMonth + 1);
$('#year').val(todayYear);
} }
var setActiveDashboard = function () { var setActiveDashboard = function () {
@@ -522,15 +529,18 @@ var defaultInitDate = function() {
var date = new Date(); var date = new Date();
var dateMonth = date.getMonth(); var dateMonth = date.getMonth();
var dateYear = date.getFullYear(); var dateYear = date.getFullYear();
var initDate = $('#year').val() + '-' + $('#month').val() + '-' + '01'; var retval = $('#yearInit').val() + '-' + $('#monthInit').val() + '-' + '01';
return initDate; return retval;
} }
var defaultEndDate = function () { var defaultEndDate = function () {
var date = new Date(); /*var date = new Date();
var dateMonth = date.getMonth(); var dateMonth = date.getMonth();
var dateYear = date.getFullYear(); var dateYear = date.getFullYear();
return dateYear + "-" + (dateMonth + 1) + "-30"; return dateYear + "-" + (dateMonth + 1) + "-30";*/
var retval = $('#year').val() + '-' + $('#month').val() + '-' + '01';
return retval;
} }
var fillDashboardsList = function (presenterData) { var fillDashboardsList = function (presenterData) {