From 075511d09d6ac12fe535f1a4078d2e8722a4c2b1 Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Wed, 28 Apr 2021 13:32:51 +0200 Subject: [PATCH] move general.exam_mode to teaching.exam_mode --- calculators/cg20.yaml | 2 +- calculators/cp300.yaml | 2 +- calculators/cp330+.yaml | 2 +- calculators/cp330.yaml | 2 +- calculators/cp400+e.yaml | 2 +- calculators/cp400.yaml | 2 +- calculators/g25+e.yaml | 2 +- calculators/g25+e2.yaml | 2 +- calculators/g25+pro.yaml | 2 +- calculators/g35+.yaml | 2 +- calculators/g35+e.yaml | 2 +- calculators/g35+e2.yaml | 2 +- calculators/g35+usb3.yaml | 2 +- calculators/g35+usb4.yaml | 2 +- calculators/g75+.yaml | 2 +- calculators/g75+e.yaml | 2 +- calculators/g75.yaml | 2 +- calculators/g85.yaml | 2 +- calculators/g85sd.yaml | 2 +- calculators/g90+e.yaml | 2 +- calculators/g95.yaml | 2 +- lang/en.yaml | 6 +++--- lang/fr.yaml | 6 +++--- model.yaml | 2 +- tools/calcdb.py | 2 +- 25 files changed, 29 insertions(+), 29 deletions(-) diff --git a/calculators/cg20.yaml b/calculators/cg20.yaml index 062e6d1..f8355ac 100644 --- a/calculators/cg20.yaml +++ b/calculators/cg20.yaml @@ -3,13 +3,13 @@ cg20: full_name: "Prizm" international_name: "fx-CG 10/20" year_launched: 2011 - exam_mode: no predecessor: no successor: g90+e family: family.prizm active: no teaching: audience: audience.high_school + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/cp300.yaml b/calculators/cp300.yaml index 2b2ac86..a0fd4e3 100644 --- a/calculators/cp300.yaml +++ b/calculators/cp300.yaml @@ -3,13 +3,13 @@ cp300: full_name: "Classpad 300" international_name: "Classpad 300" year_launched: 2003 - exam_mode: no predecessor: no successor: cp330 family: family.cas active: no teaching: audience: audience.high_school_college + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/cp330+.yaml b/calculators/cp330+.yaml index 70d4a52..353cdd3 100644 --- a/calculators/cp330+.yaml +++ b/calculators/cp330+.yaml @@ -3,13 +3,13 @@ cp330+: full_name: "Classpad 330+" international_name: "Classpad 330+" year_launched: 2012 - exam_mode: no predecessor: cp330 successor: cp400 family: family.cas active: no teaching: audience: audience.high_school_college + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/cp330.yaml b/calculators/cp330.yaml index 8485042..f76e687 100644 --- a/calculators/cp330.yaml +++ b/calculators/cp330.yaml @@ -3,13 +3,13 @@ cp330: full_name: "Classpad 300+/330" international_name: "Classpad 300+/330" year_launched: [2005,2007] - exam_mode: no predecessor: cp300 successor: cp330+ family: family.cas active: no teaching: audience: audience.high_school_college + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/cp400+e.yaml b/calculators/cp400+e.yaml index 2920e09..a0f847c 100644 --- a/calculators/cp400+e.yaml +++ b/calculators/cp400+e.yaml @@ -3,13 +3,13 @@ cp400+e: full_name: "Classpad 400+E" international_name: "fx-CP 400+E/fx-CG 500" year_launched: 2016 - exam_mode: yes predecessor: cp400 successor: no family: family.cas active: yes teaching: audience: audience.high_school_college + exam_mode: yes math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/cp400.yaml b/calculators/cp400.yaml index 1fea6aa..ff0912f 100644 --- a/calculators/cp400.yaml +++ b/calculators/cp400.yaml @@ -3,13 +3,13 @@ cp400: full_name: "Classpad 400" international_name: "fx-CP 400/fx-CG 500" year_launched: 2013 - exam_mode: no predecessor: cp330+ successor: cp400+e family: family.cas active: no teaching: audience: audience.high_school_college + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/g25+e.yaml b/calculators/g25+e.yaml index d4ec354..6a864ca 100644 --- a/calculators/g25+e.yaml +++ b/calculators/g25+e.yaml @@ -3,13 +3,13 @@ g25+e: full_name: "Graph 25+E" international_name: "fx-7400G II" year_launched: 2015 - exam_mode: exam_mode.bad predecessor: g25+pro successor: g25+e2 family: family.mono active: no teaching: audience: audience.high_school + exam_mode: exam_mode.bad math_input: math_input.hidden_option pretty_print: pretty_print.hidden_option matrices: no diff --git a/calculators/g25+e2.yaml b/calculators/g25+e2.yaml index 11113d4..a412fd5 100644 --- a/calculators/g25+e2.yaml +++ b/calculators/g25+e2.yaml @@ -3,13 +3,13 @@ g25+e2: full_name: "Graph 25+E II" international_name: "fx-7400G III" year_launched: 2020 - exam_mode: exam_mode.bad predecessor: g25+e successor: no family: family.mono active: yes teaching: audience: audience.high_school + exam_mode: exam_mode.bad math_input: no pretty_print: no matrices: no diff --git a/calculators/g25+pro.yaml b/calculators/g25+pro.yaml index e9c2fd2..ba5595d 100644 --- a/calculators/g25+pro.yaml +++ b/calculators/g25+pro.yaml @@ -3,13 +3,13 @@ g25+pro: full_name: "Graph 25+ Pro" international_name: "fx-7400G II" year_launched: 2010 - exam_mode: no predecessor: g25+ successor: g25+e family: family.mono active: no teaching: audience: audience.high_school + exam_mode: no math_input: math_input.hidden_option pretty_print: pretty_print.hidden_option matrices: no diff --git a/calculators/g35+.yaml b/calculators/g35+.yaml index 9ef656b..b9c83b9 100644 --- a/calculators/g35+.yaml +++ b/calculators/g35+.yaml @@ -3,13 +3,13 @@ g35+: full_name: "Graph 35+" international_name: "fx-9750G+" year_launched: 2008 - exam_mode: no predecessor: g35 successor: g35+usb3 family: family.mono active: no teaching: audience: audience.high_school + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/g35+e.yaml b/calculators/g35+e.yaml index d0983e5..f637cb0 100644 --- a/calculators/g35+e.yaml +++ b/calculators/g35+e.yaml @@ -3,13 +3,13 @@ g35+e: full_name: "Graph 35+E" international_name: "fx-9750G II" year_launched: 2015 - exam_mode: yes predecessor: g35+usb4 successor: g35+e2 family: family.mono active: no teaching: audience: audience.high_school + exam_mode: yes math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/g35+e2.yaml b/calculators/g35+e2.yaml index a0cccca..6ba871d 100644 --- a/calculators/g35+e2.yaml +++ b/calculators/g35+e2.yaml @@ -3,13 +3,13 @@ g35+e2: full_name: "Graph 35+E II" international_name: "fx-9750G/9860G III" year_launched: 2019 - exam_mode: yes predecessor: g35+e successor: no family: family.mono active: yes teaching: audience: audience.high_school + exam_mode: yes math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/g35+usb3.yaml b/calculators/g35+usb3.yaml index 2f149c4..fcf7aaa 100644 --- a/calculators/g35+usb3.yaml +++ b/calculators/g35+usb3.yaml @@ -3,13 +3,13 @@ g35+usb3: full_name: "Graph 35+USB (SH3)" international_name: "fx-9750G II" year_launched: 2009 - exam_mode: no predecessor: g35+ successor: g35+usb4 family: family.mono active: no teaching: audience: audience.high_school + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/g35+usb4.yaml b/calculators/g35+usb4.yaml index 066dea1..c0ef63c 100644 --- a/calculators/g35+usb4.yaml +++ b/calculators/g35+usb4.yaml @@ -3,13 +3,13 @@ g35+usb4: full_name: "Graph 35+USB (SH4)" international_name: "fx-9750G II" year_launched: 2011 - exam_mode: no predecessor: g35+usb3 successor: g35+e family: family.mono active: no teaching: audience: audience.high_school + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/g75+.yaml b/calculators/g75+.yaml index 431e0a2..a58b9ee 100644 --- a/calculators/g75+.yaml +++ b/calculators/g75+.yaml @@ -3,13 +3,13 @@ g75+: full_name: "Graph 75+" international_name: "fx-9860G II" year_launched: 2014 - exam_mode: no predecessor: g75 successor: g75+e family: family.mono active: no teaching: audience: audience.high_school + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/g75+e.yaml b/calculators/g75+e.yaml index 868b734..e36083b 100644 --- a/calculators/g75+e.yaml +++ b/calculators/g75+e.yaml @@ -3,13 +3,13 @@ g75+e: full_name: "Graph 75+E" international_name: "fx-9860G II" year_launched: 2015 - exam_mode: yes predecessor: g75+ successor: g35+e2 family: family.mono active: no teaching: audience: audience.high_school + exam_mode: yes math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/g75.yaml b/calculators/g75.yaml index af80956..d8b28bf 100644 --- a/calculators/g75.yaml +++ b/calculators/g75.yaml @@ -3,13 +3,13 @@ g75: full_name: "Graph 75" international_name: "fx-9860G II" year_launched: 2009 - exam_mode: no predecessor: g85 successor: g75+ family: family.mono active: no teaching: audience: audience.high_school + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/g85.yaml b/calculators/g85.yaml index 0e62c91..1aa09cd 100644 --- a/calculators/g85.yaml +++ b/calculators/g85.yaml @@ -3,13 +3,13 @@ g85: full_name: "Graph 85" international_name: "fx-9860G" year_launched: 2005 - exam_mode: no predecessor: g65usb successor: [g75, g95] family: family.mono active: no teaching: audience: audience.high_school + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/g85sd.yaml b/calculators/g85sd.yaml index f06c04b..447083b 100644 --- a/calculators/g85sd.yaml +++ b/calculators/g85sd.yaml @@ -3,13 +3,13 @@ g85sd: full_name: "Graph 85 SD" international_name: "fx-9860G SD" year_launched: 2005 - exam_mode: no predecessor: g65usb successor: [g75, g95] family: family.mono active: no teaching: audience: audience.high_school + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/g90+e.yaml b/calculators/g90+e.yaml index 06a0172..4bb7fef 100644 --- a/calculators/g90+e.yaml +++ b/calculators/g90+e.yaml @@ -3,13 +3,13 @@ g90+e: full_name: "Graph 90+E" international_name: "fx-CG 50" year_launched: 2017 - exam_mode: yes predecessor: cg20 successor: no family: family.prizm active: yes teaching: audience: audience.high_school + exam_mode: yes math_input: yes pretty_print: yes matrices: yes diff --git a/calculators/g95.yaml b/calculators/g95.yaml index d262fc2..0654a12 100644 --- a/calculators/g95.yaml +++ b/calculators/g95.yaml @@ -3,13 +3,13 @@ g95: full_name: "Graph 95 (SD)" international_name: "fx-9860G II SD" year_launched: 2009 - exam_mode: no predecessor: [g85, g85sd] successor: g75+e family: family.mono active: no teaching: audience: audience.high_school + exam_mode: no math_input: yes pretty_print: yes matrices: yes diff --git a/lang/en.yaml b/lang/en.yaml index f64024b..397c62e 100644 --- a/lang/en.yaml +++ b/lang/en.yaml @@ -18,12 +18,12 @@ fields: general: international_name: "International name" year_launched: "Year of launch" - exam_mode: "Exam mode support" predecessor: "Predecessor" successor: "Successor" family: "Family" teaching: audience: "Target audience" + exam_mode: "Exam mode support" math_input: "Math input" pretty_print: "Math output (pretty-print)" matrices: "Matrices" @@ -78,8 +78,6 @@ fields: enums: general: - exam_mode: - bad: "Hard to use" family: mono: "Monochromes" prizm: "Color" @@ -94,6 +92,8 @@ enums: high_school: "High school" high_school_college: "High school/College" college: "College" + exam_mode: + bad: "Hard to use" math_input: hidden_option: "Hidden option" pretty_print: diff --git a/lang/fr.yaml b/lang/fr.yaml index ee435c7..440485b 100644 --- a/lang/fr.yaml +++ b/lang/fr.yaml @@ -18,12 +18,12 @@ fields: general: international_name: "Correspondance internationale" year_launched: "Année de sortie" - exam_mode: "Mode Examen" predecessor: "Précédesseur" successor: "Successeur" family: "Famille" teaching: audience: "Type de public" + exam_mode: "Mode Examen" math_input: "Saisie en écriture naturelle" pretty_print: "Résultats en écriture naturelle" matrices: "Matrices" @@ -78,8 +78,6 @@ fields: enums: general: - exam_mode: - bad: "Compliqué" family: mono: "Monochromes" prizm: "Couleur" @@ -94,6 +92,8 @@ enums: high_school: "Lycée" high_school_college: "Lycée/Supérieur" college: "Supérieur" + exam_mode: + bad: "Compliqué" math_input: hidden_option: "Activable" pretty_print: diff --git a/model.yaml b/model.yaml index bbdccc7..b5fd710 100644 --- a/model.yaml +++ b/model.yaml @@ -87,12 +87,12 @@ all_fields: - full_name - international_name - year_launched - - exam_mode - predecessor - successor - family teaching: - audience + - exam_mode - math_input - pretty_print - matrices diff --git a/tools/calcdb.py b/tools/calcdb.py index ed379a4..9d209c0 100644 --- a/tools/calcdb.py +++ b/tools/calcdb.py @@ -88,7 +88,7 @@ def render(db, lang, category, field, value): return ("?", ["bad"]) # Styles for some fixed field/value pairs - if f == "general.exam_mode": + if f == "teaching.exam_mode": styles = { False: ["bad"], "exam_mode.bad": ["warn"], True: ["good"] } styles = styles.get(value,[]) if (category == "links" or category == "manuals") and value == False: