matplobbot-shared 0.1.29__py3-none-any.whl → 0.1.30__py3-none-any.whl

{matplobbot_shared-0.1.29.dist-info → matplobbot_shared-0.1.30.dist-info}/METADATA

@@ -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.dist-info → matplobbot_shared-0.1.30.dist-info}/RECORD

@@ -2,9 +2,9 @@ shared_lib/__init__.py,sha256=Wxuw1wbvCOsKqs6WfIQ05cx_vndhPs6rH2krMatFRqA,45
 shared_lib/database.py,sha256=vGiCxk1m_xZxaJQtjQPC_7G2Wxnu-ptWx5Z7q_XDIGs,20706
 shared_lib/i18n.py,sha256=VBWQWVF-k_HDiidYo_RUPyUCM7oL897z5hOw9jvOoYY,1762
 shared_lib/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shared_lib/services/schedule_service.py,sha256=S14iRmZHYX7l4TVB95gtAWVzHLOjC8Heos9Q1T-1-d0,1911
+shared_lib/services/schedule_service.py,sha256=l4kffo866Pzj-rVNqAL-vMVYhB-Arfgl_bzwnNIVA9M,2441
 shared_lib/services/university_api.py,sha256=Ui-zjfKOHCCf2Imh8CNtVOWegwuep7IB8gO9IKNUrrE,1898
-matplobbot_shared-0.1.29.dist-info/METADATA,sha256=svsJe75U880XVPVDaqs4kR00H42ErlPta2_DaKHyow0,395
-matplobbot_shared-0.1.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matplobbot_shared-0.1.29.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
-matplobbot_shared-0.1.29.dist-info/RECORD,,
+matplobbot_shared-0.1.30.dist-info/METADATA,sha256=i0itMsVkSh3YoPt8uMPoifKOXd5DgXBTc9alPnT6ez0,395
+matplobbot_shared-0.1.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matplobbot_shared-0.1.30.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
+matplobbot_shared-0.1.30.dist-info/RECORD,,

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"
                 )