Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-02 23:05:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 14.77.3

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2015-03-05 23:18:43 +01:00
parent 7f77bfc277
commit 25d7b52dce
2 changed files with 285 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -103,12 +103,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.77.2 (2015/03/05)"
#define Log_PLATFORM_VERSION "SWAD 14.77.3 (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.3: Mar 05, 2015 Changes in shared record. (178509 lines)
Version 14.77.2: Mar 05, 2015 Changes in shared record. (178504 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');

86
swad_record.c
View File

@ -2088,6 +2088,23 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
TypeOfView == Rec_RECORD_PRINT) &&
IAmTeacher && Gbl.Usrs.Listing.RecsUsrs == Rec_RECORD_USERS_STUDENTS))));
bool ShowData = ItsMe || UsrDat->Accepted || IAmDegAdmin || IAmSuperuser;
bool ShowMailIDRoleRows = (TypeOfView != Rec_RECORD_PUBLIC);
bool ShowAddressRows = (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 ||
TypeOfView == Rec_RECORD_PRINT) &&
(IAmTeacher || IAmSuperuser) &&
UsrDat->RoleInCurrentCrsDB == Rol_ROLE_STUDENT));
bool ShowTeacherRows = (((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
((TypeOfView == Rec_RECORD_LIST ||
TypeOfView == Rec_RECORD_PRINT) &&
UsrDat->RoleInCurrentCrsDB == Rol_ROLE_TEACHER)); // He/she is a teacher in the current course
Usr_Sex_t Sex;
Rol_Role_t Role;
Rol_Role_t DefaultRoleInCurrentCrs;
@ -2134,6 +2151,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
case Rec_MY_COMMON_RECORD_CHECK:
case Rec_OTHER_USR_COMMON_RECORD_CHECK:
case Rec_RECORD_LIST:
case Rec_RECORD_PUBLIC:
RecordWidth = Rec_WIDTH_SHARE_RECORD_SMALL;
FrameWidth = 10;
Col3Width = 160;
@ -2163,7 +2181,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/***** Institution *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"width:%upx;"
" text-align:left; vertical-align:middle;\">"
" text-align:left; vertical-align:top;\">"
"<table class=\"CELLS_PAD_2\">"
"<tr>"
"<td style=\"width:%upx;"
@ -2304,22 +2322,19 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/***** Full name *****/
fprintf (Gbl.F.Out,"</td>"
"<td class=\"HEAD_REC_BIG\" style=\"text-align:left;"
" vertical-align:middle;\">"
"%s<br />%s<br />%s<br />&nbsp;"
" vertical-align:top;\">"
"%s<br />%s<br />%s"
"</td>"
"</tr>"
"</table>"
"</td>",
UsrDat->FirstName[0] ? UsrDat->FirstName :
"&nbsp;",
UsrDat->Surname1[0] ? UsrDat->Surname1 :
"&nbsp;",
UsrDat->Surname2[0] ? UsrDat->Surname2 :
"&nbsp;");
UsrDat->FirstName ,
UsrDat->Surname1,
UsrDat->Surname2);
/***** Photo *****/
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"%s\" style=\"width:%upx;"
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"width:%upx;"
" text-align:center; vertical-align:top;\">",
TypeOfView == Rec_FORM_MY_COMMON_RECORD ? ClassForm :
ClassData,
@ -2376,15 +2391,25 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
if (!DataForm)
QR_PutLinkToPrintQRCode (QR_NICKNAME,UsrDat,false);
}
fprintf (Gbl.F.Out,"</td>");
/***** User's web and social networks *****/
fprintf (Gbl.F.Out,"<td style=\"width:%upx;"
" vertical-align:top;\">",
Col3Width);
Net_ShowWebsAndSocialNets (UsrDat->UsrCod);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
if (ShowMailIDRoleRows)
{
/***** User's e-mail *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">",
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_Email,
ClassData,Col2Width);
if (UsrDat->Email[0])
@ -2402,20 +2427,13 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
}
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>");
/***** User's ID *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">",
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width,Txt_ID,
ClassData,Col2Width);
ID_WriteUsrIDs (UsrDat,ShowID);
@ -2434,7 +2452,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
else
fprintf (Gbl.F.Out,"%s",Txt_Role);
fprintf (Gbl.F.Out,":</td>"
"<td class=\"%s\""
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassData,Col2Width);
switch (TypeOfView)
@ -2555,7 +2573,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"<td colspan=\"2\" class=\"%s\""
" style=\"width:%upx; text-align:left;\">"
"%s"
"</td>"
"</tr>",
@ -2565,6 +2584,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
ClassData,Col2Width,
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ? Txt_SEX_SINGULAR_Abc[UsrDat->Sex] :
Txt_ROLES_SINGULAR_Abc[UsrDat->RoleInCurrentCrsDB][UsrDat->Sex]);
}
/***** Name *****/
/* Surname 1 */
@ -2627,16 +2647,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,"</td>"
"</tr>");
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 ||
TypeOfView == Rec_RECORD_PRINT) &&
(IAmTeacher || IAmSuperuser) &&
(UsrDat->RoleInCurrentCrsDB == Rol_ROLE_GUEST__ ||
UsrDat->RoleInCurrentCrsDB == Rol_ROLE_STUDENT)))
{
/* Country */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
@ -2688,6 +2698,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,"</td>"
"</tr>");
if (ShowAddressRows)
{
/* Origin place */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
@ -2850,15 +2862,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
}
/***** Institution, centre, department, office, etc. *****/
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
((TypeOfView == Rec_RECORD_LIST ||
TypeOfView == Rec_RECORD_PRINT) &&
(UsrDat->RoleInCurrentCrsDB == Rol_ROLE_GUEST__ ||
UsrDat->RoleInCurrentCrsDB == Rol_ROLE_TEACHER))) // He/she is a teacher in the current course
if (ShowTeacherRows)
{
/* Institution */
fprintf (Gbl.F.Out,"<tr>"