meal plan stuff

vue/src/apps/MealPlanView/MealPlanView.vue

@@ -2,7 +2,31 @@
     <div>
         <b-tabs content-class="mt-3" v-model="current_tab">
             <b-tab :title="$t('Planner')" active>
-                <div class="row calender-row d-none d-lg-block">
+                <div class=" d-none d-lg-block">
+                    <div class="row">
+                        <div class="col col-2">
+                            <h4>{{ $t('Meal_Types') }}</h4>
+
+                            <b-form-checkbox :button-variant="danger" v-model="mt.checked" size="lg" v-for="mt in meal_types" v-bind:key="mt.id">
+
+                                <b-badge variant="primary" :style="{'background-color':mt.color}">{{ mt.name }}</b-badge>
+                            </b-form-checkbox>
+
+                            <hr/>
+                            <button class="btn btn-success shadow-none mt-1 btn-block" @click="createEntryClick(new Date())"><i
+                                class="fas fa-calendar-plus"></i> {{ $t("Create") }}
+                            </button>
+                            <button class="btn btn-primary shadow-none mt-1 btn-block" @click="createAutoPlan(new Date())"><i
+                                class="fas fa-calendar-plus"></i> {{ $t("Auto_Planner") }}
+                            </button>
+                            <a class="btn btn-primary shadow-none mt-1 btn-blockmt-1 btn-block" :href="iCalUrl"><i class="fas fa-download"></i>
+                                {{ $t("Export_To_ICal") }}
+                            </a>
+
+
+                        </div>
+                        <div class="col col-10">
+                            <div class="row calender-row ">
                                 <div class="col-12 calender-parent">
                                     <calendar-view
                                         :show-date="showDate"
@@ -48,6 +72,10 @@
                                     </calendar-view>
                                 </div>
                             </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
                             <div class="row d-block d-lg-none">
                                 <div>
                                     <div class="col-12">
@@ -120,6 +148,9 @@
 
                                 </div>
                             </div>
+                        </div>
+                    </div>
+                </div>
 
             </b-tab>
             <b-tab :title="$t('Settings')">
@@ -253,20 +284,6 @@
             :current_period="current_period"
         ></auto-meal-plan-modal>
 
-        <div class="row d-none d-lg-block">
-            <div class="col-12 float-right">
-                <button class="btn btn-success shadow-none" @click="createEntryClick(new Date())"><i
-                    class="fas fa-calendar-plus"></i> {{ $t("Create") }}
-                </button>
-                <button class="btn btn-primary shadow-none" @click="createAutoPlan(new Date())"><i
-                    class="fas fa-calendar-plus"></i> {{ $t("Auto_Planner") }}
-                </button>
-                <a class="btn btn-primary shadow-none" :href="iCalUrl"><i class="fas fa-download"></i>
-                    {{ $t("Export_To_ICal") }}
-                </a>
-            </div>
-        </div>
-
         <bottom-navigation-bar :create_links="[{label:$t('Export_To_ICal'), url: iCalUrl, icon:'fas fa-download'}]">
             <template #custom_create_functions>
                 <h6 class="dropdown-header">{{ $t('Meal_Plan') }}</h6>

vue/src/components/MealPlanCard.vue

@@ -41,11 +41,8 @@
         <div class="card-body p-1" v-if="detailed && entry.entry.recipe == null" :style="`background-color: ${background_color}`">
             <p>{{ entry.entry.note }}</p>
         </div>
+
         <div class="row p-1 flex-nowrap" v-if="!detailed" :style="`background-color: ${background_color}`">
-            <div class="col-2">
-                <span class="font-light text-center" v-if="entry.entry.meal_type.icon != null" v-b-tooltip.hover.left :title="entry.entry.meal_type.name">{{ entry.entry.meal_type.icon }}</span>
-                <span class="font-light text-center" v-if="entry.entry.meal_type.icon == null" v-b-tooltip.hover.left :title="entry.entry.meal_type.name">❓</span>
-            </div>
             <div class="col-10 d-inline-block text-truncate" :style="`max-height:${item_height}`">
                 <span class="font-light">{{ title }}</span>
             </div>
@@ -71,7 +68,8 @@ export default {
             image_placeholder: window.IMAGE_PLACEHOLDER,
         }
     },
-    mounted() {},
+    mounted() {
+    },
     computed: {
         entry: function () {
             return this.value.originalItem

vue/src/components/MealPlanEditModal.vue

@@ -135,10 +135,9 @@ import Vue from "vue"
 import VueCookies from "vue-cookies"
 import {BootstrapVue} from "bootstrap-vue"
 import GenericMultiselect from "@/components/GenericMultiselect"
-import {ApiMixin, getUserPreference} from "@/utils/utils"
+import {ApiMixin, getUserPreference, ToastMixin} from "@/utils/utils"
 
 const {ApiApiFactory} = require("@/utils/openapi/api")
-const {StandardToasts} = require("@/utils/utils")
 
 import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
 import {useMealPlanStore} from "@/stores/MealPlanStore";
@@ -163,7 +162,7 @@ export default {
             default: true,
         },
     },
-    mixins: [ApiMixin],
+    mixins: [ApiMixin, ToastMixin],
     components: {
         GenericMultiselect,
         RecipeCard: () => import("@/components/RecipeCard.vue"),
@@ -234,9 +233,11 @@ export default {
         editEntry() {
 
             if (this.entryEditing.meal_type == null) {
+                this.makeToast('Warning', this.$t('Meal_Type_Required'), 'warning')
                 return;
             }
             if (this.entryEditing.recipe == null && this.entryEditing.title === "") {
+                this.makeToast('Warning', this.$t('Title_or_Recipe_Required'), 'warning')
                 return
             }
             //TODO properly validate

vue/src/components/Modals/ColorInput.vue

@@ -0,0 +1,46 @@
+<template>
+    <div>
+        <b-form-group v-bind:label="field_label" class="mb-3">
+            <b-form-input v-model="new_value" type="color" ></b-form-input>
+            <em v-if="help" class="small text-muted">{{ help }}</em>
+            <small v-if="subtitle" class="text-muted">{{ subtitle }}</small>
+        </b-form-group>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "ColorInput",
+    props: {
+        field: { type: String, default: "You Forgot To Set Field Name" },
+        label: { type: String, default: "Text Field" },
+        value: { type: String, default: "" },
+        help: { type: String, default: undefined },
+        subtitle: { type: String, default: undefined },
+        optional: {type: Boolean, default: false},
+    },
+    computed: {
+        field_label: function () {
+            if (this.optional) {
+                return this.label
+            } else {
+                return this.label + '*'
+            }
+        }
+    },
+    data() {
+        return {
+            new_value: undefined,
+        }
+    },
+    mounted() {
+        this.new_value = this.value
+    },
+    watch: {
+        new_value: function () {
+            this.$root.$emit("change", this.field, this.new_value)
+        },
+    },
+    methods: {},
+}
+</script>

vue/src/components/Modals/GenericModalForm.vue

@@ -19,6 +19,7 @@
                     <file-input v-if="visibleCondition(f, 'file')" :label="f.label" :value="f.value" :field="f.field" @change="storeValue" :optional="f.optional"/>
                     <small-text v-if="visibleCondition(f, 'smalltext')" :value="f.value" />
                     <date-input v-if="visibleCondition(f, 'date')" :label="f.label" :value="f.value" :field="f.field" :help="showHelp && f.help" :subtitle="f.subtitle" :optional="f.optional"/>
+                    <color-input v-if="visibleCondition(f, 'color')" :label="f.label" :value="f.value" :field="f.field" :help="showHelp && f.help" :subtitle="f.subtitle" :optional="f.optional"/>
                     <number-input v-if="visibleCondition(f, 'number')" :label="f.label" :value="f.value" :field="f.field" :placeholder="f.placeholder" :help="showHelp && f.help" :subtitle="f.subtitle" :optional="f.optional"/>
                 </div>
                 <template v-slot:modal-footer>

vue/src/utils/models.js

@@ -830,7 +830,7 @@ export class Models {
             params: ["filter_list"],
         },
         create: {
-            params: [["name"]],
+            params: [["name", "color", "default"]],
             form: {
                 name: {
                     form_field: true,
@@ -839,6 +839,20 @@ export class Models {
                     label: "Name",
                     placeholder: "",
                 },
+                color: {
+                    form_field: true,
+                    type: "color",
+                    field: "color",
+                    label: "Color",
+                    placeholder: "",
+                },
+                default: {
+                    form_field: true,
+                    type: "checkbox",
+                    field: "default",
+                    label: "Default",
+                    placeholder: "",
+                },
             },
         },
     }

vue/src/utils/openapi/api.ts

@@ -4,7 +4,7 @@
  * Django Recipes
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 0.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -166,7 +166,9 @@ export enum AutomationTypeEnum {
     UnitAlias = 'UNIT_ALIAS',
     KeywordAlias = 'KEYWORD_ALIAS',
     DescriptionReplace = 'DESCRIPTION_REPLACE',
-    InstructionReplace = 'INSTRUCTION_REPLACE'
+    InstructionReplace = 'INSTRUCTION_REPLACE',
+    NeverUnit = 'NEVER_UNIT',
+    TransposeWords = 'TRANSPOSE_WORDS'
 }
 
 /**
@@ -463,6 +465,12 @@ export interface Food {
      * @memberof Food
      */
     recipe?: FoodRecipe | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof Food
+     */
+    url?: string | null;
     /**
      * 
      * @type {Array<FoodProperties>}
@@ -665,6 +673,12 @@ export interface FoodPropertiesFoodUnit {
      * @memberof FoodPropertiesFoodUnit
      */
     description?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof FoodPropertiesFoodUnit
+     */
+    base_unit?: string | null;
     /**
      * 
      * @type {string}
@@ -690,12 +704,6 @@ export interface FoodPropertyType {
      * @memberof FoodPropertyType
      */
     name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof FoodPropertyType
-     */
-    icon?: string | null;
     /**
      * 
      * @type {string}
@@ -708,6 +716,12 @@ export interface FoodPropertyType {
      * @memberof FoodPropertyType
      */
     description?: string | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof FoodPropertyType
+     */
+    order?: number;
     /**
      * 
      * @type {string}
@@ -928,12 +942,6 @@ export interface ImportLogKeyword {
      * @memberof ImportLogKeyword
      */
     name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ImportLogKeyword
-     */
-    icon?: string | null;
     /**
      * 
      * @type {string}
@@ -1104,6 +1112,12 @@ export interface IngredientFood {
      * @memberof IngredientFood
      */
     recipe?: FoodRecipe | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof IngredientFood
+     */
+    url?: string | null;
     /**
      * 
      * @type {Array<FoodProperties>}
@@ -1708,12 +1722,6 @@ export interface Keyword {
      * @memberof Keyword
      */
     name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof Keyword
-     */
-    icon?: string | null;
     /**
      * 
      * @type {string}
@@ -1866,12 +1874,6 @@ export interface MealPlanMealType {
      * @memberof MealPlanMealType
      */
     order?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof MealPlanMealType
-     */
-    icon?: string | null;
     /**
      * 
      * @type {string}
@@ -2043,12 +2045,6 @@ export interface MealType {
      * @memberof MealType
      */
     order?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof MealType
-     */
-    icon?: string | null;
     /**
      * 
      * @type {string}
@@ -3062,12 +3058,6 @@ export interface PropertyType {
      * @memberof PropertyType
      */
     name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof PropertyType
-     */
-    icon?: string | null;
     /**
      * 
      * @type {string}
@@ -3080,6 +3070,12 @@ export interface PropertyType {
      * @memberof PropertyType
      */
     description?: string | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof PropertyType
+     */
+    order?: number;
     /**
      * 
      * @type {string}
@@ -3262,12 +3258,6 @@ export interface RecipeBook {
      * @memberof RecipeBook
      */
     description?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof RecipeBook
-     */
-    icon?: string | null;
     /**
      * 
      * @type {Array<CustomFilterShared>}
@@ -3514,12 +3504,6 @@ export interface RecipeKeywords {
      * @memberof RecipeKeywords
      */
     name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof RecipeKeywords
-     */
-    icon?: string | null;
     /**
      * 
      * @type {string}
@@ -3855,6 +3839,12 @@ export interface RecipeSteps {
      * @memberof RecipeSteps
      */
     numrecipe?: string;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof RecipeSteps
+     */
+    show_ingredients_table?: boolean;
 }
 /**
  * 
@@ -4580,7 +4570,7 @@ export interface Step {
      * @type {boolean}
      * @memberof Step
      */
-    show_ingredeints_table?: boolean;
+    show_ingredients_table?: boolean;
 }
 /**
  * 
@@ -4851,6 +4841,12 @@ export interface Unit {
      * @memberof Unit
      */
     description?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof Unit
+     */
+    base_unit?: string | null;
     /**
      * 
      * @type {string}
@@ -4943,6 +4939,12 @@ export interface UnitConversionBaseUnit {
      * @memberof UnitConversionBaseUnit
      */
     description?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof UnitConversionBaseUnit
+     */
+    base_unit?: string | null;
     /**
      * 
      * @type {string}

vue/src/utils/openapi/common.ts

@@ -4,7 +4,7 @@
  * Django Recipes
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 0.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

vue/src/utils/openapi/configuration.ts

@@ -4,7 +4,7 @@
  * Django Recipes
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 0.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).