Skip to content

Commit

Permalink
Merge pull request #299 from shashwatbangar/#2vjxdha-n
Browse files Browse the repository at this point in the history
Fixed: Job runtime not set on jobConfiguration page in case of moreJobs(#2vjxdha)
  • Loading branch information
adityasharma7 authored Nov 24, 2022
2 parents bea65af + 30bf042 commit 4e91a2e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion src/components/MoreJobs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ export default defineComponent({
methods: {
async viewJobConfiguration(job: any) {
job.jobTitle = this.getEnumName(job.systemJobEnumId)
emitter.emit('viewJobConfiguration', {jobId: job.jobId, jobTitle: job.jobTitle, statusId: job.statusId, job});
job.status = job.statusId === 'SERVICE_DRAFT' ? 'SERVICE_DRAFT' : job.frequency;
emitter.emit('viewJobConfiguration', {jobId: job.jobId, jobTitle: job.jobTitle, status: job.status, job});
},
getDate (runTime: any) {
return DateTime.fromMillis(runTime).toLocaleString(DateTime.DATE_MED);
Expand Down
2 changes: 1 addition & 1 deletion src/views/Inventory.vue
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export default defineComponent({
async viewJobConfiguration(jobInformation: any) {
this.currentJob = jobInformation.job || this.getJob(this.jobEnums[jobInformation.id])
this.title = jobInformation.title ? jobInformation.title : (jobInformation.job.enumName || jobInformation.job.jobName)
this.currentJobStatus = jobInformation.status
this.currentJobStatus = jobInformation.status;
this.freqType = jobInformation.id && this.jobFrequencyType[jobInformation.id]
await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob });
Expand Down
2 changes: 1 addition & 1 deletion src/views/PreOrder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ export default defineComponent({
async viewJobConfiguration(jobInformation: any) {
this.currentJob = jobInformation.job || this.getJob(this.jobEnums[jobInformation.id])
this.title = jobInformation.title ? jobInformation.title : (jobInformation.job.enumName || jobInformation.job.jobName)
this.currentJobStatus = jobInformation.status
this.currentJobStatus = jobInformation.status;
this.freqType = jobInformation.id && this.jobFrequencyType[jobInformation.id]
await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob });
Expand Down
2 changes: 1 addition & 1 deletion src/views/Product.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default defineComponent({
async viewJobConfiguration(jobInformation: any) {
this.currentJob = jobInformation.job || this.getJob(this.jobEnums[jobInformation.id])
this.title = jobInformation.title ? jobInformation.title : (jobInformation.job.enumName || jobInformation.job.jobName)
this.currentJobStatus = jobInformation.status
this.currentJobStatus = jobInformation.status;
this.freqType = jobInformation.id && this.jobFrequencyType[jobInformation.id]
await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob });
Expand Down

0 comments on commit 4e91a2e

Please sign in to comment.