From 28a00680e52de627eeaef7c6242b81708596330d Mon Sep 17 00:00:00 2001 From: SDE Date: Sat, 9 Dec 2023 21:03:09 +0300 Subject: [PATCH 1/4] 0.3.4 contacts page --- GeneralApp/admin.py | 3 ++- GeneralApp/urls.py | 1 + GeneralApp/views.py | 11 +++++++++++ templates/pages/p_contacts.html | 29 +++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 templates/pages/p_contacts.html diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index 8dc6c7f..f3555b0 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -249,9 +249,10 @@ class Admin_Office(Admin_Trans_BaseModelViewPage): # 'main_office', 'city', 'address', + 'picture', ( 'work_time_from', 'work_time_to', - # 'workTime', + 'workTime', ), # ('legal_name', 'unp', 'legal_address', 'urInfo'), # 'fullContactInfo', diff --git a/GeneralApp/urls.py b/GeneralApp/urls.py index 93dc521..a009b5c 100644 --- a/GeneralApp/urls.py +++ b/GeneralApp/urls.py @@ -6,6 +6,7 @@ from .views import * urlpatterns = [ path('', MainPage, name='main'), + path('contacts/', contacts_view, name='contacts'), path('page//', StaticPageView, name='static_page'), path('test_code', test_code, name='test_code'), ] \ No newline at end of file diff --git a/GeneralApp/views.py b/GeneralApp/views.py index 95152ef..971220a 100644 --- a/GeneralApp/views.py +++ b/GeneralApp/views.py @@ -92,3 +92,14 @@ def StaticPageView(request, url): # return HttpResponse(t.render(Dict, request)) +def contacts_view(request): + # from RoutesApp.forms import RouteForm + # from SubscribesApp.funcs import get_subsribes_w_options + + Dict = { + 'offices': Office.objects.filter(enable=True) + } + + t = loader.get_template('pages/p_contacts.html') + return get_inter_http_respose(t, Dict, request) + # return HttpResponse(t.render(Dict, request)) diff --git a/templates/pages/p_contacts.html b/templates/pages/p_contacts.html new file mode 100644 index 0000000..42c8f10 --- /dev/null +++ b/templates/pages/p_contacts.html @@ -0,0 +1,29 @@ +{% extends 'tb_base.html' %} +{% block CONTENT %} + +
+ Контакты +
+ {% for office in offices %} +
+ {% if office.picture %} + {{ office.city }} + {% endif %} +
{{ office.city }}
+
{{ office.address }}
+ Часы работы: +
{{ office.work_time_from }} - {{ office.work_time_to }}
+
{{ office.work_time }}
+
+ {% for contact in office.contacts %} +
+ {% if contact.contact_label %}{{ contact.contact_label }}: {% endif %}{{ contact.get_prefix_w_data }} +
+ {% endfor %} +
+
+ {% endfor %} +
+
+ +{% endblock %} \ No newline at end of file From 85d6267dfe491ca0f1d93892298d91dd8553edd1 Mon Sep 17 00:00:00 2001 From: SDE Date: Sat, 9 Dec 2023 21:16:07 +0300 Subject: [PATCH 2/4] 0.3.5 contacts page --- GeneralApp/admin.py | 11 ++++++++--- GeneralApp/views.py | 29 +++++++++++++++++------------ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index f3555b0..5de6ee1 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -90,6 +90,7 @@ class Admin_StackedInline_Block(Admin_Trans_GenericBaseIconStackedInline, SuperI # class Admin_StaticPage(NestedModelAdmin, Admin_Trans_BaseModelViewPage): class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage): + from ServicesApp.admin import Admin_StackedInline_BlockPluginPresentation fieldsets = [ @@ -120,20 +121,24 @@ class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage): 'order', 'modifiedDT', 'createDT' ] - list_display_links = ['id'] + list_display_links = ['id', 'image_thumb', 'name'] list_editable = ['order'] list_filter = ['modifiedDT', 'createDT'] search_fields = ['name', 'title'] # filter_horizontal = ['options'] - inlines = [Admin_StackedInline_Block] + inlines = [ + Admin_StackedInline_BlockPluginPresentation, + Admin_StackedInline_Block, + AdminStacked_FAQitem, + ] def has_delete_permission(self, request, obj=None): if request.user.is_superuser: return True - if obj.url in ('main', 'spec_technics', 'works'): + if obj.url in ('main', 'contacts'): return False admin.site.register(StaticPage,Admin_StaticPage) diff --git a/GeneralApp/views.py b/GeneralApp/views.py index 971220a..21ac062 100644 --- a/GeneralApp/views.py +++ b/GeneralApp/views.py @@ -29,6 +29,14 @@ def MainPage(request): name_ru = _('Главная') ) + try: + page = StaticPage.objects.get(url='contacts') + except StaticPage.DoesNotExist: + page = StaticPage.objects.create( + url='contacts', + name_ru = _('Контакты') + ) + # from ArticlesApp.models import ArticleModel # arts = ArticleModel.objects.filter(enable=True).order_by('-createDT')[:4] @@ -56,18 +64,7 @@ def StaticPageView(request, url): if url == '': return MainPage(request) - elif url == 'for_movers': - Dict.update({ - # 'route_form': RouteForm(), - 'owner_type': 'customer', - }) - elif url == 'for_customers': - Dict.update({ - # 'route_form': RouteForm(), - 'owner_type': 'mover' - }) - # elif url == 'works': - # return WorksPage(request) + elif url in ['main']: raise Http404 @@ -95,8 +92,16 @@ def StaticPageView(request, url): def contacts_view(request): # from RoutesApp.forms import RouteForm # from SubscribesApp.funcs import get_subsribes_w_options + try: + page = StaticPage.objects.get(url='contacts') + except Exception as e: + page = StaticPage.objects.create( + url='contacts', + name_ru=_('Контакты') + ) Dict = { + 'page': page, 'offices': Office.objects.filter(enable=True) } From a75a8ef37be6d36e0c8b357c583a774113bbafe2 Mon Sep 17 00:00:00 2001 From: SDE Date: Sat, 9 Dec 2023 21:20:32 +0300 Subject: [PATCH 3/4] 0.3.6 contacts page --- ...ktime_alter_office_worktime_en_and_more.py | 28 +++++++++++++++++++ GeneralApp/models.py | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 GeneralApp/migrations/0021_alter_office_worktime_alter_office_worktime_en_and_more.py diff --git a/GeneralApp/migrations/0021_alter_office_worktime_alter_office_worktime_en_and_more.py b/GeneralApp/migrations/0021_alter_office_worktime_alter_office_worktime_en_and_more.py new file mode 100644 index 0000000..0a3dfe7 --- /dev/null +++ b/GeneralApp/migrations/0021_alter_office_worktime_alter_office_worktime_en_and_more.py @@ -0,0 +1,28 @@ +# Generated by Django 4.2.7 on 2023-12-09 21:19 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('GeneralApp', '0020_alter_office_options_office_work_time_from_en_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='office', + name='workTime', + field=models.CharField(blank=True, max_length=220, null=True, verbose_name='Комментарий к времени работы'), + ), + migrations.AlterField( + model_name='office', + name='workTime_en', + field=models.CharField(blank=True, max_length=220, null=True, verbose_name='Комментарий к времени работы'), + ), + migrations.AlterField( + model_name='office', + name='workTime_ru', + field=models.CharField(blank=True, max_length=220, null=True, verbose_name='Комментарий к времени работы'), + ), + ] diff --git a/GeneralApp/models.py b/GeneralApp/models.py index 945dcef..3167b03 100644 --- a/GeneralApp/models.py +++ b/GeneralApp/models.py @@ -171,7 +171,7 @@ class Office(BaseModelViewPage): city = models.CharField(max_length=250, verbose_name=_(u'Город')) address = models.CharField(max_length=250, verbose_name=_(u'Адрес'), null=True, blank=True) workTime = models.CharField( - max_length=220, verbose_name=_(u'Комментарий к времени работы'), + max_length=220, verbose_name=_(u'Комментарий к времени работы'), null=True, blank=True # help_text='добавляется справа от времени работы' ) work_time_from = models.TimeField(verbose_name=_('Время работы с'), default=work_time_default_from()) From 7234523a952df3ed7cc0b0bddfa7dfa6612fb3d2 Mon Sep 17 00:00:00 2001 From: SDE Date: Sat, 9 Dec 2023 21:22:41 +0300 Subject: [PATCH 4/4] 0.3.7 contacts page --- GeneralApp/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index 5de6ee1..44efd60 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -274,7 +274,7 @@ class Admin_Office(Admin_Trans_BaseModelViewPage): save_on_top = True # prepopulated_fields = {"url": ("name",)} list_display = [ - 'id', 'enable', 'order', 'city', 'address', 'work_time_from', 'work_time_to', + 'image_thumb', 'id', 'enable', 'order', 'city', 'address', 'work_time_from', 'work_time_to', # 'main_office', 'modifiedDT', 'createDT' ]