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 14.102.4

This commit is contained in:
Antonio Cañas Vargas 2015-03-25 16:25:50 +01:00
parent a135132719
commit 71e730db1d
3 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -103,11 +103,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.102.1 (2015/03/24)"
#define Log_PLATFORM_VERSION "SWAD 14.102.4 (2015/03/25)"
// 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 14.102.4: Mar 25, 2015 Fixed bug in ranking. (183883 lines)
Version 14.102.3: Mar 25, 2015 Fixed bug in record. (183882 lines)
Version 14.102.2: Mar 25, 2015 Fixed bug in record. (183882 lines)
Version 14.102.1: Mar 24, 2015 Fixed minor bugs. (183871 lines)
Version 14.102: Mar 24, 2015 Changes in some update buttons. (183865 lines)
Version 14.101: Mar 24, 2015 Fixed bug in form to create a new account.

2
swad_profile.c
View File

@ -1470,7 +1470,7 @@ void Prf_ShowUsrInRanking (const struct UsrData *UsrDat,unsigned Rank)
Gbl.ColorRows[Gbl.RowEvenOdd]);
/***** Put form to go to public profile *****/
if (Visible && UsrDat->Nickname[0])
if (Visible)
{
Act_FormStart (ActSeePubPrf);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);

63
swad_record.c
View File

@ -2057,9 +2057,9 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR);
bool RoleForm = (Gbl.CurrentCrs.Crs.CrsCod > 0 &&
(TypeOfView == Rec_FORM_SIGN_UP ||
TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR ||
TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR));
bool SexForm = TypeOfView == Rec_FORM_MY_COMMON_RECORD;
bool DataForm = (TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR ||
(TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR &&
@ -2567,20 +2567,17 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** User's role *****/
/***** User's role or sex *****/
if (RoleForm)
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">",
ClassForm,C2Width);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"%s*",Txt_Sex);
else
fprintf (Gbl.F.Out,"%s",Txt_Role);
fprintf (Gbl.F.Out,":</td>"
" style=\"width:%upx; text-align:right;\">"
"%s:</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,
Txt_Role,
ClassData,C3Width + C4Width);
switch (TypeOfView)
{
@ -2600,23 +2597,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
}
fprintf (Gbl.F.Out,"</select>");
break;
case Rec_FORM_MY_COMMON_RECORD: // It's me, change my data
for (Sex = Usr_SEX_FEMALE;
Sex <= Usr_SEX_MALE;
Sex++)
{
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"Sex\" value=\"%u\"",(unsigned) Sex);
if (Sex == Gbl.Usrs.Me.UsrDat.Sex)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />"
"<img src=\"%s/%s16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\""
" style=\"vertical-align:bottom;\" />%s",
Gbl.Prefs.IconsURL,Usr_StringsSexDB[Sex],
Txt_SEX_SINGULAR_Abc[Sex],
Txt_SEX_SINGULAR_Abc[Sex]);
}
break;
case Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR: // The other user already exists in the platform
if (UsrDat->RoleInCurrentCrsDB < Rol_ROLE_STUDENT) // The other user does not belong to current course
{
@ -2696,7 +2676,36 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
else // RoleForm == false
else if (SexForm)
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"%s*:</td>"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,
Txt_Sex,
ClassData,C3Width + C4Width);
for (Sex = Usr_SEX_FEMALE;
Sex <= Usr_SEX_MALE;
Sex++)
{
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"Sex\" value=\"%u\"",(unsigned) Sex);
if (Sex == Gbl.Usrs.Me.UsrDat.Sex)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />"
"<img src=\"%s/%s16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\""
" style=\"vertical-align:bottom;\" />%s",
Gbl.Prefs.IconsURL,Usr_StringsSexDB[Sex],
Txt_SEX_SINGULAR_Abc[Sex],
Txt_SEX_SINGULAR_Abc[Sex]);
}
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
else // RoleForm == false, SexForm == false
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"