Asset transfer icon display was activated.

titov-vv · Feb 6, 2024 · 5c4413c · 5c4413c
1 parent bbdab5d
commit 5c4413c
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 78 deletions.
diff --git a/jal/db/asset.py b/jal/db/asset.py
@@ -25,7 +25,10 @@ def __init__(self, asset_id: int = 0, data: dict = None, search: bool = False, c
         super().__init__(cached=True)
         if not JalAsset.db_cache:
             self._fetch_data()
-        self._id = asset_id
+        try:
+            self._id = int(asset_id)
+        except (TypeError, ValueError):
+            self._id = 0
         if self._valid_data(data, search, create):
             if search:
                 self._id = self._find_asset(data)

diff --git a/jal/db/operations.py b/jal/db/operations.py
@@ -778,16 +778,22 @@ class Transfer(LedgerTransaction):
     }
 
     def __init__(self, operation_id=None, display_type=None):
+        assert display_type in [Transfer.Outgoing, Transfer.Incoming, Transfer.Fee], "Unknown transfer type"
         icons = {
-            Transfer.Outgoing: JalIcon.TRANSFER_OUT,
-            Transfer.Incoming: JalIcon.TRANSFER_IN,
-            Transfer.Fee: JalIcon.FEE
+            (Transfer.Outgoing, True): JalIcon.TRANSFER_OUT,
+            (Transfer.Incoming, True): JalIcon.TRANSFER_IN,
+            (Transfer.Fee, True): JalIcon.FEE,
+            (Transfer.Outgoing, False): JalIcon.TRANSFER_ASSET_OUT,
+            (Transfer.Incoming, False): JalIcon.TRANSFER_ASSET_IN,
+            (Transfer.Fee, False): JalIcon.FEE,
         }
         self.names = {
-            Transfer.NA: self.tr("UNDEFINED"),
-            Transfer.Outgoing: self.tr("Outgoing transfer"),
-            Transfer.Incoming: self.tr("Incoming transfer"),
-            Transfer.Fee: self.tr("Transfer fee"),
+            (Transfer.Outgoing, True): self.tr("Outgoing transfer"),
+            (Transfer.Incoming, True): self.tr("Incoming transfer"),
+            (Transfer.Fee, True): self.tr("Transfer fee"),
+            (Transfer.Outgoing, False): self.tr("Outgoing asset transfer"),
+            (Transfer.Incoming, False): self.tr("Incoming asset transfer"),
+            (Transfer.Fee, False): self.tr("Asset transfer fee"),
         }
         super().__init__(operation_id)
         self._otype = LedgerTransaction.Transfer
@@ -810,23 +816,18 @@ def __init__(self, operation_id=None, display_type=None):
         self._fee_currency = JalAsset(self._fee_account.currency()).symbol()
         self._fee_account_name = self._fee_account.name()
         self._fee = Decimal(self._data['fee']) if self._data['fee'] else Decimal('0')
-        try:
-            self._icon = JalIcon[icons[display_type]]
-            self._oname = self.names[display_type]
-        except KeyError:
-            assert False, "Unknown transfer type"
         self._asset = JalAsset(self._data['asset'])
         self._number = self._data['number']
         self._account = self._withdrawal_account
         self._note = self._data['note']
+        self._icon = JalIcon[icons[(display_type, self._asset.id() == 0)]]
+        self._oname = self.names[(display_type, self._asset.id() == 0)]
         if self._display_type == Transfer.Outgoing:
             self._reconciled = self._withdrawal_account.reconciled_at() >= self._withdrawal_timestamp
-        elif self._display_type == Transfer.Incoming:
+        if self._display_type == Transfer.Incoming:
             self._reconciled = self._deposit_account.reconciled_at() >= self._deposit_timestamp
-        elif self._display_type == Transfer.Fee:
+        if self._display_type == Transfer.Fee:
             self._reconciled = self._fee_account.reconciled_at() >= self._withdrawal_timestamp
-        else:
-            assert False, "Unknown transfer type"
 
     def timestamp(self):
         if self._display_type == Transfer.Incoming:

diff --git a/jal/languages/en.ts b/jal/languages/en.ts
@@ -620,57 +620,57 @@
 <context>
     <name>CorporateAction</name>
     <message>
-        <location filename="../db/operations.py" line="1031"/>
+        <location filename="../db/operations.py" line="1032"/>
         <source>UNDEFINED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="1032"/>
+        <location filename="../db/operations.py" line="1033"/>
         <source>Symbol change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="1033"/>
+        <location filename="../db/operations.py" line="1034"/>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="1034"/>
+        <location filename="../db/operations.py" line="1035"/>
         <source>Spin-off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="1035"/>
+        <location filename="../db/operations.py" line="1036"/>
         <source>Merger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="1038"/>
+        <location filename="../db/operations.py" line="1039"/>
         <source>Delisting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="1139"/>
+        <location filename="../db/operations.py" line="1140"/>
         <source>Asset isn&apos;t a part of corporate action results: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="1158"/>
+        <location filename="../db/operations.py" line="1159"/>
         <source>Corporate action type isn&apos;t defined. Date: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="1163"/>
+        <location filename="../db/operations.py" line="1164"/>
         <source>Asset amount is not enough for corporate action processing. Date: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="1167"/>
+        <location filename="../db/operations.py" line="1168"/>
         <source>Unhandled case: Corporate action covers not full open position. Date: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="1176"/>
+        <location filename="../db/operations.py" line="1177"/>
         <source>Results value of corporate action doesn&apos;t match 100% of initial asset value. </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1882,27 +1882,27 @@
 <context>
     <name>JalAsset</name>
     <message>
-        <location filename="../db/asset.py" line="155"/>
+        <location filename="../db/asset.py" line="158"/>
         <source>There are no quote/rate for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/asset.py" line="213"/>
+        <location filename="../db/asset.py" line="216"/>
         <source>Quotations were updated: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/asset.py" line="260"/>
+        <location filename="../db/asset.py" line="263"/>
         <source>Unexpected attempt to update ISIN for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/asset.py" line="280"/>
+        <location filename="../db/asset.py" line="283"/>
         <source>Country updated for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/asset.py" line="290"/>
+        <location filename="../db/asset.py" line="293"/>
         <source>Reg.number updated for </source>
         <translation type="unfinished"></translation>
     </message>
@@ -5665,52 +5665,62 @@ Please select an account for import:</source>
 <context>
     <name>Transfer</name>
     <message>
-        <location filename="../db/operations.py" line="787"/>
-        <source>UNDEFINED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../db/operations.py" line="788"/>
+        <location filename="../db/operations.py" line="791"/>
         <source>Outgoing transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="789"/>
+        <location filename="../db/operations.py" line="792"/>
         <source>Incoming transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="790"/>
+        <location filename="../db/operations.py" line="793"/>
         <source>Transfer fee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="864"/>
+        <location filename="../db/operations.py" line="794"/>
+        <source>Outgoing asset transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../db/operations.py" line="795"/>
+        <source>Incoming asset transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../db/operations.py" line="796"/>
+        <source>Asset transfer fee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../db/operations.py" line="865"/>
         <source>Cost basis:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="879"/>
+        <location filename="../db/operations.py" line="880"/>
         <source>Error. Zero rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="937"/>
+        <location filename="../db/operations.py" line="938"/>
         <source>Can&apos;t collect fee from the account &apos;{}&apos; ({}) as organization isn&apos;t set for it. Date: {}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="960"/>
+        <location filename="../db/operations.py" line="961"/>
         <source>Asset amount is not enough for asset transfer processing. Date: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="965"/>
+        <location filename="../db/operations.py" line="966"/>
         <source>Processed asset amount is less than transfer amount. Date: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../db/operations.py" line="978"/>
+        <location filename="../db/operations.py" line="979"/>
         <source>Asset withdrawal not found for transfer.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/jal/languages/ru.qm b/jal/languages/ru.qm