yohan/brie-aurore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ajout du retour en arrière dans les années dans la page stats Aurore + blocage de la page quand on est pas dans la résidence "Aurore"

Browse Source
This commit is contained in:
Romain Beuque 2014-10-03 12:40:17 +02:00
parent 760e056da8
commit c743de013b
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Brie/brie/controllers/stats.py
View File

@ -17,7 +17,7 @@ from operator import itemgetter
class StatsController(AuthenticatedBaseController): class StatsController(AuthenticatedBaseController):
@expose("brie.templates.stats.index") @expose("brie.templates.stats.index")
def index(self): def index(self, year = None):
residences = [] residences = []
rooms_stats = dict() rooms_stats = dict()
members_stats = dict() members_stats = dict()
@ -28,12 +28,24 @@ class StatsController(AuthenticatedBaseController):
global_total_earned = 0 global_total_earned = 0
global_current_members = 0 global_current_members = 0
residences_ldap = Residences.get_residences(self.user) residences_ldap = Residences.get_residences(self.user)
year = CotisationComputes.current_year()
#on restreint l'acces a la page stats pour les membres Aurore
for residence_ldap in residences_ldap:
if residence_ldap.uniqueMember.first() == self.user.residence_dn and residence_ldap.cn.first() != "Aurore":
raise Exception("acces refuse")
#end if
#end for
if year is None:
year = CotisationComputes.current_year()
for residence_ldap in residences_ldap: for residence_ldap in residences_ldap:
residence_dn = residence_ldap.uniqueMember.first() residence_dn = residence_ldap.uniqueMember.first()
residence_name = residence_ldap.cn.first() residence_name = residence_ldap.cn.first()
residences.append(residence_name) residences.append(residence_name)
members_stats[residence_name] = CotisationComputes.members_status_from_residence(self.user, residence_dn) #members_stats[residence_name] = CotisationComputes.members_status_from_residence(self.user, residence_dn)
cotisations_year = Cotisation.get_all_cotisation_by_year(self.user, residence_dn, year)
members_stats[residence_name] = CotisationComputes.members_status_from_list_cotisations(self.user, residence_dn, cotisations_year)
members_stats[residence_name]['number_of_cotisation_paid_members'] = len(members_stats[residence_name]['cotisation_paid_members']) members_stats[residence_name]['number_of_cotisation_paid_members'] = len(members_stats[residence_name]['cotisation_paid_members'])
members_stats[residence_name]['number_of_cotisation_late_members'] = len(members_stats[residence_name]['cotisation_late_members']) members_stats[residence_name]['number_of_cotisation_late_members'] = len(members_stats[residence_name]['cotisation_late_members'])
members_stats[residence_name]['number_of_no_cotisation_members'] = len(members_stats[residence_name]['no_cotisation_members']) members_stats[residence_name]['number_of_no_cotisation_members'] = len(members_stats[residence_name]['no_cotisation_members'])
@ -74,6 +86,7 @@ class StatsController(AuthenticatedBaseController):
return { return {
"user" : self.user, "user" : self.user,
"residence" : residence, "residence" : residence,
"year" : int(year),
"residences" : residences, "residences" : residences,
"rooms_stats" : rooms_stats, "rooms_stats" : rooms_stats,
"members_stats" : members_stats, "members_stats" : members_stats,

1
Brie/brie/templates/stats/index.html
View File

@ -6,6 +6,7 @@
</head> </head>
<body> <body>
<xi:include href="navbar.html" /> <xi:include href="navbar.html" />
<a href="/stats/index/${year-1}">Année précédente</a> | année scolaire ${year-1}/${year} | <a href="/stats/index/${year+1}">Année suivante</a>
<div py:if="residence == 'Aurore'" class="section" > <div py:if="residence == 'Aurore'" class="section" >
<span class="section_name show_section_name">Globalement</span> <span class="section_name show_section_name">Globalement</span>
<div> <div>