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

This commit is contained in:
Antonio Cañas Vargas 2015-03-05 21:42:02 +01:00
parent 19eef8bad4
commit 7f77bfc277
9 changed files with 127 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
swad_ID.c
View File

@ -336,23 +336,22 @@ void ID_WriteUsrIDs (struct UsrData *UsrDat,bool ICanSeeUsrID)
{
unsigned NumID;
for (NumID = 0;
NumID < UsrDat->IDs.Num;
NumID++)
{
if (NumID)
fprintf (Gbl.F.Out,"<br />");
if (ICanSeeUsrID)
{
if (ICanSeeUsrID)
for (NumID = 0;
NumID < UsrDat->IDs.Num;
NumID++)
{
if (NumID)
fprintf (Gbl.F.Out,"<br />");
if (!UsrDat->IDs.List[NumID].Confirmed)
fprintf (Gbl.F.Out,"<span style=\"color:#804040;\">");
fprintf (Gbl.F.Out,"%s",UsrDat->IDs.List[NumID].ID);
if (!UsrDat->IDs.List[NumID].Confirmed)
fprintf (Gbl.F.Out,"</span>");
}
else
fprintf (Gbl.F.Out,"********");
}
else
fprintf (Gbl.F.Out,"********");
}
/*****************************************************************************/
@ -406,7 +405,7 @@ void ID_ShowFormOthIDs (void)
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
Rec_ShowCommonRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -591,7 +590,7 @@ void ID_RemoveOtherUsrID (void)
ID_GetListIDsFromUsrCod (&Gbl.Usrs.Other.UsrDat);
/***** Show user's record *****/
Rec_ShowCommonRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
}
else // User not found
Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
@ -706,7 +705,7 @@ void ID_NewOtherUsrID (void)
ID_GetListIDsFromUsrCod (&Gbl.Usrs.Other.UsrDat);
/***** Show user's record *****/
Rec_ShowCommonRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
}
else // User not found
Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.77.1 (2015/03/05)"
#define Log_PLATFORM_VERSION "SWAD 14.77.2 (2015/03/05)"
// 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 | tail -1
/*
Version 14.77.2: Mar 05, 2015 Changes in shared record. (? lines)
Version 14.77.1: Mar 05, 2015 New option to select the user and then go to his/her public user's profile. (178475 lines)
2 changes necessary in database:
INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1401','es','N','Solicitar perfil de usuario');

2
swad_enrollment.c
View File

@ -2859,7 +2859,7 @@ static void Enr_ShowFormToEditOtherUsr (void)
Pho_PutLinkToChangeUsrPhoto (&Gbl.Usrs.Other.UsrDat); // Put link (form) to change user's photo
/***** User's record *****/
Rec_ShowCommonRecord (Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR,&Gbl.Usrs.Other.UsrDat);
Rec_ShowSharedUsrRecord (Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR,&Gbl.Usrs.Other.UsrDat);
/***** Show list of groups to register/remove me/user *****/
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups?

2
swad_network.c
View File

@ -142,7 +142,7 @@ void Net_ShowWebsAndSocialNets (long UsrCod)
Net_WebsAndSocialNetworks_t NumURL;
char URL[Cns_MAX_BYTES_URL+1];
fprintf (Gbl.F.Out,"<div style=\"width:144px; text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"width:144px; margin:0 auto;\">");
for (NumURL = (Net_WebsAndSocialNetworks_t) 0;
NumURL < Net_NUM_WEBS_AND_SOCIAL_NETWORKS;

2
swad_password.c
View File

@ -746,7 +746,7 @@ void Pwd_ShowFormOthPwd (void)
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
Rec_ShowCommonRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
fprintf (Gbl.F.Out,"</td>"
"</tr>");

131
swad_record.c
View File

@ -956,7 +956,7 @@ void Rec_ListRecordsInvs (void)
fprintf (Gbl.F.Out,"\">");
/* Common record */
Rec_ShowCommonRecord (TypeOfView,&UsrDat);
Rec_ShowSharedUsrRecord (TypeOfView,&UsrDat);
fprintf (Gbl.F.Out,"</div>");
@ -1023,7 +1023,7 @@ static void Rec_ShowRecordOneStdCrs (void)
" margin-bottom:10px;\">");
/* Common record */
Rec_ShowCommonRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
/* Record of the student in the course */
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_TEACHER &&
@ -1106,7 +1106,7 @@ void Rec_ListRecordsStdsCrs (void)
fprintf (Gbl.F.Out,"\">");
/* Common record */
Rec_ShowCommonRecord (TypeOfView,&UsrDat);
Rec_ShowSharedUsrRecord (TypeOfView,&UsrDat);
/* Record of the student in the course */
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_TEACHER &&
@ -1178,7 +1178,7 @@ static void Rec_ShowRecordOneTchCrs (void)
" margin-bottom:10px;\">");
/* Common record */
Rec_ShowCommonRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
/* Office hours */
Lay_StartRoundFrameTable10 (NULL,0,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]);
@ -1270,7 +1270,7 @@ void Rec_ListRecordsTchsCrs (void)
fprintf (Gbl.F.Out,"\">");
/* Common record */
Rec_ShowCommonRecord (TypeOfView,&UsrDat);
Rec_ShowSharedUsrRecord (TypeOfView,&UsrDat);
/* Office hours */
if (ShowOfficeHours)
@ -1402,7 +1402,7 @@ void Rec_ShowFormMyCrsRecord (void)
Rec_PutFormToMyCommonRecord (); // Put link (form) to my common record
/* Common record */
Rec_ShowCommonRecord (Rec_RECORD_LIST,&Gbl.Usrs.Me.UsrDat);
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Me.UsrDat);
/***** Get list of fields of records in current course *****/
Rec_GetListRecordFieldsInCurrentCrs ();
@ -1870,7 +1870,7 @@ void Rec_ShowFormSignUpWithMyCommonRecord (void)
/***** Show the form *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormStart (ActSignUp);
Rec_ShowCommonRecord (Rec_FORM_SIGN_UP,&Gbl.Usrs.Me.UsrDat);
Rec_ShowSharedUsrRecord (Rec_FORM_SIGN_UP,&Gbl.Usrs.Me.UsrDat);
Lay_PutSendButton (Txt_Sign_up);
fprintf (Gbl.F.Out,"</form>"
"</div>");
@ -1904,7 +1904,7 @@ void Rec_ShowFormMyCommRecord (void)
/***** My record *****/
Act_FormStart (ActChgMyData);
Rec_ShowCommonRecord (Rec_FORM_MY_SHARE_RECORD,&Gbl.Usrs.Me.UsrDat);
Rec_ShowSharedUsrRecord (Rec_FORM_MY_COMMON_RECORD,&Gbl.Usrs.Me.UsrDat);
Lay_PutSendButton (Txt_Save_changes);
Rec_WriteLinkToDataProtectionClause ();
fprintf (Gbl.F.Out,"</form>"
@ -1957,7 +1957,7 @@ void Rec_ShowFormOtherNewCommonRecord (struct UsrData *UsrDat)
/***** Show the form *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Rec_ShowCommonRecord (Rec_FORM_NEW_RECORD_OTHER_NEW_USR,UsrDat);
Rec_ShowSharedUsrRecord (Rec_FORM_NEW_RECORD_OTHER_NEW_USR,UsrDat);
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups?
Grp_ShowLstGrpsToChgOtherUsrsGrps (UsrDat->UsrCod);
@ -1980,7 +1980,7 @@ void Rec_ShowMyCommonRecordUpd (void)
/***** Show my record for checking *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Rec_ShowCommonRecord (Rec_MY_SHARE_RECORD_CHECK,&Gbl.Usrs.Me.UsrDat);
Rec_ShowSharedUsrRecord (Rec_MY_COMMON_RECORD_CHECK,&Gbl.Usrs.Me.UsrDat);
fprintf (Gbl.F.Out,"</div>");
}
@ -1996,7 +1996,7 @@ void Rec_ShowCommonRecordUnmodifiable (struct UsrData *UsrDat)
/***** Show user's record *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Rec_ShowCommonRecord (Rec_OTHER_USR_SHARE_RECORD_CHECK,UsrDat);
Rec_ShowSharedUsrRecord (Rec_OTHER_USR_COMMON_RECORD_CHECK,UsrDat);
fprintf (Gbl.F.Out,"</div>");
}
@ -2005,8 +2005,8 @@ void Rec_ShowCommonRecordUnmodifiable (struct UsrData *UsrDat)
/*****************************************************************************/
// Show form or only data depending on TypeOfView
void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
struct UsrData *UsrDat)
void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
struct UsrData *UsrDat)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Admin_user;
@ -2056,34 +2056,36 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
bool HeBelongsToCurrentCrs = (UsrDat->RoleInCurrentCrsDB == Rol_ROLE_STUDENT ||
UsrDat->RoleInCurrentCrsDB == Rol_ROLE_TEACHER);
bool RoleForm = (TypeOfView == Rec_FORM_SIGN_UP ||
TypeOfView == Rec_FORM_MY_SHARE_RECORD ||
TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR ||
TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR);
bool DataForm = (TypeOfView == Rec_FORM_MY_SHARE_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 &&
!(IAmTeacher && HeIsTeacher))); // A teacher can not modify another teacher's data
bool MsgForm = Gbl.Usrs.Me.Logged &&
(TypeOfView == Rec_RECORD_LIST ||
TypeOfView == Rec_OTHER_USR_SHARE_RECORD_CHECK);
bool GoToPublicProfileForm = (TypeOfView == Rec_RECORD_LIST ||
TypeOfView == Rec_OTHER_USR_COMMON_RECORD_CHECK);
bool CommandForms = GoToPublicProfileForm && Gbl.Usrs.Me.Logged;
bool ShowEmail = (IAmDegAdmin || IAmSuperuser || DataForm ||
TypeOfView == Rec_FORM_MY_SHARE_RECORD ||
TypeOfView == Rec_MY_SHARE_RECORD_CHECK ||
TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ||
TypeOfView == Rec_FORM_MY_COURSE_RECORD ||
TypeOfView == Rec_MY_COURSE_RECORD_CHECK ||
(UsrDat->Accepted &&
(TypeOfView == Rec_OTHER_USR_SHARE_RECORD_CHECK ||
((TypeOfView == Rec_RECORD_LIST || TypeOfView == Rec_RECORD_PRINT) &&
(TypeOfView == Rec_OTHER_USR_COMMON_RECORD_CHECK ||
((TypeOfView == Rec_RECORD_LIST ||
TypeOfView == Rec_RECORD_PRINT) &&
(IAmTeacher || Gbl.Usrs.Listing.RecsUsrs == Rec_RECORD_USERS_TEACHERS)))));
bool ShowID = (IAmDegAdmin || IAmSuperuser || DataForm ||
TypeOfView == Rec_FORM_MY_SHARE_RECORD ||
TypeOfView == Rec_MY_SHARE_RECORD_CHECK ||
TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ||
TypeOfView == Rec_FORM_MY_COURSE_RECORD ||
TypeOfView == Rec_MY_COURSE_RECORD_CHECK ||
(UsrDat->Accepted &&
((TypeOfView == Rec_OTHER_USR_SHARE_RECORD_CHECK &&
((TypeOfView == Rec_OTHER_USR_COMMON_RECORD_CHECK &&
!(IAmTeacher && HeIsTeacher)) || // A teacher can not see another teacher's ID
((TypeOfView == Rec_RECORD_LIST || TypeOfView == Rec_RECORD_PRINT) &&
((TypeOfView == Rec_RECORD_LIST ||
TypeOfView == Rec_RECORD_PRINT) &&
IAmTeacher && Gbl.Usrs.Listing.RecsUsrs == Rec_RECORD_USERS_STUDENTS))));
bool ShowData = ItsMe || UsrDat->Accepted || IAmDegAdmin || IAmSuperuser;
Usr_Sex_t Sex;
@ -2102,7 +2104,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
switch (TypeOfView)
{
case Rec_FORM_SIGN_UP:
case Rec_FORM_MY_SHARE_RECORD:
case Rec_FORM_MY_COMMON_RECORD:
RecordWidth = Rec_WIDTH_SHARE_RECORD_BIG;
FrameWidth = 10;
Col3Width = 160;
@ -2129,8 +2131,8 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
ClassData = "DAT_REC";
break;
case Rec_MY_SHARE_RECORD_CHECK:
case Rec_OTHER_USR_SHARE_RECORD_CHECK:
case Rec_MY_COMMON_RECORD_CHECK:
case Rec_OTHER_USR_COMMON_RECORD_CHECK:
case Rec_RECORD_LIST:
RecordWidth = Rec_WIDTH_SHARE_RECORD_SMALL;
FrameWidth = 10;
@ -2191,12 +2193,17 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
" text-align:center; vertical-align:top;\">",
Rec_INSTITUTION_LOGO_SIZE + 8);
if (MsgForm)
if (CommandForms)
{
fprintf (Gbl.F.Out,"<div style=\"width:22px; margin:6px auto 0 auto;\">");
/***** Button to admin user *****/
if (ItsMe || Gbl.Usrs.Me.LoggedRole >= Rol_ROLE_TEACHER)
if (ItsMe ||
(Gbl.CurrentCrs.Crs.CrsCod > 0 && Gbl.Usrs.Me.LoggedRole == Rol_ROLE_TEACHER) ||
(Gbl.CurrentDeg.Deg.DegCod > 0 && Gbl.Usrs.Me.LoggedRole == Rol_ROLE_DEG_ADM) ||
(Gbl.CurrentCtr.Ctr.CtrCod > 0 && Gbl.Usrs.Me.LoggedRole == Rol_ROLE_CTR_ADM) ||
(Gbl.CurrentIns.Ins.InsCod > 0 && Gbl.Usrs.Me.LoggedRole == Rol_ROLE_INS_ADM) ||
Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
{
Act_FormStart (ActReqMdfUsr);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
@ -2312,9 +2319,9 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/***** Photo *****/
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
fprintf (Gbl.F.Out,"<td rowspan=\"3\" class=\"%s\" style=\"width:%upx;"
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"%s\" style=\"width:%upx;"
" text-align:center; vertical-align:top;\">",
TypeOfView == Rec_FORM_MY_SHARE_RECORD ? ClassForm :
TypeOfView == Rec_FORM_MY_COMMON_RECORD ? ClassForm :
ClassData,
Col3Width);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
@ -2325,14 +2332,14 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
if (ShowData)
{
fprintf (Gbl.F.Out,"<br />");
if (TypeOfView == Rec_FORM_MY_SHARE_RECORD)
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
{
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"PublicPhoto\" value=\"Y\"");
if (UsrDat->PublicPhoto)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," /> %s",Txt_Public_photo);
}
else if (TypeOfView == Rec_MY_SHARE_RECORD_CHECK)
else if (TypeOfView == Rec_MY_COMMON_RECORD_CHECK)
fprintf (Gbl.F.Out,"%s",
UsrDat->PublicPhoto ? Txt_Public_photo :
Txt_Private_Photo);
@ -2352,20 +2359,16 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
Col2Width);
if (UsrDat->Nickname[0])
{
if (MsgForm)
if (GoToPublicProfileForm)
{
/* Put form to send a message */
Act_FormStart (ActReqMsgUsr);
Grp_PutParamAllGroups ();
if (HeBelongsToCurrentCrs)
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
else
Msg_PutHiddenParamAnotherRecipient (UsrDat);
/* Put form to go to public profile */
Act_FormStart (ActSeePubPrf);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
sprintf (Gbl.Title,Txt_Write_a_message_to_X,UsrDat->FullName);
Act_LinkFormSubmit (Gbl.Title,"HEAD_REC_BIG");
}
fprintf (Gbl.F.Out,"@%s",UsrDat->Nickname);
if (MsgForm)
if (GoToPublicProfileForm)
fprintf (Gbl.F.Out,"</a>"
"</form>");
@ -2397,8 +2400,15 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
else
fprintf (Gbl.F.Out,"********");
}
fprintf (Gbl.F.Out,"</td>");
/***** User's web and social networks *****/
fprintf (Gbl.F.Out,"<td rowspan=\"3\" style=\"width:%upx;"
" vertical-align:top;\">",
Col3Width);
Net_ShowWebsAndSocialNets (UsrDat->UsrCod);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
"</tr>");
/***** User's ID *****/
fprintf (Gbl.F.Out,"<tr>"
@ -2409,15 +2419,8 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
ClassForm,Col1Width,Txt_ID,
ClassData,Col2Width);
ID_WriteUsrIDs (UsrDat,ShowID);
fprintf (Gbl.F.Out,"</td>");
/***** User's web and social networks *****/
fprintf (Gbl.F.Out,"<td rowspan=\"2\" style=\"width:%upx;"
" text-align:center; vertical-align:middle;\">",
Col3Width);
Net_ShowWebsAndSocialNets (UsrDat->UsrCod);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
"</tr>");
/***** User's role *****/
if (RoleForm)
@ -2426,7 +2429,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width);
if (TypeOfView == Rec_FORM_MY_SHARE_RECORD)
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"%s*",Txt_Sex);
else
fprintf (Gbl.F.Out,"%s",Txt_Role);
@ -2452,7 +2455,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
}
fprintf (Gbl.F.Out,"</select>");
break;
case Rec_FORM_MY_SHARE_RECORD: // It's me, change my data
case Rec_FORM_MY_COMMON_RECORD: // It's me, change my data
for (Sex = Usr_SEX_FEMALE;
Sex <= Usr_SEX_MALE;
Sex++)
@ -2557,10 +2560,10 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
"</td>"
"</tr>",
ClassForm,Col1Width,
TypeOfView == Rec_MY_SHARE_RECORD_CHECK ? Txt_Sex :
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ? Txt_Sex :
Txt_Role,
ClassData,Col2Width,
TypeOfView == Rec_MY_SHARE_RECORD_CHECK ? Txt_SEX_SINGULAR_Abc[UsrDat->Sex] :
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ? Txt_SEX_SINGULAR_Abc[UsrDat->Sex] :
Txt_ROLES_SINGULAR_Abc[UsrDat->RoleInCurrentCrsDB][UsrDat->Sex]);
/***** Name *****/
@ -2569,7 +2572,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s",
ClassForm,Col1Width,Txt_Surname_1);
if (TypeOfView == Rec_FORM_MY_SHARE_RECORD)
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":</td>"
"<td colspan=\"2\" class=\"%s\""
@ -2609,7 +2612,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s",
ClassForm,Col1Width,Txt_First_name);
if (TypeOfView == Rec_FORM_MY_SHARE_RECORD)
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":</td>"
"<td class=\"%s\" colspan=\"2\""
@ -2624,8 +2627,8 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,"</td>"
"</tr>");
if (TypeOfView == Rec_FORM_MY_SHARE_RECORD ||
TypeOfView == Rec_MY_SHARE_RECORD_CHECK ||
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ||
TypeOfView == Rec_FORM_MY_COURSE_RECORD ||
TypeOfView == Rec_MY_COURSE_RECORD_CHECK ||
((TypeOfView == Rec_RECORD_LIST ||
@ -2640,7 +2643,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:left;\">"
"%s",
ClassForm,Col1Width,Txt_Country);
if (TypeOfView == Rec_FORM_MY_SHARE_RECORD)
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":</td>"
"<td colspan=\"2\" class=\"%s\""
@ -2847,8 +2850,8 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
}
/***** Institution, centre, department, office, etc. *****/
if (((TypeOfView == Rec_FORM_MY_SHARE_RECORD ||
TypeOfView == Rec_MY_SHARE_RECORD_CHECK ||
if (((TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ||
TypeOfView == Rec_FORM_MY_COURSE_RECORD ||
TypeOfView == Rec_MY_COURSE_RECORD_CHECK) &&
(UsrDat->Roles & (1 << Rol_ROLE_TEACHER))) || // He/she (me, really) is a teacher in any course

15
swad_record.h
View File

@ -52,16 +52,21 @@
typedef enum
{
Rec_FORM_SIGN_UP,
Rec_FORM_MY_SHARE_RECORD,
Rec_FORM_MY_COMMON_RECORD,
Rec_MY_COMMON_RECORD_CHECK,
Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR,
Rec_FORM_NEW_RECORD_OTHER_NEW_USR,
Rec_MY_SHARE_RECORD_CHECK,
Rec_OTHER_USR_SHARE_RECORD_CHECK,
Rec_OTHER_USR_COMMON_RECORD_CHECK,
Rec_FORM_MY_COURSE_RECORD,
Rec_MY_COURSE_RECORD_CHECK,
Rec_OTHER_USR_COURSE_RECORD_CHECK,
Rec_RECORD_LIST,
Rec_RECORD_PRINT,
Rec_RECORD_PUBLIC,
} Rec_RecordViewType_t;
typedef enum {
@ -144,8 +149,8 @@ void Rec_ShowFormMyCommRecord (void);
void Rec_ShowFormOtherNewCommonRecord (struct UsrData *UsrDat);
void Rec_ShowMyCommonRecordUpd (void);
void Rec_ShowCommonRecordUnmodifiable (struct UsrData *UsrDat);
void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
struct UsrData *UsrDat);
void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
struct UsrData *UsrDat);
void Rec_UpdateMyRecord (void);
Rol_Role_t Rec_GetRoleFromRecordForm (void);

23
swad_text.c
View File

@ -46452,6 +46452,27 @@ const char *Txt_User_ID =
"N&ordm; de identif. do utilizador";
#endif
const char *Txt_User_not_found =
#if L==0
"Usuari no trobat";
#elif L==1
"Benutzer nicht gefunden.";
#elif L==2
"User not found.";
#elif L==3
"Usuario/a no encontrado/a.";
#elif L==4
"Utilisateur introuvable.";
#elif L==5
"Usuario/a no encontrado/a."; // Okoteve traducción
#elif L==6
"IUtente non trovato.";
#elif L==7
"Nie znaleziono u&zdot;ytkownika.";
#elif L==8
"Utilizador n&atilde;o encontrado.";
#endif
const char *Txt_User_not_found_or_you_do_not_have_permission_ =
#if L==0
"Usuari no trobat"
@ -46482,7 +46503,7 @@ const char *Txt_User_not_found_or_you_do_not_have_permission_ =
" o non si dispone dell'autorizzazione"
" per eseguire questa azione.";
#elif L==7
"Utilisateur introuvable"
"User not found"
" or you do not have permission"
" to perform this action."; // Potrzebujesz tlumaczenie
#elif L==8

14
swad_user.c
View File

@ -7400,6 +7400,7 @@ void Usr_RequestUserProfile (void)
void Usr_ShowUserProfile (void)
{
extern const char *Txt_User_not_found;
char Nickname[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA + 1];
long OtherUsrCod;
@ -7416,9 +7417,6 @@ void Usr_ShowUserProfile (void)
Usr_GetParamOtherUsrCodEncrypted ();
}
sprintf (Gbl.Message,"Gbl.Usrs.Other.UsrDat.UsrCod = %ld",Gbl.Usrs.Other.UsrDat.UsrCod);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
/***** Check if user exists and get his data *****/
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat)) // Existing user
{
@ -7434,8 +7432,16 @@ void Usr_ShowUserProfile (void)
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/***** Common record *****/
Rec_ShowCommonRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
Rec_ShowSharedUsrRecord (Rec_RECORD_PUBLIC,&Gbl.Usrs.Other.UsrDat);
fprintf (Gbl.F.Out,"</div>");
}
else
{
/***** Show error message *****/
Lay_ShowAlert (Lay_WARNING,Txt_User_not_found);
/***** Request nickname again *****/
Usr_RequestUserProfile ();
}
}