RolandWH/SIPPCompare
1
0
Fork 0
mirror of https://github.com/RolandWH/SIPPCompare.git synced 2025-03-14 22:01:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify and fix fees logic

Browse Source
This commit is contained in:
Roland W-H 2025-01-28 15:45:57 +00:00
parent cafe2da484
commit 922f4b3a39
2 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
.idea/workspace.xml generated
View File

@ -4,20 +4,9 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="1c319b92-4392-4dac-a78b-6bf35361fa44" name="Changes" comment=""> <list default="true" id="1c319b92-4392-4dac-a78b-6bf35361fa44" name="Changes" comment="initial commit">
<change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/SIPPCompare.iml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main_window.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main_window.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gui/main_gui.ui" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gui/output_window.ui" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gui/platform_edit.ui" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main_window.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/output_window.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/platform_edit.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -34,6 +23,18 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="GitHubPullRequestSearchHistory"><![CDATA[{
"lastFilter": {
"state": "OPEN",
"assignee": "RolandWH"
}
}]]></component>
<component name="GithubPullRequestsUISettings"><![CDATA[{
"selectedUrlAndAccountId": {
"url": "https://github.com/RolandWH/SIPPCompare.git",
"accountId": "58149c61-8599-4d08-aec1-eb13472087b5"
}
}]]></component>
<component name="ProjectColorInfo">{ <component name="ProjectColorInfo">{
&quot;associatedIndex&quot;: 4 &quot;associatedIndex&quot;: 4
}</component> }</component>
@ -43,19 +44,19 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"Python.Run main.executor": "Run", &quot;Python.Run main.executor&quot;: &quot;Run&quot;,
"Python.main.executor": "Run", &quot;Python.main.executor&quot;: &quot;Run&quot;,
"Python.main_window.executor": "Run", &quot;Python.main_window.executor&quot;: &quot;Run&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.git.unshallow": "true", &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
"git-widget-placeholder": "master", &quot;git-widget-placeholder&quot;: &quot;master&quot;,
"ignore.virus.scanning.warn.message": "true", &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
"last_opened_file_path": "C:/dev/SIPPCompare/main.py", &quot;last_opened_file_path&quot;: &quot;C:/dev/SIPPCompare/main.py&quot;,
"settings.editor.selected.configurable": "editor.preferences.fonts.default" &quot;settings.editor.selected.configurable&quot;: &quot;editor.preferences.fonts.default&quot;
} }
}]]></component> }</component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\dev\SIPPCompare\src" /> <recent name="C:\dev\SIPPCompare\src" />
@ -102,6 +103,15 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1737895685673</updated> <updated>1737895685673</updated>
</task> </task>
<task id="LOCAL-00001" summary="initial commit">
<option name="closed" value="true" />
<created>1738078065403</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1738078065403</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -115,4 +125,8 @@
</map> </map>
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration">
<MESSAGE value="initial commit" />
<option name="LAST_COMMIT_MESSAGE" value="initial commit" />
</component>
</project> </project>

11
src/main_window.py
View File

@ -61,13 +61,16 @@ class SIPPCompare(QMainWindow):
break break
shares_value = (1 - (slider_val / 100)) * value_num shares_value = (1 - (slider_val / 100)) * value_num
share_plat_fees = self.share_plat_fee * shares_value if (self.share_plat_fee * shares_value / 12) > self.share_plat_max_fee:
if (share_plat_fees / 12) > self.share_plat_max_fee:
share_plat_fees = self.share_plat_max_fee * 12 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_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 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) self.show_output_win(fund_plat_fees, fund_deal_fees, share_plat_fees, share_deal_fees)