diff --git a/utils/stats_prises.py b/utils/stats_prises.py index 790d4604..807acbeb 100755 --- a/utils/stats_prises.py +++ b/utils/stats_prises.py @@ -21,19 +21,28 @@ def compte_prises(reseau, batiment=''): n = cur.fetchone()[0] else: batiment = batiment.lower() - cur.execute("SELECT COUNT(prises) FROM prises WHERE (batiment, " + reseau + ")=(%s, True)", (batiment, )) + if batiment == "g": + cur.execute("SELECT COUNT(prises) FROM prises WHERE (batiment, " + reseau + ")=(%s, True) AND substring(chambre for 1) <> '0'", (batiment, )) + else: + cur.execute("SELECT COUNT(prises) FROM prises WHERE (batiment, " + reseau + ")=(%s, True)", (batiment, )) n = cur.fetchone()[0] + return n +tot_crans = 0 +tot_crous = 0 + data = [] -for bat in ['A', 'B', 'C', 'G', 'H', 'I', 'J', 'M', '']: +for bat in ['A', 'B', 'C', 'G', 'H', 'I', 'J', 'M']: n_crans = compte_prises('crans', bat) n_crous = compte_prises('crous', bat) + tot_crans += n_crans + tot_crous += n_crous frac_crans = 1.*n_crans/(n_crous + n_crans) - if bat == '': - bat = 'Total' data.append([bat, n_crans, n_crous, '%0.2f' % (100*frac_crans)]) +data.append(["Total", tot_crans, tot_crous, '%0.2f' % (100.*n_crans/(n_crous+n_crans))]) + print tableau(data, [u'Bât.', u'CRANS', u'CROUS', u'% CRANS'], [7, 7, 7, 9], ['c', 'd', 'd', 'd'])