diff --git a/core/migrations/0010_node_balance_badge.py b/core/migrations/0010_node_balance_badge.py new file mode 100644 index 0000000..593e2e2 --- /dev/null +++ b/core/migrations/0010_node_balance_badge.py @@ -0,0 +1,20 @@ +# Generated by Django 5.0 on 2024-05-22 09:17 + +import helpers.filesystem +import imagekit.models.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0009_node_has_linked_crm_node_linked_crm_url'), + ] + + operations = [ + migrations.AddField( + model_name='node', + name='balance_badge', + field=imagekit.models.fields.ProcessedImageField(blank=True, null=True, upload_to=helpers.filesystem.RandomFileName('badge/'), verbose_name='Imagen del distintivo de balance'), + ), + ] diff --git a/core/models/node.py b/core/models/node.py index cff0919..6a2b35d 100644 --- a/core/models/node.py +++ b/core/models/node.py @@ -21,6 +21,9 @@ class Node(models.Model): banner_image = ProcessedImageField(null=True, blank=True, upload_to=RandomFileName('node/'), verbose_name=_('Imagen principal'), processors=[ResizeToFit(756, 512, upscale=False)], format='PNG') + balance_badge = ProcessedImageField(null=True, blank=True, upload_to=RandomFileName('badge/'), + verbose_name=_('Imagen del distintivo de balance'), + processors=[ResizeToFit(512, 512, upscale=False)], format='PNG') webpage_link = models.URLField(blank=True, null=True, verbose_name=_('Página web'), max_length=250) takahe_server = models.URLField(blank=True, null=True, verbose_name=_('Servidor de Takahe')) diff --git a/market/forms/market.py b/market/forms/market.py index a27e9da..7963ee2 100644 --- a/market/forms/market.py +++ b/market/forms/market.py @@ -12,6 +12,7 @@ class Meta: 'register_consumer_url': forms.TextInput(), 'register_provider_url': forms.TextInput(), 'info_page_url': forms.TextInput(), - 'banner_image': forms.FileInput() + 'banner_image': forms.FileInput(), + 'balance_badge': forms.FileInput(), } exclude = [] diff --git a/market/urls.py b/market/urls.py index b318c47..228cfc4 100644 --- a/market/urls.py +++ b/market/urls.py @@ -10,7 +10,7 @@ # Superadmin market management path('m/', views.MarketList.as_view(), name='market_list'), path('m/add/', views.AddMarket.as_view(), name='add_market'), - path('m//', views.EditMarket.as_view(), name='edit_market'), + path('m//', views.EditMarket.as_view(), name='edit_market'), #### Market management ##### path('/dashboard/', views.MarketDashboard.as_view(), name='market_dashboard'), diff --git a/market/views/market.py b/market/views/market.py index 08a5c46..aafa1fa 100644 --- a/market/views/market.py +++ b/market/views/market.py @@ -52,15 +52,16 @@ def get_success_url(self): return reverse('market:market_list', ) -class EditMarket(UpdateView, MarketFormsetView): +class EditMarket(MarketMixin, UpdateView, MarketFormsetView): template_name = 'market/edit.html' + pk_url_kwarg = 'market' form_class = MarketForm model = Node initial = {'preffered_locale': 'es-ES'} def get_success_url(self): messages.success(self.request, _('Datos actualizados correctamente.')) - return reverse('market:edit_market', kwargs={"pk": self.object.pk}) + return reverse('market:edit_market', kwargs={"market": self.object.pk}) class MarketInfoView(MarketMixin, TemplateView): diff --git a/market/views/provider.py b/market/views/provider.py index 39b5b2e..0808207 100644 --- a/market/views/provider.py +++ b/market/views/provider.py @@ -168,7 +168,7 @@ def get_success_url(self): return self.reverse('market:provider_detail', kwargs={'pk': self.object.pk}) -class ProviderSocialBalance(DetailView): +class ProviderSocialBalance(AccountAccessMixin, MarketMixin, DetailView): template_name = 'balance/detail.html' context_object_name = 'entity' model = Provider diff --git a/templates/balance/detail.html b/templates/balance/detail.html index aa356df..98c6ace 100644 --- a/templates/balance/detail.html +++ b/templates/balance/detail.html @@ -24,9 +24,9 @@

{% translate 'Distintivo de calidad del MESM' %}

{% translate 'Al realizar el Balance Social, además de obtener el sello, infografía e informe personalizado, las entidades que lo soliciten, tendrán este Distintivo de calidad, como herramienta diferenciadora que dará visibilidad y prestigio a vuestra entidad.' %} - Sello MES +
Sello MES
+ {% translate 'El distintivo contiene un QR que permite a las socias visitar un documento como el que se puede ver aquí.' %} - {% translate 'El distintivo contiene un QR que permite a las socias visitar un documento como el que se puede ver aquí.' %}
diff --git a/templates/market/form.html b/templates/market/form.html index 0f299d2..3aee0e1 100644 --- a/templates/market/form.html +++ b/templates/market/form.html @@ -6,12 +6,45 @@
-
+
{% include "common/forms/field.html" with field=form.name %} {% include "common/forms/field.html" with field=form.shortname %} - + + + {% include "common/forms/field.html" with field=form.preferred_locale %} + + +
+ +
+
+ {% include "common/forms/switch.html" with field=form.visible %} + {% include "common/forms/switch.html" with field=form.self_register_allowed %} + {% include "common/forms/switch.html" with field=form.member_card_enabled %} +
+
+ {% include "common/forms/field.html" with field=form.register_provider_url %} + {% include "common/forms/field.html" with field=form.register_consumer_url %} +
+ {% include "common/forms/switch.html" with field=form.has_linked_crm %} +
+ {% include "common/forms/field.html" with field=form.linked_crm_url %} +
+ +
+
+ +
+
+

edit_location {% translate 'Datos públicos' %}

+ + {% include "common/forms/field.html" with field=form.info_page_url %} + + {% include "common/forms/field.html" with field=form.contact_email %} + +
{{object.title}} @@ -29,32 +62,36 @@
- {% include "common/forms/field.html" with field=form.preferred_locale %} +
- {% include "common/forms/field.html" with field=form.contact_email %} +
+
{% translate 'Distintivo de balance social' %}
+

{% translate 'Imagen (preferiblemente PNG con transparencia) para representar el distintivo de balance social de este mercado. ' %}

+ {% translate 'Se utiliza desde la app para acceder al detalle de balance de cada proveedora' %} +
-
- {% include "common/forms/switch.html" with field=form.self_register_allowed %} - {% include "common/forms/switch.html" with field=form.member_card_enabled %} -
-
- {% include "common/forms/field.html" with field=form.register_provider_url %} - {% include "common/forms/field.html" with field=form.register_consumer_url %} -
-
- {% include "common/forms/switch.html" with field=form.visible %} -
+
+
+
+ {{object.title}} - {% include "common/forms/field.html" with field=form.info_page_url %} - {% include "common/forms/switch.html" with field=form.has_linked_crm %} -
- {% include "common/forms/field.html" with field=form.linked_crm_url %} -
+
-
-
+
+ edit +
+
+
+ {{ form.balance_badge }} +
+
+
+
+
+
+