diff --git a/src/abstraction/resources/workoutResource.js b/src/abstraction/resources/workoutResource.js index bd046b5..27da4a5 100644 --- a/src/abstraction/resources/workoutResource.js +++ b/src/abstraction/resources/workoutResource.js @@ -16,6 +16,7 @@ export const getJson = (data) => ({ video: data.video, set: data.set, per_set: data.per_set, + estimate_time: data.estimate_time, }); export const setData = (data) => ({ id: data.id, diff --git a/src/components/Programs/Modals/FiltersModal.vue b/src/components/Programs/Modals/FiltersModal.vue index c2093c9..c486388 100644 --- a/src/components/Programs/Modals/FiltersModal.vue +++ b/src/components/Programs/Modals/FiltersModal.vue @@ -96,8 +96,8 @@ diff --git a/src/components/Users/Modals/ChangeRoleModal.vue b/src/components/Users/Modals/ChangeRoleModal.vue index 76f5a61..208ba4a 100644 --- a/src/components/Users/Modals/ChangeRoleModal.vue +++ b/src/components/Users/Modals/ChangeRoleModal.vue @@ -96,7 +96,7 @@ export default { this.currectRoleId = this.role_id ? this.role_id : 0; this.$_closeModal(); } else { - toast.error("Change the roll first", "Error"); + toast.error("Change the role first", "Error"); } } }, diff --git a/src/components/Users/Modals/FiltersModal.vue b/src/components/Users/Modals/FiltersModal.vue index c095bbd..3127ef4 100644 --- a/src/components/Users/Modals/FiltersModal.vue +++ b/src/components/Users/Modals/FiltersModal.vue @@ -28,7 +28,7 @@ > -
+
diff --git a/src/components/Workouts/Item.vue b/src/components/Workouts/Item.vue index 1e85ccd..27ab1e7 100644 --- a/src/components/Workouts/Item.vue +++ b/src/components/Workouts/Item.vue @@ -42,7 +42,7 @@ height="26" icon="WMi-trash" class="custom-btn custom-icon ml-1" - @click.native="deleteWorkout(workout.id)" + @click.native="removeWorkout(workout.id)" /> { + this.deleteWorkout(id); + }); + }, }, }; diff --git a/src/components/Workouts/Modals/FiltersModal.vue b/src/components/Workouts/Modals/FiltersModal.vue index a81b8b3..0fae0bf 100644 --- a/src/components/Workouts/Modals/FiltersModal.vue +++ b/src/components/Workouts/Modals/FiltersModal.vue @@ -76,7 +76,7 @@ import SectionTitle from "../../Global/Section/SectionTitle.vue"; import { cloneDeep } from "lodash"; -import { mapMutations } from "vuex"; +import { mapMutations, mapGetters } from "vuex"; const defaultFilter = { name: { type: "like", @@ -95,6 +95,9 @@ export default { data: () => ({ filter: cloneDeep(defaultFilter), }), + computed: { + ...mapGetters("workouts", ["getFilters"]), + }, methods: { ...mapMutations("workouts", ["SET_FILTER_WORKOUTS"]), filterWorkotus() { @@ -109,5 +112,9 @@ export default { this.$_closeModal(); }, }, + created() { + let filter = { ...this.filter, ...this.getFilters }; + this.filter = filter; + }, }; diff --git a/src/components/WorkoutsSeries/Item.vue b/src/components/WorkoutsSeries/Item.vue index 6bf8431..42e74bf 100644 --- a/src/components/WorkoutsSeries/Item.vue +++ b/src/components/WorkoutsSeries/Item.vue @@ -3,14 +3,11 @@ -
+ product image
{{ item.description }} @@ -59,7 +59,7 @@ @@ -136,7 +136,7 @@ import WorkoutToSeriesRepository from "@/abstraction/repository/workoutToSeriesR let cancelId; const defaultFilter = { - title: { + name: { type: "like", val: null, }, @@ -163,7 +163,7 @@ export default { clearTimeout(cancelId); if (val && val.length > 1) { cancelId = setTimeout(async () => { - this.filter.title.val = val; + this.filter.name.val = val; this.SET_FILTER_WORKOUTS_TO_SERIES(this.filter); await this.loadWorkoutsToSeries(); this.isLoading = false; diff --git a/src/store/modules/programs/getters.js b/src/store/modules/programs/getters.js index 6e86240..de9c630 100644 --- a/src/store/modules/programs/getters.js +++ b/src/store/modules/programs/getters.js @@ -2,5 +2,6 @@ export default { getPrograms: state => state.programs, getProgram: state => state.program, getPaginationProgram: state => state.pagination, + getFilters: state => state.filters, getFilterCount: state => state.filterCount }; diff --git a/src/store/modules/users/getters.js b/src/store/modules/users/getters.js index 9d7b264..50431d5 100644 --- a/src/store/modules/users/getters.js +++ b/src/store/modules/users/getters.js @@ -2,5 +2,6 @@ export default { getUsers: state => state.users, getRoles: state => state.roles, getPaginationUser: state => state.pagination, + getFilters: state => state.filters, getFilterCount: state => state.filterCount }; diff --git a/src/store/modules/workouts/getters.js b/src/store/modules/workouts/getters.js index 666c10e..1bd2991 100644 --- a/src/store/modules/workouts/getters.js +++ b/src/store/modules/workouts/getters.js @@ -2,5 +2,6 @@ export default { getWorkouts: state => state.workouts, getWorkout: state => state.workout, getPaginationWorkout: state => state.pagination, + getFilters: state => state.filters, getFilterCount: state => state.filterCount } \ No newline at end of file