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.7

This commit is contained in:
Antonio Cañas Vargas 2016-04-23 14:06:49 +02:00
parent 567db87c74
commit ebf2244dab
2 changed files with 43 additions and 25 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.6 (2016-04-23)"
#define Log_PLATFORM_VERSION "SWAD 15.202.7 (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.7: Apr 23, 2016 Code refactoring in record card. (200964 lines)
Version 15.202.6: Apr 23, 2016 Code refactoring in record card. (200949 lines)
Version 15.202.5: Apr 23, 2016 Code refactoring in record card. (200934 lines)
Version 15.202.4: Apr 23, 2016 Code refactoring in record card. (200926 lines)

65
swad_record.c
View File

@ -117,6 +117,10 @@ static void Rec_ShowOriginPlace (struct UsrData *UsrDat,
bool ShowData,
bool DataForm,
const char *ClassForm);
static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,
bool ShowData,
bool DataForm,
const char *ClassForm);
static void Rec_WriteLinkToDataProtectionClause (void);
@ -1979,7 +1983,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
struct UsrData *UsrDat)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Date_of_birth;
extern const char *Txt_Institution;
extern const char *Txt_Centre;
extern const char *Txt_Department;
@ -2134,29 +2137,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/***** Origin place *****/
Rec_ShowOriginPlace (UsrDat,ShowData,DataForm,ClassForm);
/* Date of birth */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"REC_DAT_BOLD LEFT_MIDDLE\""
" style=\"width:%upx;\">",
ClassForm,Rec_C1_BOTTOM,Txt_Date_of_birth,
Rec_C2_BOTTOM);
if (ShowData)
{
if (DataForm)
Dat_WriteFormDate (Gbl.Now.Date.Year - Rec_USR_MAX_AGE,
Gbl.Now.Date.Year - Rec_USR_MIN_AGE,
"Birth",
&(UsrDat->Birthday),
false,false);
else if (UsrDat->StrBirthday[0])
fprintf (Gbl.F.Out,"%s",UsrDat->StrBirthday);
}
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** Date of birth *****/
Rec_ShowDateOfBirth (UsrDat,ShowData,DataForm,ClassForm);
/* Local address */
fprintf (Gbl.F.Out,"<tr>"
@ -3318,6 +3300,41 @@ static void Rec_ShowOriginPlace (struct UsrData *UsrDat,
"</tr>");
}
/*****************************************************************************/
/**************************** Show user's country ****************************/
/*****************************************************************************/
static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,
bool ShowData,
bool DataForm,
const char *ClassForm)
{
extern const char *Txt_Date_of_birth;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"REC_DAT_BOLD LEFT_MIDDLE\""
" style=\"width:%upx;\">",
ClassForm,Rec_C1_BOTTOM,Txt_Date_of_birth,
Rec_C2_BOTTOM);
if (ShowData)
{
if (DataForm)
Dat_WriteFormDate (Gbl.Now.Date.Year - Rec_USR_MAX_AGE,
Gbl.Now.Date.Year - Rec_USR_MIN_AGE,
"Birth",
&(UsrDat->Birthday),
false,false);
else if (UsrDat->StrBirthday[0])
fprintf (Gbl.F.Out,"%s",UsrDat->StrBirthday);
}
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/*****************************************************************************/
/*********************** Write a link to netiquette rules ********************/
/*****************************************************************************/