diff --git a/importlog.py b/importlog.py index 2755690..7566b88 100644 --- a/importlog.py +++ b/importlog.py @@ -8,6 +8,15 @@ from status import st, Status from datetime import datetime, timedelta import pytz +class Importlogline(db.Model): + id = db.Column(db.Integer, db.Sequence('ill_id_seq'), primary_key=True ) + import_id = db.Column(db.Integer, db.ForeignKey('import.id'), primary_key=True ) + log_date = db.Column(db.DateTime(timezone=True)) + log = db.Column(db.String) + + def __repr__(self): + return "".format(self.id, self.start_time, self.last_update, self.state, self.num_passes, self.current_pass, self.num_files, self.num_files, self.current_file_num, self.current_file) -class Importlogline(db.Model): - action_id = db.Column(db.Integer, db.ForeignKey('import.id'), primary_key=True ) - log = db.Column(db.String) ################################################################################ # /imports -> show current settings @@ -46,9 +52,10 @@ def imports(): def importlog(id): page_title='Show Import Details' importlog = Importlog.query.get(id) + logs=Importlogline.query.filter(Importlogline.import_id==id).all() duration=(datetime.now(pytz.utc)-importlog.start_time) duration= duration-timedelta(microseconds=duration.microseconds) - return render_template("importlog.html", imp=importlog, st=importlog.start_time.strftime("%d/%m/%Y %I:%M:%S %p"), duration=duration, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() ) + return render_template("importlog.html", imp=importlog, logs=logs, duration=duration, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() ) ############################################################################### # This func creates a new filter in jinja2 to format the time from the db in a diff --git a/templates/importlog.html b/templates/importlog.html index 8a9fd80..761839f 100644 --- a/templates/importlog.html +++ b/templates/importlog.html @@ -41,5 +41,15 @@ +
+ + + + {% for log in logs %} + + {% endfor %} + +
WhenDetails
{{log.log_date|vicdate}}{{log.log}}
+
{% endblock main_content %}