mirror of https://github.com/acanas/swad-core.git
Version19.206
This commit is contained in:
parent
a218ab0b47
commit
70f9bd4ed5
|
@ -759,8 +759,7 @@ void Acc_CreateNewUsr (struct UsrData *UsrDat,bool CreatingMyOwnAccount)
|
|||
"Theme,IconSet,Language,FirstDayOfWeek,DateFormat,"
|
||||
"PhotoVisibility,BaPrfVisibility,ExPrfVisibility,"
|
||||
"CtyCod,"
|
||||
"LocalAddress,LocalPhone,"
|
||||
"FamilyAddress,FamilyPhone,"
|
||||
"LocalPhone,FamilyPhone,"
|
||||
"Birthday,Comments,"
|
||||
"Menu,SideCols,NotifNtfEvents,EmailNtfEvents)"
|
||||
" VALUES"
|
||||
|
@ -786,8 +785,8 @@ void Acc_CreateNewUsr (struct UsrData *UsrDat,bool CreatingMyOwnAccount)
|
|||
Pri_VisibilityDB[UsrDat->BaPrfVisibility],
|
||||
Pri_VisibilityDB[UsrDat->ExPrfVisibility],
|
||||
UsrDat->CtyCod,
|
||||
UsrDat->LocalAddress ,UsrDat->LocalPhone,
|
||||
UsrDat->FamilyAddress,UsrDat->FamilyPhone,
|
||||
UsrDat->Phone1,
|
||||
UsrDat->Phone2,
|
||||
BirthdayStrDB,
|
||||
CommentsLength ? UsrDat->Comments :
|
||||
"",
|
||||
|
|
|
@ -544,10 +544,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
|||
En OpenSWAD:
|
||||
ps2pdf source.ps destination.pdf
|
||||
*/
|
||||
#define Log_PLATFORM_VERSION "SWAD 19.205 (2020-04-29)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 19.206 (2020-04-29)"
|
||||
#define CSS_FILE "swad19.193.1.css"
|
||||
#define JS_FILE "swad19.193.1.js"
|
||||
/*
|
||||
Version 19.206: Apr 29, 2020 Removed addresses in user's data. (300259 lines)
|
||||
Version 19.205: Apr 29, 2020 Removed origin place in user's data. (300399 lines)
|
||||
Version 19.204.5: Apr 28, 2020 Save start and end dates on creation of exam event. (300471 lines)
|
||||
Version 19.204.4: Apr 28, 2020 Fixed bug in creation of new exam. (300470 lines)
|
||||
|
|
|
@ -3324,9 +3324,9 @@ mysql> DESCRIBE usr_data;
|
|||
"CtrCod INT NOT NULL DEFAULT -1,"
|
||||
"Office VARCHAR(2047) NOT NULL DEFAULT ''," // Usr_MAX_BYTES_ADDRESS
|
||||
"OfficePhone CHAR(16) NOT NULL DEFAULT ''," // Usr_MAX_BYTES_PHONE
|
||||
"LocalAddress VARCHAR(2047) NOT NULL DEFAULT ''," // Usr_MAX_BYTES_ADDRESS
|
||||
"LocalAddress VARCHAR(2047) NOT NULL DEFAULT ''," // Usr_MAX_BYTES_ADDRESS // TODO: Remove, not yet used
|
||||
"LocalPhone CHAR(16) NOT NULL DEFAULT ''," // Usr_MAX_BYTES_PHONE
|
||||
"FamilyAddress VARCHAR(2047) NOT NULL DEFAULT ''," // Usr_MAX_BYTES_ADDRESS
|
||||
"FamilyAddress VARCHAR(2047) NOT NULL DEFAULT ''," // Usr_MAX_BYTES_ADDRESS // TODO: Remove, not yet used
|
||||
"FamilyPhone CHAR(16) NOT NULL DEFAULT ''," // Usr_MAX_BYTES_PHONE
|
||||
"OriginPlace VARCHAR(2047) NOT NULL DEFAULT ''," // Usr_MAX_BYTES_ADDRESS // TODO: Remove, not yet used
|
||||
"Birthday DATE,"
|
||||
|
|
|
@ -555,8 +555,8 @@ void Enr_UpdateUsrData (struct UsrData *UsrDat)
|
|||
" SET Password='%s',"
|
||||
"Surname1='%s',Surname2='%s',FirstName='%s',Sex='%s',"
|
||||
"CtyCod=%ld,"
|
||||
"LocalAddress='%s',LocalPhone='%s',"
|
||||
"FamilyAddress='%s',FamilyPhone='%s',"
|
||||
"LocalPhone='%s',"
|
||||
"FamilyPhone='%s',"
|
||||
"Birthday=%s,"
|
||||
"Comments='%s'"
|
||||
" WHERE UsrCod=%ld",
|
||||
|
@ -564,8 +564,8 @@ void Enr_UpdateUsrData (struct UsrData *UsrDat)
|
|||
UsrDat->Surname1,UsrDat->Surname2,UsrDat->FirstName,
|
||||
Usr_StringsSexDB[UsrDat->Sex],
|
||||
UsrDat->CtyCod,
|
||||
UsrDat->LocalAddress,UsrDat->LocalPhone,
|
||||
UsrDat->FamilyAddress,UsrDat->FamilyPhone,
|
||||
UsrDat->Phone1,
|
||||
UsrDat->Phone2,
|
||||
BirthdayStrDB,
|
||||
UsrDat->Comments ? UsrDat->Comments :
|
||||
"",
|
||||
|
|
122
swad_record.c
122
swad_record.c
|
@ -128,10 +128,8 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat,bool PutForm);
|
|||
static void Rec_ShowFirstName (struct UsrData *UsrDat,bool PutForm);
|
||||
static void Rec_ShowCountry (struct UsrData *UsrDat,bool PutForm);
|
||||
static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,bool ShowData,bool PutForm);
|
||||
static void Rec_ShowLocalAddress (struct UsrData *UsrDat,bool ShowData,bool PutForm);
|
||||
static void Rec_ShowLocalPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm);
|
||||
static void Rec_ShowFamilyAddress (struct UsrData *UsrDat,bool ShowData,bool PutForm);
|
||||
static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm);
|
||||
static void Rec_ShowPhone1 (struct UsrData *UsrDat,bool ShowData,bool PutForm);
|
||||
static void Rec_ShowPhone2 (struct UsrData *UsrDat,bool ShowData,bool PutForm);
|
||||
static void Rec_ShowComments (struct UsrData *UsrDat,bool ShowData,bool PutForm);
|
||||
static void Rec_ShowTeacherRows (struct UsrData *UsrDat,struct Instit *Ins,
|
||||
bool ShowData);
|
||||
|
@ -2350,17 +2348,11 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
|
|||
/***** Date of birth *****/
|
||||
Rec_ShowDateOfBirth (UsrDat,ShowData,ICanEdit);
|
||||
|
||||
/***** Local address *****/
|
||||
Rec_ShowLocalAddress (UsrDat,ShowData,ICanEdit);
|
||||
/***** Phone 1 *****/
|
||||
Rec_ShowPhone1 (UsrDat,ShowData,ICanEdit);
|
||||
|
||||
/***** Local phone *****/
|
||||
Rec_ShowLocalPhone (UsrDat,ShowData,ICanEdit);
|
||||
|
||||
/***** Family address *****/
|
||||
Rec_ShowFamilyAddress (UsrDat,ShowData,ICanEdit);
|
||||
|
||||
/***** Family phone *****/
|
||||
Rec_ShowFamilyPhone (UsrDat,ShowData,ICanEdit);
|
||||
/***** Phone 2 *****/
|
||||
Rec_ShowPhone2 (UsrDat,ShowData,ICanEdit);
|
||||
|
||||
/***** User's comments *****/
|
||||
Rec_ShowComments (UsrDat,ShowData,ICanEdit);
|
||||
|
@ -3315,44 +3307,11 @@ static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,bool ShowData,bool PutFo
|
|||
HTM_TR_End ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/************************ Show user's local address **************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void Rec_ShowLocalAddress (struct UsrData *UsrDat,bool ShowData,bool PutForm)
|
||||
{
|
||||
extern const char *Txt_Local_address;
|
||||
|
||||
/***** Local address *****/
|
||||
HTM_TR_Begin (NULL);
|
||||
|
||||
/* Label */
|
||||
Frm_LabelColumn ("REC_C1_BOT RM",PutForm ? "LocalAddress" :
|
||||
NULL,
|
||||
Txt_Local_address);
|
||||
|
||||
/* Data */
|
||||
HTM_TD_Begin ("class=\"REC_C2_BOT DAT_N LM\"");
|
||||
if (ShowData)
|
||||
{
|
||||
if (PutForm)
|
||||
HTM_INPUT_TEXT ("LocalAddress",Usr_MAX_CHARS_ADDRESS,
|
||||
UsrDat->LocalAddress,
|
||||
HTM_DONT_SUBMIT_ON_CHANGE,
|
||||
"id=\"LocalAddress\" class=\"REC_C2_BOT_INPUT\"");
|
||||
else if (UsrDat->LocalAddress[0])
|
||||
HTM_Txt (UsrDat->LocalAddress);
|
||||
}
|
||||
HTM_TD_End ();
|
||||
|
||||
HTM_TR_End ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/************************* Show user's local phone ***************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void Rec_ShowLocalPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm)
|
||||
static void Rec_ShowPhone1 (struct UsrData *UsrDat,bool ShowData,bool PutForm)
|
||||
{
|
||||
extern const char *Txt_Phone;
|
||||
|
||||
|
@ -3360,7 +3319,7 @@ static void Rec_ShowLocalPhone (struct UsrData *UsrDat,bool ShowData,bool PutFor
|
|||
HTM_TR_Begin (NULL);
|
||||
|
||||
/* Label */
|
||||
Frm_LabelColumn ("REC_C1_BOT RM",PutForm ? "LocalPhone" :
|
||||
Frm_LabelColumn ("REC_C1_BOT RM",PutForm ? "Phone1" :
|
||||
NULL,
|
||||
Txt_Phone);
|
||||
|
||||
|
@ -3369,13 +3328,13 @@ static void Rec_ShowLocalPhone (struct UsrData *UsrDat,bool ShowData,bool PutFor
|
|||
if (ShowData)
|
||||
{
|
||||
if (PutForm)
|
||||
HTM_INPUT_TEL ("LocalPhone",UsrDat->LocalPhone,
|
||||
HTM_INPUT_TEL ("Phone1",UsrDat->Phone1,
|
||||
HTM_DONT_SUBMIT_ON_CHANGE,
|
||||
"id=\"LocalPhone\" class=\"REC_C2_BOT_INPUT\"");
|
||||
else if (UsrDat->LocalPhone[0])
|
||||
"id=\"Phone1\" class=\"REC_C2_BOT_INPUT\"");
|
||||
else if (UsrDat->Phone1[0])
|
||||
{
|
||||
HTM_A_Begin ("href=\"tel:%s\" class=\"DAT_N\"",UsrDat->LocalPhone);
|
||||
HTM_Txt (UsrDat->LocalPhone);
|
||||
HTM_A_Begin ("href=\"tel:%s\" class=\"DAT_N\"",UsrDat->Phone1);
|
||||
HTM_Txt (UsrDat->Phone1);
|
||||
HTM_A_End ();
|
||||
}
|
||||
}
|
||||
|
@ -3384,44 +3343,11 @@ static void Rec_ShowLocalPhone (struct UsrData *UsrDat,bool ShowData,bool PutFor
|
|||
HTM_TR_End ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*********************** Show user's family address **************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void Rec_ShowFamilyAddress (struct UsrData *UsrDat,bool ShowData,bool PutForm)
|
||||
{
|
||||
extern const char *Txt_Family_address;
|
||||
|
||||
/***** Family address *****/
|
||||
HTM_TR_Begin (NULL);
|
||||
|
||||
/* Label */
|
||||
Frm_LabelColumn ("REC_C1_BOT RM",PutForm ? "FamilyAddress" :
|
||||
NULL,
|
||||
Txt_Family_address);
|
||||
|
||||
/* Data */
|
||||
HTM_TD_Begin ("class=\"REC_C2_BOT DAT_N LM\"");
|
||||
if (ShowData)
|
||||
{
|
||||
if (PutForm)
|
||||
HTM_INPUT_TEXT ("FamilyAddress",Usr_MAX_CHARS_ADDRESS,
|
||||
UsrDat->FamilyAddress,
|
||||
HTM_DONT_SUBMIT_ON_CHANGE,
|
||||
"id=\"FamilyAddress\" class=\"REC_C2_BOT_INPUT\"");
|
||||
else if (UsrDat->FamilyAddress[0])
|
||||
HTM_Txt (UsrDat->FamilyAddress);
|
||||
}
|
||||
HTM_TD_End ();
|
||||
|
||||
HTM_TR_End ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/************************ Show user's family phone ***************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm)
|
||||
static void Rec_ShowPhone2 (struct UsrData *UsrDat,bool ShowData,bool PutForm)
|
||||
{
|
||||
extern const char *Txt_Phone;
|
||||
|
||||
|
@ -3429,7 +3355,7 @@ static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,bool ShowData,bool PutFo
|
|||
HTM_TR_Begin (NULL);
|
||||
|
||||
/* Label */
|
||||
Frm_LabelColumn ("REC_C1_BOT RM",PutForm ? "FamilyPhone" :
|
||||
Frm_LabelColumn ("REC_C1_BOT RM",PutForm ? "Phone2" :
|
||||
NULL,
|
||||
Txt_Phone);
|
||||
|
||||
|
@ -3438,13 +3364,13 @@ static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,bool ShowData,bool PutFo
|
|||
if (ShowData)
|
||||
{
|
||||
if (PutForm)
|
||||
HTM_INPUT_TEL ("FamilyPhone",UsrDat->FamilyPhone,
|
||||
HTM_INPUT_TEL ("Phone2",UsrDat->Phone2,
|
||||
HTM_DONT_SUBMIT_ON_CHANGE,
|
||||
"id=\"FamilyPhone\" class=\"REC_C2_BOT_INPUT\"");
|
||||
else if (UsrDat->FamilyPhone[0])
|
||||
"id=\"Phone2\" class=\"REC_C2_BOT_INPUT\"");
|
||||
else if (UsrDat->Phone2[0])
|
||||
{
|
||||
HTM_A_Begin ("href=\"tel:%s\" class=\"DAT_N\"",UsrDat->FamilyPhone);
|
||||
HTM_Txt (UsrDat->FamilyPhone);
|
||||
HTM_A_Begin ("href=\"tel:%s\" class=\"DAT_N\"",UsrDat->Phone2);
|
||||
HTM_Txt (UsrDat->Phone2);
|
||||
HTM_A_End ();
|
||||
}
|
||||
}
|
||||
|
@ -3805,13 +3731,9 @@ static void Rec_GetUsrExtraDataFromRecordForm (struct UsrData *UsrDat)
|
|||
&(UsrDat->Birthday.Year ));
|
||||
Dat_ConvDateToDateStr (&(UsrDat->Birthday),UsrDat->StrBirthday);
|
||||
|
||||
Par_GetParToText ("LocalAddress",UsrDat->LocalAddress,Usr_MAX_BYTES_ADDRESS);
|
||||
Par_GetParToText ("Phone1",UsrDat->Phone1,Usr_MAX_BYTES_PHONE);
|
||||
|
||||
Par_GetParToText ("LocalPhone",UsrDat->LocalPhone,Usr_MAX_BYTES_PHONE);
|
||||
|
||||
Par_GetParToText ("FamilyAddress",UsrDat->FamilyAddress,Usr_MAX_BYTES_ADDRESS);
|
||||
|
||||
Par_GetParToText ("FamilyPhone",UsrDat->FamilyPhone,Usr_MAX_BYTES_PHONE);
|
||||
Par_GetParToText ("Phone2",UsrDat->Phone2,Usr_MAX_BYTES_PHONE);
|
||||
|
||||
Rec_GetUsrCommentsFromForm (UsrDat);
|
||||
}
|
||||
|
|
42
swad_text.c
42
swad_text.c
|
@ -12299,27 +12299,6 @@ const char *Txt_Failed_email_confirmation_key =
|
|||
"Erro na chave de confirmação de email.";
|
||||
#endif
|
||||
|
||||
const char *Txt_Family_address =
|
||||
#if L==1 // ca
|
||||
"Domicilio familiar"; // Necessita traduccio
|
||||
#elif L==2 // de
|
||||
"Heimatadresse";
|
||||
#elif L==3 // en
|
||||
"Family address";
|
||||
#elif L==4 // es
|
||||
"Domicilio familiar";
|
||||
#elif L==5 // fr
|
||||
"Adresse famille";
|
||||
#elif L==6 // gn
|
||||
"Domicilio familiar"; // Okoteve traducción
|
||||
#elif L==7 // it
|
||||
"Domicilio familiare";
|
||||
#elif L==8 // pl
|
||||
"Adres rodziny";
|
||||
#elif L==9 // pt
|
||||
"Endereço Família";
|
||||
#endif
|
||||
|
||||
const char *Txt_Feedback =
|
||||
#if L==1 // ca
|
||||
"Realimentación"; // Necessita traduccio
|
||||
|
@ -18352,27 +18331,6 @@ const char *Txt_Links_removed =
|
|||
"Ligações removidas";
|
||||
#endif
|
||||
|
||||
const char *Txt_Local_address =
|
||||
#if L==1 // ca
|
||||
"Domicilio local"; // Necessita traduccio
|
||||
#elif L==2 // de
|
||||
"Lokale Adresse";
|
||||
#elif L==3 // en
|
||||
"Local address";
|
||||
#elif L==4 // es
|
||||
"Domicilio local";
|
||||
#elif L==5 // fr
|
||||
"Adresse locale";
|
||||
#elif L==6 // gn
|
||||
"Domicilio local"; // Okoteve traducción
|
||||
#elif L==7 // it
|
||||
"Indirizzo locale";
|
||||
#elif L==8 // pl
|
||||
"Adres lokalny";
|
||||
#elif L==9 // pt
|
||||
"Local Address";
|
||||
#endif
|
||||
|
||||
const char *Txt_Location =
|
||||
#if L==1 // ca
|
||||
"Ubicació";
|
||||
|
|
184
swad_user.c
184
swad_user.c
|
@ -138,8 +138,8 @@ static const char *Usr_ParamUsrCod[Rol_NUM_ROLES] =
|
|||
};
|
||||
|
||||
#define Usr_NUM_MAIN_FIELDS_DATA_ADM 7
|
||||
#define Usr_NUM_ALL_FIELDS_DATA_GST 16
|
||||
#define Usr_NUM_ALL_FIELDS_DATA_STD 12
|
||||
#define Usr_NUM_ALL_FIELDS_DATA_GST 14
|
||||
#define Usr_NUM_ALL_FIELDS_DATA_STD 10
|
||||
#define Usr_NUM_ALL_FIELDS_DATA_TCH 11
|
||||
const char *Usr_UsrDatMainFieldNames[Usr_NUM_MAIN_FIELDS_DATA_USR];
|
||||
|
||||
|
@ -353,10 +353,8 @@ void Usr_ResetUsrDataExceptUsrCodAndIDs (struct UsrData *UsrDat)
|
|||
UsrDat->Birthday.Day = 0;
|
||||
UsrDat->Birthday.Month = 0;
|
||||
UsrDat->Birthday.Year = 0;
|
||||
UsrDat->LocalAddress[0] = '\0';
|
||||
UsrDat->LocalPhone[0] = '\0';
|
||||
UsrDat->FamilyAddress[0] = '\0';
|
||||
UsrDat->FamilyPhone[0] = '\0';
|
||||
UsrDat->Phone1[0] = '\0';
|
||||
UsrDat->Phone2[0] = '\0';
|
||||
if (UsrDat->Comments)
|
||||
UsrDat->Comments[0] = '\0';
|
||||
|
||||
|
@ -527,15 +525,13 @@ void Usr_GetUsrDataFromUsrCod (struct UsrData *UsrDat,Usr_GetPrefs_t GetPrefs)
|
|||
"CtrCod," // row[14]
|
||||
"Office," // row[15]
|
||||
"OfficePhone," // row[16]
|
||||
"LocalAddress," // row[17]
|
||||
"LocalPhone," // row[18]
|
||||
"FamilyAddress," // row[19]
|
||||
"FamilyPhone," // row[20]
|
||||
"LocalPhone," // row[17]
|
||||
"FamilyPhone," // row[18]
|
||||
"DATE_FORMAT(Birthday,"
|
||||
"'%%Y%%m%%d')," // row[21]
|
||||
"Comments," // row[22]
|
||||
"NotifNtfEvents," // row[23]
|
||||
"EmailNtfEvents" // row[24]
|
||||
"'%%Y%%m%%d')," // row[19]
|
||||
"Comments," // row[20]
|
||||
"NotifNtfEvents," // row[21]
|
||||
"EmailNtfEvents" // row[22]
|
||||
" FROM usr_data"
|
||||
" WHERE UsrCod=%ld",
|
||||
UsrDat->UsrCod);
|
||||
|
@ -560,26 +556,24 @@ void Usr_GetUsrDataFromUsrCod (struct UsrData *UsrDat,Usr_GetPrefs_t GetPrefs)
|
|||
"CtrCod," // row[14]
|
||||
"Office," // row[15]
|
||||
"OfficePhone," // row[16]
|
||||
"LocalAddress," // row[17]
|
||||
"LocalPhone," // row[18]
|
||||
"FamilyAddress," // row[19]
|
||||
"FamilyPhone," // row[20]
|
||||
"LocalPhone," // row[17]
|
||||
"FamilyPhone," // row[18]
|
||||
"DATE_FORMAT(Birthday,"
|
||||
"'%%Y%%m%%d')," // row[21]
|
||||
"Comments," // row[22]
|
||||
"NotifNtfEvents," // row[23]
|
||||
"EmailNtfEvents," // row[24]
|
||||
"'%%Y%%m%%d')," // row[19]
|
||||
"Comments," // row[20]
|
||||
"NotifNtfEvents," // row[21]
|
||||
"EmailNtfEvents," // row[22]
|
||||
|
||||
// Settings (usually not necessary
|
||||
// when getting another user's data)
|
||||
"Language," // row[25]
|
||||
"FirstDayOfWeek," // row[26]
|
||||
"DateFormat," // row[27]
|
||||
"Theme," // row[28]
|
||||
"IconSet," // row[29]
|
||||
"Menu," // row[30]
|
||||
"SideCols," // row[31]
|
||||
"ThirdPartyCookies" // row[32]
|
||||
"Language," // row[23]
|
||||
"FirstDayOfWeek," // row[24]
|
||||
"DateFormat," // row[25]
|
||||
"Theme," // row[26]
|
||||
"IconSet," // row[27]
|
||||
"Menu," // row[28]
|
||||
"SideCols," // row[29]
|
||||
"ThirdPartyCookies" // row[30]
|
||||
" FROM usr_data"
|
||||
" WHERE UsrCod=%ld",
|
||||
UsrDat->UsrCod);
|
||||
|
@ -652,33 +646,29 @@ void Usr_GetUsrDataFromUsrCod (struct UsrData *UsrDat,Usr_GetPrefs_t GetPrefs)
|
|||
Str_Copy (UsrDat->Tch.OfficePhone,row[16],
|
||||
Usr_MAX_BYTES_PHONE);
|
||||
|
||||
/* Get local address (row[17]) and local phone (row[18]) */
|
||||
Str_Copy (UsrDat->LocalAddress,row[17],
|
||||
Usr_MAX_BYTES_ADDRESS);
|
||||
Str_Copy (UsrDat->LocalPhone,row[18],
|
||||
/* Get phone 1 (row[17]) */
|
||||
Str_Copy (UsrDat->Phone1,row[17],
|
||||
Usr_MAX_BYTES_PHONE);
|
||||
|
||||
/* Get local address (row[19]) and local phone (row[20]) */
|
||||
Str_Copy (UsrDat->FamilyAddress,row[19],
|
||||
Usr_MAX_BYTES_ADDRESS);
|
||||
Str_Copy (UsrDat->FamilyPhone,row[20],
|
||||
/* Get phone 2 (row[18]) */
|
||||
Str_Copy (UsrDat->Phone2,row[18],
|
||||
Usr_MAX_BYTES_PHONE);
|
||||
|
||||
/* Get birthday (row[21]) */
|
||||
Dat_GetDateFromYYYYMMDD (&(UsrDat->Birthday),row[21]);
|
||||
/* Get birthday (row[19]) */
|
||||
Dat_GetDateFromYYYYMMDD (&(UsrDat->Birthday),row[19]);
|
||||
Dat_ConvDateToDateStr (&(UsrDat->Birthday),UsrDat->StrBirthday);
|
||||
|
||||
/* Get comments (row[22]) */
|
||||
Usr_GetUsrCommentsFromString (row[23] ? row[22] :
|
||||
/* Get comments (row[20]) */
|
||||
Usr_GetUsrCommentsFromString (row[20] ? row[20] :
|
||||
"",
|
||||
UsrDat);
|
||||
|
||||
/* Get on which events the user wants to be notified inside the platform (row[23]) */
|
||||
if (sscanf (row[23],"%u",&UsrDat->NtfEvents.CreateNotif) != 1)
|
||||
/* Get on which events the user wants to be notified inside the platform (row[21]) */
|
||||
if (sscanf (row[21],"%u",&UsrDat->NtfEvents.CreateNotif) != 1)
|
||||
UsrDat->NtfEvents.CreateNotif = (unsigned) -1; // 0xFF..FF
|
||||
|
||||
/* Get on which events the user wants to be notified by email (row[24]) */
|
||||
if (sscanf (row[24],"%u",&UsrDat->NtfEvents.SendEmail) != 1)
|
||||
/* Get on which events the user wants to be notified by email (row[22]) */
|
||||
if (sscanf (row[22],"%u",&UsrDat->NtfEvents.SendEmail) != 1)
|
||||
UsrDat->NtfEvents.SendEmail = 0;
|
||||
if (UsrDat->NtfEvents.SendEmail >= (1 << Ntf_NUM_NOTIFY_EVENTS)) // Maximum binary value for NotifyEvents is 000...0011...11
|
||||
UsrDat->NtfEvents.SendEmail = 0;
|
||||
|
@ -686,50 +676,50 @@ void Usr_GetUsrDataFromUsrCod (struct UsrData *UsrDat,Usr_GetPrefs_t GetPrefs)
|
|||
/***** Get user's settings *****/
|
||||
if (GetPrefs == Usr_GET_PREFS)
|
||||
{
|
||||
/* Get language (row[25]) */
|
||||
/* Get language (row[23]) */
|
||||
UsrDat->Prefs.Language = Lan_LANGUAGE_UNKNOWN; // Language unknown
|
||||
for (Lan = (Lan_Language_t) 1;
|
||||
Lan <= (Lan_Language_t) Lan_NUM_LANGUAGES;
|
||||
Lan++)
|
||||
if (!strcasecmp (row[25],Lan_STR_LANG_ID[Lan]))
|
||||
if (!strcasecmp (row[23],Lan_STR_LANG_ID[Lan]))
|
||||
{
|
||||
UsrDat->Prefs.Language = Lan;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Get first day of week (row[26]) */
|
||||
UsrDat->Prefs.FirstDayOfWeek = Cal_GetFirstDayOfWeekFromStr (row[26]);
|
||||
/* Get first day of week (row[24]) */
|
||||
UsrDat->Prefs.FirstDayOfWeek = Cal_GetFirstDayOfWeekFromStr (row[24]);
|
||||
|
||||
/* Get date format (row[27]) */
|
||||
UsrDat->Prefs.DateFormat = Dat_GetDateFormatFromStr (row[27]);
|
||||
/* Get date format (row[25]) */
|
||||
UsrDat->Prefs.DateFormat = Dat_GetDateFormatFromStr (row[25]);
|
||||
|
||||
/* Get theme (row[28]) */
|
||||
/* Get theme (row[26]) */
|
||||
UsrDat->Prefs.Theme = The_THEME_DEFAULT;
|
||||
for (Theme = (The_Theme_t) 0;
|
||||
Theme <= (The_Theme_t) (The_NUM_THEMES - 1);
|
||||
Theme++)
|
||||
if (!strcasecmp (row[28],The_ThemeId[Theme]))
|
||||
if (!strcasecmp (row[26],The_ThemeId[Theme]))
|
||||
{
|
||||
UsrDat->Prefs.Theme = Theme;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Get icon set (row[29]) */
|
||||
/* Get icon set (row[27]) */
|
||||
UsrDat->Prefs.IconSet = Ico_ICON_SET_DEFAULT;
|
||||
for (IconSet = (Ico_IconSet_t) 0;
|
||||
IconSet <= (Ico_IconSet_t) (Ico_NUM_ICON_SETS - 1);
|
||||
IconSet++)
|
||||
if (!strcasecmp (row[29],Ico_IconSetId[IconSet]))
|
||||
if (!strcasecmp (row[27],Ico_IconSetId[IconSet]))
|
||||
{
|
||||
UsrDat->Prefs.IconSet = IconSet;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Get menu (row[30]) */
|
||||
UsrDat->Prefs.Menu = Mnu_GetMenuFromStr (row[30]);
|
||||
/* Get menu (row[28]) */
|
||||
UsrDat->Prefs.Menu = Mnu_GetMenuFromStr (row[28]);
|
||||
|
||||
/* Get if user wants to show side columns (row[31]) */
|
||||
if (sscanf (row[31],"%u",&UsrDat->Prefs.SideCols) == 1)
|
||||
/* Get if user wants to show side columns (row[29]) */
|
||||
if (sscanf (row[29],"%u",&UsrDat->Prefs.SideCols) == 1)
|
||||
{
|
||||
if (UsrDat->Prefs.SideCols > Lay_SHOW_BOTH_COLUMNS)
|
||||
UsrDat->Prefs.SideCols = Cfg_DEFAULT_COLUMNS;
|
||||
|
@ -737,8 +727,8 @@ void Usr_GetUsrDataFromUsrCod (struct UsrData *UsrDat,Usr_GetPrefs_t GetPrefs)
|
|||
else
|
||||
UsrDat->Prefs.SideCols = Cfg_DEFAULT_COLUMNS;
|
||||
|
||||
/* Get if user accepts third party cookies (row[32]) */
|
||||
UsrDat->Prefs.AcceptThirdPartyCookies = (row[32][0] == 'Y');
|
||||
/* Get if user accepts third party cookies (row[30]) */
|
||||
UsrDat->Prefs.AcceptThirdPartyCookies = (row[30][0] == 'Y');
|
||||
}
|
||||
|
||||
/***** Free structure that stores the query result *****/
|
||||
|
@ -3752,20 +3742,12 @@ static void Usr_WriteRowGstAllData (struct UsrData *UsrDat)
|
|||
" ",
|
||||
NULL,true,false);
|
||||
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
|
||||
UsrDat->LocalAddress[0] ? UsrDat->LocalAddress :
|
||||
" ",
|
||||
UsrDat->Phone1[0] ? UsrDat->Phone1 :
|
||||
" ",
|
||||
NULL,true,false);
|
||||
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
|
||||
UsrDat->LocalPhone[0] ? UsrDat->LocalPhone :
|
||||
" ",
|
||||
NULL,true,false);
|
||||
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
|
||||
UsrDat->FamilyAddress[0] ? UsrDat->FamilyAddress :
|
||||
" ",
|
||||
NULL,true,false);
|
||||
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
|
||||
UsrDat->FamilyPhone[0] ? UsrDat->FamilyPhone :
|
||||
" ",
|
||||
UsrDat->Phone2[0] ? UsrDat->Phone2 :
|
||||
" ",
|
||||
NULL,true,false);
|
||||
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
|
||||
UsrDat->StrBirthday[0] ? UsrDat->StrBirthday :
|
||||
|
@ -3826,24 +3808,14 @@ static void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames)
|
|||
|
||||
/***** Write the rest of the data of the student *****/
|
||||
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
|
||||
UsrDat->LocalAddress[0] ? (ShowData ? UsrDat->LocalAddress :
|
||||
"********") :
|
||||
" ",
|
||||
UsrDat->Phone1[0] ? (ShowData ? UsrDat->Phone1 :
|
||||
"********") :
|
||||
" ",
|
||||
NULL,true,UsrDat->Accepted);
|
||||
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
|
||||
UsrDat->LocalPhone[0] ? (ShowData ? UsrDat->LocalPhone :
|
||||
"********") :
|
||||
" ",
|
||||
NULL,true,UsrDat->Accepted);
|
||||
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
|
||||
UsrDat->FamilyAddress[0] ? (ShowData ? UsrDat->FamilyAddress :
|
||||
"********") :
|
||||
" ",
|
||||
NULL,true,UsrDat->Accepted);
|
||||
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
|
||||
UsrDat->FamilyPhone[0] ? (ShowData ? UsrDat->FamilyPhone :
|
||||
"********") :
|
||||
" ",
|
||||
UsrDat->Phone2[0] ? (ShowData ? UsrDat->Phone2 :
|
||||
"********") :
|
||||
" ",
|
||||
NULL,true,UsrDat->Accepted);
|
||||
Usr_WriteUsrData (Gbl.ColorRows[Gbl.RowEvenOdd],
|
||||
UsrDat->StrBirthday[0] ? (ShowData ? UsrDat->StrBirthday :
|
||||
|
@ -6816,8 +6788,6 @@ void Usr_ListAllDataGsts (void)
|
|||
extern const char *Txt_Department;
|
||||
extern const char *Txt_Office;
|
||||
extern const char *Txt_Phone;
|
||||
extern const char *Txt_Local_address;
|
||||
extern const char *Txt_Family_address;
|
||||
extern const char *Txt_Date_of_birth;
|
||||
unsigned NumColumnsCommonCard;
|
||||
unsigned NumCol;
|
||||
|
@ -6837,11 +6807,9 @@ void Usr_ListAllDataGsts (void)
|
|||
FieldNames[ 8] = Txt_Department;
|
||||
FieldNames[ 9] = Txt_Office;
|
||||
FieldNames[10] = Txt_Phone;
|
||||
FieldNames[11] = Txt_Local_address;
|
||||
FieldNames[11] = Txt_Phone;
|
||||
FieldNames[12] = Txt_Phone;
|
||||
FieldNames[13] = Txt_Family_address;
|
||||
FieldNames[14] = Txt_Phone;
|
||||
FieldNames[15] = Txt_Date_of_birth;
|
||||
FieldNames[13] = Txt_Date_of_birth;
|
||||
|
||||
/***** Get and update type of list,
|
||||
number of columns in class photo
|
||||
|
@ -6923,9 +6891,7 @@ void Usr_ListAllDataStds (void)
|
|||
extern const char *Txt_First_name;
|
||||
extern const char *Txt_Institution;
|
||||
extern const char *Txt_Email;
|
||||
extern const char *Txt_Local_address;
|
||||
extern const char *Txt_Phone;
|
||||
extern const char *Txt_Family_address;
|
||||
extern const char *Txt_Date_of_birth;
|
||||
extern const char *Txt_Group;
|
||||
extern const char *Txt_RECORD_FIELD_VISIBILITY_RECORD[Rec_NUM_TYPES_VISIBILITY];
|
||||
|
@ -6941,18 +6907,16 @@ void Usr_ListAllDataStds (void)
|
|||
size_t Length;
|
||||
|
||||
/***** Initialize field names *****/
|
||||
FieldNames[ 0] = Txt_Photo;
|
||||
FieldNames[ 1] = Txt_ID;
|
||||
FieldNames[ 2] = Txt_Surname_1;
|
||||
FieldNames[ 3] = Txt_Surname_2;
|
||||
FieldNames[ 4] = Txt_First_name;
|
||||
FieldNames[ 5] = Txt_Email;
|
||||
FieldNames[ 6] = Txt_Institution;
|
||||
FieldNames[ 7] = Txt_Local_address;
|
||||
FieldNames[ 8] = Txt_Phone;
|
||||
FieldNames[ 9] = Txt_Family_address;
|
||||
FieldNames[10] = Txt_Phone;
|
||||
FieldNames[11] = Txt_Date_of_birth;
|
||||
FieldNames[0] = Txt_Photo;
|
||||
FieldNames[1] = Txt_ID;
|
||||
FieldNames[2] = Txt_Surname_1;
|
||||
FieldNames[3] = Txt_Surname_2;
|
||||
FieldNames[4] = Txt_First_name;
|
||||
FieldNames[5] = Txt_Email;
|
||||
FieldNames[6] = Txt_Institution;
|
||||
FieldNames[7] = Txt_Phone;
|
||||
FieldNames[8] = Txt_Phone;
|
||||
FieldNames[9] = Txt_Date_of_birth;
|
||||
|
||||
GroupNames = NULL; // To avoid warning
|
||||
|
||||
|
|
|
@ -194,10 +194,8 @@ struct UsrData
|
|||
long CtyCod; // Country
|
||||
struct Date Birthday;
|
||||
char StrBirthday [Cns_MAX_BYTES_DATE + 1];
|
||||
char LocalAddress [Usr_MAX_BYTES_ADDRESS + 1];
|
||||
char LocalPhone [Usr_MAX_BYTES_PHONE + 1];
|
||||
char FamilyAddress [Usr_MAX_BYTES_ADDRESS + 1];
|
||||
char FamilyPhone [Usr_MAX_BYTES_PHONE + 1];
|
||||
char Phone1 [Usr_MAX_BYTES_PHONE + 1];
|
||||
char Phone2 [Usr_MAX_BYTES_PHONE + 1];
|
||||
char *Comments;
|
||||
long InsCtyCod; // Country of the institution
|
||||
long InsCod; // Institution
|
||||
|
|
Loading…
Reference in New Issue