mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-01 22:35:28 +02:00
Version 15.29.1
This commit is contained in:
Antonio Cañas Vargas
parent
abc03e633c
commit
1a68c78525
47
js/swad.js
47
js/swad.js
|
|
@ -33,7 +33,7 @@ var ListSeconds = [];
|
|||
var countClockConnected = 0;
|
||||
|
||||
// Write a date in client local time
|
||||
function writeLocalDateFromUTC(id,secsSince1970UTC) {
|
||||
function writeLocalDateFromUTC(id,TimeUTC) {
|
||||
var d = new Date;
|
||||
var Yea;
|
||||
var Mon;
|
||||
|
|
@ -41,7 +41,7 @@ function writeLocalDateFromUTC(id,secsSince1970UTC) {
|
|||
var StrMon;
|
||||
var StrDay;
|
||||
|
||||
d.setTime(secsSince1970UTC * 1000);
|
||||
d.setTime(TimeUTC * 1000);
|
||||
Yea = d.getFullYear();
|
||||
Mon = d.getMonth() + 1;
|
||||
Day = d.getDate();
|
||||
|
|
@ -52,10 +52,10 @@ function writeLocalDateFromUTC(id,secsSince1970UTC) {
|
|||
|
||||
/*************** Write a date-time in client local time **********************/
|
||||
// - id is the id of the HTML element in which date-time will be written
|
||||
// - secsSince1970UTC is the date-time to write in UTC UNIX time format
|
||||
// - TimeUTC is the date-time to write in UTC UNIX time format
|
||||
// - separator is HTML code to write between date and time
|
||||
|
||||
function writeLocalDateTimeFromUTC(id,secsSince1970UTC,separator) {
|
||||
function writeLocalDateTimeFromUTC(id,TimeUTC,separator) {
|
||||
var d = new Date;
|
||||
var Yea;
|
||||
var Mon;
|
||||
|
|
@ -69,7 +69,7 @@ function writeLocalDateTimeFromUTC(id,secsSince1970UTC,separator) {
|
|||
var StrMin;
|
||||
var StrSec;
|
||||
|
||||
d.setTime(secsSince1970UTC * 1000);
|
||||
d.setTime(TimeUTC * 1000);
|
||||
Yea = d.getFullYear();
|
||||
Mon = d.getMonth() + 1;
|
||||
Day = d.getDate();
|
||||
|
|
@ -87,7 +87,7 @@ function writeLocalDateTimeFromUTC(id,secsSince1970UTC,separator) {
|
|||
}
|
||||
|
||||
// Set local date-time form fields from UTC time
|
||||
function setLocalDateTimeFormFromUTC(id,secsSince1970UTC) {
|
||||
function setLocalDateTimeFormFromUTC(id,TimeUTC) {
|
||||
var FormYea = document.getElementById(id+'Year');
|
||||
var FormMon = document.getElementById(id+'Month');
|
||||
var FormDay = document.getElementById(id+'Day');
|
||||
|
|
@ -98,9 +98,9 @@ function setLocalDateTimeFormFromUTC(id,secsSince1970UTC) {
|
|||
var Year;
|
||||
var YearIsValid = false;
|
||||
|
||||
if (secsSince1970UTC) {
|
||||
if (TimeUTC) {
|
||||
d = new Date;
|
||||
d.setTime(secsSince1970UTC * 1000);
|
||||
d.setTime(TimeUTC * 1000);
|
||||
Year = d.getFullYear();
|
||||
for (var i=0; i<FormYea.options.length && !YearIsValid; i++)
|
||||
if (FormYea.options[i].value == Year) {
|
||||
|
|
@ -659,7 +659,18 @@ function disableDetailedClicks () {
|
|||
/******************************** Draw a month *******************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
function DrawMonth (id,RealYear,RealMonth)
|
||||
function DrawCurrentMonth (id,TimeUTC) {
|
||||
var d = new Date;
|
||||
|
||||
d.setTime(TimeUTC * 1000);
|
||||
DrawMonth (id,d.getFullYear(),d.getMonth() + 1,d.getDate());
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/******************************** Draw a month *******************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
function DrawMonth (id,CurrentYear,CurrentMonth,CurrentDay)
|
||||
{
|
||||
var MONTHS_CAPS = [
|
||||
'ENERO',
|
||||
|
|
@ -704,8 +715,8 @@ function DrawMonth (id,RealYear,RealMonth)
|
|||
var DayOfWeek; /* 0, 1, 2, 3, 4, 5, 6 */
|
||||
var DayOfMonth;
|
||||
var NumDaysInMonth;
|
||||
var Year = RealYear;
|
||||
var Month = RealMonth;
|
||||
var Year = CurrentYear;
|
||||
var Month = CurrentMonth;
|
||||
// var YYYYMMDD;
|
||||
// var NumHld;
|
||||
var ClassForDay; // Class of day depending on type of day
|
||||
|
|
@ -747,7 +758,7 @@ function DrawMonth (id,RealYear,RealMonth)
|
|||
|
||||
/***** Month name *****/
|
||||
HTMLContent += '<div class="MONTH">' +
|
||||
MONTHS_CAPS[RealMonth-1] + ' ' + RealYear +
|
||||
MONTHS_CAPS[CurrentMonth-1] + ' ' + CurrentYear +
|
||||
'</div>';
|
||||
|
||||
/***** Month head: first letter for each day of week *****/
|
||||
|
|
@ -775,26 +786,28 @@ function DrawMonth (id,RealYear,RealMonth)
|
|||
DayOfWeek++)
|
||||
{
|
||||
/***** Set class for day being drawn *****/
|
||||
ClassForDay = (Month == RealMonth) ? 'DAY_WRK' :
|
||||
ClassForDay = (Month == CurrentMonth) ? 'DAY_WRK' :
|
||||
'DAY_WRK_LIGHT';
|
||||
/* Day being drawn is sunday? */
|
||||
if (DayOfWeek == 6) // All the sundays are holidays
|
||||
ClassForDay = (Month == RealMonth) ? 'DAY_HLD' :
|
||||
ClassForDay = (Month == CurrentMonth) ? 'DAY_HLD' :
|
||||
'DAY_HLD_LIGHT';
|
||||
|
||||
/* Date being drawn is today? */
|
||||
/*
|
||||
IsToday = (Gbl.CurrentAct != ActPrnCal && Month == RealMonth &&
|
||||
IsToday = (Gbl.CurrentAct != ActPrnCal && Month == CurrentMonth &&
|
||||
Year == Gbl.Now.Date.Year &&
|
||||
Month == Gbl.Now.Date.Month &&
|
||||
DayOfMonth == Gbl.Now.Date.Day);
|
||||
*/
|
||||
IsToday = false;
|
||||
IsToday = (Year == CurrentYear &&
|
||||
Month == CurrentMonth &&
|
||||
DayOfMonth == CurrentDay);
|
||||
|
||||
/* Check if day has an exam announcement */
|
||||
/*
|
||||
ThisDayHasEvent = false;
|
||||
if (!DrawingCalendar || Month == RealMonth) // If drawing calendar and the month is not the real one, don't draw exam announcements
|
||||
if (!DrawingCalendar || Month == CurrentMonth) // If drawing calendar and the month is not the real one, don't draw exam announcements
|
||||
for (NumExamAnnouncement = 0;
|
||||
NumExamAnnouncement < Gbl.LstExamAnnouncements.NumExamAnnounc;
|
||||
NumExamAnnouncement++)
|
||||
|
|
|
|||
|
|
@ -69,10 +69,9 @@ void Cal_DrawCurrentMonth (void)
|
|||
fprintf (Gbl.F.Out,"<div id=\"CurrentMonth\">"
|
||||
"</div>"
|
||||
"<script type=\"text/javascript\">"
|
||||
"DrawMonth ('CurrentMonth',%u,%u);"
|
||||
"DrawCurrentMonth ('CurrentMonth',%ld);"
|
||||
"</script>",
|
||||
Gbl.Now.Date.Year,
|
||||
Gbl.Now.Date.Month);
|
||||
(long) Gbl.StartExecutionTimeUTC);
|
||||
|
||||
/***** Free list of dates of exam announcements *****/
|
||||
Exa_FreeListExamAnnouncements ();
|
||||
|
|
|
|||
|
|
@ -108,11 +108,12 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.29 (2015/10/29)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.29.1 (2015/10/29)"
|
||||
|
||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
||||
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
|
||||
/*
|
||||
Version 15.29.1: Oct 29, 2015 Writing JavaScript function to draw a month in browser. Not finished. (186694 lines)
|
||||
Version 15.29: Oct 29, 2015 Writing JavaScript function to draw a month in browser. Not finished. (186684 lines)
|
||||
Version 15.28.1: Oct 28, 2015 Fixed bug in the calculation of some statistics. (186416 lines)
|
||||
Version 15.28: Oct 28, 2015 IANA zone names are used in the calculation of some statistics. (186407 lines)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user