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 16.46

This commit is contained in:
Antonio Cañas Vargas 2016-10-29 00:22:34 +02:00
parent 23603b940f
commit 664a18ccab
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -154,13 +154,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.45.10 (2016-10-28)"
#define Log_PLATFORM_VERSION "SWAD 16.46 (2016-10-29)"
#define CSS_FILE "swad16.32.1.css"
#define JS_FILE "swad15.238.1.js"
// 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 16.46: Oct 29, 2016 Fixed bugs in surveys.
View only the surveys of my groups. (206032 lines)
Version 16.45.10: Oct 28, 2016 Messages translated. (205995 lines)
Version 16.45.9: Oct 28, 2016 Free lists of user's countries, institutions, centres and degrees.
Code refactoring related to hierarchy. (205994 lines)

45
swad_survey.c
View File

@ -193,6 +193,10 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
unsigned NumSvy;
bool ICanEdit = Svy_CheckIfICanCreateSvy ();
/***** Get number of groups in current course *****/
if (!Gbl.CurrentCrs.Grps.NumGrps)
Gbl.CurrentCrs.Grps.WhichGrps = Grp_ALL_GROUPS;
/***** Get list of surveys *****/
Svy_GetListSurveys ();
@ -844,7 +848,7 @@ static void Svy_PutParams (void)
void Svy_GetListSurveys (void)
{
extern const char *Sco_ScopeDB[Sco_NUM_SCOPES];
char SubQuery[Sco_NUM_SCOPES][128];
char SubQuery[Sco_NUM_SCOPES][256];
char OrderBySubQuery[256];
char Query[2048];
MYSQL_RES *mysql_res;
@ -872,8 +876,9 @@ void Svy_GetListSurveys (void)
Cods[Sco_SCOPE_DEG] = Gbl.CurrentDeg.Deg.DegCod; // Degree
Cods[Sco_SCOPE_CRS] = Gbl.CurrentCrs.Crs.CrsCod; // Course
/* Fill subqueries for system, country, institution, centre and degree */
for (Scope = Sco_SCOPE_SYS, SubQueryFilled = false;
Scope <= Sco_SCOPE_CRS;
Scope <= Sco_SCOPE_DEG;
Scope++)
if (ScopesAllowed & 1 << Scope)
{
@ -881,13 +886,45 @@ void Svy_GetListSurveys (void)
SubQueryFilled ? " OR " :
"",
Sco_ScopeDB[Scope],Cods[Scope],
(ScopesAllowed & 1 << Sco_SCOPE_SYS) ? "" :
" AND Hidden='N'");
(HiddenAllowed & 1 << Scope) ? "" :
" AND Hidden='N'");
SubQueryFilled = true;
}
else
SubQuery[Scope][0] = '\0';
/* Fill subquery for course */
if (ScopesAllowed & 1 << Sco_SCOPE_CRS)
{
if (Gbl.CurrentCrs.Grps.WhichGrps == Grp_ONLY_MY_GROUPS)
sprintf (SubQuery[Scope],"%s("
"Scope='%s' AND Cod='%ld'%s"
" AND "
"(SvyCod NOT IN"
" (SELECT SvyCod FROM svy_grp)"
" OR"
" SvyCod IN"
" (SELECT svy_grp.SvyCod"
" FROM svy_grp,crs_grp_usr"
" WHERE crs_grp_usr.UsrCod='%ld'"
" AND svy_grp.GrpCod=crs_grp_usr.GrpCod))"
")",
SubQueryFilled ? " OR " :
"",
Sco_ScopeDB[Scope],Cods[Sco_SCOPE_CRS],
(HiddenAllowed & 1 << Sco_SCOPE_CRS) ? "" :
" AND Hidden='N'",
Gbl.Usrs.Me.UsrDat.UsrCod);
else // Gbl.CurrentCrs.Grps.WhichGrps == Grp_ALL_GROUPS
sprintf (SubQuery[Scope],"%s(Scope='%s' AND Cod='%ld'%s)",
SubQueryFilled ? " OR " :
"",
Sco_ScopeDB[Scope],Cods[Sco_SCOPE_CRS],
(HiddenAllowed & 1 << Sco_SCOPE_CRS) ? "" :
" AND Hidden='N'");
SubQueryFilled = true;
}
if (SubQueryFilled)
{
switch (Gbl.Svys.SelectedOrderType)