COnference import bugs. add field in filter form

city/forms.py

@@ -167,4 +167,17 @@ class CityDeleteForm(forms.ModelForm):
 
 
 class CityFilterForm(AdminFilterForm):
-    model = City
+    country = forms.ChoiceField(choices=[('', '')]+[(item.id, item.name) for item in Country.objects.all()], required=False,
+                                label='Страна')
+    model = City
+
+    def filter(self):
+        qs = super(CityFilterForm, self).filter()
+
+        data = self.cleaned_data
+        country_id = data['country']
+
+
+        if country_id:
+            qs = qs.filter(country__id=country_id)
+        return qs

conference/forms.py

@@ -375,4 +375,16 @@ class TimeTableForm(forms.Form):
 
 
 class ConferenceFilterForm(AdminFilterForm):
-    model = Conference
+    created = forms.DateField(required=False, label='Дата создания')
+    model = Conference
+
+    def filter(self):
+        qs = super(ConferenceFilterForm, self).filter()
+
+        data = self.cleaned_data
+        created = data['created']
+
+        if created:
+
+            qs = qs.filter(created__startswith=created)
+        return qs

conference/models.py

@@ -53,6 +53,7 @@ class Conference(TranslatableModel, EventMixin, ExpoMixin):
                              related_name='conference_city')
     place = models.ForeignKey('place_conference.PlaceConference', verbose_name='Место проведения',
                               blank=True, null=True, on_delete=models.PROTECT, related_name='conference_place')
+    place_alt = models.CharField(blank=True, null=True, max_length=255) # alternative for object place
     theme = models.ManyToManyField('theme.Theme', verbose_name='Тематики',
                               related_name='conference_themes')
     tag = models.ManyToManyField('theme.Tag', verbose_name='Теги',

functions/form_check.py

@@ -31,10 +31,15 @@ def translit_with_separator(string, separator='-'):
     #make string unicode
     string = string.strip()
     string = u'%s'%string
-    string = string.replace(u'\u200e', '')
 
     #make string translit
-    st = pytils.translit.translify(string)
+    try:
+        st = pytils.translit.translify(string)
+    except ValueError:
+        # remove exception symbs(hack)
+        string = string.replace(u'\u200e', '')
+        string = string.replace(u'\u200b', '')
+        st = pytils.translit.translify(string)
 
     #replace "bad" symbols for '-'symbol
     st = st.replace('.', '')

import_xls/excel_settings.py

@@ -500,6 +500,8 @@ event_sett = {
     u'Участники':{u'field': u'members', u'func': to_int},
     u'Страны':{u'field': u'stat_countries', u'func': unicode},
     u'Площадь':{u'field': u'area', u'func': to_int},
+    u'Мин стоимость':{u'field': u'min_price', u'func': to_int},
+    u'Макс стоимость':{u'field': u'max_price', u'func': to_int},
     u'Min_Raw кв.м.':{u'field': u'min_closed_area', u'func': to_int},
     u'Max_Raw кв.м.':{u'field': u'max_closed_area', u'func': to_int},
     u'Min_Pack кв.м.':{u'field': u'min_closed_equipped_area', u'func': to_int},

import_xls/import_forms.py

@@ -330,13 +330,25 @@ class ImportEventForm(ImportForm):
                     value = func(obj, cell, setting['label'])
 
                 else:
+
                     value = func(cell)
-                try:
-                    setattr(obj, field_name, value)
-                except ValueError:
-                    continue
+                if field_name != 'place':
+
+                    try:
+                        setattr(obj, field_name, value)
+                    except ValueError:
+                        continue
+                else:
+                    if value is None:
+                        setattr(obj, 'place_alt', cell)
+                    else:
+                        try:
+                            setattr(obj, field_name, value)
+                        except Exception:
+                            setattr(obj, 'place_alt', cell)
             if not obj.url:
                 obj.url = translit_with_separator(obj.name)
+            obj.is_published = True
             try:
                 obj.save()
 

import_xls/utils.py

@@ -30,6 +30,7 @@ def to_date(value):
         return None
 
     if isinstance(value, unicode) or isinstance(value, str):
+
         try:
             t = time.strptime(value, "%d.%m.%Y")
         except ValueError:

static/custom_js/main.js

@@ -113,6 +113,12 @@ function postStat(data, textStatus){
 
 $(document).ready(function(){
 
+    $('#id_created').datetimepicker({
+        todayHighlight: true,
+        format : 'yyyy-mm-dd',
+        minView:2
+    });
+
     $('#photo_form').on('submit', function(e){
         e.preventDefault();
         var url = $(this).attr('action');
@@ -230,11 +236,7 @@ $(document).ready(function(){
     });
     //  end on-of events
 
-    $('select').select2({
-        width: 'element',
-        allowClear: true
 
-    });//end select
 
 
 
@@ -485,5 +487,11 @@ $(document).ready(function(){
         });
     });
 
+     $('select').select2({
+        width: 'element',
+        allowClear: true
+
+    });//end select
+
 
 });

templates/admin/base.html

@@ -72,6 +72,9 @@
 
     </div>
 </body>
+{# datetimepicker #}
+          <link href="{% static 'js/datetimepicker/css/datetimepicker.css' %}" rel="stylesheet"/>
+          <script src="{% static 'js/datetimepicker/js/bootstrap-datetimepicker.js' %}"></script>
 <script src="{% static 'custom_js/main.js' %}"></script>
 {% block bot_scripts %}
 {% endblock %}

templates/admin/exposition/exposition.html

@@ -39,9 +39,6 @@
         <script src="{% static 'custom_js/select_tag.js' %}"></script>
         -->
 
-          {# datetimepicker #}
-          <link href="{% static 'js/datetimepicker/css/datetimepicker.css' %}" rel="stylesheet"/>
-          <script src="{% static 'js/datetimepicker/js/bootstrap-datetimepicker.js' %}"></script>
             <script type="text/javascript">
             $(document).ready(function(){
                 $('#id_data_begin').datetimepicker({