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

Version 15.201.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-04-22 12:24:02 +02:00
parent 7db412b60b
commit 0a7877f41f
2 changed files with 59 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -137,13 +137,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.201 (2016-04-21)" #define Log_PLATFORM_VERSION "SWAD 15.201.1 (2016-04-22)"
#define CSS_FILE "swad15.198.css" #define CSS_FILE "swad15.198.css"
#define JS_FILE "swad15.197.js" #define JS_FILE "swad15.197.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.201.1: Apr 22, 2016 Code refactoring in record card. (200778 lines)
Version 15.201: Apr 21, 2016 New private file zone for the teachers who belong to a course. (200768 lines) Version 15.201: Apr 21, 2016 New private file zone for the teachers who belong to a course. (200768 lines)
50 changes necessary in database: 50 changes necessary in database:
CREATE TABLE notif_backup LIKE notif; CREATE TABLE notif_backup LIKE notif;

102
swad_record.c
View File

@ -60,7 +60,7 @@ extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
#define Rec_INSTITUTION_LOGO_SIZE 64 #define Rec_INSTITUTION_LOGO_SIZE 64
#define Rec_DEGREE_LOGO_SIZE 64 #define Rec_DEGREE_LOGO_SIZE 64
#define Rec_USR_MIN_AGE 16 // years old #define Rec_USR_MIN_AGE 12 // years old
#define Rec_USR_MAX_AGE 120 // years old #define Rec_USR_MAX_AGE 120 // years old
#define Rec_SHOW_OFFICE_HOURS_DEFAULT true #define Rec_SHOW_OFFICE_HOURS_DEFAULT true
@ -83,6 +83,9 @@ static bool Rec_GetParamShowOfficeHours (void);
static void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat, static void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat,
const char *Anchor); const char *Anchor);
static void Rec_ShowMyCrsRecordUpdated (void); static void Rec_ShowMyCrsRecordUpdated (void);
static void Rec_ShowInstitution (struct Institution *Ins,bool PutFormLinks);
static void Rec_WriteLinkToDataProtectionClause (void); static void Rec_WriteLinkToDataProtectionClause (void);
static void Rec_GetUsrExtraDataFromRecordForm (struct UsrData *UsrDat); static void Rec_GetUsrExtraDataFromRecordForm (struct UsrData *UsrDat);
@ -2083,51 +2086,11 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
Lay_StartRoundFrameTable (StrRecordWidth,2,NULL); Lay_StartRoundFrameTable (StrRecordWidth,2,NULL);
/***** Institution *****/ /***** Institution *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>");
"<td class=\"CENTER_MIDDLE\"" Ins.InsCod = UsrDat->InsCod;
" style=\"width:%upx; height:%upx;\">", if (Ins.InsCod > 0)
Rec_C1_TOP,Rec_C1_TOP);
if (UsrDat->InsCod > 0)
{
Ins.InsCod = UsrDat->InsCod;
Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_BASIC_DATA); Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_BASIC_DATA);
Rec_ShowInstitution (&Ins,PutFormLinks);
/* Form to go to the institution */
if (PutFormLinks)
{
Act_FormGoToStart (ActSeeInsInf);
Ins_PutParamInsCod (Ins.InsCod);
Act_LinkFormSubmit (Ins.FullName,NULL);
}
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName,
Rec_INSTITUTION_LOGO_SIZE,NULL,true);
if (PutFormLinks)
{
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();
}
}
fprintf (Gbl.F.Out,"</td>"
"<td class=\"REC_HEAD LEFT_MIDDLE\""
" style=\"width:%upx; height:%upx;\">",
Rec_C2_TOP,Rec_C1_TOP);
if (UsrDat->InsCod > 0)
{
/* Form to go to the institution */
if (PutFormLinks)
{
Act_FormGoToStart (ActSeeInsInf);
Ins_PutParamInsCod (Ins.InsCod);
Act_LinkFormSubmit (Ins.FullName,"REC_HEAD");
}
fprintf (Gbl.F.Out,"%s",Ins.FullName);
if (PutFormLinks)
{
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();
}
}
fprintf (Gbl.F.Out,"</td>");
/***** Photo *****/ /***** Photo *****/
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
@ -3147,6 +3110,55 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
Lay_EndRoundFrameTable (); Lay_EndRoundFrameTable ();
} }
/*****************************************************************************/
/*********************** Show institution in record card *********************/
/*****************************************************************************/
static void Rec_ShowInstitution (struct Institution *Ins,bool PutFormLinks)
{
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\""
" style=\"width:%upx; height:%upx;\">",
Rec_C1_TOP,Rec_C1_TOP);
if (Ins->InsCod > 0)
{
/* Form to go to the institution */
if (PutFormLinks)
{
Act_FormGoToStart (ActSeeInsInf);
Ins_PutParamInsCod (Ins->InsCod);
Act_LinkFormSubmit (Ins->FullName,NULL);
}
Log_DrawLogo (Sco_SCOPE_INS,Ins->InsCod,Ins->ShortName,
Rec_INSTITUTION_LOGO_SIZE,NULL,true);
if (PutFormLinks)
{
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();
}
}
fprintf (Gbl.F.Out,"</td>"
"<td class=\"REC_HEAD LEFT_MIDDLE\""
" style=\"width:%upx; height:%upx;\">",
Rec_C2_TOP,Rec_C1_TOP);
if (Ins->InsCod > 0)
{
/* Form to go to the institution */
if (PutFormLinks)
{
Act_FormGoToStart (ActSeeInsInf);
Ins_PutParamInsCod (Ins->InsCod);
Act_LinkFormSubmit (Ins->FullName,"REC_HEAD");
}
fprintf (Gbl.F.Out,"%s",Ins->FullName);
if (PutFormLinks)
{
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();
}
}
fprintf (Gbl.F.Out,"</td>");
}
/*****************************************************************************/ /*****************************************************************************/
/*********************** Write a link to netiquette rules ********************/ /*********************** Write a link to netiquette rules ********************/
/*****************************************************************************/ /*****************************************************************************/