Skip to content

Commit

Permalink
Merge pull request #16 from IDEMSInternational/content/1.1.17
Browse files Browse the repository at this point in the history
content: 1.1.17
  • Loading branch information
efmchris authored Dec 2, 2024
2 parents 358b471 + 5b5d629 commit 8f66dc7
Show file tree
Hide file tree
Showing 6 changed files with 149 additions and 147 deletions.
23 changes: 11 additions & 12 deletions app_data/sheets/data_list/esm_strand_list.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,16 @@
{
"id": "NPV",
"theme_id_1": "NPV_QC10",
"theme_id_2": "NPV_C10",
"theme_id_3": "NPV_C20",
"theme_id_4": "NPV_CPV100",
"theme_id_5": "NPV_C100",
"name": "NR – Number & Place Value",
"theme_id_2": "NPV_C20",
"theme_id_3": "NPV_CPV100",
"theme_id_4": "NPV_C100",
"name": "Number & Place Value",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Number & Place Value"
"eng": "Number & Place Value"
}
}
},
Expand All @@ -70,13 +69,13 @@
"id": "FEP",
"theme_id_1": "FEP_EPW",
"theme_id_2": "FEP_EPS",
"name": "NR – Fractions & Equal Parts",
"name": "Fractions & Equal Parts",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Fractions & Equal Parts"
"eng": "Fractions & Equal Parts"
}
}
},
Expand All @@ -86,13 +85,13 @@
"theme_id_2": "Data_Rep",
"theme_id_3": "Data_Graph",
"theme_id_4": "Data_Anal",
"name": "NR – Data",
"name": "Data",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Data"
"eng": "Data"
}
}
},
Expand All @@ -102,13 +101,13 @@
"theme_id_2": "Meas_Wt",
"theme_id_3": "Meas_Vol",
"theme_id_4": "Meas_Time",
"name": "NR – Measurement",
"name": "Measurement",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Measurement"
"eng": "Measurement"
}
}
}
Expand Down
91 changes: 39 additions & 52 deletions app_data/sheets/data_list/esm_theme_list.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,75 +90,62 @@
"id": "NPV_QC10",
"strand_id": "NPV",
"topic_id_1": "NPV_QC10_CBQC",
"topic_id_2": "NPV_QC10_CQ10",
"topic_id_3": "NPV_QC10_NS10",
"topic_id_4": "NPV_QC10_Sub5",
"topic_id_5": "NPV_QC10_OrdN",
"topic_id_2": "NPV_QC10_CMQ10",
"topic_id_3": "NPV_QC10_Sub10",
"topic_id_4": "NPV_QC10_Comp10",
"topic_id_5": "NPV_QC10_Ordinals",
"topic_id_6": "NPV_QC10_WN10",
"topic_id_7": "NPV_QC10_MQ10",
"name": "NR – Quantities & Counting to 10",
"name": "Quantities & Counting to 10",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Quantities & Counting to 10"
}
}
},
{
"id": "NPV_C10",
"strand_id": "NPV",
"topic_id_1": "NPV_C10_P",
"name": "NR – Comparing to 10",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Comparing to 10"
"eng": "Quantities & Counting to 10"
}
}
},
{
"id": "NPV_C20",
"strand_id": "NPV",
"topic_id_1": "NPV_C20_P",
"name": "NR – Counting to 20",
"topic_id_1": "NPV_C20_Count20",
"topic_id_2": "NPV_C20_PV20",
"topic_id_3": "NPV_C20_Comp20",
"name": "Counting to 20",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Counting to 20"
"eng": "Counting to 20"
}
}
},
{
"id": "NPV_CPV100",
"strand_id": "NPV",
"topic_id_1": "NPV_CPV100_P",
"name": "NR – Counting & Place Value to 100",
"name": "Counting & Place Value to 10",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Counting & Place Value to 100"
"eng": "Counting & Place Value to 10"
}
}
},
{
"id": "NPV_C100",
"strand_id": "NPV",
"topic_id_1": "NPV_C100_P",
"name": "NR – Comparing to 100",
"name": "Comparing to 100",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Comparing to 100"
"eng": "Comparing to 100"
}
}
},
Expand Down Expand Up @@ -203,27 +190,27 @@
"id": "NO_DD",
"strand_id": "NO",
"topic_id_1": "NO_DD_P",
"name": "NR – Add & Subtract – Double Digit",
"name": "Add & Subtract – Double Digit",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Add & Subtract – Double Digit"
"eng": "Add & Subtract – Double Digit"
}
}
},
{
"id": "NO_MSD",
"strand_id": "NO",
"topic_id_1": "NO_MSD_P",
"name": "NR – Multiply – Single Digit",
"name": "Multiply – Single Digit",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Multiply – Single Digit"
"eng": "Multiply – Single Digit"
}
}
},
Expand All @@ -232,13 +219,13 @@
"strand_id": "FP",
"topic_id_1": "FEP_EPW_NEP",
"topic_id_2": "FEP_EPW_MEPS",
"name": "NR – Equal Parts of a Whole",
"name": "Equal Parts of a Whole",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Equal Parts of a Whole"
"eng": "Equal Parts of a Whole"
}
}
},
Expand All @@ -247,69 +234,69 @@
"strand_id": "FP",
"topic_id_1": "FEP_EPS_NEP",
"topic_id_2": "FEP_EPS_MEPS",
"name": "NR – Equal Parts of a Set",
"name": "Equal Parts of a Set",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Equal Parts of a Set"
"eng": "Equal Parts of a Set"
}
}
},
{
"id": "Data_CO",
"strand_id": "Data",
"topic_id_1": "Data_CO_P",
"name": "NR – Collecting and Organizing",
"name": "Collecting and Organizing",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Collecting and Organizing"
"eng": "Collecting and Organizing"
}
}
},
{
"id": "Data_Rep",
"strand_id": "Data",
"topic_id_1": "Data_Rep_P",
"name": "NR – Representing",
"name": "Representing",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Representing"
"eng": "Representing"
}
}
},
{
"id": "Data_Graph",
"strand_id": "Data",
"topic_id_1": "Data_Graph_P",
"name": "NR – Graphing",
"name": "Graphing",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Graphing"
"eng": "Graphing"
}
}
},
{
"id": "Data_Anal",
"strand_id": "Data",
"topic_id_1": "Data_Anal_P",
"name": "NR – Analyzing",
"name": "Analyzing",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Analyzing"
"eng": "Analyzing"
}
}
},
Expand All @@ -319,13 +306,13 @@
"topic_id_1": "Meas_Dist_CL",
"topic_id_2": "Meas_Dist_MLNS",
"topic_id_3": "Meas_Dist_MLS",
"name": "NR – Distance",
"name": "Distance",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Distance"
"eng": "Distance"
}
}
},
Expand All @@ -335,13 +322,13 @@
"topic_id_1": "Meas_Wt_CW",
"topic_id_2": "Meas_Wt_MWNS",
"topic_id_3": "Meas_Wt_MWS",
"name": "NR – Weight",
"name": "Weight",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Weight"
"eng": "Weight"
}
}
},
Expand All @@ -351,13 +338,13 @@
"topic_id_1": "Meas_Vol_CV",
"topic_id_2": "Meas_Vol_CVNS",
"topic_id_3": "Meas_Vol_CVS",
"name": "NR – Volume",
"name": "Volume",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Volume"
"eng": "Volume"
}
}
},
Expand All @@ -367,13 +354,13 @@
"topic_id_1": "Meas_Time_PofD",
"topic_id_2": "Meas_Time_Cal",
"topic_id_3": "Meas_Time_TTH",
"name": "NR – Time",
"name": "Time",
"_translations": {
"name": {}
},
"_translatedFields": {
"name": {
"eng": "NR – Time"
"eng": "Time"
}
}
}
Expand Down
Loading

0 comments on commit 8f66dc7

Please sign in to comment.