sysadminix/Aerbim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.4.22 services order

Browse Source
This commit is contained in:
SDE
2023-12-20 20:47:09 +05:00
parent 0484b73673
commit b3fbe77401
3 changed files with 83 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
GeneralApp/migrations/0024_block_bg_video_url_en_block_bg_video_url_ru_and_more.py Normal file
View File

@@ -0,0 +1,74 @@
# Generated by Django 4.2.7 on 2023-12-19 00:32
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('GeneralApp', '0023_alter_block_block_type'),
]
operations = [
migrations.AddField(
model_name='block',
name='bg_video_url_en',
field=models.TextField(blank=True, null=True, verbose_name='Ссылка на фоновое видео'),
),
migrations.AddField(
model_name='block',
name='bg_video_url_ru',
field=models.TextField(blank=True, null=True, verbose_name='Ссылка на фоновое видео'),
),
migrations.AddField(
model_name='block',
name='video_url_en',
field=models.TextField(blank=True, null=True, verbose_name='Ссылка на видео'),
),
migrations.AddField(
model_name='block',
name='video_url_ru',
field=models.TextField(blank=True, null=True, verbose_name='Ссылка на видео'),
),
migrations.AddField(
model_name='widgetforblock',
name='video_url_en',
field=models.TextField(blank=True, null=True, verbose_name='Ссылка на видео'),
),
migrations.AddField(
model_name='widgetforblock',
name='video_url_ru',
field=models.TextField(blank=True, null=True, verbose_name='Ссылка на видео'),
),
migrations.AlterField(
model_name='office',
name='work_time_from',
field=models.TimeField(default=datetime.datetime(2023, 12, 19, 9, 0), verbose_name='Время работы с'),
),
migrations.AlterField(
model_name='office',
name='work_time_from_en',
field=models.TimeField(default=datetime.datetime(2023, 12, 19, 9, 0), null=True, verbose_name='Время работы с'),
),
migrations.AlterField(
model_name='office',
name='work_time_from_ru',
field=models.TimeField(default=datetime.datetime(2023, 12, 19, 9, 0), null=True, verbose_name='Время работы с'),
),
migrations.AlterField(
model_name='office',
name='work_time_to',
field=models.TimeField(default=datetime.datetime(2023, 12, 19, 18, 0), verbose_name='Время работы до'),
),
migrations.AlterField(
model_name='office',
name='work_time_to_en',
field=models.TimeField(default=datetime.datetime(2023, 12, 19, 18, 0), null=True, verbose_name='Время работы до'),
),
migrations.AlterField(
model_name='office',
name='work_time_to_ru',
field=models.TimeField(default=datetime.datetime(2023, 12, 19, 18, 0), null=True, verbose_name='Время работы до'),
),
]

7
ServicesApp/models.py
View File

@@ -96,6 +96,13 @@ class Service(BaseModelViewPage):
null=True, blank=True
)
def get_subservices(self):
sub_services = Service.objects.filter(
enable=True,
parent_service=self
).order_by('order')
return sub_services
class Meta:

4
templates/blocks/b_services_3cols_w_groups.html
View File

@@ -15,9 +15,9 @@
{{ service.name }}
</div>
<div class="clear_both"></div>
{% if service.rel_children_for_service.all %}
{% if service.get_subservices %}
<div class="childs_service_container">
{% for sub_serv in service.rel_children_for_service.all %}
{% for sub_serv in service.get_subservices %}
<div class="services_block_child">
{% if sub_serv.picture %}
<div class="left_part_service">