cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-22 05:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/74-admin-workflow' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2025-02-18 09:36:44 +08:00
parent 3f692891b7 331fae8513
commit 9836a35040
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/Eloquent/Filters/IdAfter.php
+3 -1
View File
@@ -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)
resources/assets/vue/components/admin-workflow/elements/QuestionAnswer2Component.vue
+1 -1
View File
@@ -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(){
resources/assets/vue/components/admin-workflow/elements/QuestionAnswerComponent.vue
+1 -1
View File
@@ -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(){