Changeset 33249

Timestamp:

2019-06-27T23:21:50+12:00 (5 years ago)

Author:

davidb

Message:

Further checking needed when converting cell-value to be in unicode format

File:

• main/trunk/model-sites-dev/heritage-nz/collect/pdf-reports/prepare/xlsutil.py (modified) (1 diff)

main/trunk/model-sites-dev/heritage-nz/collect/pdf-reports/prepare/xlsutil.py

@@ -14 +14 @@
     if type(value) != unicode:
         value_str = value
-        if type(value_str) != str:
+        if type(value) != str:
+
+            # numbers in the spreadsheet default to 'float'
+            # but if actually a whole number, want it be
+            # type cast to an 'int' otherwise a '.0' ends
+            # up on the end of the string version
+            if type(value) is float:
+                if value == int(value): 
+                    value = int(value)
+
             value_str = str(value)