ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use correct seqs and order jobs by id

Browse Source
This commit is contained in:
Damien De Paoli
2021-01-20 21:47:53 +11:00
parent 574c12f7f5
commit 021aeb69c7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
job.py
View File

@@ -24,7 +24,7 @@ class JobExtra(db.Model):
return "<id: {}, job_id: {}, name: {}, value: {}>".format(self.id, self.job_id, self.name, self.value ) return "<id: {}, job_id: {}, name: {}, value: {}>".format(self.id, self.job_id, self.name, self.value )
class Joblog(db.Model): class Joblog(db.Model):
id = db.Column(db.Integer, db.Sequence('ill_id_seq'), primary_key=True ) id = db.Column(db.Integer, db.Sequence('joblog_id_seq'), primary_key=True )
job_id = db.Column(db.Integer, db.ForeignKey('job.id'), primary_key=True ) job_id = db.Column(db.Integer, db.ForeignKey('job.id'), primary_key=True )
log_date = db.Column(db.DateTime(timezone=True)) log_date = db.Column(db.DateTime(timezone=True))
log = db.Column(db.String) log = db.Column(db.String)
@@ -33,7 +33,7 @@ class Joblog(db.Model):
return "<id: {}, job_id: {}, log: {}".format(self.id, self.job_id, self.log ) return "<id: {}, job_id: {}, log: {}".format(self.id, self.job_id, self.log )
class Job(db.Model): class Job(db.Model):
id = db.Column(db.Integer, db.Sequence('joblog_id_seq'), primary_key=True ) id = db.Column(db.Integer, db.Sequence('job_id_seq'), primary_key=True )
start_time = db.Column(db.DateTime(timezone=True)) start_time = db.Column(db.DateTime(timezone=True))
last_update = db.Column(db.DateTime(timezone=True)) last_update = db.Column(db.DateTime(timezone=True))
name = db.Column(db.String) name = db.Column(db.String)
@@ -89,7 +89,7 @@ def NewJob(name, num_files="0", wait_for=None ):
@app.route("/jobs", methods=["GET"]) @app.route("/jobs", methods=["GET"])
def jobs(): def jobs():
page_title='Job list' page_title='Job list'
jobs = Job.query.all() jobs = Job.query.order_by(Job.id).all()
return render_template("jobs.html", jobs=jobs, page_title=page_title) return render_template("jobs.html", jobs=jobs, page_title=page_title)