Merge branch 'develop' of gitlab.com:OldminTeam/expomap into develop

apps/conference/forms.py

@@ -6,6 +6,7 @@ from django.forms.util import ErrorList
 from django.core.validators import validate_email, URLValidator
 from django.utils.translation import ugettext as _
 #models
+from .models import flags as FLAGS
 from events.models import TargetAudience
 from models import Conference, TimeTable, CURRENCY, Statistic, BIT_AUDIENCE, Speaker
 from country.models import Country
@@ -24,6 +25,8 @@ from functions.form_check import translit_with_separator
 from functions.admin_forms import AdminFilterForm, EventsAdminFilterFormMixin
 from functions.forms import ML_ModelMultipleChoiceField
 
+from bitfield.forms import BitFieldCheckboxSelectMultiple
+
 places = [(item.id, item.name) for item in PlaceConference.objects.language().all()]
 places.insert(0,('', 'Не выбрано'))
 

apps/conference/models.py

@@ -8,6 +8,7 @@ from django.core.urlresolvers import reverse_lazy
 from django.db import models
 from django.db.models import Q
 from django.db.models.signals import post_save, pre_save
+from django.dispatch import receiver
 from django.utils import translation
 from django.utils.translation import ugettext as _
 
@@ -23,7 +24,7 @@ from functions.translate import fill_with_signal
 from functions.files import gen_path
 from hvad.models import TranslatableModel, TranslatedFields, TranslationManager
 from photologue.models import Gallery
-from service.models import Service
+from service.models import Service, LinkedService
 from events.common import MEMBERS, VISITORS, PRICE, PRICE_EUR
 from events.models import TargetAudience
 
@@ -296,3 +297,12 @@ pre_save.connect(pre_save_handler, sender=Conference)
 post_save.connect(post_save_handler, sender=Conference)
 post_save.connect(post_save_handler, sender=TimeTable)
 post_save.connect(post_save_handler, sender=Statistic)
+
+
+@receiver(post_save, sender=Conference)
+def conference_services_handler(sender, instance, **kwargs):
+    """
+    При сохранении конференции сохраняем данные по услугам
+    """
+    for service in LinkedService.objects.all():
+        service.update_all_flags()

apps/conference/signals.py

@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.db.models.signals import post_save
-from models import Conference
-from functions.signal_handlers import post_save_handler
-
-#post_save.connect(post_save_handler, sender=Conference)

apps/exposition/models.py

@@ -10,6 +10,7 @@ from django.core.urlresolvers import reverse_lazy
 from django.db import models
 from django.db.models import Q
 from django.db.models.signals import post_save, pre_save
+from django.dispatch import receiver
 from django.utils import translation
 from django.utils.translation import ugettext as _
 from functions.custom_fields import EnumField
@@ -21,7 +22,7 @@ from hvad.models import TranslatableModel, TranslatedFields, TranslationManager
 from import_xls.model_utils import ExpoImportManager
 from manager import ClientManager
 from organiser.models import Organiser
-from service.models import Service
+from service.models import Service, LinkedService
 from events.common import MEMBERS, VISITORS, PRICE, PRICE_EUR
 
 
@@ -363,3 +364,12 @@ post_save.connect(post_save_handler, sender=Exposition)
 post_save.connect(post_save_handler, sender=TimeTable)
 post_save.connect(post_save_handler, sender=TmpTimeTable)
 post_save.connect(post_save_handler, sender=Statistic)
+
+
+@receiver(post_save, sender=Exposition)
+def exposition_services_handler(sender, instance, **kwargs):
+    """
+    При сохранении выставки сохраняем данные по услугам
+    """
+    for service in LinkedService.objects.all():
+        service.update_all_flags()

apps/exposition/signals.py

@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.db.models.signals import post_save
-from models import Exposition
-from functions.signal_handlers import post_save_handler
-
-#post_save.connect(post_save_handler, sender=Exposition)

templates/c_admin/conference/conference.html

@@ -152,6 +152,13 @@
                                 <span class="help-inline">{{  form.audience.errors }}</span>
                             </div>
                     </div>
+                {# services #}
+                <div class="control-group {% if form.services.errors %}error{% endif %}">
+                    <label class="control-label">{{ form.services.label }}:</label>
+                        <div class="controls">{{ form.services }}
+                            <span class="help-inline">{{ form.services.errors }}</span>
+                        </div>
+                </div>
                 {# country #}
                     <div class="control-group {% if form.country.errors %}error{% endif %}">
                         <label class="control-label"><b>{{ form.country.label }}:</b></label>

templates/c_admin/newsletters/newsletter_list_daily.html

@@ -72,5 +72,13 @@
     {# pagination #}
     {% include 'c_admin/includes/admin_pagination.html' with page_obj=page_obj %}
 </div>
-
+<script>
+    $(document).ready(function(){
+       $("#id_start_date, #id_end_date").datetimepicker({
+           todayHighlight: true,
+           format: 'yyyy-mm-dd',
+           minView: 2
+       });
+    });
+</script>
 {% endblock %}