sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v13.94' into master

Browse Source
This commit is contained in:
Sander Roosendaal
2020-09-29 22:32:14 +02:00
parent 4f71f5661d 0364f94dd5
commit 13f828a67e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/dataprepnodjango.py
View File

@@ -957,6 +957,7 @@ def updatecpdata_sql(rower_id,delta,cp,table='cpdata',distance=pd.Series([]),deb
} }
) )
if not distance.empty: if not distance.empty:
df['distance'] = distance df['distance'] = distance
@@ -965,6 +966,7 @@ def updatecpdata_sql(rower_id,delta,cp,table='cpdata',distance=pd.Series([]),deb
else: else:
engine = create_engine(database_url, echo=False) engine = create_engine(database_url, echo=False)
with engine.connect() as conn, conn.begin(): with engine.connect() as conn, conn.begin():
df.to_sql(table, engine, if_exists='append', index=False) df.to_sql(table, engine, if_exists='append', index=False)
conn.close() conn.close()

2
rowers/templates/monitorjobs.html
View File

@@ -24,7 +24,7 @@
}; };
previous = current; previous = current;
}); });
setTimeout(checkJobs, 5000); setTimeout(checkJobs, 20000);
}()); }());
</script> </script>