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 15.40.3

This commit is contained in:
Antonio Cañas Vargas 2015-11-19 18:33:16 +01:00
parent ef540c1f14
commit 5788439dfc
6 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -111,11 +111,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.40.2 (2015/11/19)"
#define Log_PLATFORM_VERSION "SWAD 15.40.3 (2015/11/19)"
// 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 15.40.3: Nov 19, 2015 Code refactoring in institutions. (187281 lines)
Version 15.40.2: Nov 19, 2015 Some links to countries, institutions, centres and degrees removed. (187281 lines)
Version 15.40.1: Nov 19, 2015 Changes in behaviour of links to countries, institutions, centres and degrees. (187288 lines)
Version 15.40: Nov 17, 2015 Changes in statistics of number of users.

10
swad_country.c
View File

@ -149,7 +149,7 @@ void Cty_SeeCtyWithPendingInss (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LEFT_MIDDLE %s\">",
BgColor);
Cty_DrawCountryMapWithLinkToSeeCtyInf (&Cty,ActSeeIns,
Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeIns,
"DAT_NOBR","COUNTRY_MAP_SMALL");
fprintf (Gbl.F.Out,"</td>");
@ -516,7 +516,7 @@ void Cty_ListCountries2 (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LEFT_MIDDLE %s\">",
BgColor);
Cty_DrawCountryMapWithLinkToSeeCtyInf (&Gbl.Ctys.Lst[NumCty],ActSeeIns,
Cty_DrawCountryMapAndNameWithLink (&Gbl.Ctys.Lst[NumCty],ActSeeIns,
"DAT_NOBR_N","COUNTRY_MAP_SMALL");
fprintf (Gbl.F.Out,"</td>");
@ -636,11 +636,11 @@ static unsigned Cty_GetNumUsrsWhoClaimToBelongToCty (long CtyCod)
}
/*****************************************************************************/
/*********************** Check if country map exists *************************/
/********************* Draw country map and name with link *******************/
/*****************************************************************************/
void Cty_DrawCountryMapWithLinkToSeeCtyInf (struct Country *Cty,Act_Action_t Action,
const char *ClassLink,const char *ClassMap)
void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action,
const char *ClassLink,const char *ClassMap)
{
extern const char *Txt_Go_to_X;

4
swad_country.h
View File

@ -80,8 +80,8 @@ void Cty_ListCountries (void);
void Cty_ListCountries1 (void);
void Cty_ListCountries2 (void);
void Cty_DrawCountryMapWithLinkToSeeCtyInf (struct Country *Cty,Act_Action_t Action,
const char *ClassLink,const char *ClassMap);
void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action,
const char *ClassLink,const char *ClassMap);
void Cty_DrawCountryMap (struct Country *Cty,const char *Class);
bool Cty_CheckIfCountryMapExists (struct Country *Cty);

53
swad_institution.c
View File

@ -92,7 +92,6 @@ void Ins_SeeInsWithPendingCtrs (void)
extern const char *Txt_Institutions_with_pending_centres;
extern const char *Txt_Institution;
extern const char *Txt_Centres_ABBREVIATION;
extern const char *Txt_Go_to_X;
extern const char *Txt_There_are_no_institutions_with_requests_for_centres_to_be_confirmed;
char Query[1024];
MYSQL_RES *mysql_res;
@ -162,15 +161,8 @@ void Ins_SeeInsWithPendingCtrs (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LEFT_MIDDLE %s\">",
BgColor);
Act_FormGoToStart (ActSeeCtr);
Ins_PutParamInsCod (Ins.InsCod);
sprintf (Gbl.Title,Txt_Go_to_X,Ins.FullName);
Act_LinkFormSubmit (Gbl.Title,"DAT_NOBR");
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName,
16,"CENTER_MIDDLE",true);
fprintf (Gbl.F.Out,"&nbsp;%s</a>",
Ins.FullName);
Act_FormEnd ();
Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeCtr,
"DAT_NOBR","CENTER_MIDDLE");
fprintf (Gbl.F.Out,"</td>");
/* Number of pending centres (row[1]) */
@ -192,6 +184,35 @@ void Ins_SeeInsWithPendingCtrs (void)
DB_FreeMySQLResult (&mysql_res);
}
/*****************************************************************************/
/****************** Draw institution logo and name with link *****************/
/*****************************************************************************/
void Ins_DrawInstitutionLogoAndNameWithLink (struct Institution *Ins,Act_Action_t Action,
const char *ClassLink,const char *ClassLogo)
{
extern const char *Txt_Go_to_X;
/***** Start form *****/
Act_FormGoToStart (Action);
Ins_PutParamInsCod (Ins->InsCod);
/***** Link to action *****/
sprintf (Gbl.Title,Txt_Go_to_X,Ins->FullName);
Act_LinkFormSubmit (Gbl.Title,ClassLink);
/***** Draw institution logo *****/
Log_DrawLogo (Sco_SCOPE_INS,Ins->InsCod,Ins->ShortName,
16,ClassLogo,true);
/***** End link *****/
fprintf (Gbl.F.Out,"&nbsp;%s</a>",Ins->FullName);
/***** End form *****/
Act_FormEnd ();
}
/*****************************************************************************/
/*************** Show information of the current institution *****************/
/*****************************************************************************/
@ -523,7 +544,6 @@ static void Ins_ListInstitutionsForSeeing (void)
static void Ins_ListOneInstitutionForSeeing (struct Institution *Ins,unsigned NumIns)
{
extern const char *Txt_Go_to_X;
extern const char *Txt_INSTITUTION_STATUS[Ins_NUM_STATUS_TXT];
const char *TxtClassNormal;
const char *TxtClassStrong;
@ -554,15 +574,8 @@ static void Ins_ListOneInstitutionForSeeing (struct Institution *Ins,unsigned Nu
/***** Institution logo and name *****/
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE %s\">",
TxtClassStrong,BgColor);
Act_FormGoToStart (ActSeeCtr);
Ins_PutParamInsCod (Ins->InsCod);
sprintf (Gbl.Title,Txt_Go_to_X,Ins->FullName);
Act_LinkFormSubmit (Gbl.Title,TxtClassStrong);
Log_DrawLogo (Sco_SCOPE_INS,Ins->InsCod,Ins->ShortName,
16,NULL,true);
fprintf (Gbl.F.Out,"&nbsp;%s</a>",
Ins->FullName);
Act_FormEnd ();
Ins_DrawInstitutionLogoAndNameWithLink (Ins,ActSeeCtr,
"DAT_NOBR","CENTER_MIDDLE");
fprintf (Gbl.F.Out,"</td>");
/***** Stats *****/

3
swad_institution.h
View File

@ -92,6 +92,9 @@ typedef enum
void Ins_SeeInsWithPendingCtrs (void);
void Ins_DrawInstitutionLogoAndNameWithLink (struct Institution *Ins,Act_Action_t Action,
const char *ClassLink,const char *ClassLogo);
void Ins_ShowConfiguration (void);
void Ins_PrintConfiguration (void);

18
swad_statistic.c
View File

@ -3232,7 +3232,7 @@ static void Sta_ShowNumHitsPerCountry (unsigned long NumRows,
"<th class=\"CENTER_TOP\">"
"%s"
"</th>"
"<th class=\"CENTER_TOP\">"
"<th class=\"LEFT_TOP\">"
"%s"
"</th>"
"<th class=\"LEFT_TOP\">"
@ -3291,7 +3291,7 @@ static void Sta_WriteCountry (long CtyCod)
Cty_GetDataOfCountryByCod (&Cty);
/***** Form to go to country *****/
Cty_DrawCountryMapWithLinkToSeeCtyInf (&Cty,ActSeeCtyInf,
Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeCtyInf,
"LOG","COUNTRY_MAP_TINY");
}
else // Hit with no country selected
@ -3323,7 +3323,7 @@ static void Sta_ShowNumHitsPerInstitution (unsigned long NumRows,
"<th class=\"CENTER_TOP\">"
"%s"
"</th>"
"<th class=\"CENTER_TOP\">"
"<th class=\"LEFT_TOP\">"
"%s"
"</th>"
"<th class=\"LEFT_TOP\">"
@ -3370,7 +3370,6 @@ static void Sta_ShowNumHitsPerInstitution (unsigned long NumRows,
static void Sta_WriteInstitution (long InsCod)
{
extern const char *Txt_Go_to_X;
struct Institution Ins;
/***** Start cell *****/
@ -3387,15 +3386,8 @@ static void Sta_WriteInstitution (long InsCod)
Ins.FullName);
/***** Form to go to institution *****/
Act_FormGoToStart (ActSeeInsInf);
Ins_PutParamInsCod (InsCod);
sprintf (Gbl.Title,Txt_Go_to_X,Ins.ShortName);
Act_LinkFormSubmit (Gbl.Title,"LOG");
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName,
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;</a>",
Ins.ShortName);
Act_FormEnd ();
Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeInsInf,
"LOG","CENTER_TOP");
}
else // Hit with no institution selected
/***** No institution selected *****/