Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved: runTime set to start of the next day for 'EVERYDAY' frequency (#2ftb2vw) #206

Merged
merged 3 commits into from
Aug 26, 2022
Merged

Improved: runTime set to start of the next day for 'EVERYDAY' frequency (#2ftb2vw) #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21ff94e
Improved: updateRuntime method to set the start of next day(#2ftb2vw)
rathoreprashant Jul 29, 2022
044a664
Merge branch 'main' of https://github.com/hotwax/job-manager into #2f…
rathoreprashant Jul 29, 2022
c58bc2b
Implemented: code to update job runtime by prepareRuntime method(#2ft…
rathoreprashant Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,11 @@ const handleDateTimeInput = (dateTimeValue: any) => {
return DateTime.fromISO(dateTime).toMillis()
}

export { handleDateTimeInput, showToast, hasError , parseCsv , jsonToCsv, JsonToCsvOption, isFutureDate }
const prepareRuntime = (job: any) => {
// For job frequency everyday, set to start of next day
if (job.frequency === 'EVERYDAY') {
return DateTime.now().startOf('day').toMillis() + 86400000;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should use plus method to add 1 day to it
https://moment.github.io/luxon/api-docs/index.html

}
}

export { handleDateTimeInput, showToast, hasError , parseCsv , jsonToCsv, JsonToCsvOption, isFutureDate, prepareRuntime }
3 changes: 2 additions & 1 deletion src/views/Inventory.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ import {
import { defineComponent } from 'vue';
import { mapGetters, useStore } from 'vuex';
import JobConfiguration from '@/components/JobConfiguration.vue'
import { isFutureDate, showToast } from '@/utils';
import { isFutureDate, showToast, prepareRuntime } from '@/utils';
import emitter from '@/event-bus';
import { useRouter } from 'vue-router'
import { translate } from '@/i18n';
Expand Down Expand Up @@ -135,6 +135,7 @@ export default defineComponent({
if (!checked) {
this.store.dispatch('job/cancelJob', job)
} else if (job?.status === 'SERVICE_DRAFT') {
job.runTime = prepareRuntime(job)
this.store.dispatch('job/scheduleService', job)
} else if (job?.status === 'SERVICE_PENDING') {
this.store.dispatch('job/updateJob', job)
Expand Down
3 changes: 2 additions & 1 deletion src/views/Orders.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ import { useRouter } from 'vue-router'
import { mapGetters } from "vuex";
import JobConfiguration from '@/components/JobConfiguration.vue';
import { DateTime } from 'luxon';
import { hasError, isFutureDate, showToast } from '@/utils';
import { hasError, isFutureDate, showToast, prepareRuntime } from '@/utils';
import emitter from '@/event-bus';

export default defineComponent({
Expand Down Expand Up @@ -366,6 +366,7 @@ export default defineComponent({
if (!checked) {
this.store.dispatch('job/cancelJob', job)
} else if (job?.status === 'SERVICE_DRAFT') {
job.runTime = prepareRuntime(job)
this.store.dispatch('job/scheduleService', job)
} else if (job?.status === 'SERVICE_PENDING') {
this.store.dispatch('job/updateJob', job)
Expand Down
3 changes: 2 additions & 1 deletion src/views/PreOrder.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ import { mapGetters } from "vuex";
import { useRouter } from 'vue-router'
import { alertController } from '@ionic/vue';
import JobConfiguration from '@/components/JobConfiguration.vue'
import { isFutureDate, showToast } from '@/utils';
import { isFutureDate, showToast, prepareRuntime } from '@/utils';
import emitter from '@/event-bus';
import { translate } from '@/i18n';

Expand Down Expand Up @@ -263,6 +263,7 @@ export default defineComponent({
if (!checked) {
this.store.dispatch('job/cancelJob', job)
} else if (job?.status === 'SERVICE_DRAFT') {
job.runTime = prepareRuntime(job)
this.store.dispatch('job/scheduleService', job)
} else if (job?.status === 'SERVICE_PENDING') {
this.store.dispatch('job/updateJob', job)
Expand Down