Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-22 05:00:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with incorrect MS Project XML working day imports

Browse Source
This commit is contained in:
Dion Moult
2022-02-21 19:55:08 +11:00
parent 32af2025ec
commit 97c660fec8
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifc4d/ifc4d/msp2ifc.py
+11 -2
View File
@@ -202,6 +202,15 @@ class MSP2Ifc:
self.create_task(self.tasks[subtask_id], parent_task=task) self.create_task(self.tasks[subtask_id], parent_task=task)
def process_working_week(self, week, calendar): def process_working_week(self, week, calendar):
day_map = {
"1": 7, # Sunday
"2": 1, # Monday
"3": 2, # Tuesday
"4": 3, # Wednesday
"5": 4, # Thursday
"6": 5, # Friday
"7": 6, # Saturday
}
for day in week: for day in week:
if day["ifc"]: if day["ifc"]:
continue continue
@@ -210,12 +219,12 @@ class MSP2Ifc:
"sequence.add_work_time", self.file, work_calendar=calendar, time_type="WorkingTimes" "sequence.add_work_time", self.file, work_calendar=calendar, time_type="WorkingTimes"
) )
weekday_component = [int(day["DayType"])] weekday_component = [day_map[day["DayType"]]]
for day2 in week: for day2 in week:
if day["DayType"] == day2["DayType"]: if day["DayType"] == day2["DayType"]:
continue continue
if day["WorkingTimes"] == day2["WorkingTimes"]: if day["WorkingTimes"] == day2["WorkingTimes"]:
weekday_component.append(int(day2["DayType"])) weekday_component.append(day_map[day2["DayType"]])
# Don't process the next day, as we can group it # Don't process the next day, as we can group it
day2["ifc"] = day["ifc"] day2["ifc"] = day["ifc"]