Complaints now on wallet page

1 files changed, 130 insertions, 124 deletions

diff --git a/core/models/caves.py b/core/models/caves.py
index c6c47de..03d5208 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -574,6 +574,8 @@ def GetCaveLookup():
     """lookup function modelled on GetPersonExpeditionNameLookup
     repeated assignment each call, needs refactoring
     
+    Used when parsing wallets contents.json file too in views/uploads.py
+    
     Does NOT detect duplicates! Needs fixing.
     Needs to be a proper funciton that raises an exception if there is a duplicate.
     OR we could set it to return None if there are duplictes, and require the caller to 
@@ -609,130 +611,134 @@ def GetCaveLookup():
     # and Becka's email of 25 may 2020 on new kataster numbers
     
     # These might alse create more duplicate entries, so re-write it to check
-    Gcavelookup["1987-02"] = Gcavelookup["267"]
-    Gcavelookup["1990-01"] = Gcavelookup["171"]
-    Gcavelookup["1990-02"] = Gcavelookup["172"]
-    Gcavelookup["1990-03"] = Gcavelookup["173"]
-    Gcavelookup["1990-04"] = Gcavelookup["174"]
-    Gcavelookup["1990-05"] = Gcavelookup["175"]
-    Gcavelookup["1990-06"] = Gcavelookup["176"]
-    Gcavelookup["1990-07"] = Gcavelookup["177"]
-    Gcavelookup["1990-08"] = Gcavelookup["178"]
-    Gcavelookup["1990-09"] = Gcavelookup["179"]
-    Gcavelookup["1990-10"] = Gcavelookup["180"]
-    Gcavelookup["1990-11"] = Gcavelookup["181"]
-    Gcavelookup["1990-12"] = Gcavelookup["182"]
-    Gcavelookup["1990-13"] = Gcavelookup["183"]
-    Gcavelookup["1990-14"] = Gcavelookup["184"]
-    Gcavelookup["1990-18"] = Gcavelookup["188"]
-    Gcavelookup["1990-adam"] = Gcavelookup["225"]
-    Gcavelookup["1993-01"] = Gcavelookup["200"]
-    Gcavelookup["1996-02"] = Gcavelookup["224"]
-    Gcavelookup["1996-03"] = Gcavelookup["223"]
-    Gcavelookup["1996-04"] = Gcavelookup["222"]
-    Gcavelookup["1996wk2"] = Gcavelookup["207"]
-    Gcavelookup["1996wk3"] = Gcavelookup["208"]
-    Gcavelookup["1996wk5"] = Gcavelookup["219"]
-    Gcavelookup["1996wk6"] = Gcavelookup["218"]
-    Gcavelookup["1996wk8"] = Gcavelookup["209"]
-    Gcavelookup["1996wk11"] = Gcavelookup["268"]
-    Gcavelookup["96wk11"]   = Gcavelookup["268"]
-    Gcavelookup["1998-01"] = Gcavelookup["201"]
-    Gcavelookup["1998-03"] = Gcavelookup["210"]
-    Gcavelookup["1999-03"] = Gcavelookup["204"]
-    Gcavelookup["1999-04"] = Gcavelookup["230"]
-    Gcavelookup["1999-10"] = Gcavelookup["162"]
-    Gcavelookup["1999-bo-01"] = Gcavelookup["205"]
-    Gcavelookup["1999-ob-01"] = Gcavelookup["205"]
-    Gcavelookup["1999-ob-03"] = Gcavelookup["226"]
-    Gcavelookup["1999-ob-04"] = Gcavelookup["227"]
-    Gcavelookup["2000-01"] = Gcavelookup["231"]
-    Gcavelookup["2000-03"] = Gcavelookup["214"]
-    Gcavelookup["2000-04"] = Gcavelookup["220"]
-    Gcavelookup["2000-05"] = Gcavelookup["215"]
-    Gcavelookup["2000-06"] = Gcavelookup["216"]
-    Gcavelookup["2000-07"] = Gcavelookup["217"]
-    Gcavelookup["2000-09"] = Gcavelookup["234"]
-    Gcavelookup["2000-aa-01"] = Gcavelookup["250"]
-    Gcavelookup["2001-04"] = Gcavelookup["239"]
-    Gcavelookup["2001-05"] = Gcavelookup["243"]
-    Gcavelookup["2002-01"] = Gcavelookup["249"]
-    Gcavelookup["2002-02"] = Gcavelookup["234"]
-    Gcavelookup["2002-04"] = Gcavelookup["242"]
-    Gcavelookup["2002-05"] = Gcavelookup["294"]
-    Gcavelookup["2003-01"] = Gcavelookup["256"]
-    Gcavelookup["2003-02"] = Gcavelookup["248"]
-    Gcavelookup["2003-03"] = Gcavelookup["247"]
-    Gcavelookup["2003-04"] = Gcavelookup["241"]
-    Gcavelookup["2003-05"] = Gcavelookup["246"]
-    Gcavelookup["2003-06"] = Gcavelookup["161"]
-    Gcavelookup["2003-08"] = Gcavelookup["240"]
-    Gcavelookup["2003-09"] = Gcavelookup["245"]
-    Gcavelookup["2003-10"] = Gcavelookup["244"]
-    Gcavelookup["2004-01"] = Gcavelookup["269"]
-    Gcavelookup["2004-03"] = Gcavelookup["270"]
-    Gcavelookup["2004-11"] = Gcavelookup["251"]
-    Gcavelookup["2004-12"] = Gcavelookup["161"]
-    Gcavelookup["2004-15"] = Gcavelookup["253"]
-    Gcavelookup["2004-19"] = Gcavelookup["254"]
-    Gcavelookup["2004-20"] = Gcavelookup["255"]
-    Gcavelookup["2005-04"] = Gcavelookup["204"]
-    Gcavelookup["2005-05"] = Gcavelookup["264"]
-    Gcavelookup["2005-07"] = Gcavelookup["257"]
-    Gcavelookup["2006-08"] = Gcavelookup["285"]
-    Gcavelookup["2006-09"] = Gcavelookup["298"]
-    Gcavelookup["2007-71"] = Gcavelookup["271"]
-    Gcavelookup["2010-01"] = Gcavelookup["263"]
-    Gcavelookup["2010-03"] = Gcavelookup["293"]
-    Gcavelookup["2011-01"] = Gcavelookup["292"]
-    Gcavelookup["2012-dd-05"] = Gcavelookup["286"]
-    Gcavelookup["2012-ns-13"] = Gcavelookup["292"]
-    Gcavelookup["2014-neo-01"] = Gcavelookup["273"]
-    Gcavelookup["2014-sd-01"] = Gcavelookup["274"]
-    Gcavelookup["2014-ms-14"] = Gcavelookup["287"]
-    Gcavelookup["2015-mf-06"] = Gcavelookup["288"]
-    Gcavelookup["2016-jb-01"] = Gcavelookup["289"]
-    Gcavelookup["2017-pw-01"] = Gcavelookup["277"]
-    Gcavelookup["2018-dm-07"] = Gcavelookup["359"] # NB this is 1626
-    Gcavelookup["2017_cucc_24"] = Gcavelookup["291"] # note _ not -
-    Gcavelookup["2017_cucc_23"] = Gcavelookup["295"] # note _ not -
-    Gcavelookup["2017_cucc_28"] = Gcavelookup["290"] # note _ not -
-    Gcavelookup["bs17"] = Gcavelookup["283"]
-    
-    Gcavelookup["1976/b11"] = Gcavelookup["198"]
-    Gcavelookup["1976/b8"] = Gcavelookup["197"]
-    Gcavelookup["1976/b9"] = Gcavelookup["190"]
-    Gcavelookup["b11"] = Gcavelookup["1976/b11"]
-    Gcavelookup["b8"] = Gcavelookup["1976/b8"]
-    Gcavelookup["b9"] = Gcavelookup["1976/b9"]
-
-    Gcavelookup["2011-01-bs30"] = Gcavelookup["190"]
-    Gcavelookup["bs30"] = Gcavelookup["190"]
-    Gcavelookup["87"] = Gcavelookup["190"]
-    Gcavelookup["2011-01"] = Gcavelookup["190"]
- 
-    Gcavelookup["quarriesd"] = Gcavelookup["2002-08"]
-    Gcavelookup["2002-x11"] = Gcavelookup["2005-08"]
-    Gcavelookup["2002-x12"] = Gcavelookup["2005-07"]
-    Gcavelookup["2002-x13"] = Gcavelookup["2005-06"]
-    Gcavelookup["2002-x14"] = Gcavelookup["2005-05"]
-    
-    Gcavelookup["kh"] = Gcavelookup["161"]
-    Gcavelookup["161-kh"] = Gcavelookup["161"]
-    Gcavelookup["204-steinBH"] = Gcavelookup["204"]
-    Gcavelookup["stonebridge"] = Gcavelookup["204"]
-    Gcavelookup["hauchhole"] = Gcavelookup["234"]
-    Gcavelookup["hauch"] = Gcavelookup["234"]
-    Gcavelookup["234-hauch"] = Gcavelookup["234"]
-    Gcavelookup["tunnocks"] = Gcavelookup["258"]
-    Gcavelookup["balcony"] = Gcavelookup["264"]
-    Gcavelookup["balkon"] = Gcavelookup["264"]
-    Gcavelookup["fgh"] = Gcavelookup["290"]
-    Gcavelookup["gsh"] = Gcavelookup["291"]
-
-    Gcavelookup["homecoming"] = Gcavelookup["2018-dm-07"]
-    Gcavelookup["heimkommen"] = Gcavelookup["2018-dm-07"]
-    Gcavelookup["99ob02"] = Gcavelookup["1999-ob-02"]
+    # skip any missing keys as this gets called during tests when the database is not loaded
+    try:
+        Gcavelookup["1987-02"] = Gcavelookup["267"]
+        Gcavelookup["1990-01"] = Gcavelookup["171"]
+        Gcavelookup["1990-02"] = Gcavelookup["172"]
+        Gcavelookup["1990-03"] = Gcavelookup["173"]
+        Gcavelookup["1990-04"] = Gcavelookup["174"]
+        Gcavelookup["1990-05"] = Gcavelookup["175"]
+        Gcavelookup["1990-06"] = Gcavelookup["176"]
+        Gcavelookup["1990-07"] = Gcavelookup["177"]
+        Gcavelookup["1990-08"] = Gcavelookup["178"]
+        Gcavelookup["1990-09"] = Gcavelookup["179"]
+        Gcavelookup["1990-10"] = Gcavelookup["180"]
+        Gcavelookup["1990-11"] = Gcavelookup["181"]
+        Gcavelookup["1990-12"] = Gcavelookup["182"]
+        Gcavelookup["1990-13"] = Gcavelookup["183"]
+        Gcavelookup["1990-14"] = Gcavelookup["184"]
+        Gcavelookup["1990-18"] = Gcavelookup["188"]
+        Gcavelookup["1990-adam"] = Gcavelookup["225"]
+        Gcavelookup["1993-01"] = Gcavelookup["200"]
+        Gcavelookup["1996-02"] = Gcavelookup["224"]
+        Gcavelookup["1996-03"] = Gcavelookup["223"]
+        Gcavelookup["1996-04"] = Gcavelookup["222"]
+        Gcavelookup["1996wk2"] = Gcavelookup["207"]
+        Gcavelookup["1996wk3"] = Gcavelookup["208"]
+        Gcavelookup["1996wk5"] = Gcavelookup["219"]
+        Gcavelookup["1996wk6"] = Gcavelookup["218"]
+        Gcavelookup["1996wk8"] = Gcavelookup["209"]
+        Gcavelookup["1996wk11"] = Gcavelookup["268"]
+        Gcavelookup["96wk11"]   = Gcavelookup["268"]
+        Gcavelookup["1998-01"] = Gcavelookup["201"]
+        Gcavelookup["1998-03"] = Gcavelookup["210"]
+        Gcavelookup["1999-03"] = Gcavelookup["204"]
+        Gcavelookup["1999-04"] = Gcavelookup["230"]
+        Gcavelookup["1999-10"] = Gcavelookup["162"]
+        Gcavelookup["1999-bo-01"] = Gcavelookup["205"]
+        Gcavelookup["1999-ob-01"] = Gcavelookup["205"]
+        Gcavelookup["1999-ob-03"] = Gcavelookup["226"]
+        Gcavelookup["1999-ob-04"] = Gcavelookup["227"]
+        Gcavelookup["2000-01"] = Gcavelookup["231"]
+        Gcavelookup["2000-03"] = Gcavelookup["214"]
+        Gcavelookup["2000-04"] = Gcavelookup["220"]
+        Gcavelookup["2000-05"] = Gcavelookup["215"]
+        Gcavelookup["2000-06"] = Gcavelookup["216"]
+        Gcavelookup["2000-07"] = Gcavelookup["217"]
+        Gcavelookup["2000-09"] = Gcavelookup["234"]
+        Gcavelookup["2000-aa-01"] = Gcavelookup["250"]
+        Gcavelookup["2001-04"] = Gcavelookup["239"]
+        Gcavelookup["2001-05"] = Gcavelookup["243"]
+        Gcavelookup["2002-01"] = Gcavelookup["249"]
+        Gcavelookup["2002-02"] = Gcavelookup["234"]
+        Gcavelookup["2002-04"] = Gcavelookup["242"]
+        Gcavelookup["2002-05"] = Gcavelookup["294"]
+        Gcavelookup["2003-01"] = Gcavelookup["256"]
+        Gcavelookup["2003-02"] = Gcavelookup["248"]
+        Gcavelookup["2003-03"] = Gcavelookup["247"]
+        Gcavelookup["2003-04"] = Gcavelookup["241"]
+        Gcavelookup["2003-05"] = Gcavelookup["246"]
+        Gcavelookup["2003-06"] = Gcavelookup["161"]
+        Gcavelookup["2003-08"] = Gcavelookup["240"]
+        Gcavelookup["2003-09"] = Gcavelookup["245"]
+        Gcavelookup["2003-10"] = Gcavelookup["244"]
+        Gcavelookup["2004-01"] = Gcavelookup["269"]
+        Gcavelookup["2004-03"] = Gcavelookup["270"]
+        Gcavelookup["2004-11"] = Gcavelookup["251"]
+        Gcavelookup["2004-12"] = Gcavelookup["161"]
+        Gcavelookup["2004-15"] = Gcavelookup["253"]
+        Gcavelookup["2004-19"] = Gcavelookup["254"]
+        Gcavelookup["2004-20"] = Gcavelookup["255"]
+        Gcavelookup["2005-04"] = Gcavelookup["204"]
+        Gcavelookup["2005-05"] = Gcavelookup["264"]
+        Gcavelookup["2005-07"] = Gcavelookup["257"]
+        Gcavelookup["2006-08"] = Gcavelookup["285"]
+        Gcavelookup["2006-09"] = Gcavelookup["298"]
+        Gcavelookup["2007-71"] = Gcavelookup["271"]
+        Gcavelookup["2010-01"] = Gcavelookup["263"]
+        Gcavelookup["2010-03"] = Gcavelookup["293"]
+        Gcavelookup["2011-01"] = Gcavelookup["292"]
+        Gcavelookup["2012-dd-05"] = Gcavelookup["286"]
+        Gcavelookup["2012-ns-13"] = Gcavelookup["292"]
+        Gcavelookup["2014-neo-01"] = Gcavelookup["273"]
+        Gcavelookup["2014-sd-01"] = Gcavelookup["274"]
+        Gcavelookup["2014-ms-14"] = Gcavelookup["287"]
+        Gcavelookup["2015-mf-06"] = Gcavelookup["288"]
+        Gcavelookup["2016-jb-01"] = Gcavelookup["289"]
+        Gcavelookup["2017-pw-01"] = Gcavelookup["277"]
+        Gcavelookup["2018-dm-07"] = Gcavelookup["359"] # NB this is 1626
+        Gcavelookup["2017_cucc_24"] = Gcavelookup["291"] # note _ not -
+        Gcavelookup["2017_cucc_23"] = Gcavelookup["295"] # note _ not -
+        Gcavelookup["2017_cucc_28"] = Gcavelookup["290"] # note _ not -
+        Gcavelookup["bs17"] = Gcavelookup["283"]
+        
+        Gcavelookup["1976/b11"] = Gcavelookup["198"]
+        Gcavelookup["1976/b8"] = Gcavelookup["197"]
+        Gcavelookup["1976/b9"] = Gcavelookup["190"]
+        Gcavelookup["b11"] = Gcavelookup["1976/b11"]
+        Gcavelookup["b8"] = Gcavelookup["1976/b8"]
+        Gcavelookup["b9"] = Gcavelookup["1976/b9"]
+
+        Gcavelookup["2011-01-bs30"] = Gcavelookup["190"]
+        Gcavelookup["bs30"] = Gcavelookup["190"]
+        Gcavelookup["87"] = Gcavelookup["190"]
+        Gcavelookup["2011-01"] = Gcavelookup["190"]
+     
+        Gcavelookup["quarriesd"] = Gcavelookup["2002-08"]
+        Gcavelookup["2002-x11"] = Gcavelookup["2005-08"]
+        Gcavelookup["2002-x12"] = Gcavelookup["2005-07"]
+        Gcavelookup["2002-x13"] = Gcavelookup["2005-06"]
+        Gcavelookup["2002-x14"] = Gcavelookup["2005-05"]
+        
+        Gcavelookup["kh"] = Gcavelookup["161"]
+        Gcavelookup["161-kh"] = Gcavelookup["161"]
+        Gcavelookup["204-steinBH"] = Gcavelookup["204"]
+        Gcavelookup["stonebridge"] = Gcavelookup["204"]
+        Gcavelookup["hauchhole"] = Gcavelookup["234"]
+        Gcavelookup["hauch"] = Gcavelookup["234"]
+        Gcavelookup["234-hauch"] = Gcavelookup["234"]
+        Gcavelookup["tunnocks"] = Gcavelookup["258"]
+        Gcavelookup["balcony"] = Gcavelookup["264"]
+        Gcavelookup["balkon"] = Gcavelookup["264"]
+        Gcavelookup["fgh"] = Gcavelookup["290"]
+        Gcavelookup["gsh"] = Gcavelookup["291"]
+
+        Gcavelookup["homecoming"] = Gcavelookup["2018-dm-07"]
+        Gcavelookup["heimkommen"] = Gcavelookup["2018-dm-07"]
+        Gcavelookup["99ob02"] = Gcavelookup["1999-ob-02"]
+    except:
+        pass
     
     addmore = {}
     for id in Gcavelookup: