Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.99

This commit is contained in:
Antonio Cañas Vargas 2016-12-12 23:10:11 +01:00
parent 9562dfe3ef
commit 2488bc3539
15 changed files with 93 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/swad16.98.js → js/swad16.99.js
View File

@ -72,7 +72,8 @@ function writeLocalDateFromUTC (id,TimeUTC,StrToday) {
// TimeUTC is the date-time to write in UTC UNIX time format
// separator is HTML code to write between date and time
function writeLocalDateHMSFromUTC (id,TimeUTC,Separator,StrToday,OmitDateOnSameDay,OmitSeconds) {
function writeLocalDateHMSFromUTC (id,TimeUTC,Separator,StrToday,
WriteDateOnSameDay,WriteWeekDay,WriteSeconds) {
// HMS: Hour, Minutes, Seconds
var today = new Date();
var todayYea = today.getFullYear();
@ -83,6 +84,7 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,Separator,StrToday,OmitDateOnSameD
var Yea;
var Mon;
var Day;
var DayOfWeek;
var Hou;
var Min;
var Sec;
@ -98,14 +100,14 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,Separator,StrToday,OmitDateOnSameD
Mon = d.getMonth() + 1;
Day = d.getDate();
if (OmitDateOnSameDay)
if (WriteDateOnSameDay)
WriteDate = true;
else
WriteDate = (Yea != writeLocalDateHMSFromUTC.lastd.getFullYear() ||
Mon != writeLocalDateHMSFromUTC.lastd.getMonth() + 1 ||
Day != writeLocalDateHMSFromUTC.lastd.getDate())
else
WriteDate = true;
writeLocalDateHMSFromUTC.lastd = d; // Remember current date for the next call
writeLocalDateHMSFromUTC.lastd = d; // Static variable to remember current date for the next call
/* Set date */
if (WriteDate) {
@ -119,6 +121,14 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,Separator,StrToday,OmitDateOnSameD
StrDate = StrToday;
else
StrDate = Yea.toString() + StrMon + StrDay;
if (WriteWeekDay) {
DayOfWeek = d.getDay();
DayOfWeek = (DayOfWeek == 0) ? 6 : DayOfWeek - 1;
StrDate = StrDate + Separator + DAYS[DayOfWeek] + Separator;
}
else
StrDate = StrDate + Separator;
}
else
StrDate = '';
@ -128,19 +138,18 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,Separator,StrToday,OmitDateOnSameD
Min = d.getMinutes();
StrHou = ((Hou < 10) ? '0' : '') + Hou;
StrMin = ((Min < 10) ? ':0' : ':') + Min;
if (OmitSeconds)
StrSec = '';
else {
if (WriteSeconds) {
Sec = d.getSeconds();
if (Sec)
StrSec = ((Sec < 10) ? ':0' : ':') + Sec;
else
StrSec = '';
}
else
StrSec = '';
/* Write date and time */
document.getElementById(id).innerHTML = StrDate + Separator +
StrHou + StrMin + StrSec;
document.getElementById(id).innerHTML = StrDate + StrHou + StrMin + StrSec;
}
// Set local date-time form fields from UTC time

19
swad_agenda.c
View File

@ -604,9 +604,10 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
/* Start date/time */
UniqueId++;
fprintf (Gbl.F.Out,"<tr>"
"<td id=\"agd_date_start_%u\" class=\"%s LEFT_TOP COLOR%u\">"
"<td id=\"agd_date_start_%u\" class=\"%s LEFT_BOTTOM COLOR%u\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('agd_date_start_%u',%ld,'<br />','%s',false,true);"
"writeLocalDateHMSFromUTC('agd_date_start_%u',"
"%ld,'<br />','%s',true,true,false);"
"</script>"
"</td>",
UniqueId,
@ -617,9 +618,10 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
/* End date/time */
UniqueId++;
fprintf (Gbl.F.Out,"<td id=\"agd_date_end_%u\" class=\"%s LEFT_TOP COLOR%u\">"
fprintf (Gbl.F.Out,"<td id=\"agd_date_end_%u\" class=\"%s LEFT_BOTTOM COLOR%u\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('agd_date_end_%u',%ld,'<br />','%s',true,true);"
"writeLocalDateHMSFromUTC('agd_date_end_%u',"
"%ld,'<br />','%s',false,true,false);"
"</script>"
"</td>",
UniqueId,
@ -672,14 +674,11 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML
Str_InsertLinks (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"LEFT_TOP COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<p class=\"%s\">"
"%s"
"</p>"
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"LEFT_TOP COLOR%u\">"
"<p class=\"%s\">%s</p>"
"</td>"
"</tr>",
Gbl.RowEvenOdd,
AgdEvent.Hidden ? "DAT_LIGHT" :
"DAT",
Txt);

10
swad_assignment.c
View File

@ -314,9 +314,10 @@ static void Asg_ShowOneAssignment (long AsgCod)
/* Start date/time */
UniqueId++;
fprintf (Gbl.F.Out,"<tr>"
"<td id=\"asg_date_start_%u\" class=\"%s LEFT_TOP COLOR%u\">"
"<td id=\"asg_date_start_%u\" class=\"%s LEFT_BOTTOM COLOR%u\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('asg_date_start_%u',%ld,'<br />','%s',false,false);"
"writeLocalDateHMSFromUTC('asg_date_start_%u',"
"%ld,'<br />','%s',true,true,true);"
"</script>"
"</td>",
UniqueId,
@ -329,9 +330,10 @@ static void Asg_ShowOneAssignment (long AsgCod)
/* End date/time */
UniqueId++;
fprintf (Gbl.F.Out,"<td id=\"asg_date_end_%u\" class=\"%s LEFT_TOP COLOR%u\">"
fprintf (Gbl.F.Out,"<td id=\"asg_date_end_%u\" class=\"%s LEFT_BOTTOM COLOR%u\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('asg_date_end_%u',%ld,'<br />','%s',true,false);"
"writeLocalDateHMSFromUTC('asg_date_end_%u',"
"%ld,'<br />','%s',false,true,true);"
"</script>"
"</td>",
UniqueId,

16
swad_attendance.c
View File

@ -362,7 +362,7 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
/***** Start date/time *****/
UniqueId++;
fprintf (Gbl.F.Out,"<tr>" \
"<td id=\"att_date_start_%u\" class=\"%s LEFT_TOP",
"<td id=\"att_date_start_%u\" class=\"%s LEFT_BOTTOM",
UniqueId,
Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT") :
@ -372,13 +372,14 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('att_date_start_%u',%ld,'<br />','%s',false,false);"
"writeLocalDateHMSFromUTC('att_date_start_%u',"
"%ld,'<br />','%s',true,true,true);"
"</script>"
"</td>",
UniqueId,Att->TimeUTC[Att_START_TIME],Txt_Today);
/***** End date/time *****/
fprintf (Gbl.F.Out,"<td id=\"att_date_end_%u\" class=\"%s LEFT_TOP",
fprintf (Gbl.F.Out,"<td id=\"att_date_end_%u\" class=\"%s LEFT_BOTTOM",
UniqueId,
Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT") :
@ -388,7 +389,8 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('att_date_end_%u',%ld,'<br />','%s',true,false);"
"writeLocalDateHMSFromUTC('att_date_end_%u',"
"%ld,'<br />','%s',false,true,true);"
"</script>"
"</td>",
UniqueId,Att->TimeUTC[Att_END_TIME],Txt_Today);
@ -3107,7 +3109,8 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
"<td class=\"DAT LEFT_MIDDLE COLOR%u\">"
"<span id=\"att_date_start_%u\"></span> %s"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('att_date_start_%u',%ld,'&nbsp;','%s',false,false);"
"writeLocalDateHMSFromUTC('att_date_start_%u',"
"%ld,',&nbsp;','%s',true,true,true);"
"</script>"
"</td>"
"<td class=\"DAT RIGHT_MIDDLE COLOR%u\">"
@ -3515,7 +3518,8 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
" alt=\"%s\" title=\"%s\" class=\"ICO20x20\" />"
"<span id=\"att_date_start_%u\"></span> %s"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('att_date_start_%u',%ld,'&nbsp;','%s',false,false);"
"writeLocalDateHMSFromUTC('att_date_start_%u',"
"%ld,',&nbsp;','%s',true,true,true);"
"</script>"
"</td>"
"</tr>",

5
swad_changelog.h
View File

@ -185,13 +185,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.98 (2016-12-12)"
#define Log_PLATFORM_VERSION "SWAD 16.99 (2016-12-12)"
#define CSS_FILE "swad16.97.css"
#define JS_FILE "swad16.98.js"
#define JS_FILE "swad16.99.js"
// 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 16.99: Dec 12, 2016 Changes in script to write local date and time. (210782 lines)
Version 16.98: Dec 12, 2016 Changes in help about homework.
Changes in script to write local date and time. (210739 lines)
Version 16.97.1: Dec 12, 2016 Changes in translation about announcements of exams. (210748 lines)

12
swad_file_browser.c
View File

@ -6151,7 +6151,8 @@ static void Brw_WriteDatesAssignment (void)
Gbl.FileBrowser.Asg.Open ? "ASG_LST_DATE_GREEN" :
"ASG_LST_DATE_RED");
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('asg_start_date_%u',%ld,'&nbsp;','%s',false,false);"
"writeLocalDateHMSFromUTC('asg_start_date_%u',"
"%ld,',&nbsp;','%s',true,false,true);"
"</script>",
UniqueId,
(long) Gbl.FileBrowser.Asg.TimeUTC[Asg_START_TIME],Txt_Today);
@ -6171,7 +6172,8 @@ static void Brw_WriteDatesAssignment (void)
Gbl.FileBrowser.Asg.Open ? "ASG_LST_DATE_GREEN" :
"ASG_LST_DATE_RED");
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('asg_end_date_%u',%ld,'&nbsp;','%s',true,false);"
"writeLocalDateHMSFromUTC('asg_end_date_%u',"
"%ld,',&nbsp;','%s',false,false,true);"
"</script>",
UniqueId,
(long) Gbl.FileBrowser.Asg.TimeUTC[Asg_END_TIME],Txt_Today);
@ -6214,7 +6216,8 @@ static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata)
UniqueId++;
fprintf (Gbl.F.Out,"<span id=\"filedate%u\"></span>"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('filedate%u',%ld,'&nbsp;','%s',false,false);"
"writeLocalDateHMSFromUTC('filedate%u',"
"%ld,',&nbsp;','%s',true,false,false);"
"</script>",
UniqueId,
UniqueId,(long) FileMetadata->Time,Txt_Today);
@ -9378,7 +9381,8 @@ void Brw_ShowFileMetadata (void)
"</td>"
"<td id=\"filedate\" class=\"DAT LEFT_MIDDLE\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('filedate',%ld,'&nbsp;','%s',false,false);"
"writeLocalDateHMSFromUTC('filedate',"
"%ld,',&nbsp;','%s',true,true,true);"
"</script>"
"</td>"
"</tr>",

3
swad_forum.c
View File

@ -3481,7 +3481,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
UniqueId++;
fprintf (Gbl.F.Out,"<td id=\"date_%u\" class=\"%s LEFT_TOP %s\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('date_%u',%ld,'<br />','%s',false,false);"
"writeLocalDateHMSFromUTC('date_%u',"
"%ld,'<br />','%s',true,false,false);"
"</script>"
"</td>",
UniqueId,Style,BgColor,

3
swad_group.c
View File

@ -1951,7 +1951,8 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp)
fprintf (Gbl.F.Out,"<br />%s: "
"<span id=\"open_time_%u\"></span>"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('open_time_%u',%ld,'&nbsp;','%s',false,false);"
"writeLocalDateHMSFromUTC('open_time_%u',"
"%ld,',&nbsp;','%s',true,true,true);"
"</script>",
Txt_Opening_of_groups,
UniqueId,

12
swad_layout.c
View File

@ -442,6 +442,7 @@ static void Lay_WriteScripts (void)
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern const char *Txt_MONTHS_CAPS[12];
extern const char *Txt_DAYS_CAPS[7];
extern const char *Txt_DAYS_SMALL[7];
extern const char *Txt_Exam_of_X;
unsigned Month;
unsigned DayOfWeek; /* 0, 1, 2, 3, 4, 5, 6 */
@ -524,6 +525,17 @@ static void Lay_WriteScripts (void)
}
fprintf (Gbl.F.Out,"];\n");
fprintf (Gbl.F.Out," var DAYS = [");
for (DayOfWeek = 0;
DayOfWeek < 7;
DayOfWeek++)
{
if (DayOfWeek)
fprintf (Gbl.F.Out,",");
fprintf (Gbl.F.Out,"'%s'",Txt_DAYS_SMALL[DayOfWeek]);
}
fprintf (Gbl.F.Out,"];\n");
fprintf (Gbl.F.Out," var STR_EXAM = '");
fprintf (Gbl.F.Out,Txt_Exam_of_X,Gbl.CurrentCrs.Crs.FullName);
fprintf (Gbl.F.Out,"';\n");

3
swad_message.c
View File

@ -3510,7 +3510,8 @@ void Msg_WriteMsgDate (time_t TimeUTC,const char *ClassBackground)
/***** Write date and time *****/
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('date_%u',%ld,'&nbsp;','%s',false,false);"
"writeLocalDateHMSFromUTC('date_%u',"
"%ld,',&nbsp;','%s',true,false,false);"
"</script>",
UniqueId,(long) TimeUTC,Txt_Today);

3
swad_notice.c
View File

@ -711,7 +711,8 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
Act_FormEnd ();
}
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('notice_date_%u',%ld,'<br />','%s',false,false);"
"writeLocalDateHMSFromUTC('notice_date_%u',"
"%ld,'<br />','%s',true,false,false);"
"</script>"
"</div>",
UniqueId,(long) TimeUTC,Txt_Today);

3
swad_social.c
View File

@ -1449,7 +1449,8 @@ static void Soc_WriteDateTime (time_t TimeUTC)
// This must be out of the div where the output is written
// because it will be evaluated in a loop in JavaScript
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('%s',%ld,'&nbsp;','%s',false,true);"
"writeLocalDateHMSFromUTC('%s',"
"%ld,',&nbsp;','%s',true,false,false);"
"</script>",
IdDateTime,(long) TimeUTC,Txt_Today);
}

3
swad_statistic.c
View File

@ -1695,7 +1695,8 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
/* Write the date-time (row[3]) */
fprintf (Gbl.F.Out,"<td id=\"date_%u\" class=\"LOG CENTER_TOP COLOR%u\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('date_%u',%ld,'&nbsp;','%s',false,false);"
"writeLocalDateHMSFromUTC('date_%u',"
"%ld,',&nbsp;','%s',true,false,true);"
"</script>"
"</td>",
UniqueId,Gbl.RowEvenOdd,

10
swad_survey.c
View File

@ -442,7 +442,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/***** Start date/time *****/
UniqueId++;
fprintf (Gbl.F.Out,"<tr>"
"<td id=\"svy_date_start_%u\" class=\"%s LEFT_TOP",
"<td id=\"svy_date_start_%u\" class=\"%s LEFT_BOTTOM",
UniqueId,
Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" :
"DATE_RED") :
@ -452,13 +452,14 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('svy_date_start_%u',%ld,'<br />','%s',false,false);"
"writeLocalDateHMSFromUTC('svy_date_start_%u',"
"%ld,'<br />','%s',true,true,true);"
"</script>"
"</td>",
UniqueId,Svy.TimeUTC[Svy_START_TIME],Txt_Today);
/***** End date/time *****/
fprintf (Gbl.F.Out,"<td id=\"svy_date_end_%u\" class=\"%s LEFT_TOP",
fprintf (Gbl.F.Out,"<td id=\"svy_date_end_%u\" class=\"%s LEFT_BOTTOM",
UniqueId,
Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" :
"DATE_RED") :
@ -468,7 +469,8 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('svy_date_end_%u',%ld,'<br />','%s',true,false);"
"writeLocalDateHMSFromUTC('svy_date_end_%u',"
"%ld,'<br />','%s',false,true,true);"
"</script>"
"</td>",
UniqueId,Svy.TimeUTC[Svy_END_TIME],Txt_Today);

12
swad_test.c
View File

@ -672,7 +672,8 @@ static bool Tst_CheckIfNextTstAllowed (void)
"<span id=\"date_next_test\">"
"</span>"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('date_next_test',%ld,'&nbsp;','%s',false,false);"
"writeLocalDateHMSFromUTC('date_next_test',"
"%ld,',&nbsp;','%s',true,true,true);"
"</script>"
"</div>",
(long) TimeNextTestUTC,Txt_Today);
@ -2813,7 +2814,8 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
fprintf (Gbl.F.Out,"<td id=\"tst_date_%u\""
" class=\"DAT_SMALL CENTER_TOP COLOR%u\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('tst_date_%u',%ld,'<br />','%s',false,false);"
"writeLocalDateHMSFromUTC('tst_date_%u',"
"%ld,'<br />','%s',true,false,true);"
"</script>"
"</td>",
UniqueId,Gbl.RowEvenOdd,
@ -7252,7 +7254,8 @@ static void Tst_ShowTestResults (struct UsrData *UsrDat)
UniqueId++;
fprintf (Gbl.F.Out,"<td id =\"tst_date_%u\" class=\"%s RIGHT_TOP COLOR%u\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('tst_date_%u',%ld,'&nbsp;','%s',false,false);"
"writeLocalDateHMSFromUTC('tst_date_%u',"
"%ld,',&nbsp;','%s',true,false,true);"
"</script>"
"</td>",
UniqueId,ClassDat,Gbl.RowEvenOdd,
@ -7637,7 +7640,8 @@ void Tst_ShowOneTestResult (void)
"</td>"
"<td id=\"test\" class=\"DAT LEFT_TOP\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('test',%ld,'&nbsp;','%s',false,false);"
"writeLocalDateHMSFromUTC('test',"
"%ld,',&nbsp;','%s',true,true,true);"
"</script>"
"</td>"
"</tr>",