From c0cdf197c59d2b4bb5b5d71dc3bffe1fcebf434b Mon Sep 17 00:00:00 2001
From: Matthew Grove <me@mgrove.uk>
Date: Sat, 11 Sep 2021 10:45:09 +0100
Subject: [PATCH] Ensure raw mark displays properly for tests

---
 src/History.js      | 34 ++++++++++++++--------------------
 src/LoggedInHome.js |  5 +++--
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/History.js b/src/History.js
index e4889e8..01a3028 100644
--- a/src/History.js
+++ b/src/History.js
@@ -48,27 +48,21 @@ export default class History extends Component {
 
 				querySnapshot.docs.map((doc) => {
 					const data = doc.data();
+					const pushData = {
+						id: doc.id,
+						setTitle: data.set_title,
+						switchLanguage: data.switch_language,
+						percentage: (data.progress / data.questions.length * 100).toFixed(2),
+						mark: (data.progress > 0 ? data.correct.length / data.progress * 100 : 0).toFixed(2),
+						mode: data.mode,
+						correct: data.correct.length,
+						progress: data.progress,
+					};
 
 					if (data.duration !== null) {
-						return complete.push({
-							id: doc.id,
-							setTitle: data.set_title,
-							switchLanguage: data.switch_language,
-							progress: (data.progress / data.questions.length * 100).toFixed(2),
-							mark: (data.progress > 0 ? data.correct.length / data.progress * 100 : 0).toFixed(2),
-							mode: data.mode,
-							correct: data.correct.length,
-						});
+						return complete.push(pushData);
 					} else {
-						return incomplete.push({
-							id: doc.id,
-							setTitle: data.set_title,
-							switchLanguage: data.switch_language,
-							progress: (data.progress / data.questions.length * 100).toFixed(2),
-							mark: (data.progress > 0 ? data.correct.length / data.progress * 100 : 0).toFixed(2),
-							mode: data.mode,
-							correct: data.correct.length,
-						});
+						return incomplete.push(pushData);
 					}
 				});
 
@@ -133,7 +127,7 @@ export default class History extends Component {
 													<SwapHorizRoundedIcon />
 												}
 											</Link>
-											<p>{progressItem.progress}%</p>
+											<p>{progressItem.percentage}%</p>
 											<p>{progressItem.correct}/{progressItem.progress}</p>
 											<p>{progressItem.mark}%</p>
 											<p>
@@ -177,7 +171,7 @@ export default class History extends Component {
 													<SwapHorizRoundedIcon />
 												}
 											</Link>
-											<p>{progressItem.progress}%</p>
+											<p>{progressItem.percentage}%</p>
 											<p>{progressItem.correct}/{progressItem.progress}</p>
 											<p>{progressItem.mark}%</p>
 											{
diff --git a/src/LoggedInHome.js b/src/LoggedInHome.js
index 985896a..b91a93e 100644
--- a/src/LoggedInHome.js
+++ b/src/LoggedInHome.js
@@ -145,10 +145,11 @@ export default withRouter(class LoggedInHome extends React.Component {
 					id: doc.id,
 					setTitle: data.set_title,
 					switchLanguage: data.switch_language,
-					progress: (data.progress / data.questions.length * 100).toFixed(2),
+					percentage: (data.progress / data.questions.length * 100).toFixed(2),
 					mark: (data.progress > 0 ? data.correct.length / data.progress * 100 : 0).toFixed(2),
 					mode: data.mode,
 					correct: data.correct.length,
+					progress: data.progress,
 				});
 			})
 		})
@@ -281,7 +282,7 @@ export default withRouter(class LoggedInHome extends React.Component {
 													<SwapHorizRoundedIcon />
 												}
 											</Link>
-											<p>{progressItem.progress}%</p>
+											<p>{progressItem.percentage}%</p>
 											<p>{progressItem.correct}/{progressItem.progress}</p>
 											<p>{progressItem.mark}%</p>
 											<p>