diff --git a/client/src/app/core/models/recipe.model.ts b/client/src/app/core/models/recipe.model.ts index c3053a1..70549dd 100644 --- a/client/src/app/core/models/recipe.model.ts +++ b/client/src/app/core/models/recipe.model.ts @@ -34,7 +34,7 @@ export type RecipeDetailMat = { isUse: boolean; materialID: number; name: string; - mixOrder: number; + MixOrder: number; feedParameter: number; feedPattern: number; materialPathId: number; diff --git a/client/src/app/features/recipes/recipe-details/recipe-list/recipe-list.component.html b/client/src/app/features/recipes/recipe-details/recipe-list/recipe-list.component.html index 8f3e046..cc937a3 100644 --- a/client/src/app/features/recipes/recipe-details/recipe-list/recipe-list.component.html +++ b/client/src/app/features/recipes/recipe-details/recipe-list/recipe-list.component.html @@ -318,7 +318,7 @@ diff --git a/client/src/app/features/recipes/recipe-details/recipe-list/recipe-list.component.ts b/client/src/app/features/recipes/recipe-details/recipe-list/recipe-list.component.ts index cfb76e7..41b4d1f 100644 --- a/client/src/app/features/recipes/recipe-details/recipe-list/recipe-list.component.ts +++ b/client/src/app/features/recipes/recipe-details/recipe-list/recipe-list.component.ts @@ -201,9 +201,9 @@ export class RecipeListComponent implements OnInit { }, ], name: [{ value: recipeDetailMat.name, disabled: true }], - mixOrder: [ + MixOrder: [ { - value: recipeDetailMat.mixOrder, + value: recipeDetailMat.MixOrder, disabled: !this.isEditable(), }, ], @@ -317,9 +317,9 @@ export class RecipeListComponent implements OnInit { }, ], name: [{ value: recipeDetailMat.name, disabled: true }], - mixOrder: [ + MixOrder: [ { - value: recipeDetailMat.mixOrder, + value: recipeDetailMat.MixOrder, disabled: !this.isEditable(), }, ], @@ -468,7 +468,7 @@ export class RecipeListComponent implements OnInit { isUse: [{ value: false, disabled: !this.isEditable() }], materialPathId: [{ value: 0, disabled: !this.isEditable() }], name: [{ value: "", disabled: true }], - mixOrder: [{ value: "", disabled: !this.isEditable() }], + MixOrder: [{ value: "", disabled: !this.isEditable() }], stirTime: [{ value: 1, disabled: !this.isEditable() }], powderGram: [{ value: 1, disabled: !this.isEditable() }], powderTime: [{ value: 0, disabled: !this.isEditable() }], @@ -631,7 +631,15 @@ export class RecipeListComponent implements OnInit { // get value at index, if 'MixOrder' exist and is 1, return true isMixOrder = (index: number) => { - let mixOrder = this.recipeListData.at(index).get('mixOrder')?.value; + let mixOrder = this.recipeListData.at(index).get('MixOrder')?.value; + + console.log("get::MixOrder", mixOrder, "test get::mixOrder", this.recipeListData.at(index).get('mixOrder')); + // retry if not exist + // if (!mixOrder) { + // mixOrder = this.recipeListData.at(index).get('mixOrder')!.value; + // console.log("get::MixOrder", mixOrder, "test get::mixOrder", this.recipeListData.at(index).get('mixOrder')); + // } + // console.log("get::MixOrder", mixOrder, "test get::mixOrder", this.recipeListData.at(index).get('mixOrder')); return mixOrder.toString() == "1" ? true : false; } diff --git a/client/src/app/shared/types/recipe.d.ts b/client/src/app/shared/types/recipe.d.ts index 3208c6c..713fcc3 100644 --- a/client/src/app/shared/types/recipe.d.ts +++ b/client/src/app/shared/types/recipe.d.ts @@ -14,7 +14,7 @@ export interface MaterialData { id: number; name: string; enable: boolean; - mixOrder: number; + MixOrder: number; stirTime: number; powderGram: number; powderTime: number; diff --git a/server/contracts/recipe.go b/server/contracts/recipe.go index 044983e..ae5e92d 100644 --- a/server/contracts/recipe.go +++ b/server/contracts/recipe.go @@ -60,7 +60,7 @@ type RecipeDetailMat struct { IsUse bool `json:"isUse"` MaterialID uint64 `json:"materialID"` Name string `json:"name"` - MixOrder int `json:"mixOrder"` + MixOrder int `json:"MixOrder"` FeedParameter int `json:"feedParameter"` FeedPattern int `json:"feedPattern"` MaterialPathId int `json:"materialPathId"`