diff --git a/files.py b/files.py index 50a9f5a..a20cc4d 100644 --- a/files.py +++ b/files.py @@ -191,10 +191,8 @@ def files(): @app.route("/files/scannow", methods=["GET"]) def scannow(): job=NewJob("scannow", 1 ) - print("beginning of using a job to scan for new files, rather than do it in code here: {}".format(job)) - filedata.GenerateFileData() st.SetAlert("success") - st.SetMessage("Scanned for new files") + st.SetMessage("Created job to scan for new files") return render_template("base.html", page_title='Forced look for new items', file_data=filedata) ################################################################################ diff --git a/job.py b/job.py index aeebd79..f505bb6 100644 --- a/job.py +++ b/job.py @@ -75,7 +75,10 @@ def joblog(id): page_title='Show Job Details' joblog = Job.query.get(id) logs=Joblog.query.filter(Joblog.job_id==id).all() - duration=(datetime.now(pytz.utc)-joblog.start_time) + if joblog.pa_job_state == "Completed": + duration=(joblog.last_update-joblog.start_time) + else: + duration=(datetime.now(pytz.utc)-joblog.start_time) duration= duration-timedelta(microseconds=duration.microseconds) return render_template("joblog.html", job=joblog, logs=logs, duration=duration, page_title=page_title) diff --git a/main.py b/main.py index bdb5f73..ccba58c 100644 --- a/main.py +++ b/main.py @@ -36,12 +36,35 @@ from ai import * ####################################### CLASSES / DB model ####################################### +class PA_JobManager_Message(db.Model): + __tablename__ = "pa_job_manager_fe_message" + id = db.Column(db.Integer, db.Sequence('pa_job_manager_fe_message_id_seq'), primary_key=True ) + job_id = db.Column(db.Integer, db.ForeignKey('job.id') ) + alert = db.Column(db.String) + message = db.Column(db.String) + def __repr__(self): + return "".format( self.id, self.state, self.num_active_jobs, self.num_completed_jobs ) - class Joblog(Base): __tablename__ = "joblog" id = Column(Integer, Sequence('ill_id_seq'), primary_key=True ) - job_id = Column(Integer, ForeignKey('job.id'), primary_key=True ) + job_id = Column(Integer, ForeignKey('job.id') ) log_date = Column(DateTime(timezone=True)) log = Column(String) def __repr__(self): return "".format(self.id, self.start_time, self.last_update, self.name, self.state, self.num_passes, self.current_pass, self.num_files, self.num_files, self.current_file_num, self.current_file) +class PA_JobManager_FE_Message(Base): + __tablename__ = "pa_job_manager_fe_message" + id = Column(Integer, Sequence('pa_job_manager_fe_message_id_seq'), primary_key=True ) + job_id = Column(Integer, ForeignKey('job.id'), primary_key=True ) + alert = Column(String) + message = Column(String) + def __repr__(self): + return " {{ GetMessage()|safe}} - {{ ClearStatus() }} + {{ ClearStatus() }} {% endif %} + {% if GetJM_Message() != None %} + {% set msg=GetJM_Message() %} +
+ Job #{{msg.job_id}}: {{msg.message|safe}} +
+ {% set dont_print=ClearJM_Message(msg.id) %} + {% endif %} {% endif %} {% block main_content %}