diff --git a/swad_assignment.c b/swad_assignment.c index 4b05b05f4..16000d3ad 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -1790,6 +1790,17 @@ unsigned Asg_GetNumCoursesWithAssignments (Sco_Scope_t Scope) " FROM assignments" " WHERE CrsCod>'0'"); break; + case Sco_SCOPE_CTY: + sprintf (Query,"SELECT COUNT(DISTINCT (assignments.CrsCod))" + " FROM institutions,centres,degrees,courses,assignments" + " WHERE institutions.CtyCod='%ld'" + " AND institutions.InsCod=centres.InsCod" + " AND centres.CtrCod=degrees.CtrCod" + " AND degrees.DegCod=courses.DegCod" + " AND courses.Status=0" + " AND courses.CrsCod=assignments.CrsCod", + Gbl.CurrentCty.Cty.CtyCod); + break; case Sco_SCOPE_INS: sprintf (Query,"SELECT COUNT(DISTINCT (assignments.CrsCod))" " FROM centres,degrees,courses,assignments" @@ -1861,6 +1872,16 @@ unsigned Asg_GetNumAssignments (Sco_Scope_t Scope,unsigned *NumNotif) " FROM assignments" " WHERE CrsCod>'0'"); break; + case Sco_SCOPE_CTY: + sprintf (Query,"SELECT COUNT(*),SUM(assignments.NumNotif)" + " FROM institutions,centres,degrees,courses,assignments" + " WHERE institutions.CtyCod='%ld'" + " AND institutions.InsCod=centres.InsCod" + " AND centres.CtrCod=degrees.CtrCod" + " AND degrees.DegCod=courses.DegCod" + " AND courses.CrsCod=assignments.CrsCod", + Gbl.CurrentCty.Cty.CtyCod); + break; case Sco_SCOPE_INS: sprintf (Query,"SELECT COUNT(*),SUM(assignments.NumNotif)" " FROM centres,degrees,courses,assignments" diff --git a/swad_changelog.h b/swad_changelog.h index b89fa8259..933f8e4df 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.80.12 (2015/03/09)" +#define Log_PLATFORM_VERSION "SWAD 14.80.13 (2015/03/09)" // 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 | tail -1 /* + Version 14.80.13: Mar 09, 2015 Scope country for statistic of assignments. (179362 lines) Version 14.80.12: Mar 09, 2015 Scope country for statistic of tests. (179340 lines) Version 14.80.11: Mar 09, 2015 Scope country for statistic of notifications. (179267 lines) Version 14.80.10: Mar 09, 2015 Scope country for statistic of notices. (179211 lines)