Changeset 6955
- Timestamp:
- 08/07/12 12:08:35 (12 years ago)
- Location:
- sandbox/2.4.2-expresso1/prototype/modules/calendar
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js
r6954 r6955 1224 1224 1225 1225 for(var i = 0; i < evtObj.length; i++){ 1226 res.push(DataLayer.encode('schedulable:' + (evtObj[i].type == '1' ? 'preview' : 'task'), evtObj[i]));1226 res.push(DataLayer.encode('schedulable:' + (evtObj[i].type == '1' ? 'preview' : ( !!evtObj[i].taskToActivity ? 'activity': 'task')) , evtObj[i])); 1227 1227 } 1228 1228 … … 1238 1238 1239 1239 for (var i=0; i < res.length; i++) { 1240 1241 res[i].type = (res[i].type == '2' && !!res[i].tasks) ? '3' : res[i].type; 1240 1242 1241 1243 var startDate = Date.parseExact( res[i]['startDate'], User.preferences.dateFormat ); … … 1363 1365 1364 1366 var calendarView = $('#calendar').fullCalendar('getView'); 1365 var start = calendarView. visStart.getTime();1366 var end = calendarView.visEnd.getTime();1367 var start = calendarView.start.getTime(); 1368 var end = (calendarView.end.getTime() - (calendarView.name == 'month' ? 86400000 : 0 )); 1367 1369 var next = start; 1368 1370 var response = []; -
sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/event_list.ejs
r6934 r6955 182 182 <span><%= _event.privacy %></span> 183 183 </p> --> 184 185 <p class="input-group">186 <label>Organizador:</label>187 <span class="large"><%= _event.organizer.user ? _event.organizer.user.name : _event.organizer.name %> (<%= _event.organizer.user ? _event.organizer.user.mail : _event.organizer.mail %>)</span>188 </p>189 184 <%if(_event.organizer && _event.organizer.user){%> 185 <p class="input-group"> 186 <label>Organizador:</label> 187 <span class="large"><%= _event.organizer.user ? _event.organizer.user.name : _event.organizer.name %> (<%= _event.organizer.user ? _event.organizer.user.mail : _event.organizer.mail %>)</span> 188 </p> 189 <%}%> 190 190 <%if(_event.type != '3'){%> 191 191 <p class="input-group"> … … 205 205 <% if(_event.tasks) { %> 206 206 <span class="large" > 207 <% for (var m =0; m < _event.tasks.length; m++) { %>207 <% for (var m in _event.tasks) { %> 208 208 <span class="large"><%=_event.tasks[m].description%></span> 209 209 <%}%>
Note: See TracChangeset
for help on using the changeset viewer.