diff --git a/src/xml/analysis-layout.xml b/src/xml/analysis-layout.xml index 0666ba68f..b76e89ab8 100644 --- a/src/xml/analysis-layout.xml +++ b/src/xml/analysis-layout.xml @@ -1,90 +1,26 @@ - - + + - - + + - - - - - - - - - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -93,7 +29,9 @@ + + @@ -103,31 +41,104 @@ + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - - + + diff --git a/src/xml/charts.xml b/src/xml/charts.xml index 8c0d5b1c4..fc64d2d78 100644 --- a/src/xml/charts.xml +++ b/src/xml/charts.xml @@ -1,4 +1,608 @@ + + "PMC" + + "L3 Time in Zone" + time_in_zone_L3 + "L3 Time in Zone" + "seconds" + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 1 + + 0 + 1 + 0 + + 0 + + + "L4 Time in Zone" + time_in_zone_L4 + "L4 Time in Zone" + "seconds" + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 1 + + 0 + 1 + 0 + + 0 + + + "L5 Time in Zone" + time_in_zone_L5 + "L5 Time in Zone" + "seconds" + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 1 + + 0 + 1 + 0 + + 0 + + + "Coggan Acute Training Load" + coggan_atl + "Coggan Acute Training Load" + "Stress" + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "Coggan Chronic Training Load" + coggan_ctl + "Coggan Chronic Training Load" + "Stress" + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "Coggan Training Stress Balance" + coggan_tsb + "Coggan Training Stress Balance" + "Stress" + 0 + 0 + 0 + 0 + 999 + 1 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + + "Track Weight" + + "Lean Mass" + Lean Mass + "Lean Mass" + "" + 0 + 1 + 0 + 0 + 0 + 3 + -1 + 1 + + 0 + 1 + 0 + + 0 + + + "Fat Mass" + Fat Mass + "Fat Mass" + "" + 0 + 0 + 0 + 0 + 0 + 3 + -1 + 1 + + 0 + 1 + 0 + + 0 + + + "Weight" + Weight + "Weight" + "" + 0 + 1 + 0 + 0 + 0 + 4 + -1 + 0 + + 0 + 1 + 0 + + 0 + + + + "Time In Power Zone (Stacked)" + + "L3 Time in Zone" + time_in_zone_L3 + "L3 Time in Zone" + "seconds" + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 1 + + 0 + 1 + 0 + + 0 + + + "L4 Time in Zone" + time_in_zone_L4 + "L4 Time in Zone" + "seconds" + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 1 + + 0 + 1 + 0 + + 0 + + + "L5 Time in Zone" + time_in_zone_L5 + "L5 Time in Zone" + "seconds" + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 1 + + 0 + 1 + 0 + + 0 + + + + "Time In Power Zone (Bar)" + + "L3 Time in Zone" + time_in_zone_L3 + "L3 Time in Zone" + "seconds" + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + "L4 Time in Zone" + time_in_zone_L4 + "L4 Time in Zone" + "seconds" + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + "L5 Time in Zone" + time_in_zone_L5 + "L5 Time in Zone" + "seconds" + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + + "Time In HR Zone" + + "H1 Time in Zone" + time_in_zone_H1 + "H1 Time in Zone" + "seconds" + 0 + 0 + 5 + 0 + 0 + 3 + 0 + 1 + + 0 + 1 + 0 + + 0 + + + "H2 Time in Zone" + time_in_zone_H2 + "H2 Time in Zone" + "seconds" + 0 + 0 + 5 + 0 + 0 + 3 + 0 + 1 + + 0 + 1 + 0 + + 0 + + + "H3 Time in Zone" + time_in_zone_H3 + "H3 Time in Zone" + "seconds" + 0 + 0 + 5 + 0 + 0 + 3 + 0 + 1 + + 0 + 1 + 0 + + 0 + + + "H4 Time in Zone" + time_in_zone_H4 + "H4 Time in Zone" + "seconds" + 0 + 0 + 5 + 0 + 0 + 3 + 0 + 1 + + 0 + 1 + 0 + + 0 + + + "H5 Time in Zone" + time_in_zone_H5 + "H5 Time in Zone" + "seconds" + 0 + 0 + 5 + 0 + 0 + 3 + 0 + 1 + + 0 + 1 + 0 + + 0 + + + + "Power Distribution" + + "L2 Time in Zone" + time_in_zone_L2 + "L2 Time in Zone" + "seconds" + 0 + 0 + 5 + 0 + 0 + 3 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + "L3 Time in Zone" + time_in_zone_L3 + "L3 Time in Zone" + "seconds" + 0 + 0 + 5 + 0 + 0 + 3 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + "L4 Time in Zone" + time_in_zone_L4 + "L4 Time in Zone" + "seconds" + 0 + 0 + 5 + 0 + 0 + 3 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + + "KPI Tracker" + + "5 min Peak Power" + 5m_critical_power + "5 min Peak Power" + "watts" + 0 + 0 + 1 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "20 min Peak Power" + 20m_critical_power + "20 min Peak Power" + "watts" + 0 + 0 + 1 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "60 min Peak Power" + 60m_critical_power + "60 min Peak Power" + "watts" + 0 + 0 + 1 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "Weight" + Weight + "Weight" + "" + 0 + 1 + 0 + 0 + 0 + 4 + 14 + 0 + + 0 + 1 + 0 + + 0 + + + "1 min Peak Power" + 1m_critical_power + "1 min Peak Power" + "watts" + 0 + 0 + 1 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + + "Critical Power Trend" + + "60 min Peak Power" + 60m_critical_power + "60 min Peak Power" + "watts" + 0 + 1 + 5 + 0 + 0 + 4 + 0 + 0 + + 0 + 1 + 0 + + 0 + + "Aerobic Power" @@ -9,9 +613,11 @@ 0 0 5 + 0 0 1 1 + 0 0 1 @@ -27,9 +633,11 @@ 0 0 5 + 0 0 1 1 + 0 0 1 @@ -45,9 +653,11 @@ 0 0 5 + 0 0 1 1 + 0 0 1 @@ -63,9 +673,11 @@ 0 0 5 + 0 0 1 1 + 0 0 1 @@ -74,6 +686,235 @@ 0 + + "Aerobic WPK" + + "10 min Peak WPK" + 10m_peak_wpk + "10 min Peak WPK" + "wpk" + 0 + 0 + 5 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "30 min Peak WPK" + 30m_peak_wpk + "30 min Peak WPK" + "wpk" + 0 + 0 + 5 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "20 min Peak WPK" + 20m_peak_wpk + "20 min Peak WPK" + "wpk" + 0 + 0 + 5 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "60 min Peak WPK" + 60m_peak_wpk + "60 min Peak WPK" + "wpk" + 0 + 0 + 5 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "5 min Peak WPK" + 5m_peak_wpk + "5 min Peak WPK" + "wpk" + 0 + 0 + 5 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + + "Power Variance" + + "Average Power Variance" + meanpowervariance + "Average Power Variance" + "watts change" + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + "Max Power Variance" + maxpowervariance + "Max Power Variance" + "watts change" + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + + "Power Profile" + + "1 min Peak Power" + 1m_critical_power + "1 min Peak Power" + "watts" + 0 + 0 + 0 + 0 + 0 + 3 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "5 min Peak Power" + 5m_critical_power + "5 min Peak Power" + "watts" + 0 + 0 + 0 + 0 + 0 + 3 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "60 min Peak Power" + 60m_critical_power + "60 min Peak Power" + "watts" + 0 + 0 + 0 + 0 + 0 + 3 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "20 min Peak Power" + 20m_critical_power + "20 min Peak Power" + "watts" + 0 + 0 + 0 + 0 + 0 + 3 + 1 + 0 + + 0 + 1 + 0 + + 0 + + "Anaerobic Power" @@ -84,9 +925,11 @@ 0 0 5 + 0 0 1 1 + 0 0 1 @@ -102,9 +945,11 @@ 0 0 5 + 0 0 1 1 + 0 0 1 @@ -120,9 +965,11 @@ 0 0 5 + 0 0 1 1 + 0 0 1 @@ -138,9 +985,11 @@ 0 0 5 + 0 0 1 1 + 0 0 1 @@ -156,9 +1005,11 @@ 0 0 5 + 0 0 1 1 + 0 0 1 @@ -174,9 +1025,11 @@ 0 0 5 + 0 0 1 1 + 0 0 1 @@ -186,18 +1039,20 @@ - "Critical Power Trend" + "Anaerobic WPK" - "60 min Peak Power" - 60m_critical_power - "60 min Peak Power" - "watts" + "1 min Peak WPK" + 1m_peak_wpk + "1 min Peak WPK" + "wpk" 0 - 1 - 10 + 0 + 5 + 0 0 - 4 - 0 + 1 + 1 + 0 0 1 @@ -205,6 +1060,106 @@ 0 + + "1 sec Peak WPK" + 1s_peak_wpk + "1 sec Peak WPK" + "wpk" + 0 + 0 + 5 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "10 sec Peak WPK" + 10s_peak_wpk + "10 sec Peak WPK" + "wpk" + 0 + 0 + 5 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "15 sec Peak WPK" + 15s_peak_wpk + "15 sec Peak WPK" + "wpk" + 0 + 0 + 5 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "20 sec Peak WPK" + 20s_peak_wpk + "20 sec Peak WPK" + "wpk" + 0 + 0 + 5 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + + + "30 sec Peak WPK" + 30s_peak_wpk + "30 sec Peak WPK" + "wpk" + 0 + 0 + 5 + 0 + 0 + 1 + 1 + 0 + + 0 + 1 + 0 + + 0 + "Power & Speed Trend" @@ -216,9 +1171,11 @@ 0 1 25 + 0 0 4 0 + 0 0 1 @@ -234,9 +1191,11 @@ 0 1 25 + 0 0 4 2 + 0 0 1 @@ -248,16 +1207,18 @@ "Cardiovascular Response" - "95% Heart Rate" + "95% Heartrate" ninety_five_percent_hr - "95% Heart Rate" + "95% Heartrate" "bpm" 0 0 5 + 0 0 1 0 + 0 0 1 @@ -273,9 +1234,11 @@ 0 0 5 + 0 0 3 0 + 0 0 1 @@ -291,9 +1254,11 @@ 0 0 5 + 0 0 1 0 + 0 0 1 @@ -309,9 +1274,11 @@ 0 0 5 + 0 0 1 1 + 0 0 1 @@ -319,6 +1286,69 @@ 0 + + "Estimated VO2MAX" + vo2max + "Estimated VO2MAX" + "ml/min/kg" + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + + "Tempo & Threshold Time" + + "L4 Time in Zone" + time_in_zone_L4 + "L4 Time in Zone" + "seconds" + 0 + 0 + 5 + 0 + 0 + 3 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + "L5 Time in Zone" + time_in_zone_L5 + "L5 Time in Zone" + "seconds" + 0 + 0 + 5 + 0 + 0 + 3 + 0 + 0 + + 0 + 1 + 0 + + 0 + "Training Mix" @@ -330,9 +1360,11 @@ 0 0 5 + 0 0 1 0 + 0 0 1 @@ -348,9 +1380,11 @@ 0 0 5 + 0 0 1 0 + 0 0 1 @@ -366,9 +1400,11 @@ 0 0 5 + 0 0 3 0 + 0 0 1 @@ -377,45 +1413,6 @@ 0 - - "Tempo & Threshold Time" - - "L3 Time in Zone" - time_in_zone_L3 - "L3 Time in Zone" - "seconds" - 0 - 0 - 5 - 0 - 3 - 0 - - 0 - 1 - 0 - - 0 - - - "L4 Time in Zone" - time_in_zone_L4 - "L4 Time in Zone" - "seconds" - 0 - 0 - 5 - 0 - 3 - 0 - - 0 - 1 - 0 - - 0 - - "Time & Distance" @@ -426,9 +1423,11 @@ 0 0 5 + 0 0 3 0 + 0 0 1 @@ -444,9 +1443,11 @@ 0 0 5 + 0 0 1 1 + 0 0 1 @@ -462,9 +1463,11 @@ 0 0 5 + 0 0 3 0 + 0 0 1 @@ -473,45 +1476,6 @@ 0 - - "Daniels Power" - - "Daniels EqP" - daniels_equivalent_power - "Daniels EqP" - "watts" - 0 - 0 - 5 - 0 - 1 - 0 - - 0 - 1 - 0 - - 0 - - - "Daniels Points" - daniels_points - "Daniels Points" - "Daniels Points" - 0 - 0 - 0 - 0 - 3 - -1 - - 0 - 1 - 0 - - 0 - - "Skiba Power" @@ -522,9 +1486,11 @@ 0 0 5 + 0 0 3 0 + 0 0 1 @@ -540,9 +1506,11 @@ 0 0 5 + 0 0 1 0 + 0 0 1 @@ -551,6 +1519,132 @@ 0 + + "Daniels Power" + + "Daniels EqP" + daniels_equivalent_power + "Daniels EqP" + "watts" + 0 + 0 + 5 + 0 + 0 + 1 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + "Daniels Points" + daniels_points + "Daniels Points" + "Daniels Points" + 0 + 0 + 0 + 0 + 0 + 3 + -1 + 0 + + 0 + 1 + 0 + + 0 + + + + "PM Ramp & Peak" + + "Skiba Long Term Stress" + skiba_lts + "Skiba Long Term Stress" + "Stress" + 0 + 1 + 0 + 0 + 0 + 4 + -1 + 0 + + 0 + 1 + 0 + + 0 + + + "Skiba Short Term Stress" + skiba_sts + "Skiba Short Term Stress" + "Stress" + 0 + 1 + 0 + 0 + 0 + 4 + -1 + 0 + + 0 + 1 + 0 + + 0 + + + "Skiba LTS Ramp" + skiba_lr + "Skiba LTS Ramp" + "Ramp" + 0 + 1 + 0 + 0 + 0 + 4 + -1 + 0 + + 0 + 1 + 0 + + 0 + + + "Skiba STS Ramp" + skiba_sr + "Skiba STS Ramp" + "Ramp" + 0 + 1 + 0 + 0 + 0 + 4 + -1 + 0 + + 0 + 1 + 0 + + 0 + + "Skiba PM" @@ -561,9 +1655,11 @@ 0 0 5 + 0 0 1 -1 + 0 0 1 @@ -579,9 +1675,11 @@ 0 0 5 + 0 0 1 -1 + 0 0 1 @@ -597,9 +1695,11 @@ 0 0 1 + 0 0 3 -1 + 0 0 1 @@ -615,9 +1715,11 @@ 0 0 5 + 0 0 3 0 + 0 0 1 @@ -636,9 +1738,11 @@ 0 0 0 + 0 0 2 -1 + 0 0 1 @@ -654,9 +1758,11 @@ 0 0 0 + 0 0 1 -1 + 0 0 1 @@ -668,13 +1774,15 @@ "Daniels Stress Balance" daniels_sb "Daniels Stress Balance" - "Stress" + "Stress Balance" 0 0 0 + 0 0 1 -1 + 0 0 1 @@ -690,9 +1798,11 @@ 0 0 0 + 0 0 1 -1 + 0 0 1 @@ -701,4 +1811,256 @@ 0 + + "Device Reliability" + + "Dropout Time" + Dropout_Time + "Dropout Time" + "Seconds" + 0 + 0 + 0 + 0 + 0 + 2 + -1 + 0 + + 0 + 1 + 0 + + 0 + + + "Dropouts" + Dropouts + "Dropouts" + "Dropouts" + 0 + 0 + 1 + 0 + 0 + 4 + 14 + 0 + + 0 + 1 + 0 + + 0 + + + "Spikes" + Spikes + "Spikes" + "Spikes" + 0 + 0 + 0 + 0 + 0 + 4 + 12 + 0 + + 0 + 1 + 0 + + 0 + + + "Spike Time" + Spike_Time + "Spike Time" + "Seconds" + 0 + 0 + 0 + 0 + 0 + 2 + -1 + 0 + + 0 + 1 + 0 + + 0 + + + + "Withings Weight" + + "Weight" + Weight + "Weight" + "" + 0 + 1 + 0 + 0 + 0 + 4 + 14 + 0 + + 0 + 1 + 0 + + 0 + + + "Lean Mass" + Lean Mass + "Lean Mass" + "kg" + 1 + 0 + 0 + 0 + 0 + 1 + 14 + 0 + + 0 + 1 + 0 + + 0 + + + "Fat Mass" + Fat Mass + "Fat Mass" + "kg" + 1 + 0 + 0 + 0 + 0 + 1 + 14 + 0 + + 0 + 1 + 0 + + 0 + + + "Fat Ratio" + Fat Ratio + "Fat Ratio" + "%" + 0 + 1 + 0 + 0 + 0 + 4 + 2 + 0 + + 0 + 1 + 0 + + 0 + + + + "Stress and Distance" + + "TSS" + coggan_tss + "TSS" + "TSS" + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + "Distance" + total_distance + "Distance" + "km" + 0 + 0 + 0 + 0 + 0 + 4 + 2 + 0 + + 0 + 1 + 0 + + 0 + + + + "Calories vs Duration" + + "Work" + total_work + "Work" + "kJ" + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + + 0 + 1 + 0 + + 0 + + + "Duration" + workout_time + "Duration" + "seconds" + 0 + 0 + 2 + 0 + 0 + 3 + 0 + 0 + + 0 + 1 + 0 + + 0 + + diff --git a/src/xml/diary-layout.xml b/src/xml/diary-layout.xml index ff2fc673c..126974bc9 100644 --- a/src/xml/diary-layout.xml +++ b/src/xml/diary-layout.xml @@ -1,24 +1,60 @@ - - - - + + + + - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/xml/home-layout.xml b/src/xml/home-layout.xml index d8bb74b98..d889faff2 100644 --- a/src/xml/home-layout.xml +++ b/src/xml/home-layout.xml @@ -1,4 +1,12 @@ + + + + + + + + @@ -6,24 +14,39 @@ - + - - + - + - + + + + + + + + + + + + + + + + + @@ -32,13 +55,12 @@ - + - - + @@ -51,9 +73,8 @@ - - + @@ -62,13 +83,12 @@ - + - - + @@ -79,8 +99,6 @@ - - - + diff --git a/src/xml/metadata.xml b/src/xml/metadata.xml index c5bb3746c..ed1ea5260 100644 --- a/src/xml/metadata.xml +++ b/src/xml/metadata.xml @@ -1,82 +1,12 @@ - +"Workout Code" "Race" - - "Won" - "Criterium" - "TT" - "TTT" - "DNF" - "DNP" - - - "Test" - - "FTP" - "Monod" - - - "Threshold" - - "L4" - - - "Tempo" - - "L3" - - - "Endurance" - - "L2" - - - "Recovery" - - - - "Hills" - - "2HILLS" - "3HILLS" - "4HILLS" - "5HILLS" - "6HILLS" - "ToSH" - - - "Indoor" - - "Computrainer" - "Turbo" - - - "Bike" - - "Bike" - - - "Swim" - - - - "Run" - - - - "Solo" - - "Alone" - - - "Sick" - - "Crash" + "Default" - + @@ -84,121 +14,190 @@ "Workout" "Start Date" 5 + "" + 0 "Workout" "Start Time" 6 + "" + 0 "Workout" "Workout Code" 2 + "" + 1 "Workout" "Sport" 2 + "" + 1 - "" + "Workout" + "Route" + 2 + "" + 0 + + + "Workout" "Keywords" 2 + "" + 0 - "" + "Workout" "Objective" 1 + "" + 0 "" "Weight" 4 + "" + 0 "Notes" "Notes" 1 + "" + 1 - "" + "Device" "Device" 2 + "" + 0 - "" + "Device" "Recording Interval" 4 + "" + 0 - "" + "Device" "Device Info" 1 + "" + 0 "Metric" "Duration" 4 + "" + 0 "Metric" "Time Riding" 4 + "" + 0 "Metric" "Distance" 4 + "" + 0 "Metric" "Work" 4 + "" + 0 "Metric" "Elevation Gain" 4 + "" + 0 "Metric" "Average Speed" 4 + "" + 0 "Metric" "Average Power" 4 + "" + 0 "Metric" "Average Heart Rate" 4 + "" + 0 "Metric" "Average Cadence" 4 + "" + 0 "Metric" "BikeScore™" 4 + "" + 0 "Metric" "xPower" 4 + "" + 0 "Metric" "Daniels Points" 4 + "" + 0 "Metric" "Daniels EqP" 4 + "" + 0 + + + "" + "Calendar Text" + 1 + "" + 0 + + + "" + "Data" + 2 + "" + 0 diff --git a/src/xml/train-layout.xml b/src/xml/train-layout.xml index 584a815ce..88bb3c13f 100644 --- a/src/xml/train-layout.xml +++ b/src/xml/train-layout.xml @@ -62,16 +62,8 @@ - - - - - - - - - +