diff --git a/layouts/v7/modules/Calendar/resources/Calendar.js b/layouts/v7/modules/Calendar/resources/Calendar.js index b04334ac2e7b76b2b6a2078352f8f999bddbd70c..0b938b775ac4a70758f3f6c50927d3d0f8d16aaf 100644 --- a/layouts/v7/modules/Calendar/resources/Calendar.js +++ b/layouts/v7/modules/Calendar/resources/Calendar.js @@ -1569,16 +1569,41 @@ Vtiger.Class("Calendar_Calendar_Js", { var thisInstance = this; var userDefaultActivityView = thisInstance.getDefaultCalendarView(); var userDefaultTimeFormat = thisInstance.getDefaultCalendarTimeFormat(); + + var dateFormat = app.getDateFormat(); + //Converting to fullcalendar accepting date format + var monthPos = dateFormat.search("mm"); + var datePos = dateFormat.search("dd"); + if (monthPos < datePos) { + dateFormat = "M/D"; + } else { + dateFormat = "D/M"; + } + var calenderConfigs = { header: { left: 'month,agendaWeek,agendaDay,vtAgendaList', center: 'title', right: 'today prev,next', }, + columnFormat: { + month: 'ddd', + week: 'ddd '+dateFormat, + day: 'dddd '+dateFormat + }, views: { - vtAgendaList: { - duration: {days: Calendar_Calendar_Js.numberOfDaysInAgendaView} - } + vtAgendaList: { + duration: {days: Calendar_Calendar_Js.numberOfDaysInAgendaView} + }, + month:{ + columnFormat:'ddd' + }, + agendaWeek: { + columnFormat: 'ddd ' + dateFormat + }, + agendaDay: { + columnFormat: 'dddd '+dateFormat + } }, fixedWeekCount: false, firstDay: thisInstance.daysOfWeek[thisInstance.getUserPrefered('start_day')],