move general.exam_mode to teaching.exam_mode
This commit is contained in:
parent
bf974e452e
commit
075511d09d
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue