core/oc-lib
6
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

correct time loc

Browse Source
This commit is contained in:
mr
2026-03-20 14:01:14 +01:00
parent f1a9214ac7
commit 5619010838
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
models/common/planner.go
View File

@@ -33,14 +33,7 @@ func GetPlannerLongestTime(end *time.Time, planned map[tools.DataType]map[string
} }
longestTime := float64(0) longestTime := float64(0)
for _, priced := range planned[tools.PROCESSING_RESOURCE] { for _, priced := range planned[tools.PROCESSING_RESOURCE] {
if priced.GetLocationEnd() == nil { longestTime += priced.GetExplicitDurationInS()
continue
}
newS := priced.GetLocationEnd()
if end == nil && longestTime < newS.Sub(*end).Seconds() {
longestTime = newS.Sub(*end).Seconds()
}
// get the nearest start from start var
} }
return longestTime return longestTime
} }

2
models/resources/priced_resource.go
View File

@@ -117,7 +117,7 @@ func (abs *PricedResource[T]) GetExplicitDurationInS() float64 {
} }
if abs.BookingConfiguration.ExplicitBookingDurationS == 0 { if abs.BookingConfiguration.ExplicitBookingDurationS == 0 {
if abs.BookingConfiguration.UsageEnd == nil && abs.BookingConfiguration.UsageStart == nil { if abs.BookingConfiguration.UsageEnd == nil && abs.BookingConfiguration.UsageStart == nil {
return (1 * time.Hour).Seconds() return (5 * time.Minute).Seconds()
} }
if abs.BookingConfiguration.UsageEnd == nil { if abs.BookingConfiguration.UsageEnd == nil {
add := abs.BookingConfiguration.UsageStart.Add(5 * time.Minute) add := abs.BookingConfiguration.UsageStart.Add(5 * time.Minute)