Skip to content

Commit 5cf37cf

Browse files
Only show Results button when results exist
1 parent ea23e54 commit 5cf37cf

5 files changed

Lines changed: 45 additions & 8 deletions

File tree

backend/api/Database/Context/InitDb.cs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,36 @@ private static List<MissionDefinition> GetMissionDefinitions()
330330
LastSuccessfulRun = null,
331331
};
332332

333+
var onlyImagesWithoutAnalysisMissionDefinition = new MissionDefinition
334+
{
335+
Id = Guid.NewGuid().ToString(),
336+
Name = "Only Images Without Analysis Mission",
337+
InstallationCode = inspectionAreas[5].Installation.InstallationCode,
338+
InspectionArea = inspectionAreas[5],
339+
Tasks =
340+
[
341+
new TaskDefinition
342+
{
343+
TagId = "image-tag-1",
344+
Description = "Tag to take image of",
345+
RobotPose = new Pose(),
346+
AnalysisTypes = [],
347+
SensorType = SensorType.Image,
348+
TargetPosition = new Position(),
349+
},
350+
new TaskDefinition
351+
{
352+
TagId = "image-tag-2",
353+
Description = "Tag to take image of",
354+
RobotPose = new Pose(),
355+
AnalysisTypes = [],
356+
SensorType = SensorType.Image,
357+
TargetPosition = new Position(),
358+
},
359+
],
360+
LastSuccessfulRun = null,
361+
};
362+
333363
return new List<MissionDefinition>([
334364
missionDefinition1,
335365
missionDefinition2,
@@ -339,6 +369,7 @@ private static List<MissionDefinition> GetMissionDefinitions()
339369
missionDefinition6,
340370
thermalReadingMission,
341371
cloeMission,
372+
onlyImagesWithoutAnalysisMissionDefinition,
342373
]);
343374
}
344375

frontend/src/models/InspectionRecord.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export interface FlotillaAnalysisResultMessage {
5252
export interface InspectionData {
5353
inspectionId: string
5454
analysisId: string
55-
visualisedSAS?: string
55+
visualizedSAS?: string
5656
fileType: FileType
5757
anonymizedSAS?: string
5858
analysisType?: string
@@ -94,7 +94,7 @@ export const inspectionRecordToInspectionData = (record: InspectionRecord): Insp
9494
return {
9595
inspectionId: record.inspectionId,
9696
analysisId: analysis.id,
97-
visualisedSAS: analysis.visualizedSAS,
97+
visualizedSAS: analysis.visualizedSAS,
9898
anonymizedSAS: analysis.anonymizedSAS,
9999
analysisType: record.inspectionType,
100100
tag: record.tag,

frontend/src/pages/InspectionReportPage/InspectionReportImage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,17 +162,17 @@ const AnalysisImageWithPlaceholder = ({
162162
const { useSaraData } = useInspectionsContext()
163163
const { data, isPending, isError } = useSaraData(inspectionId)
164164

165-
if (!data?.visualisedSAS) {
165+
if (!data?.visualizedSAS) {
166166
return <TextAsImage isLargeImage={isLargeImage} text={'No analysis available'} />
167167
} else if (isPending) {
168168
return <PendingResultPlaceholder isLargeImage={isLargeImage} />
169169
} else if (isError || !data) {
170170
return <TextAsImage isLargeImage={isLargeImage} text={'No analysis could be found'} />
171171
} else
172172
return isLargeImage ? (
173-
<StyledInspection $otherContentHeight={'174px'} src={data.visualisedSAS} />
173+
<StyledInspection $otherContentHeight={'174px'} src={data.visualizedSAS} />
174174
) : (
175-
<StyledInspectionImage src={data.visualisedSAS} />
175+
<StyledInspectionImage src={data.visualizedSAS} />
176176
)
177177
}
178178

frontend/src/pages/MissionPage/AnalysisResultView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ export const AnalysisResultDialogContent = ({ inspection }: { inspection: Inspec
3939

4040
return (
4141
<div>
42-
{inspection.visualisedSAS ? (
43-
<AnalysisImage sasURI={inspection.visualisedSAS} isPending={false} />
42+
{inspection.visualizedSAS ? (
43+
<AnalysisImage sasURI={inspection.visualizedSAS} isPending={false} />
4444
) : (
4545
<>{/* No image to display*/}</>
4646
)}

frontend/src/pages/MissionPage/TaskOverview/TaskTable.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,13 @@ const TaskTableRow = ({
110110
<Table.Cell>
111111
<TaskStatusDisplay status={task.status} errorMessage={task.errorDescription} />
112112
</Table.Cell>
113-
<Table.Cell>{inspectionData ? <TaskAnalysisDisplay inspectionData={inspectionData} /> : <></>}</Table.Cell>
113+
<Table.Cell>
114+
{inspectionData && (inspectionData.visualizedSAS || inspectionData.value) ? (
115+
<TaskAnalysisDisplay inspectionData={inspectionData} />
116+
) : (
117+
<></>
118+
)}
119+
</Table.Cell>
114120
</StyledTableRow>
115121
)
116122
}

0 commit comments

Comments
 (0)