Private
Public Access
1
0

Merge branch 'release/v9.01'

This commit is contained in:
Sander Roosendaal
2018-12-31 17:53:26 +01:00
23 changed files with 334 additions and 64 deletions

View File

@@ -115,6 +115,7 @@ def update_subscription(rower,data,method='up'):
amount = data['amount']
amount = '{amount:.2f}'.format(amount=amount)
gatewaydata = {
"price": amount,
"plan_id": plan.external_id,
@@ -124,16 +125,19 @@ def update_subscription(rower,data,method='up'):
},
}
if plan.paymenttype == 'single':
gatewaydata['number_of_billing_cycles'] = 1
else:
gatewaydata['never_expires'] = True
result = gateway.subscription.update(
rower.subscription_id,
gatewaydata
)
try:
result = gateway.subscription.update(
rower.subscription_id,
gatewaydata
)
except:
return False
if result.is_success:
rower.paidplan = plan
@@ -164,13 +168,13 @@ def update_subscription(rower,data,method='up'):
handle_send_email_subscription_update,
name, rower.user.email,
plan.name,
plan.paymenttype == 'recurring',
plan.paymenttype,
plan.price,
amount,
result.subscription.billing_period_end_date.strftime('%Y-%m-%d'),
method)
return True
return True,amount
else:
errors = result.errors.for_object("subscription")
codes = [str(e.code) for e in errors]
@@ -183,9 +187,9 @@ def update_subscription(rower,data,method='up'):
if create_new:
return create_subscription(rower,data)
return False
return False,0
return False
return False,0
def create_subscription(rower,data):
@@ -203,7 +207,7 @@ def create_subscription(rower,data):
if result.is_success:
payment_method_token = result.payment_method.token
else:
return False
return False,0
result = gateway.subscription.create({
"payment_method_token": payment_method_token,
@@ -225,7 +229,7 @@ def create_subscription(rower,data):
)
recurring = plan.paymenttype == 'recurring',
recurring = plan.paymenttype
job = myqueue(
queuehigh,
@@ -237,12 +241,12 @@ def create_subscription(rower,data):
plan.price,
result.subscription.billing_period_end_date.strftime('%Y-%m-%d')
)
return True
return True,plan.price
else:
return False
return False,0
return False
return False,0
def cancel_subscription(rower,id):
themessages = []
@@ -268,6 +272,7 @@ def cancel_subscription(rower,id):
rower.planexpires = timezone.now()
rower.clubsize = 0
rower.rowerplan = 'basic'
rower.subscription_id = None
rower.save()
themessages.append("Your plan was reset to basic")
@@ -309,7 +314,8 @@ def find_subscriptions(rower):
'plan_id': subscription.plan_id,
'price': subscription.price,
'id': subscription.id,
'plan': plan.name
'plan': plan.name,
'never_expires': subscription.never_expires
}
result.append(thedict)
@@ -337,9 +343,11 @@ def get_transactions(start_date,end_date):
for transaction in results:
try:
r = Rower.objects.filter(
rs = Rower.objects.filter(
customer_id=transaction.customer['id'],
paymentprocessor='braintree')[0]
paymentprocessor='braintree')
if rs:
r = rs[0]
countries.append(r.country)
names.append('{f} {l}'.format(
f = r.user.first_name,
@@ -350,7 +358,7 @@ def get_transactions(start_date,end_date):
ids.append(r.id)
usernames.append(r.user.username)
except KeyError:
except (KeyError,IndexError):
countries.append(
transaction.credit_card_details.country_of_issuance)
names.append('{f} {l}'.format(

View File

@@ -151,7 +151,6 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
except KeyError:
pass
row.write_csv(datafilename, gzip=True)
dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
dosummary = dosummary or summary == ''

View File

@@ -58,7 +58,7 @@ def processattachment(rower, fileobj, title, uploadoptions,testing=False):
try:
with open('media/'+filename,'r') as fop:
line = fop.readline()
except IOError:
except (IOError, UnicodeEncodeError):
if testing:
print 'IOError',filename,'media/'+filename
return 0
@@ -83,9 +83,9 @@ def processattachment(rower, fileobj, title, uploadoptions,testing=False):
if uploadoptions and not 'error' in uploadoptions:
workout = Workout.objects.get(id=workoutid[0])
uploads.do_sync(workout, uploadoptions)
uploads.make_private(workout, uploadoptions)
uploads.set_workouttype(workout, uploadoptions)
uploads.do_sync(workout, uploadoptions)
if 'make_plot' in uploadoptions:
plottype = uploadoptions['plottype']
workoutcsvfilename = workout.csvfilename[6:-4]
@@ -211,8 +211,15 @@ class Command(BaseCommand):
else:
# move attachment and make workout
if testing:
print name
print attachment.document
try:
print name
except UnicodeEncodeError:
print "Unicode Error"
try:
print attachment.document
except UnicodeEncodeError:
pass
workoutid = processattachment(
rower, attachment.document, name, uploadoptions,
testing=testing

View File

@@ -833,7 +833,7 @@ def handle_send_email_subscription_update(
res = send_template_email(from_email,['info@rowsandall.com'],
'Subscription Update Notification',
template_name,
notification_template_name,
d, **kwargs)
return 1
@@ -852,6 +852,7 @@ def handle_send_email_subscription_create(
from_email = 'Rowsandall <admin@rowsandall.com>'
d = {
'name': username,
'siteurl': siteurl,

View File

@@ -16,7 +16,13 @@
</li>
<li class="grid_4">
<h2>Choose your Plan</h2>
<table width="100%">
<p>Unless specified otherwise, the payments on the
recurring payment plans are annual. The prices are specified
as a price per year.
</p>
<table width="100%">
{{ planselectform.as_table }}
</table>
</li>

View File

@@ -23,3 +23,12 @@
});
});
</script>
<script type='text/javascript'
src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
</script>
<script>
$('#payment-form').submit(function() {
$(this).find("button[type='submit']").prop('disabled',true);
console.log("disabled");
}
</script>

View File

@@ -7,7 +7,7 @@
<p>
Thank you for changing to {{ user.rower.paidplan.name }}. You're all settled.
membership.
You will receive an email confirming the transaction.
</p>
<p>

View File

@@ -78,7 +78,11 @@
</li>
<li class="grid_4">
<p>
Your downgrade will be effective immediately. You will not be charged.
Your downgrade will be effective immediately.
We need your payment method to process the downgrade.
If the selected
new plan has a lower price than your current plan, your payment method
will not be charged.
</p>
</li>
</ul>

View File

@@ -39,13 +39,6 @@
<td>&#10004;</td>
<td>&#10004;</td>
</tr>
<tr>
<td>Automatic Synchronization with other fitness sites</td>
<td>&nbsp;</td>
<td>&#10004;</td>
<td>&#10004;</td>
<td>&#10004;</td>
</tr>
<tr>
<td>Heart rate and power zones</td>
<td>&#10004;</td>
@@ -60,6 +53,13 @@
<td>&#10004;</td>
<td>&#10004;</td>
</tr>
<tr>
<td>Automatic Synchronization with other fitness sites</td>
<td>&nbsp;</td>
<td>&#10004;</td>
<td>&#10004;</td>
<td>&#10004;</td>
</tr>
<tr>
<td>Advanced Analysis (Critical Power, Stats, Box Chart, Trend Flex)</td>
<td>&nbsp;</td>
@@ -125,9 +125,16 @@
<td nowrap="nowrap">From 65&euro;/year</td>
<td nowrap="nowrap">From 90&euro;/year</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
{% if rower %}
<tr>
<td>Your current plan</td>
<td><h3>Your current plan</h3></td>
<td>
{% if rower.rowerplan == 'basic' %}
<h3>BASIC</h3>
@@ -137,21 +144,21 @@
</td>
<td>
{% if rower.rowerplan == 'pro' %}
PRO
<h3>PRO ({{ rower.paymenttype }})</h3>
{% else %}
&nbsp;
{% endif %}
</td>
<td>
{% if rower.rowerplan == 'plan' %}
SELF-COACH
<h3>SELF-COACH ({{ rower.paymenttype }})</h3>
{% else %}
&nbsp;
{% endif %}
</td>
<td>
{% if rower.rowerplan == 'coach' %}
COACH
<h3>COACH ({{ rower.paymenttype }})</h3>
{% else %}
&nbsp;
{% endif %}
@@ -265,9 +272,6 @@
<h2>Coach and Self-Coach Membership</h2>
<p>The Coach plan functionality listed is available to the coach only. Individual athletes
can purchase upgrades to "Pro" and "Self-Coach" plans.
</p>
<p>Rowsandall.com's Training Planning functionality
is part of the paid "Self-Coach" and "Coach" plans.</p>
@@ -279,6 +283,11 @@
athletes.
</p>
<p>The Coach plan functionality listed is available to the coach only.
Individual athletes
can purchase upgrades to "Pro" and "Self-Coach" plans.
</p>
<p>If you would like to find a coach who helps you plan your training
through rowsandall.com, contact me throught the contact form.</p>

View File

@@ -7,7 +7,8 @@
<p>
Thank you for registering to {{ user.rower.paidplan.name }}. You have paid for 12 months
membership.
membership. You were charged {{ amount }} &euro; You will receive an email
confirming the payment
</p>
<p>

View File

@@ -8,7 +8,7 @@
subscription to the Rowsandall paid plan "{{ planname }}".
</p>
{% if recurring %}
{% if recurring=='recurring' %}
<p>
Your next charge is due on {{ end_of_billing_period }}. We will charge your {{ paymentmethod }}
on that date.

View File

@@ -7,7 +7,7 @@
New plan: "{{ planname }}".
</p>
{% if recurring %}
{% if recurring=='recurring'%}
<p>
The subscription cost is &euro;{{ price }} per year.
The next charge is due on {{ end_of_billing_period }}.

View File

@@ -7,7 +7,7 @@
Thank you. You have successfully changed your plan to "{{ planname }}".
</p>
{% if recurring %}
{% if recurring=='recurring' %}
<p>
The subscription cost is &euro;{{ price }} per year.
Your next charge is due on {{ end_of_billing_period }}. We will charge you automatically

View File

@@ -7,7 +7,7 @@
New plan: "{{ planname }}".
</p>
{% if recurring %}
{% if recurring=='recurring' %}
<p>
The subscription cost is &euro;{{ price }} per year.
The next charge is due on {{ end_of_billing_period }}.

View File

@@ -9,7 +9,7 @@
You are now on the Rowsandall paid plan "{{ planname }}".
</p>
{% if recurring %}
{% if recurring=='recurring' %}
<p>
The subscription cost is &euro;{{ price }} per year.
Your next charge is due on {{ end_of_billing_period }}. We will charge you automatically

View File

@@ -7,7 +7,7 @@
New plan: "{{ planname }}".
</p>
{% if recurring %}
{% if recurring=='recurring' %}
<p>
The subscription cost is &euro;{{ price }} per year.
The next charge is due on {{ end_of_billing_period }}.

View File

@@ -12,7 +12,8 @@
<table class="plantable shortpadded" width="80%">
<thead>
<tr>
<th>Subscription</th><th>Next Billing Date</th><th>Price</th><th>&nbsp;</th>
<th>Subscription</th><th>Paid Until</th><th>Price</th>
<th>Subscription type</th><th>&nbsp;</th>
</tr>
</thead>
<tbody>
@@ -27,6 +28,13 @@
<td>
{{ subscription|lookup:"price" }} &euro;
</td>
<td>
{% if subscription|lookup:"never_expires" %}
Recurring
{% else %}
Not recurring
{% endif %}
</td>
<td>
<a href="/rowers/me/cancelsubscription/{{ subscription|lookup:'id' }}">Stop this plan</a>
</td>
@@ -37,7 +45,9 @@
<p>
<p>
By clicking on the link to stop the plan, you will downgrade to the Basic plan.
Future payments will be stopped.
Future payments will be stopped. Warning: You will not receive a refund.
If you wanted to downgrade (and receive a credit for the price
difference), click here: <a href="/rowers/downgrade">Downgrade</a>.
</p>
{% else %}
<p>
@@ -45,7 +55,7 @@
from the site.
</p>
<p>
If you have paid through PayPal, log in to your PayPal account and cancel the recurring payment
If you have paid through PayPal, log in to your PayPal account and cancel any recurring payment
there. We will manually downgrade your subscription.
</p>
<p>

View File

@@ -17,6 +17,12 @@
</li>
<li class="grid_3">
<h2>Choose your Plan</h2>
<p>Unless specified otherwise, the payments on the
recurring payment plans are annual. The prices are specified
as a price per year.
</p>
<table width="100%">
{{ planselectform.as_table }}
</table>

View File

@@ -91,7 +91,12 @@
cycle, you will be charged for a prorated amount. For example, when
you upgrade from a 15&euro; plan to a 65&euro; plan (a difference of
50&euro;) in the 6th month of the 12 month billing cycle, you
will be charged 35&euro;.
will be charged 25&euro;.
</p>
<p>
After you hit the Upgrade button, the transaction will be launched.
Please wait until the transaction completes. Do not click the
button twice. Do not close your browser window.
</p>
</li>
</ul>

192
rowers/testdata/emails/划船.csv vendored Normal file
View File

@@ -0,0 +1,192 @@
TimeStamp (sec), activityIdx, lapIdx, pointIdx, ElapsedTime (sec), Horizontal (meters), Stroke500mPace (sec/500m), Cadence (stokes/min), HRCur (bpm), Power (watts), Calories (kCal), Speed (m/sec), StrokeCount, StrokeDistance (meters), DriveLength (meters), DriveTime (ms), StrokeRecoveryTime (ms), WorkPerStroke (joules), AverageDriveForce (lbs), PeakDriveForce (lbs), DragFactor
1463751686.96239, 0, 0, 0, 2.8, 5.4, 262.89, 0, 127, 19, 0, 1.905, 1, 1.83, 0.77, 960, 1580, 0, 23, 47, 0
1463751690.20054, 0, 0, 1, 6.06, 13.1, 239.41, 19, 127, 26, 0, 2.092, 2, 6.52, 1.36, 1410, 1750, 0, 42.4, 67.4, 100
1463751693.11068, 0, 0, 2, 8.93, 21, 199.12, 20, 128, 45, 0, 2.517, 3, 7.44, 1.3, 1060, 1750, 0, 43.9, 69.8, 106
1463751696.23139, 0, 0, 3, 12.08, 30.3, 176.45, 20, 129, 64, 1, 2.841, 4, 8.32, 1.3, 970, 1870, 0, 45.2, 72.5, 105
1463751699.11457, 0, 0, 4, 14.95, 39, 168.51, 20, 130, 74, 1, 2.975, 5, 8.8, 1.27, 920, 1790, 0, 46.5, 72.8, 105
1463751702.11066, 0, 0, 5, 17.93, 48.2, 163.97, 21, 131, 80, 2, 3.058, 6, 8.8, 1.3, 920, 1890, 0, 45.4, 72.7, 105
1463751705.1113, 0, 0, 6, 20.92, 57.6, 162.09, 20, 131, 83, 2, 3.094, 7, 9.16, 1.33, 900, 1900, 0, 49.8, 79.8, 105
1463751707.87064, 0, 0, 7, 23.72, 66.4, 159.77, 20, 132, 87, 3, 3.139, 8, 9.22, 1.27, 860, 1900, 0, 48.2, 75.3, 105
1463751710.7814, 0, 0, 8, 26.63, 75.5, 160.14, 21, 132, 86, 3, 3.131, 9, 9.15, 1.3, 880, 1860, 0, 48.4, 75.9, 105
1463751713.9049, 0, 0, 9, 29.62, 85.1, 158.98, 20, 132, 88, 4, 3.154, 10, 9.29, 1.33, 890, 1810, 0, 52.8, 85.8, 105
1463751716.60206, 0, 0, 10, 32.45, 95, 152.48, 21, 132, 100, 4, 3.289, 11, 9.36, 1.39, 860, 1780, 0, 73, 119.6, 105
1463751719.33239, 0, 0, 11, 35.19, 105, 140.88, 22, 133, 127, 5, 3.561, 12, 9.92, 1.42, 820, 1780, 0, 70.6, 117.2, 105
1463751722.15066, 0, 0, 12, 38.01, 115.3, 137.94, 21, 134, 135, 5, 3.637, 13, 10.28, 1.39, 790, 1840, 0, 70.3, 119.1, 105
1463751724.97069, 0, 0, 13, 40.82, 125.8, 136.53, 21, 135, 139, 6, 3.675, 14, 10.28, 1.39, 780, 1820, 0, 76, 136.9, 105
1463751727.85138, 0, 0, 14, 43.7, 136.6, 134.22, 21, 136, 146, 6, 3.739, 15, 10.49, 1.39, 770, 1810, 0, 75.4, 129.5, 105
1463751730.64129, 0, 0, 15, 46.5, 147.2, 133.17, 22, 137, 150, 7, 3.768, 16, 10.49, 1.42, 780, 1830, 0, 76.9, 135.3, 105
1463751733.43153, 0, 0, 16, 49.29, 157.6, 132.44, 22, 139, 152, 7, 3.789, 17, 10.49, 1.36, 750, 1850, 0, 71.8, 120.3, 105
1463751736.1614, 0, 0, 17, 51.99, 167.8, 134.47, 21, 140, 146, 8, 3.732, 18, 10.41, 1.36, 750, 1760, 0, 74.8, 132.1, 105
1463751738.92547, 0, 0, 18, 54.79, 178.5, 133.24, 22, 140, 150, 9, 3.766, 19, 10.19, 1.39, 760, 1860, 0, 81, 144.8, 105
1463751741.62073, 0, 0, 19, 57.47, 188.5, 131.75, 21, 141, 155, 9, 3.809, 20, 10.63, 1.36, 750, 1860, 0, 72.1, 123.9, 105
1463751744.50119, 0, 0, 20, 60.33, 199.3, 133.86, 21, 141, 148, 10, 3.749, 21, 10.48, 1.39, 770, 1810, 0, 76, 132, 105
1463751747.23218, 0, 0, 21, 63.01, 209.4, 132.89, 22, 142, 151, 11, 3.776, 22, 10.34, 1.36, 740, 1750, 0, 75.9, 132.2, 105
1463751749.81074, 0, 0, 22, 65.66, 219.4, 132.84, 22, 142, 151, 11, 3.777, 23, 10.14, 1.36, 750, 1750, 0, 73.7, 120.8, 105
1463751752.69194, 0, 0, 23, 68.55, 230.2, 133.71, 22, 143, 148, 12, 3.753, 24, 10.34, 1.36, 750, 1840, 0, 74.8, 129.1, 105
1463751755.36079, 0, 0, 24, 71.21, 240.2, 134, 22, 144, 147, 12, 3.745, 25, 10.42, 1.36, 750, 1710, 0, 75.7, 128.7, 105
1463751758.00075, 0, 0, 25, 73.84, 250.1, 133.1, 23, 145, 150, 13, 3.77, 26, 9.93, 1.33, 730, 1710, 0, 74.8, 134.2, 105
1463751760.46164, 0, 0, 26, 76.33, 259.6, 132.67, 23, 145, 152, 13, 3.782, 27, 9.92, 1.33, 720, 1710, 0, 76.6, 132.2, 105
1463751763.31146, 0, 0, 27, 79.17, 270.3, 132.42, 23, 145, 152, 14, 3.789, 28, 9.92, 1.33, 730, 1800, 0, 73.2, 127.3, 105
1463751766.04146, 0, 0, 28, 81.91, 280.6, 133.29, 22, 145, 149, 15, 3.765, 29, 10.27, 1.36, 740, 1810, 0, 76.8, 135.1, 105
1463751768.71528, 0, 0, 29, 84.58, 290.7, 133.16, 22, 144, 150, 15, 3.768, 30, 10.27, 1.33, 730, 1740, 0, 74.7, 133.4, 105
1463751771.41474, 0, 0, 30, 87.27, 300.8, 133.33, 23, 145, 149, 16, 3.764, 31, 9.99, 1.33, 730, 1780, 0, 76.8, 133.7, 105
1463751774.14502, 0, 0, 31, 89.95, 311.1, 132.5, 22, 145, 152, 17, 3.787, 32, 10.27, 1.36, 740, 1760, 0, 80.4, 148.7, 105
1463751776.7518, 0, 0, 32, 92.62, 321.2, 131.22, 22, 145, 157, 17, 3.824, 33, 10.2, 1.33, 720, 1760, 0, 75.7, 132.3, 105
1463751779.63428, 0, 0, 33, 95.46, 331.9, 133.06, 21, 145, 150, 18, 3.771, 34, 10.55, 1.36, 740, 1800, 0, 76.5, 137.6, 105
1463751782.30125, 0, 0, 34, 98.15, 342, 132.83, 22, 146, 151, 18, 3.778, 35, 10.34, 1.36, 740, 1750, 0, 75.3, 130.2, 105
1463751785.03088, 0, 0, 35, 100.88, 352.4, 132.86, 22, 146, 151, 19, 3.777, 36, 10.13, 1.36, 740, 1800, 0, 76.7, 133.1, 105
1463751787.82501, 0, 0, 36, 103.66, 363, 132.14, 22, 146, 153, 20, 3.798, 37, 10.34, 1.36, 740, 1850, 0, 78, 139.7, 105
1463751790.58089, 0, 0, 37, 106.41, 373.4, 132.41, 22, 147, 152, 20, 3.79, 38, 10.55, 1.36, 740, 1820, 0, 78.1, 133.2, 105
1463751793.34155, 0, 0, 38, 109.18, 383.9, 132.26, 22, 147, 153, 21, 3.794, 39, 10.49, 1.39, 760, 1820, 0, 75.9, 139.2, 105
1463751796.19159, 0, 0, 39, 112.05, 394.6, 132.68, 22, 147, 152, 21, 3.782, 40, 10.42, 1.36, 750, 1910, 0, 75.1, 129.1, 105
1463751798.92554, 0, 0, 40, 114.78, 405, 133.54, 21, 147, 149, 22, 3.758, 41, 10.77, 1.39, 760, 1800, 0, 78.8, 141.1, 105
1463751801.65488, 0, 0, 41, 117.5, 415.3, 132.57, 22, 148, 152, 23, 3.785, 42, 10.34, 1.36, 740, 1790, 0, 75.1, 131.8, 105
1463751804.59091, 0, 0, 42, 120.33, 426, 132.95, 22, 148, 151, 23, 3.774, 43, 10.27, 1.36, 740, 1900, 0, 77.2, 132.8, 105
1463751807.2916, 0, 0, 43, 123.16, 436.5, 133.31, 21, 148, 149, 24, 3.764, 44, 10.76, 1.39, 770, 1840, 0, 73.3, 128.7, 105
1463751810.11135, 0, 0, 44, 125.87, 446.9, 133.53, 22, 148, 149, 25, 3.758, 45, 10.42, 1.36, 740, 1800, 0, 82.2, 141, 105
1463751812.63096, 0, 0, 45, 128.47, 456.9, 131.28, 22, 149, 156, 25, 3.823, 46, 10.49, 1.39, 750, 1800, 0, 76.3, 143.2, 105
1463751815.45331, 0, 0, 46, 131.31, 467.6, 131.6, 22, 149, 155, 26, 3.813, 47, 10.26, 1.36, 740, 1790, 0, 76.9, 140.5, 105
1463751818.33164, 0, 0, 47, 134.17, 478.5, 131.52, 22, 150, 156, 26, 3.816, 48, 10.48, 1.42, 770, 1920, 0, 79.1, 141.4, 105
1463751821.15162, 0, 0, 48, 136.96, 489, 131.86, 21, 150, 154, 27, 3.806, 49, 10.84, 1.36, 750, 1840, 0, 74, 129.4, 105
1463751823.76125, 0, 0, 49, 139.6, 499.1, 133.6, 21, 150, 148, 28, 3.756, 50, 10.49, 1.39, 770, 1840, 0, 75.9, 138.4, 106
1463751826.67114, 0, 0, 50, 142.51, 510, 132.9, 22, 150, 151, 28, 3.776, 51, 10.43, 1.36, 740, 1840, 0, 79.1, 139.6, 105
1463751829.28098, 0, 1, 0, 145.1, 519.9, 132.3, 22, 149, 153, 29, 3.793, 52, 10.41, 1.33, 720, 1840, 0, 79, 150.8, 105
1463751832.16189, 0, 1, 1, 147.97, 530.6, 132.75, 22, 149, 151, 30, 3.78, 53, 10.34, 1.33, 730, 1820, 0, 74, 127.6, 105
1463751834.83168, 0, 1, 2, 150.68, 540.8, 133.77, 22, 149, 148, 30, 3.751, 54, 10.28, 1.33, 730, 1790, 0, 78.1, 137.3, 106
1463751837.53488, 0, 1, 3, 153.35, 550.8, 133.47, 22, 148, 149, 31, 3.76, 55, 10.22, 1.33, 740, 1740, 0, 69.9, 123.1, 105
1463751840.1748, 0, 1, 4, 156.03, 560.8, 134.81, 22, 148, 144, 31, 3.722, 56, 9.99, 1.36, 750, 1740, 0, 76, 129.1, 105
1463751842.87528, 0, 1, 5, 158.72, 571, 133.39, 22, 147, 149, 32, 3.762, 57, 10.06, 1.36, 750, 1750, 0, 74.9, 137.2, 105
1463751845.42174, 0, 1, 6, 161.28, 580.7, 133.05, 22, 147, 150, 33, 3.772, 58, 10.13, 1.36, 750, 1750, 0, 74.3, 136.5, 105
1463751848.21175, 0, 1, 7, 164.07, 591.2, 132.91, 22, 147, 151, 33, 3.776, 59, 10.14, 1.36, 750, 1730, 0, 73.1, 126.8, 105
1463751850.91232, 0, 1, 8, 166.76, 601.4, 133.04, 22, 147, 150, 34, 3.772, 60, 10.13, 1.39, 760, 1740, 0, 76.2, 138, 105
1463751853.58226, 0, 1, 9, 169.41, 611.4, 132.15, 23, 147, 153, 34, 3.797, 61, 10.06, 1.33, 730, 1740, 0, 73, 123.9, 105
1463751856.34119, 0, 1, 10, 172.15, 621.8, 132.8, 23, 147, 151, 35, 3.779, 62, 10.07, 1.36, 740, 1810, 0, 79.3, 132.7, 105
1463751859.01181, 0, 1, 11, 174.85, 632.1, 131.73, 22, 147, 155, 36, 3.81, 63, 10.35, 1.33, 720, 1790, 0, 78.8, 131, 105
1463751861.68183, 0, 1, 12, 177.52, 642.3, 131.93, 22, 147, 154, 36, 3.804, 64, 10.34, 1.36, 740, 1750, 0, 78.5, 136.6, 105
1463751864.26136, 0, 1, 13, 180.02, 652, 131.02, 23, 148, 157, 37, 3.83, 65, 10.13, 1.33, 710, 1750, 0, 82.3, 139.5, 105
1463751867.14121, 0, 1, 14, 182.81, 662.7, 129.7, 23, 148, 162, 38, 3.869, 66, 10.19, 1.36, 720, 1760, 0, 80.4, 136.5, 105
1463751869.63237, 0, 1, 15, 185.49, 673.1, 129.62, 23, 148, 163, 38, 3.872, 67, 10.27, 1.33, 710, 1780, 0, 81.5, 139.8, 105
1463751872.39166, 0, 1, 16, 188.19, 683.6, 129.53, 22, 149, 163, 39, 3.874, 68, 10.42, 1.36, 720, 1780, 0, 81, 139.9, 105
1463751875.00518, 0, 1, 17, 190.84, 693.8, 129.72, 22, 149, 162, 39, 3.869, 69, 10.33, 1.33, 710, 1770, 0, 82.3, 140.9, 105
1463751877.55146, 0, 1, 18, 193.38, 703.8, 129.24, 22, 149, 164, 40, 3.883, 70, 10.41, 1.36, 720, 1770, 0, 79.9, 142.6, 104
1463751880.37519, 0, 1, 19, 196.21, 714.7, 129.72, 23, 150, 162, 41, 3.869, 71, 10.19, 1.3, 690, 1830, 0, 83.5, 144.1, 105
1463751883.04126, 0, 1, 20, 198.87, 724.9, 129.66, 22, 150, 162, 41, 3.871, 72, 10.62, 1.36, 730, 1740, 0, 77.9, 132.4, 105
1463751885.74615, 0, 1, 21, 201.55, 735.2, 130.6, 23, 151, 159, 42, 3.842, 73, 10.2, 1.36, 730, 1760, 0, 77.5, 139.3, 105
1463751888.4131, 0, 1, 22, 204.2, 745.4, 130.73, 22, 151, 158, 43, 3.839, 74, 10.28, 1.36, 730, 1740, 0, 82.6, 147.9, 105
1463751891.11179, 0, 1, 23, 206.92, 756, 129.16, 23, 151, 164, 43, 3.886, 75, 10.28, 1.36, 720, 1810, 0, 81.5, 142, 105
1463751893.75211, 0, 1, 24, 209.59, 766.3, 129.43, 22, 150, 163, 44, 3.877, 76, 10.56, 1.36, 730, 1750, 0, 77.9, 136.6, 105
1463751896.39214, 0, 1, 25, 212.22, 776.5, 130.05, 22, 150, 161, 45, 3.859, 77, 10.35, 1.39, 740, 1710, 0, 78.6, 139.7, 105
1463751899.03209, 0, 1, 26, 214.89, 786.9, 129.53, 23, 150, 163, 45, 3.875, 78, 10.13, 1.36, 720, 1750, 0, 81.3, 145.7, 105
1463751901.70518, 0, 1, 27, 217.55, 797.2, 129.08, 22, 150, 165, 46, 3.888, 79, 10.42, 1.39, 740, 1730, 0, 79.6, 144, 105
1463751904.40509, 0, 1, 28, 220.25, 807.8, 128.8, 23, 150, 166, 46, 3.896, 80, 10.34, 1.39, 740, 1770, 0, 80.8, 139.1, 105
1463751907.102, 0, 1, 29, 222.93, 818.2, 128.68, 23, 150, 166, 47, 3.9, 81, 10.34, 1.33, 700, 1820, 0, 85.1, 145.4, 105
1463751909.65188, 0, 1, 30, 225.5, 828.4, 128.24, 22, 150, 168, 48, 3.914, 82, 10.69, 1.39, 730, 1820, 0, 84, 147, 105
1463751912.44192, 0, 1, 31, 228.29, 839.2, 127.93, 23, 150, 169, 48, 3.923, 83, 10.4, 1.36, 720, 1770, 0, 79.7, 144, 105
1463751915.082, 0, 1, 32, 230.94, 849.6, 128.83, 23, 151, 166, 49, 3.896, 84, 10.26, 1.3, 680, 1780, 0, 88.8, 158.7, 105
1463751917.75525, 0, 1, 33, 233.59, 860.1, 127.25, 22, 151, 172, 50, 3.944, 85, 10.56, 1.36, 710, 1780, 0, 85.6, 154.7, 105
1463751920.33134, 0, 1, 34, 236.17, 870.3, 127.25, 22, 152, 172, 50, 3.944, 86, 10.56, 1.36, 720, 1780, 0, 81.9, 141, 105
1463751923.12135, 0, 1, 35, 238.95, 881.1, 128.02, 22, 152, 169, 51, 3.92, 87, 10.49, 1.36, 720, 1780, 0, 82.6, 142.2, 105
1463751925.85197, 0, 1, 36, 241.69, 891.7, 128.47, 23, 152, 167, 52, 3.906, 88, 10.41, 1.33, 700, 1850, 0, 81.5, 134, 105
1463751928.52133, 0, 1, 37, 244.36, 902.1, 129.31, 22, 152, 164, 52, 3.881, 89, 10.63, 1.33, 700, 1850, 0, 85, 148.5, 105
1463751931.43215, 0, 1, 38, 247.24, 913.1, 129.97, 22, 152, 161, 53, 3.861, 90, 10.75, 1.33, 710, 1870, 0, 80.8, 142.4, 105
1463751934.22225, 0, 1, 39, 250.04, 923.9, 130.9, 22, 153, 158, 54, 3.834, 91, 10.69, 1.36, 730, 1880, 0, 82.1, 139.9, 105
1463751937.04198, 0, 1, 40, 252.87, 934.6, 130.75, 21, 154, 158, 54, 3.838, 92, 10.83, 1.39, 750, 1890, 0, 76.4, 137.2, 105
1463751939.86195, 0, 1, 41, 255.69, 945.4, 132, 21, 154, 154, 55, 3.802, 93, 10.68, 1.36, 730, 1900, 0, 81.5, 138.3, 105
1463751942.65237, 0, 1, 42, 258.49, 956, 131.82, 21, 155, 155, 56, 3.807, 94, 10.76, 1.36, 740, 1870, 0, 78.9, 130.3, 105
1463751945.53133, 0, 1, 43, 261.32, 966.7, 132.61, 21, 155, 152, 56, 3.784, 95, 10.62, 1.36, 750, 1890, 0, 74.9, 122.8, 105
1463751948.29206, 0, 1, 44, 264.12, 977.4, 133.01, 21, 156, 150, 57, 3.773, 96, 10.56, 1.33, 720, 1890, 0, 85.5, 153.3, 105
1463751951.11195, 0, 1, 45, 266.94, 988.1, 131.08, 21, 156, 157, 58, 3.828, 97, 10.78, 1.36, 730, 1900, 0, 80.4, 143.2, 105
1463751953.93205, 0, 1, 46, 269.76, 998.8, 131.61, 21, 156, 155, 58, 3.813, 98, 10.78, 1.36, 740, 1890, 0, 78.7, 146.2, 105
1463751956.8423, 0, 1, 47, 272.64, 1009.6, 132.75, 21, 156, 151, 59, 3.78, 99, 10.7, 1.36, 750, 1930, 0, 76, 127.5, 105
1463751959.75208, 0, 2, 0, 275.58, 1020.6, 133.89, 21, 156, 147, 59, 3.748, 100, 10.77, 1.36, 750, 2000, 0, 78.1, 131.1, 105
1463751962.69205, 0, 2, 1, 278.49, 1031.5, 134.57, 20, 156, 145, 60, 3.729, 101, 11.05, 1.39, 770, 1950, 0, 76.1, 133, 105
1463751965.632, 0, 2, 2, 281.45, 1042.5, 134.79, 21, 156, 144, 61, 3.723, 102, 10.78, 1.36, 750, 2000, 0, 78.5, 147.8, 105
1463751968.51212, 0, 2, 3, 284.34, 1053.3, 134.74, 20, 155, 145, 61, 3.724, 103, 10.97, 1.36, 750, 1950, 0, 80.2, 142.5, 105
1463751971.42132, 0, 2, 4, 287.24, 1064.1, 133.93, 21, 155, 147, 62, 3.747, 104, 10.9, 1.39, 770, 1950, 0, 77.5, 132.8, 105
1463751974.45137, 0, 2, 5, 290.29, 1075.3, 135.48, 20, 155, 142, 63, 3.704, 105, 11.13, 1.33, 750, 2060, 0, 74.3, 119.4, 105
1463751977.39171, 0, 2, 6, 293.22, 1086.1, 137.54, 20, 155, 136, 63, 3.648, 106, 11.06, 1.33, 750, 2090, 0, 80.2, 136.2, 105
1463751980.48204, 0, 2, 7, 296.31, 1097.5, 135.9, 21, 155, 141, 64, 3.692, 107, 10.78, 1.33, 740, 2060, 0, 83.4, 139.7, 105
1463751983.42202, 0, 2, 8, 299.27, 1108.5, 134.4, 20, 155, 146, 65, 3.733, 108, 11.19, 1.36, 750, 2010, 0, 78, 134.6, 105
1463751986.30127, 0, 2, 9, 302.13, 1119.2, 135.34, 20, 155, 143, 65, 3.707, 109, 10.98, 1.36, 750, 2010, 0, 78.1, 137.1, 105
1463751989.42192, 0, 2, 10, 305.24, 1130.6, 135.35, 20, 155, 143, 66, 3.707, 110, 10.99, 1.36, 760, 2050, 0, 79.5, 135.4, 105
1463751992.36398, 0, 2, 11, 308.12, 1141.3, 135.34, 20, 155, 143, 67, 3.707, 111, 11.05, 1.33, 740, 1960, 0, 78.7, 138.3, 105
1463751995.30195, 0, 2, 12, 311.13, 1152.4, 135.46, 21, 155, 142, 67, 3.704, 112, 10.69, 1.33, 740, 2070, 0, 77, 131.4, 105
1463751998.27184, 0, 2, 13, 314.09, 1163.3, 136.71, 20, 155, 138, 68, 3.67, 113, 11.04, 1.33, 740, 2030, 0, 78.8, 138.7, 105
1463752001.06131, 0, 2, 14, 316.89, 1173.8, 136, 20, 154, 141, 69, 3.69, 114, 10.98, 1.36, 750, 2030, 0, 81.2, 146.7, 105
1463752004.00234, 0, 2, 15, 319.82, 1184.8, 134.28, 21, 154, 146, 69, 3.737, 115, 10.83, 1.36, 750, 1960, 0, 80.1, 141.3, 105
1463752007.00188, 0, 2, 16, 322.82, 1195.8, 134.32, 21, 153, 146, 70, 3.736, 116, 10.9, 1.33, 740, 1960, 0, 76.1, 130.8, 105
1463752009.94202, 0, 2, 17, 325.73, 1206.6, 135.75, 21, 152, 141, 70, 3.696, 117, 10.76, 1.36, 760, 1960, 0, 76, 134, 105
1463752012.91198, 0, 2, 18, 328.64, 1217.3, 135.86, 21, 153, 141, 71, 3.693, 118, 10.76, 1.36, 760, 1950, 0, 74.5, 138.6, 105
1463752015.67198, 0, 2, 19, 331.5, 1227.8, 136.31, 21, 152, 140, 72, 3.681, 119, 10.7, 1.36, 760, 1910, 0, 74.9, 134.9, 105
1463752018.5521, 0, 2, 20, 334.38, 1238.7, 135.4, 21, 152, 143, 72, 3.706, 120, 10.55, 1.36, 740, 1940, 0, 83.9, 150, 105
1463752021.46551, 0, 2, 21, 337.31, 1249.5, 133.47, 21, 151, 149, 73, 3.759, 121, 10.76, 1.33, 740, 1980, 0, 73.8, 133.9, 105
1463752024.37134, 0, 2, 22, 340.19, 1260.1, 135.95, 20, 151, 141, 74, 3.691, 122, 10.84, 1.36, 760, 1950, 0, 75.7, 145.7, 105
1463752027.2858, 0, 2, 23, 343.09, 1270.9, 135.78, 21, 151, 141, 74, 3.695, 123, 10.7, 1.36, 750, 1950, 0, 79, 133.7, 105
1463752030.19206, 0, 2, 24, 346.01, 1281.8, 134.69, 21, 150, 145, 75, 3.725, 124, 10.7, 1.33, 730, 2000, 0, 77.6, 133.2, 105
1463752033.16135, 0, 2, 25, 348.98, 1292.7, 135.52, 20, 151, 142, 76, 3.703, 125, 10.9, 1.36, 760, 2000, 0, 76.9, 138, 105
1463752036.04232, 0, 2, 26, 351.88, 1303.4, 135.89, 20, 151, 141, 76, 3.692, 126, 10.97, 1.39, 780, 1950, 0, 74.6, 128.7, 105
1463752038.95205, 0, 2, 27, 354.78, 1314.3, 135.79, 21, 151, 141, 77, 3.695, 127, 10.7, 1.36, 760, 1960, 0, 80.5, 134.4, 105
1463752041.92207, 0, 2, 28, 357.74, 1325.2, 134.32, 21, 151, 146, 78, 3.736, 128, 10.76, 1.33, 740, 2030, 0, 77.6, 140.2, 104
1463752044.83212, 0, 2, 29, 360.65, 1336.1, 135.28, 20, 152, 143, 78, 3.709, 129, 11.03, 1.36, 750, 1950, 0, 78.3, 136.7, 105
1463752047.74536, 0, 2, 30, 363.57, 1346.9, 134.82, 21, 152, 144, 79, 3.722, 130, 10.84, 1.39, 770, 1980, 0, 75.5, 137.3, 105
1463752050.6513, 0, 2, 31, 366.43, 1357.4, 135.8, 20, 152, 141, 79, 3.695, 131, 10.84, 1.36, 760, 1900, 0, 72.1, 123.7, 105
1463752053.50196, 0, 2, 32, 369.34, 1368.1, 136.8, 21, 152, 138, 80, 3.668, 132, 10.42, 1.33, 750, 1960, 0, 77, 132.7, 105
1463752056.41211, 0, 2, 33, 372.25, 1379, 135.59, 20, 152, 142, 81, 3.701, 133, 10.83, 1.39, 770, 1930, 0, 79.2, 137.2, 105
1463752059.29147, 0, 2, 34, 375.11, 1389.5, 134.69, 21, 153, 145, 81, 3.725, 134, 10.62, 1.3, 720, 1960, 0, 72.7, 127.2, 105
1463752062.11135, 0, 2, 35, 377.94, 1399.9, 136.99, 21, 152, 138, 82, 3.663, 135, 10.62, 1.33, 750, 1960, 0, 76.3, 127.9, 105
1463752065.05127, 0, 2, 36, 380.87, 1410.7, 136.7, 20, 152, 139, 83, 3.67, 136, 10.9, 1.39, 780, 1990, 0, 74.4, 133.8, 105
1463752068.11299, 0, 2, 37, 383.95, 1422, 136.45, 20, 152, 139, 83, 3.677, 137, 10.77, 1.39, 780, 1990, 0, 75.3, 131.3, 105
1463752070.99214, 0, 2, 38, 386.83, 1432.8, 135.88, 20, 151, 141, 84, 3.693, 138, 10.85, 1.36, 750, 1940, 0, 80.9, 140.3, 105
1463752073.96124, 0, 2, 39, 389.75, 1443.6, 134.41, 21, 151, 146, 85, 3.733, 139, 10.76, 1.36, 750, 1970, 0, 75.4, 128, 105
1463752076.84275, 0, 2, 40, 392.67, 1454.4, 135.31, 20, 152, 143, 85, 3.708, 140, 10.9, 1.39, 770, 1950, 0, 76.4, 137.5, 105
1463752079.75179, 0, 2, 41, 395.54, 1465.1, 135.13, 21, 151, 143, 86, 3.713, 141, 10.62, 1.3, 720, 1960, 0, 80.7, 136.6, 105
1463752082.60215, 0, 2, 42, 398.41, 1475.9, 134.54, 21, 152, 145, 86, 3.73, 142, 10.76, 1.33, 730, 1930, 0, 82, 144.3, 105
1463752085.45516, 0, 2, 43, 401.29, 1486.6, 133.68, 21, 152, 148, 87, 3.754, 143, 10.7, 1.33, 730, 1970, 0, 76.4, 132, 105
1463752088.39192, 0, 2, 44, 404.22, 1497.4, 135.4, 21, 153, 143, 88, 3.706, 144, 10.77, 1.33, 740, 1990, 0, 75.1, 129.2, 105
1463752091.33566, 0, 2, 45, 407.14, 1508.2, 136.38, 20, 153, 140, 88, 3.679, 145, 10.85, 1.36, 760, 1970, 0, 79.5, 139.2, 105
1463752094.27189, 0, 3, 0, 410.1, 1519.2, 135.05, 20, 154, 144, 89, 3.716, 146, 10.92, 1.39, 770, 1990, 0, 76.7, 135.2, 105
1463752097.24196, 0, 3, 1, 413.03, 1530, 135.13, 21, 154, 143, 90, 3.713, 147, 10.84, 1.33, 740, 2000, 0, 77.2, 133, 105
1463752100.12313, 0, 3, 2, 415.96, 1540.9, 135.78, 20, 153, 141, 90, 3.695, 148, 10.97, 1.39, 770, 1960, 0, 76.2, 127.5, 105
1463752102.91121, 0, 3, 3, 418.72, 1551.3, 135.13, 21, 153, 143, 91, 3.713, 149, 10.76, 1.36, 750, 1960, 0, 80.3, 141.2, 105
1463752106.00191, 0, 3, 4, 421.78, 1562.6, 134.35, 21, 153, 146, 92, 3.735, 150, 10.76, 1.36, 760, 2000, 0, 74.5, 127.9, 105
1463752108.91173, 0, 3, 5, 424.71, 1573.3, 135.91, 20, 153, 141, 92, 3.692, 151, 10.91, 1.36, 760, 1980, 0, 74.1, 128.4, 105
1463752111.85327, 0, 3, 6, 427.64, 1584.2, 136.45, 20, 152, 139, 93, 3.677, 152, 10.77, 1.36, 760, 1980, 0, 81.1, 142, 105
1463752114.61118, 0, 3, 7, 430.42, 1594.6, 134.54, 21, 152, 145, 94, 3.73, 153, 10.91, 1.36, 750, 1980, 0, 77.7, 137.1, 105
1463752117.73244, 0, 3, 8, 433.53, 1606, 135.12, 21, 152, 143, 94, 3.713, 154, 10.83, 1.36, 760, 2010, 0, 73.1, 125.6, 105
1463752120.46199, 0, 3, 9, 436.3, 1616.2, 136.93, 20, 152, 138, 95, 3.664, 155, 10.84, 1.33, 750, 2010, 0, 75.8, 130.9, 105
1463752123.52153, 0, 3, 10, 439.32, 1627.4, 136.23, 21, 152, 140, 95, 3.683, 156, 10.63, 1.36, 750, 1970, 0, 80.1, 143.6, 105
1463752126.40141, 0, 3, 11, 442.16, 1638, 134.93, 21, 152, 144, 96, 3.719, 157, 10.84, 1.36, 760, 1970, 0, 76.8, 136.7, 105
1463752129.4022, 0, 3, 12, 445.21, 1649.2, 135.32, 20, 151, 143, 97, 3.708, 158, 10.85, 1.33, 740, 2020, 0, 78.9, 135.8, 105
1463752132.34196, 0, 3, 13, 448.16, 1660.2, 135.38, 20, 152, 143, 97, 3.706, 159, 10.92, 1.33, 740, 2020, 0, 79.3, 137.7, 105
1463752135.22199, 0, 3, 14, 451.04, 1670.8, 135.72, 20, 151, 142, 98, 3.697, 160, 10.97, 1.36, 760, 1910, 0, 74.8, 131.4, 105
1463752138.10169, 0, 3, 15, 453.92, 1681.4, 136.14, 21, 151, 140, 99, 3.686, 161, 10.55, 1.36, 760, 1950, 0, 74.8, 130.3, 105
1463752141.01194, 0, 3, 16, 456.82, 1692.1, 136.14, 21, 151, 140, 99, 3.686, 162, 10.76, 1.39, 780, 1930, 0, 74.5, 134.6, 105
1463752143.80118, 0, 3, 17, 459.62, 1702.5, 135.8, 21, 150, 141, 100, 3.695, 163, 10.63, 1.36, 760, 1930, 0, 77.1, 138.6, 105
1463752146.80193, 0, 3, 18, 462.61, 1713.7, 134.96, 21, 150, 144, 101, 3.718, 164, 10.77, 1.36, 750, 1940, 0, 79.6, 143.1, 105
1463752149.71179, 0, 3, 19, 465.52, 1724.4, 134.43, 21, 150, 146, 101, 3.733, 165, 10.7, 1.33, 740, 1980, 0, 75.8, 129, 105
1463752152.65193, 0, 3, 20, 468.42, 1735.1, 135.86, 20, 150, 141, 102, 3.693, 166, 10.85, 1.36, 760, 1950, 0, 76.1, 136, 105
1463752155.50129, 0, 3, 21, 471.27, 1745.6, 136.11, 21, 150, 140, 102, 3.687, 167, 10.71, 1.36, 760, 1890, 0, 74, 130.6, 105
1463752158.35183, 0, 3, 22, 474.16, 1756.3, 135.87, 21, 150, 141, 103, 3.693, 168, 10.42, 1.33, 740, 1960, 0, 77.9, 133.4, 105
1463752161.02127, 0, 3, 23, 476.83, 1766.2, 135.73, 20, 151, 142, 104, 3.697, 169, 10.84, 1.39, 780, 1960, 0, 69.4, 127.1, 105
1463752164.02192, 0, 3, 24, 479.83, 1777.1, 136.94, 22, 150, 138, 104, 3.664, 170, 10.2, 1.36, 760, 1900, 0, 71.9, 123.9, 105
1463752166.843, 0, 3, 25, 482.66, 1787.5, 136.94, 21, 150, 138, 105, 3.664, 171, 10.49, 1.36, 760, 1850, 0, 74.2, 132.3, 105
1463752169.57112, 0, 3, 26, 485.39, 1797.7, 136.26, 22, 150, 140, 106, 3.682, 172, 10.27, 1.33, 740, 1850, 0, 75.7, 138.2, 105
1463752172.54499, 0, 3, 27, 488.35, 1808.4, 136.14, 21, 150, 140, 106, 3.686, 173, 10.56, 1.33, 750, 1910, 0, 71.6, 120.1, 105
1463752175.24109, 0, 3, 28, 491.01, 1818.4, 136.72, 21, 149, 138, 107, 3.67, 174, 10.49, 1.36, 750, 1910, 0, 80.1, 139.4, 105
1463752178.03105, 0, 3, 29, 493.82, 1828.9, 134.42, 22, 149, 146, 107, 3.733, 175, 10.41, 1.36, 760, 1840, 0, 71.9, 131.8, 105
1463752181.00185, 0, 3, 30, 496.83, 1839.9, 135.64, 21, 149, 142, 108, 3.699, 176, 10.41, 1.36, 760, 1930, 0, 73.3, 126.6, 105
1463752183.85218, 0, 3, 31, 499.66, 1850.5, 135.73, 21, 148, 142, 109, 3.697, 177, 10.63, 1.36, 750, 1890, 0, 78.2, 134.8, 105
1463752186.73497, 0, 3, 32, 502.54, 1861.2, 134.65, 21, 148, 145, 109, 3.726, 178, 10.61, 1.39, 770, 1910, 0, 74.3, 129.2, 105
1463752189.67108, 0, 3, 33, 505.47, 1871.9, 135.4, 21, 147, 143, 110, 3.706, 179, 10.55, 1.33, 740, 1990, 0, 74.4, 131.4, 105
1463752192.64184, 0, 3, 34, 508.38, 1882.6, 136.69, 20, 147, 139, 111, 3.671, 180, 10.78, 1.33, 750, 1960, 0, 75.2, 127.8, 105
1463752195.46186, 0, 3, 35, 511.26, 1893.3, 136.35, 20, 148, 140, 111, 3.68, 181, 10.85, 1.42, 790, 1900, 0, 75.4, 132.7, 105
1463752198.37183, 0, 3, 36, 514.19, 1904.3, 134.81, 21, 149, 144, 112, 3.722, 182, 10.63, 1.39, 770, 1980, 0, 80.7, 143.4, 105
1463752201.40172, 0, 3, 37, 517.21, 1915.4, 133.66, 20, 149, 148, 112, 3.754, 183, 11.05, 1.39, 770, 2040, 0, 72.4, 131.9, 105
1463752204.37107, 0, 3, 38, 520.14, 1926.2, 136.41, 20, 150, 139, 113, 3.678, 184, 11.04, 1.36, 760, 1970, 0, 75.6, 130.5, 105
1463752207.34107, 0, 3, 39, 523.11, 1937.3, 136.1, 20, 151, 140, 114, 3.687, 185, 10.83, 1.39, 770, 1980, 0, 78.8, 147.6, 105
1463752210.13125, 0, 3, 40, 525.94, 1947.8, 134.89, 20, 152, 144, 114, 3.72, 186, 10.97, 1.39, 770, 1980, 0, 75.5, 137.1, 105
1463752213.19204, 0, 3, 41, 529.01, 1959.1, 135.58, 20, 152, 142, 115, 3.701, 187, 10.9, 1.36, 760, 1990, 0, 74.8, 129.6, 105
1463752216.10104, 0, 3, 42, 531.9, 1969.8, 136.18, 20, 153, 140, 116, 3.685, 188, 10.83, 1.36, 760, 1950, 0, 78.2, 128, 105
1463752219.01186, 0, 3, 43, 534.82, 1980.6, 135.35, 21, 153, 143, 116, 3.707, 189, 10.76, 1.36, 760, 1970, 0, 76.5, 126.2, 105
1463752221.92185, 0, 3, 44, 537.72, 1991.4, 135.36, 21, 153, 143, 117, 3.707, 190, 10.82, 1.36, 750, 1950, 0, 80.1, 142.2, 105
1463752224.20475, 0, 3, 45, 539.94, 2000, 134.09, 21, 154, 147, 118, 3.742, 191, 10.82, 1.36, 750, 1950, 0, 80.1, 133.9, 105
1 TimeStamp (sec) activityIdx lapIdx pointIdx ElapsedTime (sec) Horizontal (meters) Stroke500mPace (sec/500m) Cadence (stokes/min) HRCur (bpm) Power (watts) Calories (kCal) Speed (m/sec) StrokeCount StrokeDistance (meters) DriveLength (meters) DriveTime (ms) StrokeRecoveryTime (ms) WorkPerStroke (joules) AverageDriveForce (lbs) PeakDriveForce (lbs) DragFactor
2 1463751686.96239 0 0 0 2.8 5.4 262.89 0 127 19 0 1.905 1 1.83 0.77 960 1580 0 23 47 0
3 1463751690.20054 0 0 1 6.06 13.1 239.41 19 127 26 0 2.092 2 6.52 1.36 1410 1750 0 42.4 67.4 100
4 1463751693.11068 0 0 2 8.93 21 199.12 20 128 45 0 2.517 3 7.44 1.3 1060 1750 0 43.9 69.8 106
5 1463751696.23139 0 0 3 12.08 30.3 176.45 20 129 64 1 2.841 4 8.32 1.3 970 1870 0 45.2 72.5 105
6 1463751699.11457 0 0 4 14.95 39 168.51 20 130 74 1 2.975 5 8.8 1.27 920 1790 0 46.5 72.8 105
7 1463751702.11066 0 0 5 17.93 48.2 163.97 21 131 80 2 3.058 6 8.8 1.3 920 1890 0 45.4 72.7 105
8 1463751705.1113 0 0 6 20.92 57.6 162.09 20 131 83 2 3.094 7 9.16 1.33 900 1900 0 49.8 79.8 105
9 1463751707.87064 0 0 7 23.72 66.4 159.77 20 132 87 3 3.139 8 9.22 1.27 860 1900 0 48.2 75.3 105
10 1463751710.7814 0 0 8 26.63 75.5 160.14 21 132 86 3 3.131 9 9.15 1.3 880 1860 0 48.4 75.9 105
11 1463751713.9049 0 0 9 29.62 85.1 158.98 20 132 88 4 3.154 10 9.29 1.33 890 1810 0 52.8 85.8 105
12 1463751716.60206 0 0 10 32.45 95 152.48 21 132 100 4 3.289 11 9.36 1.39 860 1780 0 73 119.6 105
13 1463751719.33239 0 0 11 35.19 105 140.88 22 133 127 5 3.561 12 9.92 1.42 820 1780 0 70.6 117.2 105
14 1463751722.15066 0 0 12 38.01 115.3 137.94 21 134 135 5 3.637 13 10.28 1.39 790 1840 0 70.3 119.1 105
15 1463751724.97069 0 0 13 40.82 125.8 136.53 21 135 139 6 3.675 14 10.28 1.39 780 1820 0 76 136.9 105
16 1463751727.85138 0 0 14 43.7 136.6 134.22 21 136 146 6 3.739 15 10.49 1.39 770 1810 0 75.4 129.5 105
17 1463751730.64129 0 0 15 46.5 147.2 133.17 22 137 150 7 3.768 16 10.49 1.42 780 1830 0 76.9 135.3 105
18 1463751733.43153 0 0 16 49.29 157.6 132.44 22 139 152 7 3.789 17 10.49 1.36 750 1850 0 71.8 120.3 105
19 1463751736.1614 0 0 17 51.99 167.8 134.47 21 140 146 8 3.732 18 10.41 1.36 750 1760 0 74.8 132.1 105
20 1463751738.92547 0 0 18 54.79 178.5 133.24 22 140 150 9 3.766 19 10.19 1.39 760 1860 0 81 144.8 105
21 1463751741.62073 0 0 19 57.47 188.5 131.75 21 141 155 9 3.809 20 10.63 1.36 750 1860 0 72.1 123.9 105
22 1463751744.50119 0 0 20 60.33 199.3 133.86 21 141 148 10 3.749 21 10.48 1.39 770 1810 0 76 132 105
23 1463751747.23218 0 0 21 63.01 209.4 132.89 22 142 151 11 3.776 22 10.34 1.36 740 1750 0 75.9 132.2 105
24 1463751749.81074 0 0 22 65.66 219.4 132.84 22 142 151 11 3.777 23 10.14 1.36 750 1750 0 73.7 120.8 105
25 1463751752.69194 0 0 23 68.55 230.2 133.71 22 143 148 12 3.753 24 10.34 1.36 750 1840 0 74.8 129.1 105
26 1463751755.36079 0 0 24 71.21 240.2 134 22 144 147 12 3.745 25 10.42 1.36 750 1710 0 75.7 128.7 105
27 1463751758.00075 0 0 25 73.84 250.1 133.1 23 145 150 13 3.77 26 9.93 1.33 730 1710 0 74.8 134.2 105
28 1463751760.46164 0 0 26 76.33 259.6 132.67 23 145 152 13 3.782 27 9.92 1.33 720 1710 0 76.6 132.2 105
29 1463751763.31146 0 0 27 79.17 270.3 132.42 23 145 152 14 3.789 28 9.92 1.33 730 1800 0 73.2 127.3 105
30 1463751766.04146 0 0 28 81.91 280.6 133.29 22 145 149 15 3.765 29 10.27 1.36 740 1810 0 76.8 135.1 105
31 1463751768.71528 0 0 29 84.58 290.7 133.16 22 144 150 15 3.768 30 10.27 1.33 730 1740 0 74.7 133.4 105
32 1463751771.41474 0 0 30 87.27 300.8 133.33 23 145 149 16 3.764 31 9.99 1.33 730 1780 0 76.8 133.7 105
33 1463751774.14502 0 0 31 89.95 311.1 132.5 22 145 152 17 3.787 32 10.27 1.36 740 1760 0 80.4 148.7 105
34 1463751776.7518 0 0 32 92.62 321.2 131.22 22 145 157 17 3.824 33 10.2 1.33 720 1760 0 75.7 132.3 105
35 1463751779.63428 0 0 33 95.46 331.9 133.06 21 145 150 18 3.771 34 10.55 1.36 740 1800 0 76.5 137.6 105
36 1463751782.30125 0 0 34 98.15 342 132.83 22 146 151 18 3.778 35 10.34 1.36 740 1750 0 75.3 130.2 105
37 1463751785.03088 0 0 35 100.88 352.4 132.86 22 146 151 19 3.777 36 10.13 1.36 740 1800 0 76.7 133.1 105
38 1463751787.82501 0 0 36 103.66 363 132.14 22 146 153 20 3.798 37 10.34 1.36 740 1850 0 78 139.7 105
39 1463751790.58089 0 0 37 106.41 373.4 132.41 22 147 152 20 3.79 38 10.55 1.36 740 1820 0 78.1 133.2 105
40 1463751793.34155 0 0 38 109.18 383.9 132.26 22 147 153 21 3.794 39 10.49 1.39 760 1820 0 75.9 139.2 105
41 1463751796.19159 0 0 39 112.05 394.6 132.68 22 147 152 21 3.782 40 10.42 1.36 750 1910 0 75.1 129.1 105
42 1463751798.92554 0 0 40 114.78 405 133.54 21 147 149 22 3.758 41 10.77 1.39 760 1800 0 78.8 141.1 105
43 1463751801.65488 0 0 41 117.5 415.3 132.57 22 148 152 23 3.785 42 10.34 1.36 740 1790 0 75.1 131.8 105
44 1463751804.59091 0 0 42 120.33 426 132.95 22 148 151 23 3.774 43 10.27 1.36 740 1900 0 77.2 132.8 105
45 1463751807.2916 0 0 43 123.16 436.5 133.31 21 148 149 24 3.764 44 10.76 1.39 770 1840 0 73.3 128.7 105
46 1463751810.11135 0 0 44 125.87 446.9 133.53 22 148 149 25 3.758 45 10.42 1.36 740 1800 0 82.2 141 105
47 1463751812.63096 0 0 45 128.47 456.9 131.28 22 149 156 25 3.823 46 10.49 1.39 750 1800 0 76.3 143.2 105
48 1463751815.45331 0 0 46 131.31 467.6 131.6 22 149 155 26 3.813 47 10.26 1.36 740 1790 0 76.9 140.5 105
49 1463751818.33164 0 0 47 134.17 478.5 131.52 22 150 156 26 3.816 48 10.48 1.42 770 1920 0 79.1 141.4 105
50 1463751821.15162 0 0 48 136.96 489 131.86 21 150 154 27 3.806 49 10.84 1.36 750 1840 0 74 129.4 105
51 1463751823.76125 0 0 49 139.6 499.1 133.6 21 150 148 28 3.756 50 10.49 1.39 770 1840 0 75.9 138.4 106
52 1463751826.67114 0 0 50 142.51 510 132.9 22 150 151 28 3.776 51 10.43 1.36 740 1840 0 79.1 139.6 105
53 1463751829.28098 0 1 0 145.1 519.9 132.3 22 149 153 29 3.793 52 10.41 1.33 720 1840 0 79 150.8 105
54 1463751832.16189 0 1 1 147.97 530.6 132.75 22 149 151 30 3.78 53 10.34 1.33 730 1820 0 74 127.6 105
55 1463751834.83168 0 1 2 150.68 540.8 133.77 22 149 148 30 3.751 54 10.28 1.33 730 1790 0 78.1 137.3 106
56 1463751837.53488 0 1 3 153.35 550.8 133.47 22 148 149 31 3.76 55 10.22 1.33 740 1740 0 69.9 123.1 105
57 1463751840.1748 0 1 4 156.03 560.8 134.81 22 148 144 31 3.722 56 9.99 1.36 750 1740 0 76 129.1 105
58 1463751842.87528 0 1 5 158.72 571 133.39 22 147 149 32 3.762 57 10.06 1.36 750 1750 0 74.9 137.2 105
59 1463751845.42174 0 1 6 161.28 580.7 133.05 22 147 150 33 3.772 58 10.13 1.36 750 1750 0 74.3 136.5 105
60 1463751848.21175 0 1 7 164.07 591.2 132.91 22 147 151 33 3.776 59 10.14 1.36 750 1730 0 73.1 126.8 105
61 1463751850.91232 0 1 8 166.76 601.4 133.04 22 147 150 34 3.772 60 10.13 1.39 760 1740 0 76.2 138 105
62 1463751853.58226 0 1 9 169.41 611.4 132.15 23 147 153 34 3.797 61 10.06 1.33 730 1740 0 73 123.9 105
63 1463751856.34119 0 1 10 172.15 621.8 132.8 23 147 151 35 3.779 62 10.07 1.36 740 1810 0 79.3 132.7 105
64 1463751859.01181 0 1 11 174.85 632.1 131.73 22 147 155 36 3.81 63 10.35 1.33 720 1790 0 78.8 131 105
65 1463751861.68183 0 1 12 177.52 642.3 131.93 22 147 154 36 3.804 64 10.34 1.36 740 1750 0 78.5 136.6 105
66 1463751864.26136 0 1 13 180.02 652 131.02 23 148 157 37 3.83 65 10.13 1.33 710 1750 0 82.3 139.5 105
67 1463751867.14121 0 1 14 182.81 662.7 129.7 23 148 162 38 3.869 66 10.19 1.36 720 1760 0 80.4 136.5 105
68 1463751869.63237 0 1 15 185.49 673.1 129.62 23 148 163 38 3.872 67 10.27 1.33 710 1780 0 81.5 139.8 105
69 1463751872.39166 0 1 16 188.19 683.6 129.53 22 149 163 39 3.874 68 10.42 1.36 720 1780 0 81 139.9 105
70 1463751875.00518 0 1 17 190.84 693.8 129.72 22 149 162 39 3.869 69 10.33 1.33 710 1770 0 82.3 140.9 105
71 1463751877.55146 0 1 18 193.38 703.8 129.24 22 149 164 40 3.883 70 10.41 1.36 720 1770 0 79.9 142.6 104
72 1463751880.37519 0 1 19 196.21 714.7 129.72 23 150 162 41 3.869 71 10.19 1.3 690 1830 0 83.5 144.1 105
73 1463751883.04126 0 1 20 198.87 724.9 129.66 22 150 162 41 3.871 72 10.62 1.36 730 1740 0 77.9 132.4 105
74 1463751885.74615 0 1 21 201.55 735.2 130.6 23 151 159 42 3.842 73 10.2 1.36 730 1760 0 77.5 139.3 105
75 1463751888.4131 0 1 22 204.2 745.4 130.73 22 151 158 43 3.839 74 10.28 1.36 730 1740 0 82.6 147.9 105
76 1463751891.11179 0 1 23 206.92 756 129.16 23 151 164 43 3.886 75 10.28 1.36 720 1810 0 81.5 142 105
77 1463751893.75211 0 1 24 209.59 766.3 129.43 22 150 163 44 3.877 76 10.56 1.36 730 1750 0 77.9 136.6 105
78 1463751896.39214 0 1 25 212.22 776.5 130.05 22 150 161 45 3.859 77 10.35 1.39 740 1710 0 78.6 139.7 105
79 1463751899.03209 0 1 26 214.89 786.9 129.53 23 150 163 45 3.875 78 10.13 1.36 720 1750 0 81.3 145.7 105
80 1463751901.70518 0 1 27 217.55 797.2 129.08 22 150 165 46 3.888 79 10.42 1.39 740 1730 0 79.6 144 105
81 1463751904.40509 0 1 28 220.25 807.8 128.8 23 150 166 46 3.896 80 10.34 1.39 740 1770 0 80.8 139.1 105
82 1463751907.102 0 1 29 222.93 818.2 128.68 23 150 166 47 3.9 81 10.34 1.33 700 1820 0 85.1 145.4 105
83 1463751909.65188 0 1 30 225.5 828.4 128.24 22 150 168 48 3.914 82 10.69 1.39 730 1820 0 84 147 105
84 1463751912.44192 0 1 31 228.29 839.2 127.93 23 150 169 48 3.923 83 10.4 1.36 720 1770 0 79.7 144 105
85 1463751915.082 0 1 32 230.94 849.6 128.83 23 151 166 49 3.896 84 10.26 1.3 680 1780 0 88.8 158.7 105
86 1463751917.75525 0 1 33 233.59 860.1 127.25 22 151 172 50 3.944 85 10.56 1.36 710 1780 0 85.6 154.7 105
87 1463751920.33134 0 1 34 236.17 870.3 127.25 22 152 172 50 3.944 86 10.56 1.36 720 1780 0 81.9 141 105
88 1463751923.12135 0 1 35 238.95 881.1 128.02 22 152 169 51 3.92 87 10.49 1.36 720 1780 0 82.6 142.2 105
89 1463751925.85197 0 1 36 241.69 891.7 128.47 23 152 167 52 3.906 88 10.41 1.33 700 1850 0 81.5 134 105
90 1463751928.52133 0 1 37 244.36 902.1 129.31 22 152 164 52 3.881 89 10.63 1.33 700 1850 0 85 148.5 105
91 1463751931.43215 0 1 38 247.24 913.1 129.97 22 152 161 53 3.861 90 10.75 1.33 710 1870 0 80.8 142.4 105
92 1463751934.22225 0 1 39 250.04 923.9 130.9 22 153 158 54 3.834 91 10.69 1.36 730 1880 0 82.1 139.9 105
93 1463751937.04198 0 1 40 252.87 934.6 130.75 21 154 158 54 3.838 92 10.83 1.39 750 1890 0 76.4 137.2 105
94 1463751939.86195 0 1 41 255.69 945.4 132 21 154 154 55 3.802 93 10.68 1.36 730 1900 0 81.5 138.3 105
95 1463751942.65237 0 1 42 258.49 956 131.82 21 155 155 56 3.807 94 10.76 1.36 740 1870 0 78.9 130.3 105
96 1463751945.53133 0 1 43 261.32 966.7 132.61 21 155 152 56 3.784 95 10.62 1.36 750 1890 0 74.9 122.8 105
97 1463751948.29206 0 1 44 264.12 977.4 133.01 21 156 150 57 3.773 96 10.56 1.33 720 1890 0 85.5 153.3 105
98 1463751951.11195 0 1 45 266.94 988.1 131.08 21 156 157 58 3.828 97 10.78 1.36 730 1900 0 80.4 143.2 105
99 1463751953.93205 0 1 46 269.76 998.8 131.61 21 156 155 58 3.813 98 10.78 1.36 740 1890 0 78.7 146.2 105
100 1463751956.8423 0 1 47 272.64 1009.6 132.75 21 156 151 59 3.78 99 10.7 1.36 750 1930 0 76 127.5 105
101 1463751959.75208 0 2 0 275.58 1020.6 133.89 21 156 147 59 3.748 100 10.77 1.36 750 2000 0 78.1 131.1 105
102 1463751962.69205 0 2 1 278.49 1031.5 134.57 20 156 145 60 3.729 101 11.05 1.39 770 1950 0 76.1 133 105
103 1463751965.632 0 2 2 281.45 1042.5 134.79 21 156 144 61 3.723 102 10.78 1.36 750 2000 0 78.5 147.8 105
104 1463751968.51212 0 2 3 284.34 1053.3 134.74 20 155 145 61 3.724 103 10.97 1.36 750 1950 0 80.2 142.5 105
105 1463751971.42132 0 2 4 287.24 1064.1 133.93 21 155 147 62 3.747 104 10.9 1.39 770 1950 0 77.5 132.8 105
106 1463751974.45137 0 2 5 290.29 1075.3 135.48 20 155 142 63 3.704 105 11.13 1.33 750 2060 0 74.3 119.4 105
107 1463751977.39171 0 2 6 293.22 1086.1 137.54 20 155 136 63 3.648 106 11.06 1.33 750 2090 0 80.2 136.2 105
108 1463751980.48204 0 2 7 296.31 1097.5 135.9 21 155 141 64 3.692 107 10.78 1.33 740 2060 0 83.4 139.7 105
109 1463751983.42202 0 2 8 299.27 1108.5 134.4 20 155 146 65 3.733 108 11.19 1.36 750 2010 0 78 134.6 105
110 1463751986.30127 0 2 9 302.13 1119.2 135.34 20 155 143 65 3.707 109 10.98 1.36 750 2010 0 78.1 137.1 105
111 1463751989.42192 0 2 10 305.24 1130.6 135.35 20 155 143 66 3.707 110 10.99 1.36 760 2050 0 79.5 135.4 105
112 1463751992.36398 0 2 11 308.12 1141.3 135.34 20 155 143 67 3.707 111 11.05 1.33 740 1960 0 78.7 138.3 105
113 1463751995.30195 0 2 12 311.13 1152.4 135.46 21 155 142 67 3.704 112 10.69 1.33 740 2070 0 77 131.4 105
114 1463751998.27184 0 2 13 314.09 1163.3 136.71 20 155 138 68 3.67 113 11.04 1.33 740 2030 0 78.8 138.7 105
115 1463752001.06131 0 2 14 316.89 1173.8 136 20 154 141 69 3.69 114 10.98 1.36 750 2030 0 81.2 146.7 105
116 1463752004.00234 0 2 15 319.82 1184.8 134.28 21 154 146 69 3.737 115 10.83 1.36 750 1960 0 80.1 141.3 105
117 1463752007.00188 0 2 16 322.82 1195.8 134.32 21 153 146 70 3.736 116 10.9 1.33 740 1960 0 76.1 130.8 105
118 1463752009.94202 0 2 17 325.73 1206.6 135.75 21 152 141 70 3.696 117 10.76 1.36 760 1960 0 76 134 105
119 1463752012.91198 0 2 18 328.64 1217.3 135.86 21 153 141 71 3.693 118 10.76 1.36 760 1950 0 74.5 138.6 105
120 1463752015.67198 0 2 19 331.5 1227.8 136.31 21 152 140 72 3.681 119 10.7 1.36 760 1910 0 74.9 134.9 105
121 1463752018.5521 0 2 20 334.38 1238.7 135.4 21 152 143 72 3.706 120 10.55 1.36 740 1940 0 83.9 150 105
122 1463752021.46551 0 2 21 337.31 1249.5 133.47 21 151 149 73 3.759 121 10.76 1.33 740 1980 0 73.8 133.9 105
123 1463752024.37134 0 2 22 340.19 1260.1 135.95 20 151 141 74 3.691 122 10.84 1.36 760 1950 0 75.7 145.7 105
124 1463752027.2858 0 2 23 343.09 1270.9 135.78 21 151 141 74 3.695 123 10.7 1.36 750 1950 0 79 133.7 105
125 1463752030.19206 0 2 24 346.01 1281.8 134.69 21 150 145 75 3.725 124 10.7 1.33 730 2000 0 77.6 133.2 105
126 1463752033.16135 0 2 25 348.98 1292.7 135.52 20 151 142 76 3.703 125 10.9 1.36 760 2000 0 76.9 138 105
127 1463752036.04232 0 2 26 351.88 1303.4 135.89 20 151 141 76 3.692 126 10.97 1.39 780 1950 0 74.6 128.7 105
128 1463752038.95205 0 2 27 354.78 1314.3 135.79 21 151 141 77 3.695 127 10.7 1.36 760 1960 0 80.5 134.4 105
129 1463752041.92207 0 2 28 357.74 1325.2 134.32 21 151 146 78 3.736 128 10.76 1.33 740 2030 0 77.6 140.2 104
130 1463752044.83212 0 2 29 360.65 1336.1 135.28 20 152 143 78 3.709 129 11.03 1.36 750 1950 0 78.3 136.7 105
131 1463752047.74536 0 2 30 363.57 1346.9 134.82 21 152 144 79 3.722 130 10.84 1.39 770 1980 0 75.5 137.3 105
132 1463752050.6513 0 2 31 366.43 1357.4 135.8 20 152 141 79 3.695 131 10.84 1.36 760 1900 0 72.1 123.7 105
133 1463752053.50196 0 2 32 369.34 1368.1 136.8 21 152 138 80 3.668 132 10.42 1.33 750 1960 0 77 132.7 105
134 1463752056.41211 0 2 33 372.25 1379 135.59 20 152 142 81 3.701 133 10.83 1.39 770 1930 0 79.2 137.2 105
135 1463752059.29147 0 2 34 375.11 1389.5 134.69 21 153 145 81 3.725 134 10.62 1.3 720 1960 0 72.7 127.2 105
136 1463752062.11135 0 2 35 377.94 1399.9 136.99 21 152 138 82 3.663 135 10.62 1.33 750 1960 0 76.3 127.9 105
137 1463752065.05127 0 2 36 380.87 1410.7 136.7 20 152 139 83 3.67 136 10.9 1.39 780 1990 0 74.4 133.8 105
138 1463752068.11299 0 2 37 383.95 1422 136.45 20 152 139 83 3.677 137 10.77 1.39 780 1990 0 75.3 131.3 105
139 1463752070.99214 0 2 38 386.83 1432.8 135.88 20 151 141 84 3.693 138 10.85 1.36 750 1940 0 80.9 140.3 105
140 1463752073.96124 0 2 39 389.75 1443.6 134.41 21 151 146 85 3.733 139 10.76 1.36 750 1970 0 75.4 128 105
141 1463752076.84275 0 2 40 392.67 1454.4 135.31 20 152 143 85 3.708 140 10.9 1.39 770 1950 0 76.4 137.5 105
142 1463752079.75179 0 2 41 395.54 1465.1 135.13 21 151 143 86 3.713 141 10.62 1.3 720 1960 0 80.7 136.6 105
143 1463752082.60215 0 2 42 398.41 1475.9 134.54 21 152 145 86 3.73 142 10.76 1.33 730 1930 0 82 144.3 105
144 1463752085.45516 0 2 43 401.29 1486.6 133.68 21 152 148 87 3.754 143 10.7 1.33 730 1970 0 76.4 132 105
145 1463752088.39192 0 2 44 404.22 1497.4 135.4 21 153 143 88 3.706 144 10.77 1.33 740 1990 0 75.1 129.2 105
146 1463752091.33566 0 2 45 407.14 1508.2 136.38 20 153 140 88 3.679 145 10.85 1.36 760 1970 0 79.5 139.2 105
147 1463752094.27189 0 3 0 410.1 1519.2 135.05 20 154 144 89 3.716 146 10.92 1.39 770 1990 0 76.7 135.2 105
148 1463752097.24196 0 3 1 413.03 1530 135.13 21 154 143 90 3.713 147 10.84 1.33 740 2000 0 77.2 133 105
149 1463752100.12313 0 3 2 415.96 1540.9 135.78 20 153 141 90 3.695 148 10.97 1.39 770 1960 0 76.2 127.5 105
150 1463752102.91121 0 3 3 418.72 1551.3 135.13 21 153 143 91 3.713 149 10.76 1.36 750 1960 0 80.3 141.2 105
151 1463752106.00191 0 3 4 421.78 1562.6 134.35 21 153 146 92 3.735 150 10.76 1.36 760 2000 0 74.5 127.9 105
152 1463752108.91173 0 3 5 424.71 1573.3 135.91 20 153 141 92 3.692 151 10.91 1.36 760 1980 0 74.1 128.4 105
153 1463752111.85327 0 3 6 427.64 1584.2 136.45 20 152 139 93 3.677 152 10.77 1.36 760 1980 0 81.1 142 105
154 1463752114.61118 0 3 7 430.42 1594.6 134.54 21 152 145 94 3.73 153 10.91 1.36 750 1980 0 77.7 137.1 105
155 1463752117.73244 0 3 8 433.53 1606 135.12 21 152 143 94 3.713 154 10.83 1.36 760 2010 0 73.1 125.6 105
156 1463752120.46199 0 3 9 436.3 1616.2 136.93 20 152 138 95 3.664 155 10.84 1.33 750 2010 0 75.8 130.9 105
157 1463752123.52153 0 3 10 439.32 1627.4 136.23 21 152 140 95 3.683 156 10.63 1.36 750 1970 0 80.1 143.6 105
158 1463752126.40141 0 3 11 442.16 1638 134.93 21 152 144 96 3.719 157 10.84 1.36 760 1970 0 76.8 136.7 105
159 1463752129.4022 0 3 12 445.21 1649.2 135.32 20 151 143 97 3.708 158 10.85 1.33 740 2020 0 78.9 135.8 105
160 1463752132.34196 0 3 13 448.16 1660.2 135.38 20 152 143 97 3.706 159 10.92 1.33 740 2020 0 79.3 137.7 105
161 1463752135.22199 0 3 14 451.04 1670.8 135.72 20 151 142 98 3.697 160 10.97 1.36 760 1910 0 74.8 131.4 105
162 1463752138.10169 0 3 15 453.92 1681.4 136.14 21 151 140 99 3.686 161 10.55 1.36 760 1950 0 74.8 130.3 105
163 1463752141.01194 0 3 16 456.82 1692.1 136.14 21 151 140 99 3.686 162 10.76 1.39 780 1930 0 74.5 134.6 105
164 1463752143.80118 0 3 17 459.62 1702.5 135.8 21 150 141 100 3.695 163 10.63 1.36 760 1930 0 77.1 138.6 105
165 1463752146.80193 0 3 18 462.61 1713.7 134.96 21 150 144 101 3.718 164 10.77 1.36 750 1940 0 79.6 143.1 105
166 1463752149.71179 0 3 19 465.52 1724.4 134.43 21 150 146 101 3.733 165 10.7 1.33 740 1980 0 75.8 129 105
167 1463752152.65193 0 3 20 468.42 1735.1 135.86 20 150 141 102 3.693 166 10.85 1.36 760 1950 0 76.1 136 105
168 1463752155.50129 0 3 21 471.27 1745.6 136.11 21 150 140 102 3.687 167 10.71 1.36 760 1890 0 74 130.6 105
169 1463752158.35183 0 3 22 474.16 1756.3 135.87 21 150 141 103 3.693 168 10.42 1.33 740 1960 0 77.9 133.4 105
170 1463752161.02127 0 3 23 476.83 1766.2 135.73 20 151 142 104 3.697 169 10.84 1.39 780 1960 0 69.4 127.1 105
171 1463752164.02192 0 3 24 479.83 1777.1 136.94 22 150 138 104 3.664 170 10.2 1.36 760 1900 0 71.9 123.9 105
172 1463752166.843 0 3 25 482.66 1787.5 136.94 21 150 138 105 3.664 171 10.49 1.36 760 1850 0 74.2 132.3 105
173 1463752169.57112 0 3 26 485.39 1797.7 136.26 22 150 140 106 3.682 172 10.27 1.33 740 1850 0 75.7 138.2 105
174 1463752172.54499 0 3 27 488.35 1808.4 136.14 21 150 140 106 3.686 173 10.56 1.33 750 1910 0 71.6 120.1 105
175 1463752175.24109 0 3 28 491.01 1818.4 136.72 21 149 138 107 3.67 174 10.49 1.36 750 1910 0 80.1 139.4 105
176 1463752178.03105 0 3 29 493.82 1828.9 134.42 22 149 146 107 3.733 175 10.41 1.36 760 1840 0 71.9 131.8 105
177 1463752181.00185 0 3 30 496.83 1839.9 135.64 21 149 142 108 3.699 176 10.41 1.36 760 1930 0 73.3 126.6 105
178 1463752183.85218 0 3 31 499.66 1850.5 135.73 21 148 142 109 3.697 177 10.63 1.36 750 1890 0 78.2 134.8 105
179 1463752186.73497 0 3 32 502.54 1861.2 134.65 21 148 145 109 3.726 178 10.61 1.39 770 1910 0 74.3 129.2 105
180 1463752189.67108 0 3 33 505.47 1871.9 135.4 21 147 143 110 3.706 179 10.55 1.33 740 1990 0 74.4 131.4 105
181 1463752192.64184 0 3 34 508.38 1882.6 136.69 20 147 139 111 3.671 180 10.78 1.33 750 1960 0 75.2 127.8 105
182 1463752195.46186 0 3 35 511.26 1893.3 136.35 20 148 140 111 3.68 181 10.85 1.42 790 1900 0 75.4 132.7 105
183 1463752198.37183 0 3 36 514.19 1904.3 134.81 21 149 144 112 3.722 182 10.63 1.39 770 1980 0 80.7 143.4 105
184 1463752201.40172 0 3 37 517.21 1915.4 133.66 20 149 148 112 3.754 183 11.05 1.39 770 2040 0 72.4 131.9 105
185 1463752204.37107 0 3 38 520.14 1926.2 136.41 20 150 139 113 3.678 184 11.04 1.36 760 1970 0 75.6 130.5 105
186 1463752207.34107 0 3 39 523.11 1937.3 136.1 20 151 140 114 3.687 185 10.83 1.39 770 1980 0 78.8 147.6 105
187 1463752210.13125 0 3 40 525.94 1947.8 134.89 20 152 144 114 3.72 186 10.97 1.39 770 1980 0 75.5 137.1 105
188 1463752213.19204 0 3 41 529.01 1959.1 135.58 20 152 142 115 3.701 187 10.9 1.36 760 1990 0 74.8 129.6 105
189 1463752216.10104 0 3 42 531.9 1969.8 136.18 20 153 140 116 3.685 188 10.83 1.36 760 1950 0 78.2 128 105
190 1463752219.01186 0 3 43 534.82 1980.6 135.35 21 153 143 116 3.707 189 10.76 1.36 760 1970 0 76.5 126.2 105
191 1463752221.92185 0 3 44 537.72 1991.4 135.36 21 153 143 117 3.707 190 10.82 1.36 750 1950 0 80.1 142.2 105
192 1463752224.20475 0 3 45 539.94 2000 134.09 21 154 147 118 3.742 191 10.82 1.36 750 1950 0 80.1 133.9 105

View File

@@ -1098,7 +1098,7 @@ class EmailTests(TestCase):
failbox = Mailbox.objects.create(name='Failed')
failbox.save()
for filename in os.listdir('rowers/testdata/emails'):
for filename in os.listdir(u'rowers/testdata/emails'):
m = Message(mailbox=workoutsbox,
from_header = u.email,
subject = filename,
@@ -1110,7 +1110,7 @@ boattype: 4x
""")
m.save()
a2 = 'media/mailbox_attachments/'+filename
copyfile('rowers/testdata/emails/'+filename,a2)
copyfile(u'rowers/testdata/emails/'+filename,a2)
a = MessageAttachment(message=m,document=a2[6:])
a.save()

View File

@@ -1,5 +1,8 @@
from rowers.imports import *
import mytypes
from rowers.mytypes import otwtypes
from rowsandall_app.settings import (
UNDERARMOUR_CLIENT_KEY,
UNDERARMOUR_CLIENT_SECRET,
@@ -417,7 +420,7 @@ def add_workout_from_data(user,importid,data,strokedata,
times_location = times_distance
latcoord = np.zeros(len(times_distance))
loncoord = np.zeros(len(times_distance))
if workouttype in types.otwtypes:
if workouttype in otwtypes:
workouttype = 'rower'
try:

View File

@@ -1376,10 +1376,12 @@ def checkouts_view(request):
form = BillingForm(request.POST)
if form.is_valid():
data = form.cleaned_data
success = braintreestuff.create_subscription(r,data)
success,amount = braintreestuff.create_subscription(r,data)
if success:
messages.info(request,"Your payment has succeeded and your plan has been updated")
url = reverse(payment_completed_view)
url = "{baseurl}?amount={amount:.2f}".format(
baseurl = reverse(payment_completed_view),
amount = amount)
return HttpResponseRedirect(url)
else:
messages.error(request,"There was a problem with your payment")
@@ -1410,10 +1412,12 @@ def upgrade_checkouts_view(request):
form = BillingForm(request.POST)
if form.is_valid():
data = form.cleaned_data
success = braintreestuff.update_subscription(r,data)
success,amount = braintreestuff.update_subscription(r,data)
if success:
messages.info(request,"Your payment has succeeded and your plan has been updated")
url = reverse(payment_completed_view)
url = "{baseurl}?amount={amount:.2f}".format(
baseurl = reverse(payment_completed_view),
amount = amount)
return HttpResponseRedirect(url)
else:
messages.error(request,"There was a problem with your payment")
@@ -1468,13 +1472,17 @@ def payment_completed_view(request):
if not PAYMENT_PROCESSING_ON:
url = reverse('promembership')
return HttpResponseRedirect(url)
amount = request.GET.get('amount',0)
r = getrequestrower(request)
return render(request,
"payment_completed.html",
{
'rower':r
'rower':r,
'amount':amount,
})
@login_required()
@@ -18839,10 +18847,12 @@ def rower_trainingplan_view(request,
type='userdefined').order_by("startdate")
for mm in microcycles:
sps = PlannedSession.objects.filter(
rower = r,
startdate__lte=mm.enddate,
enddate__gte=mm.startdate)
sps = get_sessions(r,startdate=mm.startdate,enddate=mm.enddate)
# sps = PlannedSession.objects.filter(
# rower = r,
# startdate__lte=mm.enddate,
# enddate__gte=mm.startdate)
mm.plantime = 0