diff --git a/service/admin.py b/service/admin.py index 91ae029d..050c0d9e 100644 --- a/service/admin.py +++ b/service/admin.py @@ -141,4 +141,29 @@ class ServiceControl(FormMixin, DetailView): def get_context_data(self, **kwargs): context = super(ServiceControl, self).get_context_data(**kwargs) context['form'] = self.get_form(self.form_class) - return context \ No newline at end of file + return context + +from .forms import _ServiceForm + +class ServiceAddView(FormView): + form_class = _ServiceForm + template_name = 'admin/service/test_add.html' + success_url = '/' + + def get(self, request, *args, **kwargs): + data = request.GET + form = self.form_class(data) + + if form.is_valid(): + countries = form.cleaned_data['countries'] + types = form.cleaned_data['type'] + expos = form.cleaned_data['expos'] + confs = form.cleaned_data['confs'] + is_all_cnt = form.cleaned_data['all_counties'] + raise + else: + pass + + + + diff --git a/service/admin_urls.py b/service/admin_urls.py index 4dda045f..2ed5c296 100644 --- a/service/admin_urls.py +++ b/service/admin_urls.py @@ -2,7 +2,7 @@ from django.conf.urls import patterns, include, url from views import CallBackListView, VisitListView, TranslationListView, AdvertisingListView, \ ParticipationListView, RemoteListView,TicketsListView -from service.admin import ServiceControlList, ServiceControl +from service.admin import ServiceControlList, ServiceControl, ServiceAddView urlpatterns = patterns('service.admin', url(r'^control/list/$', ServiceControlList.as_view()), @@ -18,8 +18,11 @@ urlpatterns = patterns('service.admin', url(r'order/participation/$', ParticipationListView.as_view()), url(r'order/remote/$', RemoteListView.as_view()), url(r'order/tickets/$', TicketsListView.as_view()), + url('^test/$', ServiceAddView.as_view()), #ajax url(r'^get_city/$', 'get_city'), + url('^get_expos/$', 'get_country'), + #url(r'^get_country/$', 'get_country'), ) diff --git a/service/forms.py b/service/forms.py index 946b0d64..11c0eaa2 100644 --- a/service/forms.py +++ b/service/forms.py @@ -146,4 +146,13 @@ class ServiceControlForm(forms.Form): self.fields['event_type'] = forms.MultipleChoiceField(required=False, label = 'Тип события', widget=forms.CheckboxSelectMultiple(), choices=[(item['service_bit'], item['verbose']) - for item in self.event]) \ No newline at end of file + for item in self.event]) +from bitfield import BitField + + +class _ServiceForm(forms.Form): + type = forms.MultipleChoiceField(choices=[(x, x) for x in Service.type], widget=forms.CheckboxSelectMultiple) + countries = forms.MultipleChoiceField(choices=[(x.id,x.name) for x in Country.objects.language().all()]) + all_counties = forms.BooleanField(widget=forms.CheckboxInput) + expos = forms.CharField(widget=forms.HiddenInput) + confs = forms.CharField(widget=forms.HiddenInput) \ No newline at end of file diff --git a/templates/admin/service/service_add.html b/templates/admin/service/service_add.html index ce487c45..9c5b2403 100644 --- a/templates/admin/service/service_add.html +++ b/templates/admin/service/service_add.html @@ -48,7 +48,7 @@ {% include 'admin/forms/multilang.html' %} {% endwith %} {# url #} -