mirror of
https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git
synced 2025-08-07 04:09:15 +02:00
fix:#41 refactored function
This commit is contained in:
@@ -28,24 +28,35 @@ import (
|
|||||||
func toEvents(tables [][]*html.Node, days []string) []model.Event {
|
func toEvents(tables [][]*html.Node, days []string) []model.Event {
|
||||||
var events []model.Event
|
var events []model.Event
|
||||||
|
|
||||||
for table := range tables {
|
for tableIndex, table := range tables {
|
||||||
for row := range tables[table] {
|
day := days[tableIndex]
|
||||||
|
|
||||||
|
for _, row := range table {
|
||||||
|
tableData := findTableData(row)
|
||||||
|
if len(tableData) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
events = append(events, createEventsFromTableData(tableData, day)...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return events
|
||||||
|
}
|
||||||
|
|
||||||
|
func createEventsFromTableData(tableData []*html.Node, day string) []model.Event {
|
||||||
|
var events []model.Event
|
||||||
|
|
||||||
tableData := findTableData(tables[table][row])
|
|
||||||
if len(tableData) > 0 {
|
|
||||||
start, _ := types.ParseDateTime(date.CreateTimeFromHourAndMinuteString(getTextContent(tableData[1])))
|
start, _ := types.ParseDateTime(date.CreateTimeFromHourAndMinuteString(getTextContent(tableData[1])))
|
||||||
end, _ := types.ParseDateTime(date.CreateTimeFromHourAndMinuteString(getTextContent(tableData[2])))
|
end, _ := types.ParseDateTime(date.CreateTimeFromHourAndMinuteString(getTextContent(tableData[2])))
|
||||||
|
|
||||||
courses := getTextContent(tableData[7])
|
|
||||||
name := getTextContent(tableData[3])
|
name := getTextContent(tableData[3])
|
||||||
if functions.OnlyWhitespace(name) {
|
if functions.OnlyWhitespace(name) {
|
||||||
name = "Sonderveranstaltung"
|
name = "Sonderveranstaltung"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
courses := getTextContent(tableData[7])
|
||||||
if len(courses) > 0 {
|
if len(courses) > 0 {
|
||||||
for _, course := range strings.Split(courses, " ") {
|
for _, course := range strings.Split(courses, " ") {
|
||||||
events = append(events, model.Event{
|
events = append(events, model.Event{
|
||||||
Day: days[table],
|
Day: day,
|
||||||
Week: getTextContent(tableData[0]),
|
Week: getTextContent(tableData[0]),
|
||||||
Start: start,
|
Start: start,
|
||||||
End: end,
|
End: end,
|
||||||
@@ -59,9 +70,6 @@ func toEvents(tables [][]*html.Node, days []string) []model.Event {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
return events
|
return events
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user