From 3e0b0a87e940d13192a870c302e36a1e9672731c Mon Sep 17 00:00:00 2001 From: Mahmoud <“aljouhar@rptu.de”> Date: Wed, 13 Dec 2023 15:03:15 +0100 Subject: [PATCH 001/136] Basic Implementation for reordering books --- vue/src/apps/CookbookView/CookbookView.vue | 110 +++++++++++++++++++-- 1 file changed, 102 insertions(+), 8 deletions(-) diff --git a/vue/src/apps/CookbookView/CookbookView.vue b/vue/src/apps/CookbookView/CookbookView.vue index bc922d7e..73730056 100644 --- a/vue/src/apps/CookbookView/CookbookView.vue +++ b/vue/src/apps/CookbookView/CookbookView.vue @@ -11,6 +11,12 @@ + + oldest to newest + newest to oldest + alphabetical order + manually + @@ -19,22 +25,34 @@
-
+
-
- - - +
+ + + -
+ +
{{ book.name }} -
+
{{ book.description }}
 + + + ↑ + ↓ + + + + swap + + +
@@ -94,6 +112,13 @@ export default { current_book: undefined, loading: false, search: "", + dropdown_text: "Sort by: oldest to newest", + showOtN: false, + showNtO: true, + showAlp: true, + showMan: true, + md: 12, + inputValue: "" } }, computed: { @@ -168,7 +193,76 @@ export default { } }) }, - }, + sortAlphabetical: function(){ + this.dropdown_text = "Sort by: alphabetical order" + this.cookbooks = this.cookbooks.sort((a, b) => a.name.localeCompare(b.name)) + this.showAlp= false + this.showNtO = true + this.showOtN = true + this.showMan = true + this.md = 12 + + }, + sortNewest: function(){ + this.dropdown_text = "Sort by: newest to oldest" + this.cookbooks = this.cookbooks.sort((a, b) => b.id - a.id); + this.showNtO = false + this.showAlp= true + this.showOtN = true + this.showMan = true + this.md = 12 + }, + sortOldest: function(){ + this.dropdown_text = "Sort by: oldest to newest" + this.cookbooks = this.cookbooks.sort((a, b) => a.id - b.id) + this.showOtN= false + this.showAlp= true + this.showNtO = true + this.showMan = true + this.md = 12 + }, + enableSortManually: function(){ + this.showOtN= true + this.showAlp= true + this.showNtO = true + this.showMan = false + this.md = 8 + this.dropdown_text = "Sort by: manually" + + }, + swapUpBooks: function(index){ + const tempArray = this.cookbooks + const temp = tempArray[index - 1] + tempArray[index-1] = tempArray[index] + tempArray[index] = temp + this.cookbooks = [] + this.cookbooks = tempArray + }, + swapDownBooks: function(index){ + const tempArray = this.cookbooks + const temp = tempArray[index + 1] + tempArray[index+1] = tempArray[index] + tempArray[index] = temp + this.cookbooks = [] + this.cookbooks = tempArray + }, + swapWithPos: function(index){ + const position = parseInt(this.inputValue) + this.inputValue = "" + if (!(/^\d+$/.test(position)) || position >= this.cookbooks.length || position < 0){ + console.log("catch") + this.inputValue = "" + } else { + const tempArray = this.cookbooks + const temp = tempArray[position] + tempArray[position] = tempArray[index] + tempArray[index] = temp + this.cookbooks = [] + this.cookbooks = tempArray + } + + } + }, directives: { hover: { inserted: function (el) { From e423fc1df450385cbbfedf877337fecb46a565cf Mon Sep 17 00:00:00 2001 From: Mahmoud <“aljouhar@rptu.de”> Date: Fri, 15 Dec 2023 02:23:08 +0100 Subject: [PATCH 002/136] last changes --- vue/src/apps/CookbookView/CookbookView.vue | 59 ++++++++++++++++++---- 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/vue/src/apps/CookbookView/CookbookView.vue b/vue/src/apps/CookbookView/CookbookView.vue index 73730056..bb63db82 100644 --- a/vue/src/apps/CookbookView/CookbookView.vue +++ b/vue/src/apps/CookbookView/CookbookView.vue @@ -18,6 +18,9 @@ manually + + {{submitText}} +
@@ -33,10 +36,10 @@ - +
{{ book.name }} -
+
{{ book.description }}
 @@ -44,14 +47,13 @@ - ↑ - ↓ + ↑ + ↓ - - swap + + swap - @@ -118,7 +120,9 @@ export default { showAlp: true, showMan: true, md: 12, - inputValue: "" + inputValue: "", + submitManual: false, + submitText: "Edit" } }, computed: { @@ -200,6 +204,7 @@ export default { this.showNtO = true this.showOtN = true this.showMan = true + this.submitManual = false this.md = 12 }, @@ -210,6 +215,7 @@ export default { this.showAlp= true this.showOtN = true this.showMan = true + this.submitManual = false this.md = 12 }, sortOldest: function(){ @@ -219,16 +225,22 @@ export default { this.showAlp= true this.showNtO = true this.showMan = true + this.submitManual = false this.md = 12 }, enableSortManually: function(){ + console.log(1) + this.synchroniseLocalToDatabase(); + console.log(2) + if (localStorage.getItem('cookbooks') ){ + this.cookbooks = JSON.parse(localStorage.getItem('cookbooks')) + } this.showOtN= true this.showAlp= true this.showNtO = true this.showMan = false - this.md = 8 this.dropdown_text = "Sort by: manually" - + }, swapUpBooks: function(index){ const tempArray = this.cookbooks @@ -250,7 +262,6 @@ export default { const position = parseInt(this.inputValue) this.inputValue = "" if (!(/^\d+$/.test(position)) || position >= this.cookbooks.length || position < 0){ - console.log("catch") this.inputValue = "" } else { const tempArray = this.cookbooks @@ -261,6 +272,32 @@ export default { this.cookbooks = tempArray } + }, submitManualChanging: function(){ + if (!this.submitManual){ + this.submitText = "Submit" + this.submitManual = true + this.md = 8 + } else { + localStorage.setItem('cookbooks',JSON.stringify(this.cookbooks)) + this.submitText = "Edit" + this.submitManual = false + this.md = 12 + } + }, synchroniseLocalToDatabase: function(){ + const localStorageData = localStorage.getItem('cookbooks'); + const localStorageArray = JSON.parse(localStorageData) || []; + const updatedLocalStorageArray = localStorageArray.filter(localStorageElement => { + // Assuming there's a unique identifier in your objects, replace 'id' with the actual property + const isElementInTargetArray = this.cookbooks.some(targetElement => targetElement.id === localStorageElement.id); + return isElementInTargetArray; + }); + this.cookbooks.forEach(targetElement => { + const isNewElement = !updatedLocalStorageArray.some(localStorageElement => localStorageElement.id === targetElement.id); + if (isNewElement) { + updatedLocalStorageArray.push(targetElement); + } + }); + localStorage.setItem('cookbooks', JSON.stringify(updatedLocalStorageArray)); } }, directives: { From 45c14f6a12b04c2afa8819adef4571be7fe5c3cf Mon Sep 17 00:00:00 2001 From: Mahmoud <“aljouhar@rptu.de”> Date: Sun, 17 Dec 2023 16:35:46 +0100 Subject: [PATCH 003/136] automatic ordering through api --- cookbook/views/api.py | 12 ++++- vue/src/apps/CookbookView/CookbookView.vue | 63 ++++++++-------------- vue/src/utils/openapi/api.ts | 7 +++ 3 files changed, 39 insertions(+), 43 deletions(-) diff --git a/cookbook/views/api.py b/cookbook/views/api.py index d97d5f73..440a899c 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -651,15 +651,23 @@ class FoodViewSet(viewsets.ModelViewSet, TreeMixin): content = {'error': True, 'msg': e.args[0]} return Response(content, status=status.HTTP_403_FORBIDDEN) - +import json class RecipeBookViewSet(viewsets.ModelViewSet, StandardFilterMixin): queryset = RecipeBook.objects serializer_class = RecipeBookSerializer permission_classes = [(CustomIsOwner | CustomIsShared) & CustomTokenHasReadWriteScope] def get_queryset(self): + order_field = self.request.GET.get('order_field') + order_direction = self.request.GET.get('order_direction') + + if not order_field: + order_field = 'id' + + ordering = f"{'' if order_direction == 'asc' else '-'}{order_field}" + self.queryset = self.queryset.filter(Q(created_by=self.request.user) | Q(shared=self.request.user)).filter( - space=self.request.space).distinct() + space=self.request.space).distinct().order_by(ordering) return super().get_queryset() diff --git a/vue/src/apps/CookbookView/CookbookView.vue b/vue/src/apps/CookbookView/CookbookView.vue index bb63db82..1b2560dc 100644 --- a/vue/src/apps/CookbookView/CookbookView.vue +++ b/vue/src/apps/CookbookView/CookbookView.vue @@ -11,11 +11,11 @@ - - oldest to newest - newest to oldest - alphabetical order - manually + + oldest to newest + newest to oldest + alphabetical order + manually @@ -114,10 +114,8 @@ export default { current_book: undefined, loading: false, search: "", - dropdown_text: "Sort by: oldest to newest", - showOtN: false, - showNtO: true, - showAlp: true, + activeSortField : 'id', + activeSortDirection: 'asc', showMan: true, md: 12, inputValue: "", @@ -139,7 +137,7 @@ export default { methods: { refreshData: function () { let apiClient = new ApiApiFactory() - + apiClient.listRecipeBooks().then((result) => { this.cookbooks = result.data }) @@ -197,41 +195,24 @@ export default { } }) }, - sortAlphabetical: function(){ - this.dropdown_text = "Sort by: alphabetical order" - this.cookbooks = this.cookbooks.sort((a, b) => a.name.localeCompare(b.name)) - this.showAlp= false - this.showNtO = true - this.showOtN = true - this.showMan = true - this.submitManual = false - this.md = 12 - + orderBy: function(order_field,order_direction){ + let apiClient = new ApiApiFactory() + const options = { + order_field: order_field, + order_direction: order_direction + } + this.activeSortField = order_field + this.activeSortDirection = order_direction + apiClient.listRecipeBooks(options).then((result) => { + this.cookbooks = result.data + }) }, - sortNewest: function(){ - this.dropdown_text = "Sort by: newest to oldest" - this.cookbooks = this.cookbooks.sort((a, b) => b.id - a.id); - this.showNtO = false - this.showAlp= true - this.showOtN = true - this.showMan = true - this.submitManual = false - this.md = 12 - }, - sortOldest: function(){ - this.dropdown_text = "Sort by: oldest to newest" - this.cookbooks = this.cookbooks.sort((a, b) => a.id - b.id) - this.showOtN= false - this.showAlp= true - this.showNtO = true - this.showMan = true - this.submitManual = false - this.md = 12 + isActiveSort: function(field, direction) { + // Check if the current item is the active sorting option + return this.activeSortField === field && this.activeSortDirection === direction; }, enableSortManually: function(){ - console.log(1) this.synchroniseLocalToDatabase(); - console.log(2) if (localStorage.getItem('cookbooks') ){ this.cookbooks = JSON.parse(localStorage.getItem('cookbooks')) } diff --git a/vue/src/utils/openapi/api.ts b/vue/src/utils/openapi/api.ts index 064297c4..b08ea251 100644 --- a/vue/src/utils/openapi/api.ts +++ b/vue/src/utils/openapi/api.ts @@ -8985,6 +8985,13 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) const localVarQueryParameter = {} as any; + if (options.order_field !== undefined) { + localVarQueryParameter['order_field'] = options.order_field; + } + + if (options.order_direction!== undefined) { + localVarQueryParameter['order_direction'] = options.order_direction; + } setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; From f65597c3915959200d354b45c3a37bee28f272c0 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Fri, 22 Dec 2023 11:40:17 +0100 Subject: [PATCH 004/136] basic nocer ui, nothing really working --- cookbook/serializer.py | 4 +- .../ShoppingListView/ShoppingListView.vue | 19 +- vue/src/apps/TestView/TestView.vue | 18 ++ vue/src/components/ShoppingLineItem.vue | 205 +++++++++--------- 4 files changed, 138 insertions(+), 108 deletions(-) diff --git a/cookbook/serializer.py b/cookbook/serializer.py index ff4e2dfc..fd42bd96 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -1031,6 +1031,8 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer): name = serializers.SerializerMethodField('get_name') # should this be done at the front end? recipe_name = serializers.ReadOnlyField(source='recipe.name') mealplan_note = serializers.ReadOnlyField(source='mealplan.note') + mealplan_from_date = serializers.ReadOnlyField(source='mealplan.from_date') + mealplan_type = serializers.ReadOnlyField(source='mealplan.meal_type.name') servings = CustomDecimalField() def get_name(self, obj): @@ -1054,7 +1056,7 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer): class Meta: model = ShoppingListRecipe - fields = ('id', 'recipe_name', 'name', 'recipe', 'mealplan', 'servings', 'mealplan_note') + fields = ('id', 'recipe_name', 'name', 'recipe', 'mealplan', 'servings', 'mealplan_note','mealplan_from_date', 'mealplan_type') read_only_fields = ('id',) diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue index 66867227..b0f8742c 100644 --- a/vue/src/apps/ShoppingListView/ShoppingListView.vue +++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue @@ -155,14 +155,17 @@ v-for="(entries, index) in Object.entries(foods_group)" :key="index"> - + + + +
diff --git a/vue/src/apps/TestView/TestView.vue b/vue/src/apps/TestView/TestView.vue index 5aa6efff..24520e7f 100644 --- a/vue/src/apps/TestView/TestView.vue +++ b/vue/src/apps/TestView/TestView.vue @@ -2,6 +2,24 @@
+ + + + + 100 g Möhren Test
Info + + +
+ + 150 ml Heißwassermöhrenbrühe
Info + + + +
+
+
+ ---- +
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue index b1e52f7f..e9796e22 100644 --- a/vue/src/components/ShoppingLineItem.vue +++ b/vue/src/components/ShoppingLineItem.vue @@ -1,83 +1,20 @@