changing singular into plural.

bauble/plugins/garden/accession.py

@@ -761,9 +761,9 @@ def retrieve(cls, session, keys):
             return None
 
     def top_level_count(self):
-        return {(1, 'Accession'): 1,
-                (2, 'Planting'): len(self.plants),
-                (3, 'Living plant'): sum(p.quantity for p in self.plants)}
+        return {(1, 'Accessions'): 1,
+                (2, 'Plantings'): len(self.plants),
+                (3, 'Living plants'): sum(p.quantity for p in self.plants)}
 
 
 from bauble.plugins.garden.plant import Plant, PlantEditor

bauble/plugins/garden/location.py

@@ -152,9 +152,9 @@ def retrieve(cls, session, keys):
             return None
 
     def top_level_count(self):
-        return {(1, 'Location'): 1,
-                (2, 'Planting'): len(self.plants),
-                (3, 'Living plant'): sum(p.quantity for p in self.plants)}
+        return {(1, 'Locations'): 1,
+                (2, 'Plantings'): len(self.plants),
+                (3, 'Living plants'): sum(p.quantity for p in self.plants)}
 
 
 def mergevalues(value1, value2, formatter):

bauble/plugins/garden/plant.py

@@ -601,6 +601,10 @@ def retrieve(cls, session, keys):
         except:
             return None
 
+    def top_level_count(self):
+        return {(1, 'Plantings'): 1,
+                (2, 'Living plants'): self.quantity}
+
 
 from bauble.plugins.garden.accession import Accession
 

bauble/plugins/plants/family.py

@@ -261,16 +261,16 @@ def correct_field_names(cls, keys):
                 del keys[exchange]
 
     def top_level_count(self):
-        return {(1, 'Family'): 1}  # NOPE - this has to wait
+        return {(1, 'Families'): 1}  # NOPE - this has to wait
         species = [s for g in self.genera for s in g.species]
         accessions = [a for s in species for a in s.accessions]
         plants = [p for a in accessions for p in a.plants]
-        return {(1, 'Family'): 1,
-                (2, 'Genus'): len(self.genera),
+        return {(1, 'Families'): 1,
+                (2, 'Genera'): len(self.genera),
                 (3, 'Species'): len(species),
-                (4, 'Accession'): len(accessions),
-                (5, 'Planting'): len(plants),
-                (6, 'Living plant'): sum(p.quantity for p in plants)}
+                (4, 'Accessions'): len(accessions),
+                (5, 'Plantings'): len(plants),
+                (6, 'Living plants'): sum(p.quantity for p in plants)}
 
 
 ## defining the latin alias to the class.

bauble/plugins/plants/genus.py

@@ -333,11 +333,11 @@ def compute_serializable_fields(cls, session, keys):
     def top_level_count(self):
         accessions = [a for s in self.species for a in s.accessions]
         plants = [p for a in accessions for p in a.plants]
-        return {(1, 'Genus'): 1,
+        return {(1, 'Genera'): 1,
                 (2, 'Species'): len(self.species),
-                (3, 'Accession'): len(accessions),
-                (4, 'Planting'): len(plants),
-                (5, 'Living plant'): sum(p.quantity for p in plants)}
+                (3, 'Accessions'): len(accessions),
+                (4, 'Plantings'): len(plants),
+                (5, 'Living plants'): sum(p.quantity for p in plants)}
 
 
 class GenusNote(db.Base):

bauble/plugins/plants/species_model.py

@@ -569,9 +569,9 @@ def compute_serializable_fields(cls, session, keys):
     def top_level_count(self):
         plants = [p for a in self.accessions for p in a.plants]
         return {(1, 'Species'): 1,
-                (2, 'Accession'): len(self.accessions),
-                (3, 'Planting'): len(plants),
-                (4, 'Living plant'): sum(p.quantity for p in plants)}
+                (2, 'Accessions'): len(self.accessions),
+                (3, 'Plantings'): len(plants),
+                (4, 'Living plants'): sum(p.quantity for p in plants)}
 
 
 class SpeciesNote(db.Base, db.Serializable):