From 4b687f32fc3e09abd3777ba0db1fee821d4555d7 Mon Sep 17 00:00:00 2001 From: revelis-vincenzo Date: Wed, 15 Nov 2023 11:08:03 +0100 Subject: [PATCH] feat: cdswebsites object extra fix-migrations --- crud/cds_websites/forms.py | 16 +++-- .../templates/blocks/cds_website_page.html | 12 ++++ crud/cds_websites/templates/cds_website.html | 7 ++- .../templates/regulament_articles.html | 6 +- crud/cds_websites/templates/unique_form.html | 7 ++- crud/cds_websites/views.py | 60 +++++++++---------- ...iregolamento_sitowebcdstopicarticolireg.py | 2 +- .../migrations/0146_auto_20230712_1343.py | 2 +- ricerca_app/models.py | 4 +- 9 files changed, 70 insertions(+), 46 deletions(-) diff --git a/crud/cds_websites/forms.py b/crud/cds_websites/forms.py index 6eac5fd6..b6aa9f92 100644 --- a/crud/cds_websites/forms.py +++ b/crud/cds_websites/forms.py @@ -105,7 +105,6 @@ def __init__(self, *args, **kwargs): if self.initial: self.initial["visibile"] = bool(self.initial.get("visibile", None)) - visibile = forms.BooleanField( label=_("Visible"), required=False, @@ -146,7 +145,6 @@ def __init__(self, *args, **kwargs): class SitoWebCdsOggettiPortaleForm(forms.ModelForm): - id_classe_oggetto_portale = forms.ChoiceField( required=True, @@ -157,16 +155,25 @@ class SitoWebCdsOggettiPortaleForm(forms.ModelForm): required=True, min_value=1901, max_value=timezone.now().year, - label=_("Didactic Regulation Year"), + label=_("Didactic Regulation Academic Year"), ) id_oggetto_portale = forms.IntegerField( required=True, min_value=0, + label=_("Object Id"), ) class Meta: model = SitoWebCdsOggettiPortale exclude = ['dt_mod', 'id_user_mod','id_sito_web_cds_topic', 'cds', 'ordine', 'visibile'] - + labels = { + "titolo_it": _("Title (IT)"), + "titolo_en": _("Title (EN)"), + "testo_it": _("Text (IT)"), + "testo_en": _("Text (EN)"), + "id_oggetto_portale": _("Object Id"), + "aa_regdid_id": _("Didactic Regulation Academic Year"), + "id_classe_oggetto_portale": _("Object Class"), + } class SitoWebCdsTopicArticoliRegAltriDatiForm(forms.ModelForm): def __init__(self, *args, **kwargs): @@ -192,6 +199,7 @@ def __init__(self, *args, **kwargs): ) link = forms.URLField( label=_("Link"), + required=False, ) class Meta: diff --git a/crud/cds_websites/templates/blocks/cds_website_page.html b/crud/cds_websites/templates/blocks/cds_website_page.html index 237d144f..393bf7da 100644 --- a/crud/cds_websites/templates/blocks/cds_website_page.html +++ b/crud/cds_websites/templates/blocks/cds_website_page.html @@ -10,7 +10,11 @@
@@ -64,7 +68,11 @@
+ {% if LANGUAGE_CODE == "it" or not regart.titolo_en %} {{ regart.titolo_it }} + {% else %} + {{ regart.titolo_en }} + {% endif %} {{ regart.ordine }} @@ -150,7 +158,11 @@
+ {% if LANGUAGE_CODE == "it" or not object.titolo_en %} {{ object.titolo_it }} + {% else %} + {{ object.titolo_en }} + {% endif %} {{ object.ordine }} diff --git a/crud/cds_websites/templates/cds_website.html b/crud/cds_websites/templates/cds_website.html index 05c517d8..77dc184f 100644 --- a/crud/cds_websites/templates/cds_website.html +++ b/crud/cds_websites/templates/cds_website.html @@ -5,6 +5,7 @@ {% block centered_container %} +{% get_current_language as LANGUAGE_CODE %} @@ -31,7 +32,11 @@

- {{ cds.nome_cds_it }} + {% if LANGUAGE_CODE == "it" or not cds_website.nome_corso_en %} + {{ cds_website.nome_corso_it }} + {% else %} + {{ cds_website.nome_corso_en }} + {% endif %}

diff --git a/crud/cds_websites/templates/regulament_articles.html b/crud/cds_websites/templates/regulament_articles.html index 13ed1ec0..80b8168f 100644 --- a/crud/cds_websites/templates/regulament_articles.html +++ b/crud/cds_websites/templates/regulament_articles.html @@ -54,7 +54,11 @@
- {{ extra.testo_it }} + {% if LANGUAGE_CODE == "it" or not extra.testo_en %} + {{ extra.testo_it }} + {% else %} + {{ extra.testo_en }} + {% endif %} {{ extra.ordine }} diff --git a/crud/cds_websites/templates/unique_form.html b/crud/cds_websites/templates/unique_form.html index 7a072a42..15fb96a0 100644 --- a/crud/cds_websites/templates/unique_form.html +++ b/crud/cds_websites/templates/unique_form.html @@ -3,11 +3,14 @@ {% load i18n %} {% load static %} +{% get_current_language as LANGUAGE_CODE %} + {% block centered_container %}

- {% if edit|default:False %}{% trans "Edit " %}{% else %}{% trans "New " %}{% endif %} {{item_label|default:"item"}} {% trans " for " %} {{ cds_website.nome_corso_it }} + {% if edit|default:False %}{% trans "Edit " %}{% else %}{% trans "New " %}{% endif %} {{item_label|default:"item"}} {% trans " for " %} + {% if LANGUAGE_CODE == "it" or not cds_website.nome_corso_en %}{{ cds_website.nome_corso_it }}{% else %} {{ cds_website.nome_corso_en }} {% endif %}

{% block before_forms%} {% endblock %} @@ -18,8 +21,6 @@

{% for form in forms %} {% include "form_template.html" with form=form %} -
-
{% endfor %} {% block before_submit %} {% endblock %} diff --git a/crud/cds_websites/views.py b/crud/cds_websites/views.py index 904e6390..e3c2ebed 100644 --- a/crud/cds_websites/views.py +++ b/crud/cds_websites/views.py @@ -94,10 +94,6 @@ def cds_websites_topics_edit(request, code, cds_website=None, my_offices=None): "objects" : topic_objs, "regarts" : topic_areg } - - - if request.POST: - pass breadcrumbs = {reverse('crud_utils:crud_dashboard'): _('Dashboard'), reverse('crud_cds_websites:crud_cds_websites'): _('Cds websites'), @@ -125,16 +121,11 @@ def cds_websites_topics_edit(request, code, cds_website=None, my_offices=None): @can_manage_cds_website @can_edit_cds_website def cds_websites_item_delete(request, code, topic_id, data_id, cds_website=None, my_offices=None): - print(f"Deleting {data_id}") regart = get_object_or_404(SitoWebCdsTopicArticoliReg, pk=data_id) if regart.id_sito_web_cds_articoli_regolamento is not None: - #delete extras - extras = SitoWebCdsTopicArticoliRegAltriDati.objects.filter(id_sito_web_cds_topic_articoli_reg=regart.id) - print(extras) - #extras.delete() - #regart.delete() + regart.delete() elif regart.id_sito_web_cds_oggetti_portale is not None: - pass + regart.id_sito_web_cds_oggetti_portale.delete() return redirect('crud_cds_websites:crud_cds_websites_topics_edit', code=code) @@ -375,20 +366,20 @@ def cds_websites_object_edit(request, code, topic_id, data_id, cds_website=None, art_reg_form = SitoWebCdsTopicArticoliItemForm(data=request.POST if request.POST else None, instance=tregart) - item_form = SitoWebCdsOggettiPortaleForm(data=request.POST if request.POST else None, instance=tregart.id_sito_web_cds_oggetti_portale) + object_form = SitoWebCdsOggettiPortaleForm(data=request.POST if request.POST else None, instance=tregart.id_sito_web_cds_oggetti_portale) if request.POST: - if art_reg_form.is_valid() and item_form.is_valid(): + if art_reg_form.is_valid() and object_form.is_valid(): art_reg = art_reg_form.save(commit=False) art_reg.id_user_mod = request.user art_reg.dt_mod = now() art_reg.save() - item_form.save(commit=False) - item_form.id_user_mod = request.user - item_form.dt_mod = now() - item_form.save() + _object = object_form.save(commit=False) + _object.id_user_mod = request.user + _object.dt_mod = now() + _object.save() log_action(user=request.user, obj=cds_website, @@ -405,20 +396,20 @@ def cds_websites_object_edit(request, code, topic_id, data_id, cds_website=None, for k, v in art_reg_form.errors.items(): messages.add_message(request, messages.ERROR, f"{art_reg_form.fields[k].label}: {v}") - for k, v in item_form.errors.items(): + for k, v in object_form.errors.items(): messages.add_message(request, messages.ERROR, - f"{item_form.fields[k].label}: {v}") + f"{object_form.fields[k].label}: {v}") breadcrumbs = {reverse('crud_utils:crud_dashboard'): _('Dashboard'), reverse('crud_cds_websites:crud_cds_websites'): _('Cds websites'), - reverse('crud_cds_websites:crud_cds_websites_topics_edit', kwargs={'code': code}):cds_website.cds.nome_cds_it, + reverse('crud_cds_websites:crud_cds_websites_topics_edit', kwargs={'code': code}): cds_website.cds.nome_cds_it, '#': tregart.titolo_it } return render(request, 'unique_form.html', { 'cds_website': cds_website, 'breadcrumbs': breadcrumbs, - 'forms': [art_reg_form, item_form,], + 'forms': [art_reg_form, object_form,], 'item_label': _('Item'), 'edit': 1, }) @@ -431,21 +422,24 @@ def cds_websites_object_new(request, code, topic_id, cds_website=None, my_office art_reg_form = SitoWebCdsTopicArticoliItemForm(data=request.POST if request.POST else None) - item_form = SitoWebCdsOggettiPortaleForm(data=request.POST if request.POST else None) + object_form = SitoWebCdsOggettiPortaleForm(data=request.POST if request.POST else None) if request.POST: - if art_reg_form.is_valid() and item_form.is_valid(): + if art_reg_form.is_valid() and object_form.is_valid(): + + _object = object_form.save(commit=False) + _object.id_sito_web_cds_topic = topic_id + _object.cds = cds_website.cds + _object.id_user_mod = request.user + _object.dt_mod = now() + _object.save() art_reg = art_reg_form.save(commit=False) + art_reg.id_sito_web_cds_oggetti_portale = _object + art_reg.id_sito_web_cds_topic = get_object_or_404(SitoWebCdsTopic, pk=topic_id) art_reg.id_user_mod = request.user art_reg.dt_mod = now() art_reg.save() - - item_form.save(commit=False) - item_form.id_sito_web_cds_oggetti_portale = art_reg - item_form.id_user_mod = request.user - item_form.dt_mod = now() - item_form.save() log_action(user=request.user, obj=cds_website, @@ -462,20 +456,20 @@ def cds_websites_object_new(request, code, topic_id, cds_website=None, my_office for k, v in art_reg_form.errors.items(): messages.add_message(request, messages.ERROR, f"{art_reg_form.fields[k].label}: {v}") - for k, v in item_form.errors.items(): + for k, v in object_form.errors.items(): messages.add_message(request, messages.ERROR, - f"{item_form.fields[k].label}: {v}") + f"{object_form.fields[k].label}: {v}") breadcrumbs = {reverse('crud_utils:crud_dashboard'): _('Dashboard'), reverse('crud_cds_websites:crud_cds_websites'): _('Cds websites'), - reverse('crud_cds_websites:crud_cds_websites_topics_edit', kwargs={'code': code}):cds_website.cds.nome_cds_it, + reverse('crud_cds_websites:crud_cds_websites_topics_edit', kwargs={'code': code}): cds_website.nome_corso_it if (request.LANGUAGE_CODE == 'it' or not cds_website.nome_corso_en) else cds_website.nome_corso_en, '#': _("New Object") } return render(request, 'unique_form.html', { 'cds_website': cds_website, 'breadcrumbs': breadcrumbs, - 'forms': [art_reg_form, item_form,], + 'forms': [art_reg_form, object_form,], 'item_label': _('Item'), 'edit': 1, }) diff --git a/ricerca_app/migrations/0130_sitowebcdsarticoliregaltridati_sitowebcdsarticoliregolamento_sitowebcdstopicarticolireg.py b/ricerca_app/migrations/0130_sitowebcdsarticoliregaltridati_sitowebcdsarticoliregolamento_sitowebcdstopicarticolireg.py index ee9f761a..23b10047 100644 --- a/ricerca_app/migrations/0130_sitowebcdsarticoliregaltridati_sitowebcdsarticoliregolamento_sitowebcdstopicarticolireg.py +++ b/ricerca_app/migrations/0130_sitowebcdsarticoliregaltridati_sitowebcdsarticoliregolamento_sitowebcdstopicarticolireg.py @@ -82,7 +82,7 @@ class Migration(migrations.Migration): ('dt_mod', models.DateField(db_column='DT_MOD')), ('id_user_mod', models.IntegerField(db_column='ID_USER_MOD')), ('id_sito_web_cds_articoli_regolamento', models.ForeignKey(db_column='ID_SITO_WEB_CDS_ARTICOLI_REGOLAMENTO', on_delete=django.db.models.deletion.DO_NOTHING, to='ricerca_app.sitowebcdsarticoliregolamento')), - ('id_sito_web_cds_oggetti_portale', models.ForeignKey(blank=True, db_column='ID_SITO_WEB_CDS_OGGETTI_PORTALE', null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='ricerca_app.sitowebcdsoggettiportale')), + ('id_sito_web_cds_oggetti_portale', models.ForeignKey(blank=True, db_column='ID_SITO_WEB_CDS_OGGETTI_PORTALE', null=True, on_delete=django.db.models.deletion.CASCADE, to='ricerca_app.sitowebcdsoggettiportale')), ('id_sito_web_cds_topic', models.ForeignKey(db_column='ID_SITO_WEB_CDS_TOPIC', on_delete=django.db.models.deletion.DO_NOTHING, to='ricerca_app.sitowebcdstopic')), ], options={ diff --git a/ricerca_app/migrations/0146_auto_20230712_1343.py b/ricerca_app/migrations/0146_auto_20230712_1343.py index f451a05f..4de68051 100644 --- a/ricerca_app/migrations/0146_auto_20230712_1343.py +++ b/ricerca_app/migrations/0146_auto_20230712_1343.py @@ -40,7 +40,7 @@ class Migration(migrations.Migration): ('testo_en', models.TextField(blank=True, db_column='TESTO_EN', null=True)), ('visibile', models.IntegerField(db_column='VISIBILE')), ('dt_mod', models.DateField(db_column='DT_MOD')), - ('id_sito_web_cds_topic_articoli_reg', models.ForeignKey(db_column='ID_SITO_WEB_CDS_TOPIC_ARTICOLI_REG', on_delete=django.db.models.deletion.DO_NOTHING, to='ricerca_app.sitowebcdstopicarticolireg')), + ('id_sito_web_cds_topic_articoli_reg', models.ForeignKey(db_column='ID_SITO_WEB_CDS_TOPIC_ARTICOLI_REG', on_delete=django.db.models.deletion.CASCADE, to='ricerca_app.sitowebcdstopicarticolireg')), ('id_user_mod', models.ForeignKey(blank=True, db_column='ID_USER_MOD', null=True, on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)), ], options={ diff --git a/ricerca_app/models.py b/ricerca_app/models.py index dfed5f77..8a699c72 100644 --- a/ricerca_app/models.py +++ b/ricerca_app/models.py @@ -4223,7 +4223,7 @@ class SitoWebCdsTopicArticoliReg(models.Model): titolo_it = models.CharField(db_column='TITOLO_IT', max_length=1000) # Field name made lowercase. titolo_en = models.CharField(db_column='TITOLO_EN', max_length=1000, blank=True, null=True) # Field name made lowercase. id_sito_web_cds_topic = models.ForeignKey(SitoWebCdsTopic, models.DO_NOTHING, db_column='ID_SITO_WEB_CDS_TOPIC') # Field name made lowercase. - id_sito_web_cds_oggetti_portale = models.ForeignKey(SitoWebCdsOggettiPortale, models.DO_NOTHING, db_column='ID_SITO_WEB_CDS_OGGETTI_PORTALE', blank=True, null=True) # Field name made lowercase. + id_sito_web_cds_oggetti_portale = models.ForeignKey(SitoWebCdsOggettiPortale, models.CASCADE, db_column='ID_SITO_WEB_CDS_OGGETTI_PORTALE', blank=True, null=True) # Field name made lowercase. id_sito_web_cds_articoli_regolamento = models.ForeignKey(SitoWebCdsArticoliRegolamento, models.DO_NOTHING, db_column='ID_SITO_WEB_CDS_ARTICOLI_REGOLAMENTO', blank=True, null=True) # Field name made lowercase. ordine = models.IntegerField(db_column='ORDINE') # Field name made lowercase. dt_mod = models.DateField(db_column='DT_MOD') # Field name made lowercase. @@ -4248,7 +4248,7 @@ class Meta: class SitoWebCdsTopicArticoliRegAltriDati(models.Model): id = models.AutoField(db_column='ID', primary_key=True) # Field name made lowercase. - id_sito_web_cds_topic_articoli_reg = models.ForeignKey(SitoWebCdsTopicArticoliReg, models.DO_NOTHING, db_column='ID_SITO_WEB_CDS_TOPIC_ARTICOLI_REG') # Field name made lowercase. + id_sito_web_cds_topic_articoli_reg = models.ForeignKey(SitoWebCdsTopicArticoliReg, models.CASCADE, db_column='ID_SITO_WEB_CDS_TOPIC_ARTICOLI_REG') # Field name made lowercase. ordine = models.PositiveIntegerField(db_column='ORDINE') # Field name made lowercase. id_sito_web_cds_tipo_dato = models.ForeignKey(SitoWebCdsTipoDato, models.PROTECT, db_column='ID_SITO_WEB_CDS_TIPO_DATO') # Field name made lowercase. titolo_en = models.CharField(db_column='TITOLO_EN', max_length=1000, blank=True, null=True) # Field name made lowercase.