diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4e4c334..60e1058 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,20 +4,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -34,6 +23,18 @@
+
+
{
"associatedIndex": 4
}
@@ -43,19 +44,19 @@
- {
+ "keyToString": {
+ "Python.Run main.executor": "Run",
+ "Python.main.executor": "Run",
+ "Python.main_window.executor": "Run",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.git.unshallow": "true",
+ "git-widget-placeholder": "master",
+ "ignore.virus.scanning.warn.message": "true",
+ "last_opened_file_path": "C:/dev/SIPPCompare/main.py",
+ "settings.editor.selected.configurable": "editor.preferences.fonts.default"
}
-}]]>
+}
@@ -102,6 +103,15 @@
1737895685673
+
+
+ 1738078065403
+
+
+
+ 1738078065403
+
+
@@ -115,4 +125,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main_window.py b/src/main_window.py
index 6ce7546..c53a773 100644
--- a/src/main_window.py
+++ b/src/main_window.py
@@ -61,13 +61,16 @@ class SIPPCompare(QMainWindow):
break
shares_value = (1 - (slider_val / 100)) * value_num
- share_plat_fees = self.share_plat_fee * shares_value
- if (share_plat_fees / 12) > self.share_plat_max_fee:
+ if (self.share_plat_fee * shares_value / 12) > self.share_plat_max_fee:
share_plat_fees = self.share_plat_max_fee * 12
+ else:
+ share_plat_fees = self.share_plat_fee * shares_value
+
share_trades_num = int(self.share_trades_combo.currentText())
- share_deal_fees = self.share_deal_fee * share_trades_num
- if (share_trades_num / 12) > self.share_deal_reduce_trades:
+ if (share_trades_num / 12) >= self.share_deal_reduce_trades:
share_deal_fees = self.share_deal_reduce_amount * share_trades_num
+ else:
+ share_deal_fees = self.share_deal_fee * share_trades_num
self.show_output_win(fund_plat_fees, fund_deal_fees, share_plat_fees, share_deal_fees)