added ability to count repeated things. like locations for a species.…

… or species in a location. #235.

bauble/plugins/garden/accession.py

@@ -763,7 +763,8 @@ def retrieve(cls, session, keys):
     def top_level_count(self):
         return {(1, 'Accessions'): 1,
                 (2, 'Plantings'): len(self.plants),
-                (3, 'Living plants'): sum(p.quantity for p in self.plants)}
+                (3, 'Living plants'): sum(p.quantity for p in self.plants),
+                (4, 'Locations'): set([p.location.id for p in self.plants])}
 
 
 from bauble.plugins.garden.plant import Plant, PlantEditor

bauble/plugins/garden/location.py

@@ -152,9 +152,17 @@ def retrieve(cls, session, keys):
             return None
 
     def top_level_count(self):
+        accessions = set(p.accession for p in self.plants)
+        species = set(a.species for a in accessions)
+        genera = set(s.genus for s in species)
         return {(1, 'Locations'): 1,
                 (2, 'Plantings'): len(self.plants),
-                (3, 'Living plants'): sum(p.quantity for p in self.plants)}
+                (3, 'Living plants'): sum(p.quantity for p in self.plants),
+                (4, 'Accessions'): set(a.id for a in accessions),
+                (5, 'Species'): set(s.id for s in species),
+                (6, 'Genera'): set(g.id for g in genera),
+                (7, 'Families'): set(g.family.id for g in genera),
+                }
 
 
 def mergevalues(value1, value2, formatter):

bauble/plugins/garden/plant.py

@@ -603,7 +603,8 @@ def retrieve(cls, session, keys):
 
     def top_level_count(self):
         return {(1, 'Plantings'): 1,
-                (2, 'Living plants'): self.quantity}
+                (2, 'Living plants'): self.quantity,
+                (3, 'Locations'): set([self.location.id])}
 
 
 from bauble.plugins.garden.accession import Accession

bauble/plugins/plants/genus.py

@@ -337,7 +337,8 @@ def top_level_count(self):
                 (2, 'Species'): len(self.species),
                 (3, 'Accessions'): len(accessions),
                 (4, 'Plantings'): len(plants),
-                (5, 'Living plants'): sum(p.quantity for p in plants)}
+                (5, 'Living plants'): sum(p.quantity for p in plants),
+                (6, 'Locations'): set(p.location.id for p in plants)}
 
 
 class GenusNote(db.Base):

bauble/plugins/plants/species_model.py

@@ -571,7 +571,8 @@ def top_level_count(self):
         return {(1, 'Species'): 1,
                 (2, 'Accessions'): len(self.accessions),
                 (3, 'Plantings'): len(plants),
-                (4, 'Living plants'): sum(p.quantity for p in plants)}
+                (4, 'Living plants'): sum(p.quantity for p in plants),
+                (5, 'Locations'): set(p.location.id for p in plants)}
 
 
 class SpeciesNote(db.Base, db.Serializable):

bauble/view.py

@@ -376,11 +376,16 @@ def run(self):
         for ndx in self.ids:
             item = session.query(klass).filter(klass.id == ndx).one()
             for k, v in item.top_level_count().items():
-                d[k] = v + d.get(k, 0)
+                if isinstance(v, set):
+                    d[k] = v.union(d.get(k, set()))
+                else:
+                    d[k] = v + d.get(k, 0)
         result = []
         for k, v in sorted(d.items()):
             if isinstance(k, tuple):
                 k = k[1]
+            if isinstance(v, set):
+                v = len(v)
             result.append("%s: %d" % (k, v))
         value = _("top level count: %s") % (", ".join(result))
         if bauble.gui: