wbportfolio 1.56.5__tar.gz → 1.56.6__tar.gz

{wbportfolio-1.56.5 → wbportfolio-1.56.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbportfolio
-Version: 1.56.5
+Version: 1.56.6
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 License-File: LICENSE
 Requires-Dist: cryptography==3.4.*

{wbportfolio-1.56.5 → wbportfolio-1.56.6}/wbportfolio/contrib/company_portfolio/configs/display.py

@@ -67,9 +67,15 @@ class CompanyModelDisplay(BaseCompanyModelDisplay):
         list_display = super().get_list_display()
         list_display.fields = (
             *list_display.fields[:5],
-            dp.Field(key="invested_assets_under_management_usd", label="AUM Invested"),
-            dp.Field(key="asset_under_management", label="AUM"),
-            dp.Field(key="potential", label="Potential"),
+            dp.Field(
+                key=None,
+                label=_("AUM"),
+                children=[
+                    dp.Field(key="invested_assets_under_management_usd", label="AUM Invested", width=100),
+                    dp.Field(key="asset_under_management", label="AUM", width=100),
+                    dp.Field(key="potential", label="Potential", width=100),
+                ],
+            ),
             *list_display.fields[5:],
         )
         return list_display
@@ -140,9 +146,15 @@ class PersonModelDisplay(BasePersonModelDisplay):
 
         list_display.fields = (
             *list_display.fields[:7],
-            dp.Field(key="invested_assets_under_management_usd", label="AUM Invested"),
-            dp.Field(key="asset_under_management", label="AUM"),
-            dp.Field(key="potential", label="Potential"),
+            dp.Field(
+                key=None,
+                label=_("AUM"),
+                children=[
+                    dp.Field(key="invested_assets_under_management_usd", label="AUM Invested", width=100),
+                    dp.Field(key="asset_under_management", label="AUM", width=100),
+                    dp.Field(key="potential", label="Potential", width=100),
+                ],
+            ),
             *list_display.fields[7:],
         )
         return list_display

{wbportfolio-1.56.5 → wbportfolio-1.56.6}/wbportfolio/contrib/company_portfolio/serializers.py

@@ -103,22 +103,11 @@ class CompanyPortfolioDataMixin(serializers.ModelSerializer):
         read_only=True,
         **_get_assets_under_management_kwargs(field_name="invested_assets_under_management_usd"),
     )
-    investment_discretion = serializers.ChoiceField(**_get_investment_discretion_kwargs())
-    assets_under_management_currency = serializers.PrimaryKeyRelatedField(
-        required=False,
-        queryset=Currency.objects.all(),
-        default=None,
-        label=CompanyPortfolioData.assets_under_management_currency.field.verbose_name,
-    )
+
     assets_under_management_currency_repr = serializers.CharField(read_only=True, required=False)
-    _assets_under_management_currency = CurrencyRepresentationSerializer(source="assets_under_management_currency")
+
     potential = serializers.DecimalField(**_get_potential_kwargs())
-    potential_currency = serializers.PrimaryKeyRelatedField(
-        required=False,
-        queryset=Currency.objects.all(),
-        label=CompanyPortfolioData.potential_currency.field.verbose_name,
-    )
-    _potential_currency = CurrencyRepresentationSerializer(source="potential_currency")
+    investment_discretion = serializers.ChoiceField(**_get_investment_discretion_kwargs())
 
     # Not sure why read_only_fields does not work...
     tier = serializers.ChoiceField(
@@ -144,10 +133,6 @@ class CompanyPortfolioDataMixin(serializers.ModelSerializer):
             "asset_under_management",  # TODO: add an s after asset - After removing this field from the base model
             "assets_under_management_currency_repr",
             "invested_assets_under_management_usd",
-            "potential_currency",
-            "_potential_currency",
-            "assets_under_management_currency",
-            "_assets_under_management_currency",
             "investment_discretion",
             "potential",
             "tier",
@@ -156,6 +141,19 @@ class CompanyPortfolioDataMixin(serializers.ModelSerializer):
 
 class CompanyModelSerializer(CompanyPortfolioDataMixin, BaseCompanyModelSerializer):
     SERIALIZER_CLASS_FOR_REMOTE_ADDITIONAL_RESOURCES = BasePersonModelSerializer
+    assets_under_management_currency = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=Currency.objects.all(),
+        default=None,
+        label=CompanyPortfolioData.assets_under_management_currency.field.verbose_name,
+    )
+    _assets_under_management_currency = CurrencyRepresentationSerializer(source="assets_under_management_currency")
+    potential_currency = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=Currency.objects.all(),
+        label=CompanyPortfolioData.potential_currency.field.verbose_name,
+    )
+    _potential_currency = CurrencyRepresentationSerializer(source="potential_currency")
 
     def update(self, instance, validated_data):
         validated_data, portfolio_data = get_portfolio_data(validated_data)
@@ -209,6 +207,20 @@ class CompanyModelListSerializer(CompanyPortfolioDataMixin, BaseCompanyModelList
 class PersonModelSerializer(CompanyPortfolioDataMixin, BasePersonModelSerializer):
     SERIALIZER_CLASS_FOR_REMOTE_ADDITIONAL_RESOURCES = BasePersonModelSerializer
 
+    assets_under_management_currency = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=Currency.objects.all(),
+        default=None,
+        label=CompanyPortfolioData.assets_under_management_currency.field.verbose_name,
+    )
+    _assets_under_management_currency = CurrencyRepresentationSerializer(source="assets_under_management_currency")
+    potential_currency = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=Currency.objects.all(),
+        label=CompanyPortfolioData.potential_currency.field.verbose_name,
+    )
+    _potential_currency = CurrencyRepresentationSerializer(source="potential_currency")
+
     asset_under_management = serializers.DecimalField(
         **_get_assets_under_management_kwargs(field_name="assets_under_management"),
         read_only=True,

{wbportfolio-1.56.5 → wbportfolio-1.56.6}/wbportfolio/serializers/orders/orders.py

@@ -155,6 +155,9 @@ class OrderOrderProposalListModelSerializer(wb_serializers.ModelSerializer):
             "currency_fx_rate",
             "price",
         )
+        extra_kwargs = {
+            "price": {"required": False},
+        }
         fields = (
             "id",
             "shares",