From 01cb8465403a20eb9520c2121510152483d435ab Mon Sep 17 00:00:00 2001
From: "Anders H. Rebner" <anderhre@stud.ntnu.no>
Date: Fri, 27 Mar 2020 15:46:37 +0100
Subject: [PATCH] #39 La til graderingene i schemaet
---
soitool/serialize_export_import_soi.py | 12 +++++++++++-
test/test_serialize_export_import.py | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/soitool/serialize_export_import_soi.py b/soitool/serialize_export_import_soi.py
index 2c10055..294c713 100644
--- a/soitool/serialize_export_import_soi.py
+++ b/soitool/serialize_export_import_soi.py
@@ -15,7 +15,17 @@ SERIALIZED_SOI_SCHEMA = Schema(
"date": Or(str, None),
"valid": {"from_date": Or(str, None), "to_date": Or(str, None)},
"icon": Or(str, None),
- "classification": And(str, len),
+ "classification": And(
+ str,
+ len,
+ Or(
+ "UGRADERT",
+ "BEGRENSET",
+ "KONFIDENSIELT",
+ "HEMMELIG",
+ "STRENGT HEMMELIG",
+ ),
+ ),
"orientation": And(str, len, Or("portrait", "landscape")),
"placement_strategy": And(str, len, Or("manual", "auto")),
"algorithm_bin": And(str, len, Or("BFF", "BBF")),
diff --git a/test/test_serialize_export_import.py b/test/test_serialize_export_import.py
index eec9f43..d615e6c 100644
--- a/test/test_serialize_export_import.py
+++ b/test/test_serialize_export_import.py
@@ -28,7 +28,7 @@ DATE = "01.01.2020"
VALID_FROM = "01.01.2020"
VALID_TO = "02.01.2020"
ICON = "soitool/media/HVlogo.png"
-CLASSIFICATION = "Ugradert"
+CLASSIFICATION = "UGRADERT"
ORIENTATION = "portrait"
PLACEMENT_STRATEGY = "manual"
ALGORITHM_BIN = "BFF"
--
GitLab