ch
This commit is contained in:
@@ -4911,6 +4911,7 @@ def interactive_cum_flex_chart2(theworkouts, promember=0,
|
|||||||
var yname1 = data['yname1']
|
var yname1 = data['yname1']
|
||||||
var yname2 = data['yname2']
|
var yname2 = data['yname2']
|
||||||
var workoutid1 = data['workoutid']
|
var workoutid1 = data['workoutid']
|
||||||
|
var ytrend = data['ytrend']
|
||||||
|
|
||||||
var minspm = minspm.value
|
var minspm = minspm.value
|
||||||
var maxspm = maxspm.value
|
var maxspm = maxspm.value
|
||||||
@@ -4941,6 +4942,7 @@ def interactive_cum_flex_chart2(theworkouts, promember=0,
|
|||||||
data2['yname1'] = []
|
data2['yname1'] = []
|
||||||
data2['yname2'] = []
|
data2['yname2'] = []
|
||||||
data2['spm'] = []
|
data2['spm'] = []
|
||||||
|
data2['ytrend'] = []
|
||||||
|
|
||||||
for (var i=0; i<x1.length; i++) {
|
for (var i=0; i<x1.length; i++) {
|
||||||
if (spm1[i]>=minspm && spm1[i]<=maxspm) {
|
if (spm1[i]>=minspm && spm1[i]<=maxspm) {
|
||||||
@@ -4957,6 +4959,7 @@ def interactive_cum_flex_chart2(theworkouts, promember=0,
|
|||||||
data2['xname'].push(0)
|
data2['xname'].push(0)
|
||||||
data2['yname1'].push(0)
|
data2['yname1'].push(0)
|
||||||
data2['yname2'].push(0)
|
data2['yname2'].push(0)
|
||||||
|
data2['ytrend'].push(ytrend[i])
|
||||||
|
|
||||||
xm += x1[i]
|
xm += x1[i]
|
||||||
ym1 += y1[i]
|
ym1 += y1[i]
|
||||||
@@ -5834,6 +5837,7 @@ def interactive_flex_chart2(id, r, promember=0,
|
|||||||
var yname2 = data['yname2']
|
var yname2 = data['yname2']
|
||||||
var workoutid1 = data['workoutid']
|
var workoutid1 = data['workoutid']
|
||||||
var workoutstate1 = data['workoutstate']
|
var workoutstate1 = data['workoutstate']
|
||||||
|
var ytrend = data['ytrend']
|
||||||
|
|
||||||
var annotation = annotation.value
|
var annotation = annotation.value
|
||||||
var minspm = minspm.value
|
var minspm = minspm.value
|
||||||
@@ -5871,6 +5875,7 @@ def interactive_flex_chart2(id, r, promember=0,
|
|||||||
data2['xname'] = []
|
data2['xname'] = []
|
||||||
data2['yname1'] = []
|
data2['yname1'] = []
|
||||||
data2['yname2'] = []
|
data2['yname2'] = []
|
||||||
|
data2['ytrend'] = []
|
||||||
|
|
||||||
|
|
||||||
for (var i=0; i<x1.length; i++) {
|
for (var i=0; i<x1.length; i++) {
|
||||||
@@ -5894,6 +5899,7 @@ def interactive_flex_chart2(id, r, promember=0,
|
|||||||
data2['xname'].push(0)
|
data2['xname'].push(0)
|
||||||
data2['yname1'].push(0)
|
data2['yname1'].push(0)
|
||||||
data2['yname2'].push(0)
|
data2['yname2'].push(0)
|
||||||
|
data2['ytrend'].push(ytrend[i])
|
||||||
|
|
||||||
|
|
||||||
xm += x1[i]
|
xm += x1[i]
|
||||||
|
|||||||
Reference in New Issue
Block a user