Skip to content
Snippets Groups Projects
Commit 94354eea authored by Björn Fischer's avatar Björn Fischer :new_moon_with_face:
Browse files

Eigenes LogType-Enum für BulkEvalLog + Warning

parent 6ed2d5ad
No related branches found
No related tags found
1 merge request!752.1.0
......@@ -21,6 +21,10 @@
color: nb-theme(text-success-color) !important;
}
.text-warning {
color: nb-theme(text-warning-color) !important;
}
.text-danger {
color: nb-theme(text-danger-color) !important;
}
......
import { TaskInstance } from 'app/exercises/models/task-instance';
import { LogType } from 'app/tasks/models/log-type';
import * as moment from 'moment/moment';
import { Iso8601Helper } from 'app/shared/misc/helper/iso8601.helper';
......@@ -25,6 +24,12 @@ export class TaskInstanceState {
}
}
export enum LogType {
Info,
Error,
Warning,
}
export class BulkEvalLog {
message: string;
type: LogType;
......@@ -40,6 +45,10 @@ export class BulkEvalLog {
return this.type == LogType.Info;
}
get warning() {
return this.type == LogType.Warning;
}
get error() {
return this.type == LogType.Error;
}
......
......@@ -11,6 +11,9 @@
<nb-icon *ngIf="log.info" icon="info-outline"
class="text-primary"
style="flex-shrink: 0;"></nb-icon>
<nb-icon *ngIf="log.warning" icon="alert-triangle-outline"
class="text-warning" style="flex-shrink: 0;">
</nb-icon>
<nb-icon *ngIf="log.error" icon="close-circle-outline"
class="text-danger" style="flex-shrink: 0;">
</nb-icon>
......
......@@ -5,6 +5,7 @@ import de.hsrm.sls.subato.exercises.exercise.model.Exercise;
import de.hsrm.sls.subato.exercises.taskinstance.repository.TaskInstanceSort;
import de.hsrm.sls.subato.solutions.evaluation.TestMode;
import de.hsrm.sls.subato.solutions.evaluation.bulk.state.BulkEvalState;
import de.hsrm.sls.subato.solutions.evaluation.bulk.state.LogType;
import de.hsrm.sls.subato.solutions.evaluation.bulk.state.SolutionState;
import de.hsrm.sls.subato.solutions.evaluation.bulk.state.SolutionStateResult;
import de.hsrm.sls.subato.solutions.evaluation.bulk.state.TaskInstanceState;
......@@ -13,7 +14,6 @@ import de.hsrm.sls.subato.solutions.evaluation.bulk.task.BulkEvalTaskFactory;
import de.hsrm.sls.subato.solutions.solution.model.Solution;
import de.hsrm.sls.subato.solutions.solution.repository.SolutionRepository;
import de.hsrm.sls.subato.solutions.solution.repository.SolutionSort;
import de.hsrm.sls.subato.tasks.imp.log.LogType;
import jakarta.transaction.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -91,7 +91,7 @@ public class BulkEvalManager {
&& !solution.isAttemptsExceeded()) || affectedMode == state.getMode();
if (possiblyOutdated) {
state.setPossiblyOutdated(true);
state.log(LogType.INFO,
state.log(LogType.WARNING,
"Eine Lösung wurde geändert bzw. kam hinzu (ID %s). Der angezeigte Zustand der Auswertung ist jetzt eventuell veraltet.".formatted(
solution.getId()));
handler.onStateChange(state);
......
package de.hsrm.sls.subato.solutions.evaluation.bulk.state;
import de.hsrm.sls.subato.tasks.imp.log.LogType;
import java.time.LocalDateTime;
public class BulkEvalLog {
......
......@@ -2,7 +2,6 @@ package de.hsrm.sls.subato.solutions.evaluation.bulk.state;
import de.hsrm.sls.subato.solutions.evaluation.TestMode;
import de.hsrm.sls.subato.solutions.evaluation.bulk.BulkEvalManager;
import de.hsrm.sls.subato.tasks.imp.log.LogType;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
......
package de.hsrm.sls.subato.solutions.evaluation.bulk.state;
import com.fasterxml.jackson.annotation.JsonValue;
public enum LogType {
INFO,
PROBLEM,
WARNING;
@JsonValue
public int toValue() {
return ordinal();
}
}
\ No newline at end of file
......@@ -5,12 +5,12 @@ import de.hsrm.sls.subato.solutions.evaluation.bulk.BulkEvalHandler;
import de.hsrm.sls.subato.solutions.evaluation.bulk.BulkEvalManager;
import de.hsrm.sls.subato.solutions.evaluation.bulk.BulkEvalOptions;
import de.hsrm.sls.subato.solutions.evaluation.bulk.state.BulkEvalState;
import de.hsrm.sls.subato.solutions.evaluation.bulk.state.LogType;
import de.hsrm.sls.subato.solutions.evaluation.bulk.state.SolutionState;
import de.hsrm.sls.subato.solutions.evaluation.bulk.state.SolutionStateResult;
import de.hsrm.sls.subato.solutions.evaluation.exception.EvaluationInterruptedException;
import de.hsrm.sls.subato.solutions.evaluation.usecase.EvalSolutionUseCase;
import de.hsrm.sls.subato.solutions.solution.repository.SolutionRepository;
import de.hsrm.sls.subato.tasks.imp.log.LogType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment