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

This commit is contained in:
Antonio Cañas Vargas 2016-04-23 14:12:52 +02:00
parent ebf2244dab
commit ab95af4dd9
2 changed files with 46 additions and 28 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.7 (2016-04-23)"
#define Log_PLATFORM_VERSION "SWAD 15.202.8 (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.8: Apr 23, 2016 Code refactoring in record card. (200979 lines)
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)

71
swad_record.c
View File

@ -121,6 +121,10 @@ static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,
bool ShowData,
bool DataForm,
const char *ClassForm);
static void Rec_ShowLocalAddress (struct UsrData *UsrDat,
bool ShowData,
bool DataForm,
const char *ClassForm);
static void Rec_WriteLinkToDataProtectionClause (void);
@ -1988,7 +1992,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_Local_address;
extern const char *Txt_Family_address;
extern const char *Txt_USER_comments;
extern const char *Txt_Save_changes;
@ -2140,30 +2143,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/***** Date of birth *****/
Rec_ShowDateOfBirth (UsrDat,ShowData,DataForm,ClassForm);
/* Local address */
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_Local_address,
Rec_C2_BOTTOM);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"LocalAddress\""
" maxlength=\"%u\" value=\"%s\""
" style=\"width:%upx;\" />",
Cns_MAX_LENGTH_STRING,
UsrDat->LocalAddress,
Rec_C2_BOTTOM - 20);
else if (UsrDat->LocalAddress[0])
fprintf (Gbl.F.Out,"%s",UsrDat->LocalAddress);
}
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** Local address *****/
Rec_ShowLocalAddress (UsrDat,ShowData,DataForm,ClassForm);
/* Local phone */
fprintf (Gbl.F.Out,"<tr>"
@ -3265,7 +3246,7 @@ static void Rec_ShowCountry (struct UsrData *UsrDat,
}
/*****************************************************************************/
/**************************** Show user's country ****************************/
/************************ Show user's place of origin ************************/
/*****************************************************************************/
static void Rec_ShowOriginPlace (struct UsrData *UsrDat,
@ -3301,7 +3282,7 @@ static void Rec_ShowOriginPlace (struct UsrData *UsrDat,
}
/*****************************************************************************/
/**************************** Show user's country ****************************/
/************************ Show user's date of birth **************************/
/*****************************************************************************/
static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,
@ -3335,6 +3316,42 @@ static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,
"</tr>");
}
/*****************************************************************************/
/************************ Show user's local address **************************/
/*****************************************************************************/
static void Rec_ShowLocalAddress (struct UsrData *UsrDat,
bool ShowData,
bool DataForm,
const char *ClassForm)
{
extern const char *Txt_Local_address;
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_Local_address,
Rec_C2_BOTTOM);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"LocalAddress\""
" maxlength=\"%u\" value=\"%s\""
" style=\"width:%upx;\" />",
Cns_MAX_LENGTH_STRING,
UsrDat->LocalAddress,
Rec_C2_BOTTOM - 20);
else if (UsrDat->LocalAddress[0])
fprintf (Gbl.F.Out,"%s",UsrDat->LocalAddress);
}
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/*****************************************************************************/
/*********************** Write a link to netiquette rules ********************/
/*****************************************************************************/