[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14339] fix initial dates on resources from buildings
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14339] fix initial dates on resources from buildingschedule |
Date: |
Thu, 12 Nov 2015 14:30:39 +0000 |
Revision: 14339
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14339
Author: sigurdne
Date: 2015-11-12 14:30:38 +0000 (Thu, 12 Nov 2015)
Log Message:
-----------
fix initial dates on resources from buildingschedule
Modified Paths:
--------------
branches/dev-syncromind/booking/js/booking/schedule.js
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/schedule.js
Modified: branches/dev-syncromind/booking/js/booking/schedule.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/schedule.js 2015-11-12
12:48:02 UTC (rev 14338)
+++ branches/dev-syncromind/booking/js/booking/schedule.js 2015-11-12
14:30:38 UTC (rev 14339)
@@ -7,7 +7,8 @@
}
// var container = document.getElementById(container);
// container.innerHTML = '';
- url += '&date=' + date.getFullYear() + '-' + (date.getMonth()+1) + '-' +
date.getDate();
+ var datestr = date.getFullYear() + '-' + (date.getMonth()+1) + '-' +
date.getDate();
+ url += '&date=' + datestr;
var lang = {
WEEKDAYS_FULL: ['Sunday', 'Monday', 'Tuesday', 'Wednesday',
'Thursday', 'Friday', 'Saturday'],
@@ -32,7 +33,7 @@
}
var r = [{n: 'ResultSet'},{n: 'Result'}];
// createta d u c r cl
- createTableSchedule(container, url, colDefs, r, classTable,
schedule.state);
+ createTableSchedule(container, url, colDefs, r, classTable, datestr);
};
Modified: branches/dev-syncromind/bookingfrontend/js/bookingfrontend/schedule.js
===================================================================
--- branches/dev-syncromind/bookingfrontend/js/bookingfrontend/schedule.js
2015-11-12 12:48:02 UTC (rev 14338)
+++ branches/dev-syncromind/bookingfrontend/js/bookingfrontend/schedule.js
2015-11-12 14:30:38 UTC (rev 14339)
@@ -5,7 +5,8 @@
while(date.getDay() != 1) {
date.setDate(date.getDate()-1);
}
- url += '&date=' + date.getFullYear() + '-' + (date.getMonth()+1) + '-' +
date.getDate();
+ var datestr = date.getFullYear() + '-' + (date.getMonth()+1) + '-' +
date.getDate();
+ url += '&date=' + datestr;
var lang = {
WEEKDAYS_FULL: ['Sunday', 'Monday', 'Tuesday', 'Wednesday',
'Thursday', 'Friday', 'Saturday'],
@@ -30,7 +31,7 @@
}
var r = [{n: 'ResultSet'},{n: 'Result'}];
// createta d u c r cl
- createTableSchedule(container, url, colDefs, r, classTable,
schedule.state);
+ createTableSchedule(container, url, colDefs, r, classTable, datestr);
};
@@ -64,7 +65,7 @@
var url = self.location.href;
url = url.substr(0, (url.indexOf("#date")));
url += '#date=' + date.getFullYear() + '-' + (date.getMonth()+1) + '-' +
date.getDate();
- location.replace(url);
+ location.replace(url);
schedule.renderSchedule('schedule_container', schedule.datasourceUrl,
date, schedule.colFormatter, schedule.includeResource, classTable);
schedule.date = date;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14339] fix initial dates on resources from buildingschedule,
Sigurd Nes <=