slancelin
/
staticky
mirror of https://github.com/FallMarsisus/staticky.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert " modified: parse_salles.py" 

This reverts commit 6b3b11c9f9.
This commit is contained in:
Antonin 2024-12-16 22:26:51 +01:00
parent 6b3b11c9f9
commit 91d49599c2
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
parse_salles.py
View File

@ -22,19 +22,17 @@ def create_edt(heure:int, semestre:int, day:str) -> list[(int, str, int)]:
# initialize the coords of the cell # initialize the coords of the cell
row = 3 + (heure - 8) + 11*day_number_sem row = 3 + (heure - 8) + 11*day_number_sem
column = 0 column = 0
for cell in sheet[row][1:]: for i, cell in enumerate(sheet[row][1:]):
column+=1 column+=1
val = cell.value val = cell.value
if isEmptyRoom(val): if isEmptyRoom(val):
try: try:
roomName = sheet.cell(row=1, column=cell.column).value freeTime = getFreeDuration(sheet, row, column, day_number_sem)
temp = sheet.cell(row=1, column=cell.column).value
if roomName is not None: if temp is not None:
freeTime = getFreeDuration(sheet, row, column, day_number_sem, ("R"==roomName[0])) coordinates.append((temp, sheet.cell(row=2, column=cell.column).value, freeTime))
coordinates.append((roomName, sheet.cell(row=2, column=cell.column).value, freeTime))
except Exception as e: except Exception as e:
print(f"\033[91mError: {e}\033[0m") # affiche en rouge l'erreur print(f"Error: {e}")
return coordinates return coordinates
@ -46,7 +44,7 @@ def isThisDay(row:int, dayNumber: int) -> bool :
return 3 + 11*dayNumber <= row <= 13 + 11*dayNumber return 3 + 11*dayNumber <= row <= 13 + 11*dayNumber
def getFreeDuration(sheet, row:int, column:int, dayNumber:int, isScienceBat:bool) -> int: def getFreeDuration(sheet, row:int, column:int, dayNumber:int) -> int:
i = 0 i = 0
val = sheet[row][column].value val = sheet[row][column].value
while isEmptyRoom(val) and isThisDay(row, dayNumber): while isEmptyRoom(val) and isThisDay(row, dayNumber):
@ -54,9 +52,8 @@ def getFreeDuration(sheet, row:int, column:int, dayNumber:int, isScienceBat:bool
row += 1 row += 1
val = sheet[row][column].value val = sheet[row][column].value
#complète jusqu'à 21 si la salle est libre après if not isThisDay(row, dayNumber):
if not isThisDay(row, dayNumber) and not isScienceBat: return i + 3
return i+3
return i return i