added persistent and cant_close to PA_JobManager_FE_Message, used them from pa_job_manager to set status messages with persistence/close buttons appropriately for items like fix_dups/stale_jobs. When "fixing" now, the persistent Status message stays, but its now positioned approx. below the navbar on the right and is ok. Started on changing status to a more sensible naming conventions (away from alert to level) - more work to complete this
This commit is contained in:
9
job.py
9
job.py
@@ -74,6 +74,8 @@ class PA_JobManager_Message(db.Model):
|
||||
job_id = db.Column(db.Integer, db.ForeignKey('job.id') )
|
||||
alert = db.Column(db.String)
|
||||
message = db.Column(db.String)
|
||||
persistent = db.Column(db.Boolean)
|
||||
cant_close = db.Column(db.Boolean)
|
||||
job = db.relationship ("Job" )
|
||||
def __repr__(self):
|
||||
return f"<id: {self.id}, job_id: {self.job_id}, alert: {self.alert}, message: {self.message}, job: {self.job}"
|
||||
@@ -90,6 +92,8 @@ def GetJM_Message():
|
||||
# ClearJM_Message: used in html to clear any message just displayed
|
||||
################################################################################
|
||||
def ClearJM_Message(id):
|
||||
print(f"DDP: DID NOT clear JM message: {id}" )
|
||||
return
|
||||
PA_JobManager_Message.query.filter(PA_JobManager_Message.id==id).delete()
|
||||
db.session.commit()
|
||||
return
|
||||
@@ -307,12 +311,11 @@ def joblog_search():
|
||||
@login_required
|
||||
def CheckForJobs():
|
||||
num=GetNumActiveJobs()
|
||||
print( f"called: /checkforjobs -- num={num}" )
|
||||
sts=[]
|
||||
print("CheckForJobs called" )
|
||||
for msg in PA_JobManager_Message.query.all():
|
||||
print("there is a PA_J_MGR status message" )
|
||||
u='<a class="link-light" href="' + url_for('joblog', id=msg.job_id) + '">Job # ' + str(msg.job_id) + '</a>: '
|
||||
sts.append( { 'message': u+msg.message, 'alert': msg.alert, 'job_id': msg.job_id } )
|
||||
sts.append( { 'message': u+msg.message, 'alert': msg.alert, 'job_id': msg.job_id, 'persistent': msg.persistent, 'cant_close': msg.cant_close } )
|
||||
return make_response( jsonify( num_active_jobs=num, sts=sts ) )
|
||||
|
||||
###############################################################################
|
||||
|
||||
Reference in New Issue
Block a user