feature: added city change

Author: SimonOsipov

landing_page/mainpage/admin.py

@@ -2,7 +2,7 @@
 
 from .models import (
     MoscowPythonMeetup, LearnPythonCourse, Curators, Feedback, GraduateProjects, GraduateStories,
-    LearnPythonCoursePrices, GraduateProjectsVideos, Podcasts
+    LearnPythonCoursePrices, GraduateProjectsVideos, Podcasts, LearnPythonMultiCityCourses
 )
 
 admin.site.register(MoscowPythonMeetup)
@@ -14,3 +14,4 @@
 admin.site.register(LearnPythonCoursePrices)
 admin.site.register(GraduateProjectsVideos)
 admin.site.register(Podcasts)
+admin.site.register(LearnPythonMultiCityCourses)

landing_page/mainpage/migrations/0038_auto_20210803_1257.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.20 on 2021-08-03 09:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mainpage', '0037_auto_20210803_1252'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='learnpythonmulticitycourses',
+            old_name='cityname',
+            new_name='city_name',
+        ),
+        migrations.AlterField(
+            model_name='graduatestories',
+            name='story_section',
+            field=models.TextField(choices=[('Хочу новый навык или работу', 'Хочу новый навык или работу'), ('Есть опыт, хочу освоить новый язык', 'Есть опыт, хочу освоить новый язык'), ('Никогда не программировал', 'Никогда не программировал')], default='Никогда не программировал', help_text='В какую из секций историй', verbose_name='Раздел истории'),
+        ),
+    ]

landing_page/mainpage/models.py

@@ -225,8 +225,11 @@ def past_due_date(self):
 class LearnPythonMultiCityCourses(models.Model):
     class Meta:
         verbose_name_plural = 'LearnPython Цены на курсы в разных городах'
+        
+    def __str__(self):
+        return f'Курсы в городе {self.city_name}'
 
-    cityname = models.CharField(
+    city_name = models.CharField(
         max_length=50,
         verbose_name='Название города',
         help_text='Какой город указывать в списке'

landing_page/mainpage/views.py

@@ -7,7 +7,7 @@
 from .models import (LearnPythonCourse, GraduateProjects,
                      LearnPythonCoursePrices,
                      Feedback, Curators, GraduateStories, GraduateProjectsVideos,
-                     Podcasts,)
+                     Podcasts, LearnPythonMultiCityCourses,)
 from datetime import date
 import json
 
@@ -51,80 +51,20 @@ def index(request):
     is_online_closed = current_course.online_session_closed
 
     is_offline_closed = current_course.offline_session_closed
-
-    offline_cities = [
-         {
-             'name': 'Москва',
-             'coords': [55.755988, 37.643448],
-             'early_date': '2021-03-31',
-             'early_price': 36500,
-             'early_installment_price': 3500,
-             'basic_date': '2021-04-01',
-             'basic_price': 36500,
-             'basic_installment_price': 3500
-         },
-         {
-             'name': 'Санкт-Петербург',
-             'coords': [59.935800, 30.318139],
-             'early_date': '2021-04-30',
-             'early_price': 36500,
-             'early_installment_price': 3500,
-             'basic_date': '2021-05-01',
-             'basic_price': 36500,
-             'basic_installment_price': 3500
-         },
-         {
-             'name': 'Екатеринбург',
-             'coords': [56.826403, 60.614272],
-             'early_date': '2021-05-31',
-             'early_price': 36500,
-             'early_installment_price': 3500,
-             'basic_date': '2021-06-01',
-             'basic_price': 36500,
-             'basic_installment_price': 3500
-         },
-         {
-             'name': 'Самара',
-             'coords': [53.192632, 50.110934],
-             'early_date': '2021-06-30',
-             'early_price': 36500,
-             'early_installment_price': 3500,
-             'basic_date': '2021-07-01',
-             'basic_price': 36500,
-             'basic_installment_price': 3500
-         },
-         {
-             'name': 'Тольятти',
-             'coords': [53.503970, 49.424335],
-             'early_date': '2021-07-31',
-             'early_price': 36500,
-             'early_installment_price': 3500,
-             'basic_date': '2021-08-01',
-             'basic_price': 36500,
-             'basic_installment_price': 3500
-         },
-         {
-             'name': 'Сызрань',
-             'coords': [53.150426, 48.475794],
-             'early_date': '2021-08-31',
-             'early_price': 36500,
-             'early_installment_price': 3500,
-             'basic_date': '2021-09-01',
-             'basic_price': 36500,
-             'basic_installment_price': 3500
-         },
-         {
-             'name': 'Казань',
-             'coords': [55.795976, 49.111556],
-             'early_date': '2021-09-30',
-             'early_price': 36500,
-             'early_installment_price': 3500,
-             'basic_date': '2021-10-01',
-             'basic_price': 36500,
-             'basic_installment_price': 3500
-         }
-
-     ]
+    
+    listed_cities = [city for city in LearnPythonMultiCityCourses.objects.all()]
+    
+    offline_cities = [ 
+        {'name': city.city_name,
+         'coords': [float(city.long), float(city.lat)],
+         'early_date': str(city.early_date),
+         'early_price': str(city.early_price),
+         'early_installment_price': city.early_installment_price,
+         'basic_date': str(city.basic_date),
+         'basic_price': str(city.basic_price),
+         'basic_installment_price': city.basic_installment_price
+         } for city in listed_cities      
+    ]
 
     context = {
         'course': current_course,