RolandWH/SIPPCompare
1
0
Fork 0
mirror of https://github.com/RolandWH/SIPPCompare.git synced 2025-04-19 16:01:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

make fund deal fee checkbox optional

Browse Source
This commit is contained in:
Roland W-H 2025-03-17 21:55:13 +00:00
parent 32bc3add9b
commit f395f155d0
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/platform_edit.ui
View File

@ -80,7 +80,7 @@
<item row="2" column="3"> <item row="2" column="3">
<widget class="QCheckBox" name="fund_deal_fee_check"> <widget class="QCheckBox" name="fund_deal_fee_check">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>

11
src/main_window.py
View File

@ -66,7 +66,6 @@ class SIPPCompare(QMainWindow):
def init_variables(self): def init_variables(self):
self.optional_boxes = self.platform_win.get_optional_boxes() self.optional_boxes = self.platform_win.get_optional_boxes()
self.fund_plat_fee = self.platform_win.get_fund_plat_fee() self.fund_plat_fee = self.platform_win.get_fund_plat_fee()
self.fund_deal_fee = self.platform_win.get_fund_deal_fee()
self.share_plat_fee = self.platform_win.get_share_plat_fee() self.share_plat_fee = self.platform_win.get_share_plat_fee()
self.share_deal_fee = self.platform_win.get_share_deal_fee() self.share_deal_fee = self.platform_win.get_share_deal_fee()
@ -77,16 +76,21 @@ class SIPPCompare(QMainWindow):
self.plat_name = None self.plat_name = None
if self.optional_boxes[1]: if self.optional_boxes[1]:
self.fund_deal_fee = self.platform_win.get_fund_deal_fee()
else:
self.fund_deal_fee = None
if self.optional_boxes[2]:
self.share_plat_max_fee = self.platform_win.get_share_plat_max_fee() self.share_plat_max_fee = self.platform_win.get_share_plat_max_fee()
else: else:
self.share_plat_max_fee = None self.share_plat_max_fee = None
if self.optional_boxes[2]: if self.optional_boxes[3]:
self.share_deal_reduce_trades = self.platform_win.get_share_deal_reduce_trades() self.share_deal_reduce_trades = self.platform_win.get_share_deal_reduce_trades()
else: else:
self.share_deal_reduce_trades = None self.share_deal_reduce_trades = None
if self.optional_boxes[3]: if self.optional_boxes[4]:
self.share_deal_reduce_amount = self.platform_win.get_share_deal_reduce_amount() self.share_deal_reduce_amount = self.platform_win.get_share_deal_reduce_amount()
else: else:
self.share_deal_reduce_amount = None self.share_deal_reduce_amount = None
@ -101,6 +105,7 @@ class SIPPCompare(QMainWindow):
slider_val: int = self.mix_slider.value() slider_val: int = self.mix_slider.value()
funds_value = (slider_val / 100) * value_num funds_value = (slider_val / 100) * value_num
fund_trades_num = int(self.fund_trades_combo.currentText()) fund_trades_num = int(self.fund_trades_combo.currentText())
if self.fund_deal_fee is not None:
self.fund_deal_fees = fund_trades_num * self.fund_deal_fee self.fund_deal_fees = fund_trades_num * self.fund_deal_fee
for i in range(1, len(self.fund_plat_fee[0])): for i in range(1, len(self.fund_plat_fee[0])):

4
src/platform_edit.py
View File

@ -34,13 +34,13 @@ class PlatformEdit(QWidget):
self.save_but.setEnabled(True) self.save_but.setEnabled(True)
self.required_fields = [ self.required_fields = [
self.fund_deal_fee_box,
self.share_plat_fee_box, self.share_plat_fee_box,
self.share_deal_fee_box self.share_deal_fee_box
] ]
self.optional_fields = [ self.optional_fields = [
self.plat_name_box, self.plat_name_box,
self.fund_deal_fee_box,
self.share_plat_max_fee_box, self.share_plat_max_fee_box,
self.share_deal_reduce_trades_box, self.share_deal_reduce_trades_box,
self.share_deal_reduce_amount_box self.share_deal_reduce_amount_box
@ -48,12 +48,14 @@ class PlatformEdit(QWidget):
self.optional_check_boxes = [ self.optional_check_boxes = [
self.plat_name_check, self.plat_name_check,
self.fund_deal_fee_check,
self.share_plat_max_fee_check, self.share_plat_max_fee_check,
self.share_deal_reduce_trades_check, self.share_deal_reduce_trades_check,
self.share_deal_reduce_amount_check self.share_deal_reduce_amount_check
] ]
self.check_boxes_ticked = [ self.check_boxes_ticked = [
True,
True, True,
False, False,
False, False,