Include localisation and return mission as default

equinor · Jan 24, 2024 · b84ae6f · b84ae6f
1 parent 6cbe8dc
commit b84ae6f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/backend/api/Controllers/Models/MissionRunQueryStringParameters.cs b/backend/api/Controllers/Models/MissionRunQueryStringParameters.cs
@@ -61,14 +61,14 @@ public MissionRunQueryStringParameters()
         public List<InspectionType>? InspectionTypes { get; set; }
 
         /// <summary>
-        /// Filter for whether the result should include localisation missions. The default is false
+        /// Filter for whether the result should exclude localisation missions. The default is false
         /// </summary>
-        public bool IncludeLocalisation { get; set; }
+        public bool ExcludeLocalisation { get; set; }
 
         /// <summary>
-        /// Filter for whether the result should include return to home missions. The default is false
+        /// Filter for whether the result should exclude return to home missions. The default is false
         /// </summary>
-        public bool IncludeReturnToHome { get; set; }
+        public bool ExcludeReturnToHome { get; set; }
 
         #region Time Filters
 

diff --git a/backend/api/Services/MissionRunService.cs b/backend/api/Services/MissionRunService.cs
@@ -279,6 +279,8 @@ private static void SearchByTag(ref IQueryable<MissionRun> missionRuns, string?
         ///     <see cref="MissionRunQueryStringParameters.RobotNameSearch" />,
         ///     <see cref="MissionRunQueryStringParameters.TagSearch" />,
         ///     <see cref="MissionRunQueryStringParameters.InspectionTypes" />,
+        ///     <see cref="MissionRunQueryStringParameters.ExcludeLocalisation" />,
+        ///     <see cref="MissionRunQueryStringParameters.ExcludeReturnToHome" />,
         ///     <see cref="MissionRunQueryStringParameters.MinStartTime" />,
         ///     <see cref="MissionRunQueryStringParameters.MaxStartTime" />,
         ///     <see cref="MissionRunQueryStringParameters.MinEndTime" />,
@@ -331,11 +333,11 @@ MissionRunQueryStringParameters parameters
                         )
                 );
 
-            Expression<Func<MissionRun, bool>> localisationFilter = parameters.IncludeLocalisation
+            Expression<Func<MissionRun, bool>> localisationFilter = !parameters.ExcludeLocalisation
                 ? missionRun => true
                 : missionRun => !(missionRun.Tasks.Count() == 1 && missionRun.Tasks.All(task => task.Type == MissionTaskType.Localization));
 
-            Expression<Func<MissionRun, bool>> returnTohomeFilter = parameters.IncludeReturnToHome
+            Expression<Func<MissionRun, bool>> returnTohomeFilter = !parameters.ExcludeReturnToHome
                 ? missionRun => true
                 : missionRun => !(missionRun.Tasks.Count() == 1 && missionRun.Tasks.All(task => task.Type == MissionTaskType.DriveTo));
 

diff --git a/frontend/src/api/ApiCaller.tsx b/frontend/src/api/ApiCaller.tsx
@@ -177,6 +177,8 @@ export class BackendAPICaller {
         if (parameters.nameSearch) path = path + 'NameSearch=' + parameters.nameSearch + '&'
         if (parameters.robotNameSearch) path = path + 'RobotNameSearch=' + parameters.robotNameSearch + '&'
         if (parameters.tagSearch) path = path + 'TagSearch=' + parameters.tagSearch + '&'
+        if (parameters.excludeLocalisation) path = path + 'ExcludeLocalisation=' + parameters.excludeLocalisation + '&'
+        if (parameters.excludeReturnToHome) path = path + 'ExcludeReturnToHome=' + parameters.excludeReturnToHome + '&'
         if (parameters.minStartTime) path = path + 'MinStartTime=' + parameters.minStartTime + '&'
         if (parameters.maxStartTime) path = path + 'MaxStartTime=' + parameters.maxStartTime + '&'
         if (parameters.minEndTime) path = path + 'MinEndTime=' + parameters.minEndTime + '&'

diff --git a/frontend/src/models/MissionRunQueryParameters.ts b/frontend/src/models/MissionRunQueryParameters.ts
@@ -10,6 +10,8 @@ export interface MissionRunQueryParameters {
     tagSearch?: string
     inspectionTypes?: InspectionType[]
     area?: string
+    excludeLocalisation?: boolean
+    excludeReturnToHome?: boolean
     minStartTime?: number
     maxStartTime?: number
     minEndTime?: number