matplobbot-shared 0.1.29__tar.gz → 0.1.30__tar.gz

{matplobbot_shared-0.1.29 → matplobbot_shared-0.1.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matplobbot-shared
-Version: 0.1.29
+Version: 0.1.30
 Summary: Shared library for the Matplobbot ecosystem (database, services, i18n).
 Author: Ackrome
 Author-email: ivansergeyevich@gmail.com

{matplobbot_shared-0.1.29 → matplobbot_shared-0.1.30}/matplobbot_shared.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matplobbot-shared
-Version: 0.1.29
+Version: 0.1.30
 Summary: Shared library for the Matplobbot ecosystem (database, services, i18n).
 Author: Ackrome
 Author-email: ivansergeyevich@gmail.com

{matplobbot_shared-0.1.29 → matplobbot_shared-0.1.30}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="matplobbot-shared",
-    version="0.1.29", # Let's use the version from your requirements.txt
+    version="0.1.30", # Let's use the version from your requirements.txt
     packages=find_packages(include=['shared_lib', 'shared_lib.*']),
     description="Shared library for the Matplobbot ecosystem (database, services, i18n).",
     author="Ackrome",

{matplobbot_shared-0.1.29 → matplobbot_shared-0.1.30}/shared_lib/services/schedule_service.py

@@ -2,6 +2,18 @@
 
 from typing import List, Dict, Any
 from datetime import datetime, date
+from collections import defaultdict
+
+names_shorter = defaultdict(lambda: 'Неизвестно')
+to_add = {
+    'Практические (семинарские) занятия': 'Семинар',
+    'Лекции': 'Лекция',
+    'Консультации текущие': 'Консультация',
+    'Повторная промежуточная аттестация (экзамен)':'Пересдача'
+    }
+names_shorter.update(to_add)
+
+    
 
 def format_schedule(schedule_data: List[Dict[str, Any]], lang: str, entity_name: str, start_date: date) -> str:
     """Formats a list of lessons into a readable daily schedule."""
@@ -26,10 +38,10 @@ def format_schedule(schedule_data: List[Dict[str, Any]], lang: str, entity_name:
             formatted_lessons = []
             for lesson in sorted(lessons, key=lambda x: x['beginLesson']):
                 formatted_lessons.append(
-                    f"`{lesson['beginLesson']} - {lesson['endLesson']}`\n"
-                    f"{lesson['discipline']}\n"
-                    f"{lesson['kindOfWork']}\n"
-                    f"{lesson['auditorium']} ({lesson['building']})\n"
+                    f"`{lesson['beginLesson']} - {lesson['endLesson']} | {lesson['auditorium']}`\n"
+                    f"{lesson['discipline']} | {names_shorter[lesson['kindOfWork']]}\n"
+                    # f"{lesson['kindOfWork']}\n"
+                    # f"{lesson['auditorium']} ({lesson['building']})\n"
                     f"{lesson['lecturer_title'].replace('_',' ')}\n"
                     f"{lesson['lecturerEmail']}\n"
                 )