Fix null job rate in importing Salmonia3+ backup

zhxie · May 31, 2024 · 21cbaae · 21cbaae
1 parent 782d568
commit 21cbaae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/tools/convert_salmonia3+_backup.py b/tools/convert_salmonia3+_backup.py
@@ -330,7 +330,11 @@ def main():
                             ),
                             "jobPoint": result["kumaPoint"],
                             "jobScore": result["jobScore"],
-                            "jobRate": float(result["jobRate"]),
+                            "jobRate": (
+                                float(result["jobRate"])
+                                if result["jobRate"] != None
+                                else None
+                            ),
                             "jobBonus": result["jobBonus"],
                             "nextHistoryDetail": None,
                             "previousHistoryDetail": None,

diff --git a/views/ImportView.tsx b/views/ImportView.tsx
@@ -1089,7 +1089,7 @@ const ImportView = (props: ImportViewProps) => {
                   : null,
               jobPoint: result["kumaPoint"],
               jobScore: result["jobScore"],
-              jobRate: parseFloat(result["jobRate"]),
+              jobRate: result["jobRate"] === null ? null : parseFloat(result["jobRate"]),
               jobBonus: result["jobBonus"],
               nextHistoryDetail: null,
               previousHistoryDetail: null,