diff --git a/app/Classes/General/Eloquent/Filters/IdAfter.php b/app/Classes/General/Eloquent/Filters/IdAfter.php index e1c91a46..3273a1a3 100644 --- a/app/Classes/General/Eloquent/Filters/IdAfter.php +++ b/app/Classes/General/Eloquent/Filters/IdAfter.php @@ -5,6 +5,7 @@ namespace App\Classes\General\Eloquent\Filters; use App\Models\QAUserAnswerSelected; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Support\Facades\Log; class IdAfter implements Filter { @@ -16,9 +17,10 @@ class IdAfter implements Filter */ public static function apply(Builder $builder, $value) { - [$id, $questionGroups] = $value; + [$id, $reference, $questionGroups] = $value; $nextId = QAUserAnswerSelected::where('id', '>', $id) + ->where('reference', $reference) ->whereIn('answer', $questionGroups) ->orderBy('id', 'asc') ->limit(1) diff --git a/resources/assets/vue/components/admin-workflow/elements/QuestionAnswer2Component.vue b/resources/assets/vue/components/admin-workflow/elements/QuestionAnswer2Component.vue index f37f105a..db40eed0 100644 --- a/resources/assets/vue/components/admin-workflow/elements/QuestionAnswer2Component.vue +++ b/resources/assets/vue/components/admin-workflow/elements/QuestionAnswer2Component.vue @@ -166,7 +166,7 @@ }, created(){ this.options['reference'] = this.item.reference; - this.options['id_after'] = [this.item.id, this.item.question_groups]; + this.options['id_after'] = [this.item.id, this.item.reference, this.item.question_groups]; }, methods: { expand(){ diff --git a/resources/assets/vue/components/admin-workflow/elements/QuestionAnswerComponent.vue b/resources/assets/vue/components/admin-workflow/elements/QuestionAnswerComponent.vue index 9d137d43..f0f215f7 100644 --- a/resources/assets/vue/components/admin-workflow/elements/QuestionAnswerComponent.vue +++ b/resources/assets/vue/components/admin-workflow/elements/QuestionAnswerComponent.vue @@ -110,7 +110,7 @@ }, created(){ this.options['reference'] = this.item.reference; - this.options['id_after'] = [this.item.id, this.item.question_groups]; + this.options['id_after'] = [this.item.id, this.item.reference, this.item.question_groups]; }, methods: { expand(){