diff --git a/kraftwerk-core/src/main/java/fr/insee/kraftwerk/core/Constants.java b/kraftwerk-core/src/main/java/fr/insee/kraftwerk/core/Constants.java index 3eee6111..fd2fc860 100644 --- a/kraftwerk-core/src/main/java/fr/insee/kraftwerk/core/Constants.java +++ b/kraftwerk-core/src/main/java/fr/insee/kraftwerk/core/Constants.java @@ -59,6 +59,7 @@ private Constants() {} public static final String REPORTING_DATA_INTERVIEWER_ID_NULL_PLACEHOLDER = "NON_AFFECTE_"; public static final String REPORTING_DATA_INPUT_DATE_FORMAT = "dd/MM/yyyy HH:mm:ss"; public static final String REPORTING_DATA_OUTPUT_DATE_FORMAT = "yyyy-MM-dd-hh-mm-ss"; + public static final String REPORTING_DATA_FOLLOWUP_OUTPUT_STRING = "RELANCE"; public static final String END_LINE = "\n"; public static final String OUTPUT_FOLDER_DATETIME_PATTERN = "yyyy_MM_dd_HH_mm_ss"; public static final String ERRORS_FILE_NAME = "errors.txt"; diff --git a/kraftwerk-core/src/main/java/fr/insee/kraftwerk/core/extradata/reportingdata/ContactAttempt.java b/kraftwerk-core/src/main/java/fr/insee/kraftwerk/core/extradata/reportingdata/ContactAttempt.java index 2898b1c9..62fa02c1 100644 --- a/kraftwerk-core/src/main/java/fr/insee/kraftwerk/core/extradata/reportingdata/ContactAttempt.java +++ b/kraftwerk-core/src/main/java/fr/insee/kraftwerk/core/extradata/reportingdata/ContactAttempt.java @@ -3,7 +3,6 @@ import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.Date; import lombok.Getter; import lombok.Setter; diff --git a/kraftwerk-core/src/main/java/fr/insee/kraftwerk/core/extradata/reportingdata/StateType.java b/kraftwerk-core/src/main/java/fr/insee/kraftwerk/core/extradata/reportingdata/StateType.java index a1c70119..529e9c4b 100644 --- a/kraftwerk-core/src/main/java/fr/insee/kraftwerk/core/extradata/reportingdata/StateType.java +++ b/kraftwerk-core/src/main/java/fr/insee/kraftwerk/core/extradata/reportingdata/StateType.java @@ -3,10 +3,12 @@ import java.util.HashMap; import java.util.Map; +import fr.insee.kraftwerk.core.Constants; import lombok.Getter; @Getter public enum StateType { + STATE01("NVM", "UE non visible gestionnaire"), STATE02("NNS", "Non affecté, non commencé"), STATE03("ANV", "Affectée, non visible enquêteur"), @@ -31,8 +33,8 @@ public enum StateType { STATE22("VALPAP", "Questionnaire validé sur papier"), STATE23("VALINT", "Questionnaire validé sur internet"), STATE24("REFUSAL", "Refus de répondre"), - STATE25("RELANCE", "RELANCE"), - STATE26("FOLLOWUP", "RELANCE"); + STATE25("RELANCE", Constants.REPORTING_DATA_FOLLOWUP_OUTPUT_STRING), + STATE26("FOLLOWUP", Constants.REPORTING_DATA_FOLLOWUP_OUTPUT_STRING); private final String key; private final String value;