Commit ccfdc35b authored by Anthony Geourjon's avatar Anthony Geourjon
Browse files

Merge branch 'EDCAMPUS-2-affichage-des-evenements-dun-projet' into 'master'

Edcampus 2 affichage des evenements dun projet

See merge request !6
parents 92ee4244 f0a7f478
......@@ -110,8 +110,6 @@ root.controller('DashboardCalendarCtrl', ['$scope', "$http",'$languageFactory','
calendarCtr.getProjectEvents = function () {
var session = $scope._getSession();
var beginDate = $scope.currentDate.year + "-" + month + "-" + "01";
var endDate = $scope.currentDate.year + "-" + month + "-" + "31";
var month = $scope.currentDate.month.toString();
if(month.length === 1) month = "0" + month;
var beginDate = $scope.currentDate.year + "-" + month + "-" + "01";
......@@ -121,7 +119,7 @@ root.controller('DashboardCalendarCtrl', ['$scope', "$http",'$languageFactory','
return $eventsFactory.get_project_events(session,parameters).success(function(data, status, headers, config) {
var events = [];
window.calendar_languages = {'fr-FR' :$languageFactory._labels.calendarLanguage }
if(data.status == "success"){
calendarCtr.formatEvents(data.details);
......
......@@ -57,12 +57,13 @@ function $eventsFactory($rootScope, $http,$serverFactory,$rightFactory) {
}
/**
* [get_project_events description]
* @param {[type]} session [description]
* @param {[type]} parameters [userId, projectId]
* @return {[type]} [description]
* [get_project_events get project events]
* @param {[object]} session [user session]
* @param {[object]} parameters [string beginDate, string endDate, int projectId, bool onlyInvited (optional), array includes (optional)]
* @return {[array of object]} [{"eventDate","name","id","projectId","type","projectFullName","projectName","late"}]
*/
returns.get_project_events=function(session, parameters){
parameters.user = $rightFactory.session.userId;
return $serverFactory.runCommand("get_event", parameters);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment