| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -367,15 +367,32 @@ def rooms(self): | |||
| 367 | 367 | ) | |
| 368 | 368 | ||
| 369 | 369 | @lazyproperty | |
| 370 | - def type(self): | ||
| 370 | + def code(self): | ||
| 371 | 371 | '''May be: | |
| 372 | 372 | ||
| 373 | 373 | - ``None`` -- There's nothing special about this period. | |
| 374 | 374 | - ``"cancelled"`` -- Cancelled | |
| 375 | 375 | - ``"irregular"`` -- Substitution/"Supplierung"/Not planned event | |
| 376 | 376 | ''' | |
| 377 | 377 | ||
| 378 | - return (self._data['code'] if 'code' in self._data else None) | ||
| 378 | + if 'code' not in self._data: | ||
| 379 | + return None | ||
| 380 | + else: | ||
| 381 | + return self._data['code'] or None | ||
| 382 | + | ||
| 383 | + @lazyproperty | ||
| 384 | + def type(self): | ||
| 385 | + ''' | ||
| 386 | + May be: | ||
| 387 | + | ||
| 388 | + - ``"ls"`` -- Normal lesson | ||
| 389 | + - ``"oh"`` -- Office hour | ||
| 390 | + - ``"sb"`` -- Standby | ||
| 391 | + - ``"bs"`` -- Break Supervision | ||
| 392 | + - ``"ex"`` -- Examination | ||
| 393 | + ''' | ||
| 394 | + | ||
| 395 | + return (self._data['lstype'] if 'lstype' in self._data else 'ls') | ||
| 379 | 396 | ||
| 380 | 397 | ||
| 381 | 398 | class PeriodList(ListResult): | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -133,7 +133,14 @@ def getRooms(self, url, jsondata, headers): | |||
| 133 | 133 | period_raw['endTime'] | |
| 134 | 134 | ) | |
| 135 | 135 | if 'code' in period_raw: | |
| 136 | - self.assertEqual(period_raw['code'], period.type) | ||
| 136 | + self.assertEqual(period_raw['code'], period.code) | ||
| 137 | + else: | ||
| 138 | + self.assertEqual(period.code, None) | ||
| 139 | + | ||
| 140 | + if 'type' in period_raw: | ||
| 141 | + self.assertEqual(period_raw['lstype'], period.type) | ||
| 142 | + else: | ||
| 143 | + self.assertEqual(period.type, 'ls') | ||
| 137 | 144 | ||
| 138 | 145 | self.assertEqual(len(period_raw['kl']), len(period.klassen)) | |
| 139 | 146 | for klasse_raw, klasse in zip(period_raw['kl'], period.klassen): | |
| Back | FazBrowse Home | New Git URL |
0 commit comments