Add questions possibility for other parenst

Author: yourash

database.py

@@ -15,4 +15,5 @@ class User(Document):
     last_name = StringField()
     state = StringField()
     role = StringField(choices=ROLES, default=ROLES[0])
+    with_child_in_school = BooleanField(default=False)
     language = StringField(choices=LANGUAGES, default=LANGUAGES[0])

keyboards.py

@@ -30,6 +30,8 @@ def get_parents_without_children_keyboard(language='ua'):
     keyboard.add(DICTIONARY[language]['excursion_button'])
     keyboard.add(DICTIONARY[language]['all_about_nush_btn'])
     keyboard.add(types.KeyboardButton(text=DICTIONARY[language]['choose_school_button'], request_location=True))
+    keyboard.add(DICTIONARY[language]['ask_mon_question_btn'])
+    keyboard.add(DICTIONARY[language]['rating_mon_question_btn'])
     keyboard.add(DICTIONARY[language]['back_button'])
     return keyboard
 

languages.py

@@ -93,14 +93,14 @@
         # mon
         'mon_button': 'МОН',
         'mon_msg': 'Можна почитати відповіді МОН або поставити своє питання.',
-        'ask_mon_question_btn': '🥇 Запитати',
+        'ask_mon_question_btn': '❓ Запитати',
         'ask_mon_question_msg': 'Запитайте шось.',
         'faq_mon_btn': 'FAQ',
         'faq_mon_msg': 'Відповідаємо на запитання. Робота в 2-му пілотному класі.'
                        '<a href="http://nus.org.ua/questions/vidpovidayemo-na-zapytannya-robota-v-2-mu-pilotnomu-'
                        'klasi/?fbclid=IwAR35EpzkYuIjXN5NWa0XeNdUPWJgT-xmbTp6s3A6b_qRtpDdu8KaVbdK9r4">'
                        ' - натисність сюди</a>',
-        'rating_mon_question_btn': '📊 Рейтинг питань',
+        'rating_mon_question_btn': '📊 ТОП питань до МОН',
         'rating_mon_question_msg': 'Тут буде рейтинг питань.',
 
 

states.py

@@ -5,7 +5,6 @@
 from time import sleep
 
 
-
 def choose_status_state(message, user, is_entry=False):
     if is_entry:
         bot.send_message(message.chat.id,
@@ -32,15 +31,21 @@ def choose_status_state(message, user, is_entry=False):
 '''
 PARENTS
 '''
+
+
 def parents_state(message, user, is_entry=False):
     if is_entry:
         bot.send_message(message.chat.id,
                          DICTIONARY['ua']['is_children_msg'],
                          reply_markup=get_parents_choose_keyboard('ua'))
     else:
         if message.text == DICTIONARY['ua']['is_children_button']:
+            user.with_child_in_school = True
+            user.save()
             return True, 'parents_with_children_state'
         elif message.text == DICTIONARY['ua']['no_children_button']:
+            user.with_child_in_school = False
+            user.save()
             return True, 'parents_without_children_state'
         else:
             bot.send_message(message.chat.id,
@@ -73,7 +78,6 @@ def parents_with_children_state(message, user, is_entry=False):
     return False, ''
 
 
-
 def parents_without_children_state(message, user, is_entry=False):
     if is_entry:
         bot.send_message(message.chat.id,
@@ -87,8 +91,11 @@ def parents_without_children_state(message, user, is_entry=False):
                            photo=open('img/excursion.png', 'rb'),
                            caption=DICTIONARY['ua']['excursion_msg'],
                            reply_markup=get_excursion_button_keyboard('ua'))
-        elif message.text == DICTIONARY['ua']['choose_school_button']:
-            pass
+        elif message.text == DICTIONARY['ua']['ask_mon_question_btn']:
+            return True, 'ask_mon_question_state'
+        elif message.text == DICTIONARY['ua']['rating_mon_question_btn']:
+            bot.send_message(message.chat.id,
+                             DICTIONARY['ua']['rating_mon_question_msg'])
         elif message.text == DICTIONARY['ua']['back_button']:
             return True, 'parents_state'
         else:
@@ -181,6 +188,8 @@ def thematic_sections_state(message, user, is_entry=False):
 """
 TEACHERS
 """
+
+
 def teachers_state(message, user, is_entry=False):
     if is_entry:
         bot.send_message(message.chat.id,
@@ -246,7 +255,7 @@ def mon_state(message, user, is_entry=False):
     if is_entry:
         bot.send_message(message.chat.id,
                          DICTIONARY['ua']['mon_msg'],
-                             reply_markup=get_mon_keyboard('ua'))
+                         reply_markup=get_mon_keyboard('ua'))
     else:
         if message.text == DICTIONARY['ua']['ask_mon_question_btn']:
             return True, 'ask_mon_question_state'
@@ -276,7 +285,10 @@ def ask_mon_question_state(message, user, is_entry=False):
     else:
         if message.text == DICTIONARY['ua']['back_button']:
             if user.role == ROLES[0]:
-                return True, 'parents_with_children_state'
+                if user.with_child_in_school:
+                    return True, 'parents_with_children_state'
+                elif user.with_child_in_school is False:
+                    return True, 'parents_without_children_state'
             elif user.role == ROLES[1]:
                 return True, 'mon_state'
-    return False, ''
+    return False, ''