diff --git a/serviceCRM/admin.py b/serviceCRM/admin.py index 2b0ad64..fd38a8f 100644 --- a/serviceCRM/admin.py +++ b/serviceCRM/admin.py @@ -2,4 +2,4 @@ from django.contrib import admin from .models import Insert -admin.site.register(Insert) \ No newline at end of file +admin.site.register(Insert) diff --git a/serviceCRM/apps.py b/serviceCRM/apps.py index 0d4b91c..ad581b8 100644 --- a/serviceCRM/apps.py +++ b/serviceCRM/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class serviceCRMconfig(AppConfig): name = "serviceCRM" - verbose_name = "Service CRM" \ No newline at end of file + verbose_name = "Service CRM" diff --git a/serviceCRM/forms.py b/serviceCRM/forms.py index f0536fd..2fca7f4 100644 --- a/serviceCRM/forms.py +++ b/serviceCRM/forms.py @@ -1,6 +1,7 @@ from django import forms from .models import Insert + class DateInput(forms.DateInput): input_type = 'date' @@ -8,17 +9,18 @@ class DateInput(forms.DateInput): class InputForm(forms.ModelForm): class Meta: model = Insert - fields = {"name", "phone", "description", "date","done"} - labels = {'name': "Name", 'phone': "Phone", 'date': "Date", 'description': "Description",'done':"Done"} + fields = {"name", "phone", "description", "date", "done"} + labels = {'name': "Name", 'phone': "Phone", 'date': "Date", 'description': "Description", 'done': "Done"} widgets = { - 'name': forms.TextInput(attrs={'class':'form-control'}), + 'name': forms.TextInput(attrs={'class': 'form-control'}), 'phone': forms.TextInput(attrs={'class': 'form-control'}), 'date': DateInput(), - 'description':forms.Textarea(attrs={'class': 'form-control'}) + 'description': forms.Textarea(attrs={'class': 'form-control'}) } - field_order =["name", "phone", "date","description","done"] - # name = forms.CharField(label="Name", max_length=30) - # phone = forms.CharField(label="Phone", max_length=30) - # date = forms.DateField() - # description = forms.CharField(label="Write description of the problem...", max_length=300) + field_order = ["name", "phone", "date", "description", "done"] + + # name = forms.CharField(label="Name", max_length=30) + # phone = forms.CharField(label="Phone", max_length=30) + # date = forms.DateField() + # description = forms.CharField(label="Write description of the problem...", max_length=300) diff --git a/serviceCRM/models.py b/serviceCRM/models.py index bea8ad1..6e679b8 100644 --- a/serviceCRM/models.py +++ b/serviceCRM/models.py @@ -1,6 +1,7 @@ from django.db import models from django.contrib.auth.models import UserManager + class Insert(models.Model): name = models.CharField(max_length=50) phone = models.CharField(max_length=20) @@ -9,9 +10,7 @@ class Insert(models.Model): done = models.BooleanField() def __str__(self): - return "Ime: "+self.name + " Telefonski broj: "+self.phone+ "\nDefekt: "+self.description + "\nDatum: \n" + return "Ime: " + self.name + " Telefonski broj: " + self.phone + "\nDefekt: " + self.description + "\nDatum: \n" def isDone(self): return self.done - - diff --git a/serviceCRM/tables.py b/serviceCRM/tables.py index 36b557a..121fb85 100644 --- a/serviceCRM/tables.py +++ b/serviceCRM/tables.py @@ -1,7 +1,9 @@ import django_tables2 as tables from .models import Insert + class InsertTable(tables.Table): class Meta: model = Insert - template_name="serviceCRM/list.html" \ No newline at end of file + template_name = "serviceCRM/list.html" + fields = ['id', 'name', 'phone', 'description', 'date', 'done', 'edit'] diff --git a/serviceCRM/urls.py b/serviceCRM/urls.py index 1cc1baf..04122d2 100644 --- a/serviceCRM/urls.py +++ b/serviceCRM/urls.py @@ -15,7 +15,7 @@ Including another URLconf 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.urls import include, path +from django.urls import path import serviceCRM.views as view urlpatterns = [ diff --git a/serviceCRM/views.py b/serviceCRM/views.py index 644d690..301d9fc 100644 --- a/serviceCRM/views.py +++ b/serviceCRM/views.py @@ -43,6 +43,7 @@ class InsertNew(generic.View): return render(request, InsertNew.template_name, {'form': form}) + class List(generic.ListView): model = Insert template_name = "serviceCRM/list.html" @@ -53,5 +54,3 @@ def done(request, question_id): if req.isDone(): return HttpResponse("Done") return HttpResponse("Not Done") - -