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

Version 14.104

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2015-03-29 13:57:24 +02:00
parent 2859d080de
commit ba28858f22
3 changed files with 617 additions and 606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.103 (2015/03/28)"
#define Log_PLATFORM_VERSION "SWAD 14.104 (2015/03/29)"
// 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.104: Mar 29, 2015 Changes in layout of record cards. (184021 lines)
Version 14.103: Mar 29, 2015 New table to ban users out of ranking. (184014 lines)
1 change necessary in database:
CREATE TABLE IF NOT EXISTS usr_banned (UsrCod INT NOT NULL,UNIQUE INDEX(UsrCod));

298
swad_record.c
View File

@ -2025,6 +2025,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
extern const char *Txt_Surname_1;
extern const char *Txt_Surname_2;
extern const char *Txt_First_name;
extern const char *Txt_Country;
extern const char *Txt_Another_country;
extern const char *Txt_Place_of_origin;
extern const char *Txt_Date_of_birth;
@ -2037,10 +2038,9 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
extern const char *Txt_Family_address;
extern const char *Txt_USER_comments;
unsigned RecordWidth;
unsigned C1Width;
unsigned C2Width;
unsigned C3Width;
unsigned C4Width;
unsigned TopC1Width;
unsigned TopC2Width;
unsigned TopC3Width;
char StrRecordWidth[10+1];
const char *ClassHead;
const char *ClassForm;
@ -2105,7 +2105,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
((TypeOfView == Rec_RECORD_LIST ||
TypeOfView == Rec_RECORD_PRINT) &&
UsrDat->RoleInCurrentCrsDB == Rol_ROLE_TEACHER)); // He/she is a teacher in the current course
unsigned CommandsRowspan;
Usr_Sex_t Sex;
Rol_Role_t Role;
Rol_Role_t DefaultRoleInCurrentCrs;
@ -2164,17 +2163,15 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
{
case Rec_RECORD_PUBLIC:
RecordWidth = Rec_RECORD_WIDTH_NARROW;
C1Width = Rec_C1_WIDTH_NARROW;
C2Width = Rec_C2_WIDTH_NARROW;
C3Width = Rec_C3_WIDTH_NARROW;
C4Width = Rec_C4_WIDTH_NARROW;
TopC1Width = Rec_C1_TOP_NARROW;
TopC2Width = Rec_C2_TOP_NARROW;
TopC3Width = Rec_C3_TOP_NARROW;
break;
default:
RecordWidth = Rec_RECORD_WIDTH_WIDE;
C1Width = Rec_C1_WIDTH_WIDE;
C2Width = Rec_C2_WIDTH_WIDE;
C3Width = Rec_C3_WIDTH_WIDE;
C4Width = Rec_C4_WIDTH_WIDE;
TopC1Width = Rec_C1_TOP_WIDE;
TopC2Width = Rec_C2_TOP_WIDE;
TopC3Width = Rec_C3_TOP_WIDE;
break;
}
@ -2189,7 +2186,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:%upx; height:%upx;"
" text-align:center; vertical-align:middle;\">",
C1Width,C1Width);
TopC1Width,TopC1Width);
if (UsrDat->InsCod > 0)
{
Ins.InsCod = UsrDat->InsCod;
@ -2211,10 +2208,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
}
}
fprintf (Gbl.F.Out,"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; height:%upx;"
" text-align:left; vertical-align:middle;\">",
ClassHead,C2Width + C3Width,C1Width);
ClassHead,TopC2Width,TopC1Width);
if (UsrDat->InsCod > 0)
{
/* Form to go to the institution */
@ -2237,7 +2234,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
fprintf (Gbl.F.Out,"<td rowspan=\"3\" style=\"width:%upx;"
" text-align:center; vertical-align:top;\">",
C4Width);
TopC3Width);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO150x200",Pho_NO_ZOOM);
@ -2245,17 +2242,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
"</tr>");
/***** Commands *****/
CommandsRowspan = 5; // Name + Nickname + Webs/social networks + Layout row + Country
if (ShowIDRows)
CommandsRowspan += 6; // Email, ID, Role, Surname1, Surname2, Firstname
if (ShowAddressRows)
CommandsRowspan += 7; // Origin place, Date of birth, Local address, Local phone
// Family address, Family phone, Common comments for all the courses
if (ShowTeacherRows)
CommandsRowspan += 5; // Institution, Centre, Department, Office, Phone
fprintf (Gbl.F.Out,"<tr>"
"<td rowspan=\"%u\" style=\"width:%upx; vertical-align:top;\">",
CommandsRowspan,C1Width);
"<td rowspan=\"3\""
" style=\"width:%upx; vertical-align:top;\">",
TopC1Width);
if (PutFormLinks && Gbl.Usrs.Me.Logged)
{
@ -2425,21 +2415,21 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,"</td>");
/***** Full name *****/
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"REC_NAME\" style=\"width:%upx;"
fprintf (Gbl.F.Out,"<td class=\"REC_NAME\" style=\"width:%upx;"
" text-align:left; vertical-align:top;\">"
"%s<br />%s<br />%s"
"</td>"
"</tr>",
C2Width + C3Width,
TopC2Width,
UsrDat->FirstName ,
UsrDat->Surname1,
UsrDat->Surname2);
/***** User's nickname *****/
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"REC_NAME\" style=\"width:%upx;"
fprintf (Gbl.F.Out,"<td class=\"REC_NAME\" style=\"width:%upx;"
" text-align:left; vertical-align:bottom;\">"
"<div class=\"REC_NICK\">",
C2Width + C3Width);
TopC2Width);
if (UsrDat->Nickname[0])
{
if (PutFormLinks)
@ -2464,68 +2454,35 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
"</td>"
"</tr>");
/***** Layout row *****/
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:%upx; height:0px;\"></td>"
"<td style=\"width:%upx; height:0px;\"></td>"
"<td style=\"width:%upx; height:0px;\"></td>"
"</tr>",
C2Width,C3Width,C4Width);
/***** Country *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"%s\" style=\"width:%upx;"
"<td class=\"%s\" style=\"width:%upx;"
" text-align:left; vertical-align:top;\">",
ClassData,C2Width + C3Width);
if (ShowData)
{
if (CountryForm)
{
/* If list of countries is empty, try to get it */
if (!Gbl.Ctys.Num)
{
Gbl.Ctys.SelectedOrderType = Cty_ORDER_BY_COUNTRY;
Cty_GetListCountries (Cty_GET_ONLY_COUNTRIES);
}
fprintf (Gbl.F.Out,"<select name=\"OthCtyCod\" style=\"width:%upx;\">"
"<option value=\"-1\">%s</option>"
"<option value=\"0\"",
C2Width + C3Width - 60,
Txt_Country);
if (UsrDat->CtyCod == 0)
fprintf (Gbl.F.Out," selected=\"selected\"");
fprintf (Gbl.F.Out,">%s</option>",Txt_Another_country);
for (NumCty = 0;
NumCty < Gbl.Ctys.Num;
NumCty++)
{
fprintf (Gbl.F.Out,"<option value=\"%ld\"",
Gbl.Ctys.Lst[NumCty].CtyCod);
if (Gbl.Ctys.Lst[NumCty].CtyCod == UsrDat->CtyCod)
fprintf (Gbl.F.Out," selected=\"selected\"");
fprintf (Gbl.F.Out,">%s</option>",
Gbl.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]);
}
fprintf (Gbl.F.Out,"</select>");
}
else if (UsrDat->CtyCod > 0)
ClassData,TopC2Width);
if (ShowData && UsrDat->CtyCod > 0)
{
Cty_GetCountryName (UsrDat->CtyCod,CtyName);
fprintf (Gbl.F.Out,"%s",CtyName);
}
}
fprintf (Gbl.F.Out,"</td>");
/***** User's web and social networks *****/
fprintf (Gbl.F.Out,"<td style=\"width:%upx;\">"
"<div style=\"vertical-align:top; margin:0 auto;\">",
C4Width);
TopC3Width);
Net_ShowWebsAndSocialNets (UsrDat);
fprintf (Gbl.F.Out,"</div>"
"</td>"
"</tr>");
if (ShowIDRows ||
ShowAddressRows ||
ShowTeacherRows)
{
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"3\">"
"<table style=\"width:100%%\">");
if (ShowIDRows)
{
/***** User's e-mail *****/
@ -2534,10 +2491,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_Email,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Email,
ClassData,Rec_C2_BOTTOM_WIDE);
if (UsrDat->Email[0])
{
if (ShowEmail)
@ -2560,10 +2517,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_ID,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_ID,
ClassData,Rec_C2_BOTTOM_WIDE);
ID_WriteUsrIDs (UsrDat,ShowID);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -2575,11 +2532,11 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"%s:</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,
ClassForm,Rec_C1_BOTTOM_WIDE,
Txt_Role,
ClassData,C3Width + C4Width);
ClassData,Rec_C2_BOTTOM_WIDE);
switch (TypeOfView)
{
case Rec_FORM_SIGN_UP: // I want to apply for enrollment
@ -2683,11 +2640,11 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"%s*:</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,
ClassForm,Rec_C1_BOTTOM_WIDE,
Txt_Sex,
ClassData,C3Width + C4Width);
ClassData,Rec_C2_BOTTOM_WIDE);
for (Sex = Usr_SEX_FEMALE;
Sex <= Usr_SEX_MALE;
Sex++)
@ -2712,15 +2669,15 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">"
"%s"
"</td>"
"</tr>",
ClassForm,C2Width,
ClassForm,Rec_C1_BOTTOM_WIDE,
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ? Txt_Sex :
Txt_Role,
ClassData,C3Width + C4Width,
ClassData,Rec_C2_BOTTOM_WIDE,
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ? Txt_SEX_SINGULAR_Abc[UsrDat->Sex] :
Txt_ROLES_SINGUL_Abc[UsrDat->RoleInCurrentCrsDB][UsrDat->Sex]);
@ -2730,17 +2687,17 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"%s",
ClassForm,C2Width,Txt_Surname_1);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Surname_1);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassData,C3Width + C4Width);
ClassData,Rec_C2_BOTTOM_WIDE);
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Surname1\""
" style=\"width:%upx;\" maxlength=\"%u\" value=\"%s\" />",
C3Width + C4Width - 60,
Rec_C2_BOTTOM_WIDE - 60,
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
UsrDat->Surname1);
else if (UsrDat->Surname1[0])
@ -2754,15 +2711,15 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,
ClassForm,Rec_C1_BOTTOM_WIDE,
Txt_Surname_2,
ClassData,C3Width + C4Width);
ClassData,Rec_C2_BOTTOM_WIDE);
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Surname2\""
" style=\"width:%upx;\" maxlength=\"%u\" value=\"%s\" />",
C3Width + C4Width - 60,
Rec_C2_BOTTOM_WIDE - 60,
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
UsrDat->Surname2);
else if (UsrDat->Surname2[0])
@ -2776,23 +2733,71 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"%s",
ClassForm,C2Width,Txt_First_name);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_First_name);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":</td>"
"<td class=\"%s\" colspan=\"2\""
" style=\"width:%upx; text-align:left;\">",
ClassData,C3Width + C4Width);
ClassData,Rec_C2_BOTTOM_WIDE);
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FirstName\""
" style=\"width:%upx;\" maxlength=\"%u\" value=\"%s\" />",
C3Width + C4Width - 60,
Rec_C2_BOTTOM_WIDE - 60,
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
UsrDat->FirstName);
else if (UsrDat->FirstName[0])
fprintf (Gbl.F.Out,"<strong>%s</strong>",UsrDat->FirstName);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/* Country */
if (CountryForm)
{
/* If list of countries is empty, try to get it */
if (!Gbl.Ctys.Num)
{
Gbl.Ctys.SelectedOrderType = Cty_ORDER_BY_COUNTRY;
Cty_GetListCountries (Cty_GET_ONLY_COUNTRIES);
}
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"%s",
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Country);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":</td>"
"<td class=\"%s\" colspan=\"2\""
" style=\"width:%upx; text-align:left;\">",
ClassData,Rec_C2_BOTTOM_WIDE);
/* Selector of country */
fprintf (Gbl.F.Out,"<select name=\"OthCtyCod\" style=\"width:%upx;\">"
"<option value=\"-1\">%s</option>"
"<option value=\"0\"",
Rec_C2_BOTTOM_WIDE - 60,
Txt_Country);
if (UsrDat->CtyCod == 0)
fprintf (Gbl.F.Out," selected=\"selected\"");
fprintf (Gbl.F.Out,">%s</option>",Txt_Another_country);
for (NumCty = 0;
NumCty < Gbl.Ctys.Num;
NumCty++)
{
fprintf (Gbl.F.Out,"<option value=\"%ld\"",
Gbl.Ctys.Lst[NumCty].CtyCod);
if (Gbl.Ctys.Lst[NumCty].CtyCod == UsrDat->CtyCod)
fprintf (Gbl.F.Out," selected=\"selected\"");
fprintf (Gbl.F.Out,">%s</option>",
Gbl.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]);
}
fprintf (Gbl.F.Out,"</select>");
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
}
if (ShowAddressRows)
@ -2803,16 +2808,16 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_Place_of_origin,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Place_of_origin,
ClassData,Rec_C2_BOTTOM_WIDE);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"OriginPlace\""
" style=\"width:%upx;\" maxlength=\"%u\" value=\"%s\" />",
C3Width + C4Width - 60,
Rec_C2_BOTTOM_WIDE - 60,
Cns_MAX_LENGTH_STRING,
UsrDat->OriginPlace);
else if (UsrDat->OriginPlace[0])
@ -2827,10 +2832,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_Date_of_birth,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Date_of_birth,
ClassData,Rec_C2_BOTTOM_WIDE);
if (ShowData)
{
if (DataForm)
@ -2851,16 +2856,16 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_Local_address,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Local_address,
ClassData,Rec_C2_BOTTOM_WIDE);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"LocalAddress\""
" style=\"width:%upx;\" maxlength=\"%u\" value=\"%s\" />",
C3Width + C4Width - 60,
Rec_C2_BOTTOM_WIDE - 60,
Cns_MAX_LENGTH_STRING,
UsrDat->LocalAddress);
else if (UsrDat->LocalAddress[0])
@ -2875,16 +2880,16 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_Phone,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Phone,
ClassData,Rec_C2_BOTTOM_WIDE);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"LocalPhone\""
" style=\"width:%upx;\" maxlength=\"%u\" value=\"%s\" />",
C3Width + C4Width - 60,
Rec_C2_BOTTOM_WIDE - 60,
Usr_MAX_LENGTH_PHONE,
UsrDat->LocalPhone);
else if (UsrDat->LocalPhone[0])
@ -2899,16 +2904,16 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_Family_address,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Family_address,
ClassData,Rec_C2_BOTTOM_WIDE);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FamilyAddress\""
" style=\"width:%upx;\" maxlength=\"%u\" value=\"%s\" />",
C3Width + C4Width - 60,
Rec_C2_BOTTOM_WIDE - 60,
Cns_MAX_LENGTH_STRING,
UsrDat->FamilyAddress);
else if (UsrDat->FamilyAddress[0])
@ -2923,16 +2928,16 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_Phone,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Phone,
ClassData,Rec_C2_BOTTOM_WIDE);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FamilyPhone\""
" style=\"width:%upx;\" maxlength=\"%u\" value=\"%s\" />",
C3Width + C4Width - 60,
Rec_C2_BOTTOM_WIDE - 60,
Usr_MAX_LENGTH_PHONE,
UsrDat->FamilyPhone);
else if (UsrDat->FamilyPhone[0])
@ -2947,16 +2952,16 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" text-align:right; vertical-align:top;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\" style=\"width:%upx;"
"<td class=\"%s\" style=\"width:%upx;"
" text-align:left; vertical-align:top;\">",
ClassForm,C2Width,Txt_USER_comments,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_USER_comments,
ClassData,Rec_C2_BOTTOM_WIDE);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out,"<textarea name=\"Comments\" rows=\"3\""
" style=\"width:%upx;\">%s</textarea>",
C3Width + C4Width - 60,
Rec_C2_BOTTOM_WIDE - 60,
UsrDat->Comments);
else if (UsrDat->Comments[0])
{
@ -2978,10 +2983,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_Institution,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Institution,
ClassData,Rec_C2_BOTTOM_WIDE);
if (ShowData)
{
if (UsrDat->InsCod > 0)
@ -3003,10 +3008,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_Centre,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Centre,
ClassData,Rec_C2_BOTTOM_WIDE);
if (ShowData)
{
if (UsrDat->Tch.CtrCod > 0)
@ -3030,10 +3035,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_Department,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Department,
ClassData,Rec_C2_BOTTOM_WIDE);
if (ShowData)
{
if (UsrDat->Tch.DptCod > 0)
@ -3057,10 +3062,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_Office,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Office,
ClassData,Rec_C2_BOTTOM_WIDE);
if (ShowData)
fprintf (Gbl.F.Out,"%s",UsrDat->Tch.Office);
fprintf (Gbl.F.Out,"</td>"
@ -3072,16 +3077,21 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:right;\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s\""
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
ClassForm,C2Width,Txt_Phone,
ClassData,C3Width + C4Width);
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Phone,
ClassData,Rec_C2_BOTTOM_WIDE);
if (ShowData)
fprintf (Gbl.F.Out,"%s",UsrDat->Tch.OfficePhone);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
fprintf (Gbl.F.Out,"</table>"
"</td>"
"</tr>");
}
/***** End frame *****/
Lay_EndRoundFrameTable10 ();
}

16
swad_record.h
View File

@ -36,16 +36,16 @@
/*****************************************************************************/
#define Rec_RECORD_WIDTH_WIDE 560
#define Rec_C1_WIDTH_WIDE 52
#define Rec_C2_WIDTH_WIDE 144
#define Rec_C3_WIDTH_WIDE 210
#define Rec_C4_WIDTH_WIDE 154
#define Rec_C1_TOP_WIDE 52
#define Rec_C2_TOP_WIDE 354
#define Rec_C3_TOP_WIDE 154
#define Rec_C1_BOTTOM_WIDE (160-2)
#define Rec_C2_BOTTOM_WIDE (400-2)
#define Rec_RECORD_WIDTH_NARROW 460
#define Rec_C1_WIDTH_NARROW 52
#define Rec_C2_WIDTH_NARROW 94
#define Rec_C3_WIDTH_NARROW 160
#define Rec_C4_WIDTH_NARROW 154
#define Rec_C1_TOP_NARROW 52
#define Rec_C2_TOP_NARROW 254
#define Rec_C3_TOP_NARROW 154
#define Rec_MAX_LENGTH_NAME_FIELD 255
#define Rec_MIN_LINES_IN_EDITION_FIELD 1