MarcProe
diff --git a/‎docs/quickstart.rst‎
Lines changed: 28 additions & 3 deletions b/‎docs/quickstart.rst‎
Lines changed: 28 additions & 3 deletions
diff --git a/‎docs/session.rst‎
Lines changed: 2 additions & 0 deletions b/‎docs/session.rst‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎webuntis/session.py‎
Lines changed: 25 additions & 3 deletions b/‎webuntis/session.py‎
Lines changed: 25 additions & 3 deletions
diff --git a/‎webuntis/session.pyi‎
Lines changed: 5 additions & 0 deletions b/‎webuntis/session.pyi‎
Lines changed: 5 additions & 0 deletions
@@ -91,9 +91,7 @@ Here's the example from the :doc:`Intro <index>` again::
     s.logout() # see remark below
 
 
-So what does this do?
-
-::
+So what does this do?::
 
     # a minimal example, these parameters are absolutely neccessary
     s = webuntis.Session(
@@ -148,6 +146,33 @@ which you also can use to log yourself out automatically::
 
     # now you're logged out, even if your code halted with exceptions before.
 
+
+Get a timetable
+===============
+
+Use one of the following::
+
+    monday = ...
+    friday = ...
+
+    # klasse or teacher
+    klasse = s.klassen().filter(name='KlassenName')[0]
+    teacher = s.teachers().filter(name='ABC')[0]
+
+    # get info
+    table = s.timetable(klasse=klasse, start=monday, end=friday).to_table()
+    table = s.timetable(teacher=teacher, start=monday, end=friday).to_table()
+
+
+    # get more info
+    table = s.timetable_extended(klasse=klasse, start=monday, end=friday).to_table()
+
+Use the logged-in user::
+
+    # same as timetable_extended using data from s.login_result
+    table = s.my_timetable(start=monday, end=friday).to_table()
+
+
 Where to go from here?
 ======================
 
 
@@ -25,6 +25,8 @@ Things you can do with the API
     .. automethod:: holidays
     .. automethod:: klassen
     .. automethod:: timetable
+    .. automethod:: timetable_extended
+    .. automethod:: my_timetable
     .. automethod:: rooms
     .. automethod:: schoolyears
     .. automethod:: subjects
 
@@ -100,6 +100,12 @@ def login(self):
         else:
             raise errors.AuthError('Something went wrong while authenticating',
                                    res)
+        self.login_result = dict()
+        if 'personType' in res:
+            self.login_result['personType'] = res['personType']
+            self.login_result['personId'] = res['personId']
+        if "klasseId" in res:
+            self.login_result['klasseId'] = res['klasseId']
 
         return self
 
@@ -223,6 +229,10 @@ def timetable(self, start, end, **type_and_id):
 
     @result_wrapper
     def timetable_extended(self, start, end, **type_and_id):
+        """Get the timetable for a specific school class and time period.
+
+        Like timetable, but includes more info.
+        """
         element_type_table = {
             'klasse': 1,
             'teacher': 2,
@@ -247,11 +257,25 @@ def timetable_extended(self, start, end, **type_and_id):
         if element_type not in element_type_table:
             raise invalid_type_error
 
+        return self._timetable_extended_raw(end, start, element_id, element_type_table[element_type])
+
+    @result_wrapper
+    def my_timetable(self, end, start):
+        """Get the timetable for the logged-in user.
+
+        see timetable_extended.
+        """
+        return self._timetable_extended_raw(end, start,
+                                            self.login_result['personId'], self.login_result['personType'])
+
+
+    def _timetable_extended_raw(self, end, start, element_id, element_type_num):
+
         options = self._create_date_param(end,
                                           start,
                                           element={
                                               "id": int(element_id),
-                                              "type": element_type_table[element_type],
+                                              "type": element_type_num,
                                           },
                                           onlyBaseTimetable=False,
                                           showBooking=True,
@@ -261,13 +285,11 @@ def timetable_extended(self, start, end, **type_and_id):
                                           showLsNumber=True,
                                           showStudentgroup=True,
                                           )
-
         parameters = {
             "options": options,
         }
         return objects.PeriodList, 'getTimetable', parameters
 
-
     @result_wrapper
     def rooms(self):
         """Get all rooms of a school.
 
@@ -33,6 +33,11 @@ class ResultWrapperMixin:
                            start: Union[datetime.datetime, datetime.date, int],
                            end: Union[datetime.datetime, datetime.date, int], **type_and_id) -> objects.PeriodList: ...
 
+    def my_timetable(self,
+                     start: Union[datetime.datetime, datetime.date, int],
+                     end: Union[datetime.datetime, datetime.date, int]
+                     ) -> objects.PeriodList: ...
+
     def rooms(self) -> objects.RoomList: ...
 
     def schoolyears(self) -> objects.SchoolyearList: ...