diff --git a/swad_changelog.h b/swad_changelog.h index 16a65ddf..1f84e1a0 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -428,10 +428,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.66.5 (2019-03-06)" +#define Log_PLATFORM_VERSION "SWAD 18.66.6 (2019-03-07)" #define CSS_FILE "swad18.66.3.css" #define JS_FILE "swad18.64.js" /* + Version 18.66.6: Mar 07, 2019 Number of days printed as months or years in user's figures. (238846 lines) Version 18.66.5: Mar 06, 2019 Code refactoring in user's figures. (238739 lines) Version 18.66.4: Mar 06, 2019 Code refactoring in user's figures. (238678 lines) Version 18.66.3: Mar 06, 2019 Changed order of figures in user's profile. (238674 lines) diff --git a/swad_profile.c b/swad_profile.c index 32c5462b..6dee4eee 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -436,10 +436,16 @@ static void Prf_ShowTimeSinceFirstClick (const struct UsrData *UsrDat, const struct UsrFigures *UsrFigures) { extern const char *Txt_TIME_Since; + extern const char *Txt_year; + extern const char *Txt_years; + extern const char *Txt_month; + extern const char *Txt_months; extern const char *Txt_day; extern const char *Txt_days; extern const char *Txt_Today; char IdFirstClickTime[Frm_MAX_BYTES_ID + 1]; + int NumYears; + int NumMonths; /***** Time since first click *****/ Prf_StartListItem (Txt_TIME_Since,"clock.svg"); @@ -451,10 +457,30 @@ static void Prf_ShowTimeSinceFirstClick (const struct UsrData *UsrDat, fprintf (Gbl.F.Out,"",IdFirstClickTime); if (UsrFigures->NumDays > 0) - fprintf (Gbl.F.Out," (%d %s)", - UsrFigures->NumDays, - (UsrFigures->NumDays == 1) ? Txt_day : - Txt_days); + { + fprintf (Gbl.F.Out," ("); + NumYears = UsrFigures->NumDays / 365; + if (NumYears) + fprintf (Gbl.F.Out,"%d %s", + NumYears, + (NumYears == 1) ? Txt_year : + Txt_years); + else // Less than one year + { + NumMonths = UsrFigures->NumDays / 30; + if (NumMonths) + fprintf (Gbl.F.Out,"%d %s", + NumMonths, + (NumMonths == 1) ? Txt_month : + Txt_months); + else // Less than one month + fprintf (Gbl.F.Out,"%d %s", + UsrFigures->NumDays, + (UsrFigures->NumDays == 1) ? Txt_day : + Txt_days); + } + fprintf (Gbl.F.Out,")"); + } fprintf (Gbl.F.Out,"