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 15.202.12

This commit is contained in:
Antonio Cañas Vargas 2016-04-23 14:43:53 +02:00
parent 82110dc74b
commit 0b471f67be
2 changed files with 47 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -134,13 +134,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.202.11 (2016-04-23)"
#define Log_PLATFORM_VERSION "SWAD 15.202.12 (2016-04-23)"
#define CSS_FILE "swad15.202.css"
#define JS_FILE "swad15.197.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 15.202.12:Apr 23, 2016 Code refactoring in record card. (? lines)
Version 15.202.11:Apr 23, 2016 Code refactoring in record card. (201014 lines)
Version 15.202.10:Apr 23, 2016 Code refactoring in record card. (201000 lines)
Version 15.202.9: Apr 23, 2016 Code refactoring in record card. (200987 lines)

76
swad_record.c
View File

@ -131,6 +131,9 @@ static void Rec_ShowFamilyAddress (struct UsrData *UsrDat,
static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,
bool ShowData,bool DataForm,
const char *ClassForm);
static void Rec_ShowComments (struct UsrData *UsrDat,
bool ShowData,bool DataForm,
const char *ClassForm);
static void Rec_WriteLinkToDataProtectionClause (void);
@ -1998,7 +2001,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
extern const char *Txt_Department;
extern const char *Txt_Office;
extern const char *Txt_Phone;
extern const char *Txt_USER_comments;
extern const char *Txt_Save_changes;
extern const char *Txt_Register;
extern const char *Txt_Confirm;
@ -2160,40 +2162,13 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/***** Family phone *****/
Rec_ShowFamilyPhone (UsrDat,ShowData,DataForm,ClassForm);
/* Common comments for all the courses */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"REC_DAT_BOLD LEFT_TOP\""
" style=\"width:%upx;\">",
ClassForm,Rec_C1_BOTTOM,Txt_USER_comments,
Rec_C2_BOTTOM);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out,"<textarea name=\"Comments\" rows=\"4\""
" style=\"width:%upx;\">"
"%s"
"</textarea>",
Rec_C2_BOTTOM - 20,
UsrDat->Comments);
else if (UsrDat->Comments[0])
{
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
UsrDat->Comments,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to rigorous HTML
fprintf (Gbl.F.Out,"%s",UsrDat->Comments);
}
}
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** User's comments *****/
Rec_ShowComments (UsrDat,ShowData,DataForm,ClassForm);
}
/***** Institution, centre, department, office, etc. *****/
if (ShowTeacherRows)
{
/* Institution */
/***** Institution *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
@ -3393,6 +3368,45 @@ static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,
"</tr>");
}
/*****************************************************************************/
/************************ Show user's family phone ***************************/
/*****************************************************************************/
static void Rec_ShowComments (struct UsrData *UsrDat,
bool ShowData,bool DataForm,
const char *ClassForm)
{
extern const char *Txt_USER_comments;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"REC_DAT_BOLD LEFT_TOP\""
" style=\"width:%upx;\">",
ClassForm,Rec_C1_BOTTOM,Txt_USER_comments,
Rec_C2_BOTTOM);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out,"<textarea name=\"Comments\" rows=\"4\""
" style=\"width:%upx;\">"
"%s"
"</textarea>",
Rec_C2_BOTTOM - 20,
UsrDat->Comments);
else if (UsrDat->Comments[0])
{
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, // Convert from HTML to rigorous HTML
UsrDat->Comments,Cns_MAX_BYTES_TEXT,false);
fprintf (Gbl.F.Out,"%s",UsrDat->Comments);
}
}
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/*****************************************************************************/
/*********************** Write a link to netiquette rules ********************/
/*****************************************************************************/