pakin/Taobin-Recipe-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adjust case sensitive MixOrder

Browse source
This commit is contained in:
pakintada@gmail.com 2024-02-12 09:34:56 +07:00
parent f4b1db4867
commit 9543d4541c
5 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/app/core/models/recipe.model.ts
View file

@ -34,7 +34,7 @@ export type RecipeDetailMat = {
isUse: boolean; isUse: boolean;
materialID: number; materialID: number;
name: string; name: string;
mixOrder: number; MixOrder: number;
feedParameter: number; feedParameter: number;
feedPattern: number; feedPattern: number;
materialPathId: number; materialPathId: number;

2
client/src/app/features/recipes/recipe-details/recipe-list/recipe-list.component.html
View file

@ -318,7 +318,7 @@
<input <input
type="text" type="text"
class="input input-bordered" class="input input-bordered"
formControlName="mixOrder" formControlName="MixOrder"
/> />
</div> </div>

20
client/src/app/features/recipes/recipe-details/recipe-list/recipe-list.component.ts
View file

@ -201,9 +201,9 @@ export class RecipeListComponent implements OnInit {
}, },
], ],
name: [{ value: recipeDetailMat.name, disabled: true }], name: [{ value: recipeDetailMat.name, disabled: true }],
mixOrder: [ MixOrder: [
{ {
value: recipeDetailMat.mixOrder, value: recipeDetailMat.MixOrder,
disabled: !this.isEditable(), disabled: !this.isEditable(),
}, },
], ],
@ -317,9 +317,9 @@ export class RecipeListComponent implements OnInit {
}, },
], ],
name: [{ value: recipeDetailMat.name, disabled: true }], name: [{ value: recipeDetailMat.name, disabled: true }],
mixOrder: [ MixOrder: [
{ {
value: recipeDetailMat.mixOrder, value: recipeDetailMat.MixOrder,
disabled: !this.isEditable(), disabled: !this.isEditable(),
}, },
], ],
@ -468,7 +468,7 @@ export class RecipeListComponent implements OnInit {
isUse: [{ value: false, disabled: !this.isEditable() }], isUse: [{ value: false, disabled: !this.isEditable() }],
materialPathId: [{ value: 0, disabled: !this.isEditable() }], materialPathId: [{ value: 0, disabled: !this.isEditable() }],
name: [{ value: "", disabled: true }], name: [{ value: "", disabled: true }],
mixOrder: [{ value: "", disabled: !this.isEditable() }], MixOrder: [{ value: "", disabled: !this.isEditable() }],
stirTime: [{ value: 1, disabled: !this.isEditable() }], stirTime: [{ value: 1, disabled: !this.isEditable() }],
powderGram: [{ value: 1, disabled: !this.isEditable() }], powderGram: [{ value: 1, disabled: !this.isEditable() }],
powderTime: [{ value: 0, 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 // get value at index, if 'MixOrder' exist and is 1, return true
isMixOrder = (index: number) => { 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')); // console.log("get::MixOrder", mixOrder, "test get::mixOrder", this.recipeListData.at(index).get('mixOrder'));
return mixOrder.toString() == "1" ? true : false; return mixOrder.toString() == "1" ? true : false;
} }

2
client/src/app/shared/types/recipe.d.ts vendored
View file

@ -14,7 +14,7 @@ export interface MaterialData {
id: number; id: number;
name: string; name: string;
enable: boolean; enable: boolean;
mixOrder: number; MixOrder: number;
stirTime: number; stirTime: number;
powderGram: number; powderGram: number;
powderTime: number; powderTime: number;

2
server/contracts/recipe.go
View file

@ -60,7 +60,7 @@ type RecipeDetailMat struct {
IsUse bool `json:"isUse"` IsUse bool `json:"isUse"`
MaterialID uint64 `json:"materialID"` MaterialID uint64 `json:"materialID"`
Name string `json:"name"` Name string `json:"name"`
MixOrder int `json:"mixOrder"` MixOrder int `json:"MixOrder"`
FeedParameter int `json:"feedParameter"` FeedParameter int `json:"feedParameter"`
FeedPattern int `json:"feedPattern"` FeedPattern int `json:"feedPattern"`
MaterialPathId int `json:"materialPathId"` MaterialPathId int `json:"materialPathId"`