From: Costantino Vitale Date: Tue, 18 Oct 2022 13:26:22 +0000 (+0200) Subject: - Modifiche X-Git-Url: https://git.atlas4tour.it/?a=commitdiff_plain;h=f201ed34f52968dbae5d2b8888c5542d8d6df8c3;p=pia_atlas.git - Modifiche --- diff --git a/sistema/datatables.py b/sistema/datatables.py index 6a17edb..016b1be 100644 --- a/sistema/datatables.py +++ b/sistema/datatables.py @@ -170,7 +170,11 @@ class FeedbackDatatables(BaseDatatableView): order_columns = ['id', 'utente', 'valutazione', 'commento', 'del'] def get_initial_queryset(self): - return self.model.objects.filter(is_active=True) + percorso = self.request.GET.get('pk') + if percorso: + return self.model.objects.filter(percorso_id=int(percorso), is_active=True) + else: + return self.model.objects.none() def render_column(self, row, column): if column == 'id': diff --git a/sistema/forms.py b/sistema/forms.py index f00808f..2c0b5c2 100644 --- a/sistema/forms.py +++ b/sistema/forms.py @@ -50,6 +50,13 @@ class TipoMultimediaForm(forms.ModelForm): class PoiForm(forms.ModelForm): + + is_danger = forms.BooleanField( + label="Punto di pericolo", + required=False, + widget=forms.CheckboxInput(attrs={'class': 'form-control'}) + ) + class Meta: model = PointOfInterest exclude = ('is_active',) diff --git a/sistema/models.py b/sistema/models.py index bbc1792..b847717 100644 --- a/sistema/models.py +++ b/sistema/models.py @@ -30,6 +30,7 @@ class PointOfInterest(models.Model): lat = models.FloatField() long = models.FloatField() icona = models.FileField(upload_to='icon/', null=True) + is_danger = models.BooleanField(default=False) is_active = models.BooleanField(default=True) @@ -37,6 +38,7 @@ class Percorso(models.Model): nome = models.CharField(max_length=255, null=False) descrizione = models.CharField(max_length=255, null=False) testo = models.TextField(max_length=255, null=False) + prezzo = models.FloatField() is_active = models.BooleanField(default=True) diff --git a/sistema/templates/add_mod_percorso.html b/sistema/templates/add_mod_percorso.html index 934a19d..cc46e57 100644 --- a/sistema/templates/add_mod_percorso.html +++ b/sistema/templates/add_mod_percorso.html @@ -109,12 +109,18 @@ $(document).ready(function () { + var pk_percorso = '' + {% if form.instance.pk %} + pk_percorso = {{ form.instance.pk }} + {% endif %} + $('#feedback-table').dataTable({ processing: true, serverSide: true, ajax: { "url": "{% url 'sistema:feedback_datatables' %}", "type": 'GET', + "data": {'pk': pk_percorso}, }, language: { url: "//cdn.datatables.net/plug-ins/1.10.20/i18n/Italian.json" @@ -215,6 +221,7 @@ option.value = {{ poi.id }}; option.text = '{{ poi.nome|safe }}'; selectList.appendChild(option); + console.log(selectList) {% endfor %} } diff --git a/sistema/templates/percorsi_cliente_home.html b/sistema/templates/percorsi_cliente_home.html new file mode 100644 index 0000000..ca950e0 --- /dev/null +++ b/sistema/templates/percorsi_cliente_home.html @@ -0,0 +1,49 @@ +{% extends 'base.html' %} +{% load static %} +{% block content %} + +
+
+

Dettaglio percorso

+
+
+

I tuoi percorsi

+
+ +
+
+ +
+
+
+ +
+
+

Percorsi che puoi acquistare

+
+
+
+ {% for percorso in list_percorsi %} +
+ +
+
{{ percorso.nome}}
+

{{ percorso.descrizione }}

+
+
+
+

{{ percorso.prezzo|floatformat:2 }} €

+ Compralo subito +
+
+ +
+ {% endfor %} +
+
+
+ +
+
+ +{% endblock %} \ No newline at end of file diff --git a/sistema/templates/registration/login.html b/sistema/templates/registration/login.html index cd2b9f4..e4b5bbd 100644 --- a/sistema/templates/registration/login.html +++ b/sistema/templates/registration/login.html @@ -81,6 +81,10 @@ Forgot Password? +
+
+ Registrati +
diff --git a/sistema/templates/registration/register.html b/sistema/templates/registration/register.html index 361acfc..a3d349c 100644 --- a/sistema/templates/registration/register.html +++ b/sistema/templates/registration/register.html @@ -46,7 +46,7 @@
- +
@@ -63,7 +63,6 @@


- Back to login
diff --git a/sistema/urls.py b/sistema/urls.py index 928a187..fd37ad9 100644 --- a/sistema/urls.py +++ b/sistema/urls.py @@ -3,7 +3,7 @@ from django.urls import path from sistema.datatables import LocalitaDatatables, MultimediaDatatables, TipoMultimediaDatatables, PercorsoDatatables, \ PoiDatatables, FeedbackDatatables, GestisceLocalitaDatatables from sistema.views import Home, LocalitaListView, MultimediaListView, PuntiInteresseListView, \ - TipologiaMultimediaListView, PercorsiListView, LocalitaView, TipoMultimediaView, PoiView, PercorsoView, FeedbackView + TipologiaMultimediaListView, PercorsiListView, LocalitaView, TipoMultimediaView, PoiView, PercorsoView, FeedbackView, PercorsoInfo urlpatterns = [ path('', Home.as_view(), name='home'), @@ -40,6 +40,7 @@ urlpatterns = [ ## PERCORSO ## path('percorso/', PercorsoView.as_view(), name='percorso'), path('mod_percorso//', PercorsoView.as_view(), name='mod_percorso'), + path('percorso_info//', PercorsoInfo.as_view(), name='percorso_info'), ## FEEDBACK ## path('feedback/', FeedbackView.as_view(), name='feedback'), diff --git a/sistema/views.py b/sistema/views.py index 596b01a..db2dd36 100644 --- a/sistema/views.py +++ b/sistema/views.py @@ -12,6 +12,7 @@ from rest_framework import status from sistema.forms import LocalitaForm, TipoMultimediaForm, PoiForm, PercorsoForm, MultimediaForm from sistema.models import Localita, TipologiaMultimedia, PointOfInterest, Percorso, Tappa, TappaSerializer, Multimedia, \ Feedback, FeedbackSerializer +from socoin_atlas import settings from utenti.mixins import CustomLoginRequiredMixin @@ -39,8 +40,13 @@ class MultimediaListView(TemplateView):#PermissionRequiredMixin template_name = 'multimedia_list.html' -class PercorsiListView(TemplateView): - template_name = 'percorsi_list.html' +class PercorsiListView(View): + def get(self, request): + if request.session['roles'] == settings.CLIENTI_GROUPS: + list_percorsi = Percorso.objects.filter(is_active=True) + return render(request, 'percorsi_cliente_home.html', {'list_percorsi': list_percorsi}) + else: + return render(request, 'percorsi_list.html', {}) class Home(CustomLoginRequiredMixin, View): # CustomLoginRequiredMixin @@ -299,6 +305,10 @@ class PercorsoView(View):#PermissionRequiredMixin return redirect(reverse('sistema:percorsi_list')) +class PercorsoInfo(View): + def get(self, request, *args, **kwargs): + return render(request, 'add_mod_percorso.html', {}) + class FeedbackView(View):#PermissionRequiredMixin #permission_required = [settings.TOUR_OPERATOR_GROUPS, settings.ADMIN_GROUPS] diff --git a/utenti/datatables.py b/utenti/datatables.py index dac241e..e696b1b 100644 --- a/utenti/datatables.py +++ b/utenti/datatables.py @@ -47,7 +47,7 @@ class UserDatatables(BaseDatatableView): elif self.get_role() == settings.TOUR_OPERATOR_GROUPS: return '' % row.pk else: - return '' % row.pk + return '' #% row.pk if column == 'del': return '' % row.pk else: diff --git a/utenti/templates/clienti_list.html b/utenti/templates/clienti_list.html index 0da29c4..0313692 100644 --- a/utenti/templates/clienti_list.html +++ b/utenti/templates/clienti_list.html @@ -8,9 +8,11 @@

Lista clienti

- - - +