Periodic Table: Modified display format

master
amitdev 2015-12-30 04:35:32 +00:00
parent 46be3bc289
commit feff2c2db7
2 changed files with 85 additions and 56 deletions

View File

@ -48,16 +48,17 @@ handle query_lc => sub {
my ( $atomic_number, $atomic_mass, $element_name, $element_symbol, $element_type ) = @{$match}; my ( $atomic_number, $atomic_mass, $element_name, $element_symbol, $element_type ) = @{$match};
# Default display # Default display
my $title = "$atomic_number"; my $title = "Atomic number $atomic_number";
my $subtitle = "$element_name (atomic mass: $atomic_mass u)"; my $subtitle = "$element_name";
my $alt_subtitle = "Atomic mass $atomic_mass u";
my $raw = "$element_name ($element_symbol), atomic number $atomic_number, atomic mass $atomic_mass u"; my $raw = "$element_name ($element_symbol), atomic number $atomic_number, atomic mass $atomic_mass u";
if ($is_mass_query) { if ($is_mass_query) {
$title = "$atomic_mass u"; $title = "Atomic mass $atomic_mass u";
$subtitle = "$element_name (atomic number: $atomic_number)"; $alt_subtitle = "Atomic number $atomic_number";
} }
elsif ($is_name_query) { elsif ($is_name_query) {
$title = "$element_name"; $title = "$element_name";
$subtitle = "$atomic_number (atomic mass: $atomic_mass u)"; $subtitle = "Atomic number $atomic_number";
} }
# The text size of the icon needs to change depending on the length of the chemical symbol. # The text size of the icon needs to change depending on the length of the chemical symbol.
@ -74,6 +75,7 @@ handle query_lc => sub {
badge => $element_symbol, badge => $element_symbol,
title => $title, title => $title,
subtitle => $subtitle, subtitle => $subtitle,
altSubtitle => $alt_subtitle,
url => "https://en.wikipedia.org/wiki/$element_name", url => "https://en.wikipedia.org/wiki/$element_name",
}, },
meta => { meta => {

View File

@ -16,8 +16,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"N", "N",
"Nitrogen", "Nitrogen",
"14.007 u", "Atomic mass 14.007 u",
"Nitrogen (atomic number: 7)", "Nitrogen",
"Atomic number 7",
"green" "green"
) )
), ),
@ -27,8 +28,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"N", "N",
"Nitrogen", "Nitrogen",
"14.007 u", "Atomic mass 14.007 u",
"Nitrogen (atomic number: 7)", "Nitrogen",
"Atomic number 7",
"green" "green"
) )
), ),
@ -38,8 +40,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"N", "N",
"Nitrogen", "Nitrogen",
"14.007 u", "Atomic mass 14.007 u",
"Nitrogen (atomic number: 7)", "Nitrogen",
"Atomic number 7",
"green" "green"
) )
), ),
@ -55,8 +58,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"N", "N",
"Nitrogen", "Nitrogen",
"7", "Atomic number 7",
"Nitrogen (atomic mass: 14.007 u)", "Nitrogen",
"Atomic mass 14.007 u",
"green" "green"
) )
), ),
@ -65,8 +69,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"N", "N",
"Nitrogen", "Nitrogen",
"7", "Atomic number 7",
"Nitrogen (atomic mass: 14.007 u)", "Nitrogen",
"Atomic mass 14.007 u",
"green" "green"
) )
), ),
@ -76,8 +81,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"N", "N",
"Nitrogen", "Nitrogen",
"7", "Atomic number 7",
"Nitrogen (atomic mass: 14.007 u)", "Nitrogen",
"Atomic mass 14.007 u",
"green" "green"
) )
), ),
@ -92,8 +98,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"N", "N",
"Nitrogen", "Nitrogen",
"7", "Atomic number 7",
"Nitrogen (atomic mass: 14.007 u)", "Nitrogen",
"Atomic mass 14.007 u",
"green" "green"
) )
), ),
@ -103,8 +110,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"N", "N",
"Nitrogen", "Nitrogen",
"7", "Atomic number 7",
"Nitrogen (atomic mass: 14.007 u)", "Nitrogen",
"Atomic mass 14.007 u",
"green" "green"
) )
), ),
@ -119,7 +127,8 @@ ddg_goodie_test(
"Au", "Au",
"Gold", "Gold",
"Gold", "Gold",
"79 (atomic mass: 196.97 u)", "Atomic number 79",
"Atomic mass 196.97 u",
"red" "red"
) )
), ),
@ -130,7 +139,8 @@ ddg_goodie_test(
"Ag", "Ag",
"Silver", "Silver",
"Silver", "Silver",
"47 (atomic mass: 107.87 u)", "Atomic number 47",
"Atomic mass 107.87 u",
"red" "red"
) )
), ),
@ -145,8 +155,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"O", "O",
"Oxygen", "Oxygen",
"8", "Atomic number 8",
"Oxygen (atomic mass: 15.999 u)", "Oxygen",
"Atomic mass 15.999 u",
"green" "green"
) )
), ),
@ -156,8 +167,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"Li", "Li",
"Lithium", "Lithium",
"3", "Atomic number 3",
"Lithium (atomic mass: 6.94 u)", "Lithium",
"Atomic mass 6.94 u",
"gold" "gold"
) )
), ),
@ -167,8 +179,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"Be", "Be",
"Beryllium", "Beryllium",
"4", "Atomic number 4",
"Beryllium (atomic mass: 9.0122 u)", "Beryllium",
"Atomic mass 9.0122 u",
"gold" "gold"
) )
), ),
@ -178,8 +191,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"La", "La",
"Lanthanum", "Lanthanum",
"57", "Atomic number 57",
"Lanthanum (atomic mass: 138.91 u)", "Lanthanum",
"Atomic mass 138.91 u",
"red" "red"
) )
), ),
@ -189,8 +203,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"Ac", "Ac",
"Actinium", "Actinium",
"89", "Atomic number 89",
"Actinium (atomic mass: [227.03] u)", "Actinium",
"Atomic mass [227.03] u",
"red" "red"
) )
), ),
@ -200,8 +215,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"Sc", "Sc",
"Scandium", "Scandium",
"21", "Atomic number 21",
"Scandium (atomic mass: 44.956 u)", "Scandium",
"Atomic mass 44.956 u",
"red" "red"
) )
), ),
@ -211,8 +227,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"Al", "Al",
"Aluminium", "Aluminium",
"13", "Atomic number 13",
"Aluminium (atomic mass: 26.982 u)", "Aluminium",
"Atomic mass 26.982 u",
"green" "green"
) )
), ),
@ -222,8 +239,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"B", "B",
"Boron", "Boron",
"5", "Atomic number 5",
"Boron (atomic mass: 10.81 u)", "Boron",
"Atomic mass 10.81 u",
"green" "green"
) )
), ),
@ -233,8 +251,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"C", "C",
"Carbon", "Carbon",
"6", "Atomic number 6",
"Carbon (atomic mass: 12.011 u)", "Carbon",
"Atomic mass 12.011 u",
"green" "green"
) )
), ),
@ -244,8 +263,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"He", "He",
"Helium", "Helium",
"2", "Atomic number 2",
"Helium (atomic mass: 4.0026 u)", "Helium",
"Atomic mass 4.0026 u",
"blue-light" "blue-light"
) )
), ),
@ -255,8 +275,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"Mt", "Mt",
"Meitnerium", "Meitnerium",
"109", "Atomic number 109",
"Meitnerium (atomic mass: [276.15] u)", "Meitnerium",
"Atomic mass [276.15] u",
"red" "red"
) )
), ),
@ -267,8 +288,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"Hg", "Hg",
"Mercury", "Mercury",
"80", "Atomic number 80",
"Mercury (atomic mass: 200.59 u)", "Mercury",
"Atomic mass 200.59 u",
"red" "red"
) )
), ),
@ -277,8 +299,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"Hg", "Hg",
"Hydrargyrum", "Hydrargyrum",
"80", "Atomic number 80",
"Hydrargyrum (atomic mass: 200.59 u)", "Hydrargyrum",
"Atomic mass 200.59 u",
"red" "red"
) )
), ),
@ -289,8 +312,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"O", "O",
"Oxygen", "Oxygen",
"8", "Atomic number 8",
"Oxygen (atomic mass: 15.999 u)", "Oxygen",
"Atomic mass 15.999 u",
"green" "green"
) )
), ),
@ -299,8 +323,9 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"Li", "Li",
"Lithium", "Lithium",
"3", "Atomic number 3",
"Lithium (atomic mass: 6.94 u)", "Lithium",
"Atomic mass 6.94 u",
"gold" "gold"
) )
), ),
@ -309,15 +334,16 @@ ddg_goodie_test(
make_structured_answer( make_structured_answer(
"Uuo", "Uuo",
"Ununoctium", "Ununoctium",
"118", "Atomic number 118",
"Ununoctium (atomic mass: [294] u)", "Ununoctium",
"Atomic mass [294] u",
"red" "red"
) )
), ),
); );
sub make_structured_answer { sub make_structured_answer {
my ($badge, $element_name, $title, $subtitle, $color) = @_; my ($badge, $element_name, $title, $subtitle, $alt_subtitle, $color) = @_;
my $badge_class = ""; my $badge_class = "";
my $symbol_length = length($badge); my $symbol_length = length($badge);
@ -331,6 +357,7 @@ sub make_structured_answer {
badge => $badge, badge => $badge,
title => $title, title => $title,
subtitle => $subtitle, subtitle => $subtitle,
altSubtitle => $alt_subtitle,
url => "https://en.wikipedia.org/wiki/$element_name", url => "https://en.wikipedia.org/wiki/$element_name",
}, },
meta => { meta => {