diff --git a/models/jobsystem.model b/models/jobsystem.model index 62b3f2e0e..63f3d8d8a 100644 --- a/models/jobsystem.model +++ b/models/jobsystem.model @@ -7,7 +7,7 @@ JobMeta relativeInTime TimeRelative Maybe -- TODO find better name planExecutionAhead NominalDiffTime -- TODO find better name executionTimeEpsilon NominalDiffTime Maybe - priority JobPriority + priority JobPrio ressources JobRessources status JobStatus lastStartSystem UTCTime Maybe -- when did a job scheduler last order diff --git a/src/Model/Types/Jobsystem.hs b/src/Model/Types/Jobsystem.hs index 7840cac12..9fd7d3c3b 100644 --- a/src/Model/Types/Jobsystem.hs +++ b/src/Model/Types/Jobsystem.hs @@ -1,6 +1,6 @@ module Model.Types.Jobsystem ( JobOccurrence(..) - , JobPriority(..) + , JobPrio(..) , JobRessource(..), JobRessources(..) , module Jobsys.Basics ) where @@ -26,7 +26,7 @@ derivePersistFieldJSON ''JobOccurrence -- | Priorities of jobs to be executed. Note that Top < ... < Least must hold, so be careful with constructor order! -data JobPriority +data JobPrio = JobPrioTop | JobPrioHigh | JobPrioMedium @@ -35,9 +35,9 @@ data JobPriority deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic) deriving anyclass (Universe, Finite, NFData) -nullaryPathPiece ''JobPriority $ camelToPathPiece' 2 -pathPieceJSON ''JobPriority -derivePersistFieldPathPiece ''JobPriority +nullaryPathPiece ''JobPrio $ camelToPathPiece' 2 +pathPieceJSON ''JobPrio +derivePersistFieldPathPiece ''JobPrio data JobRessource