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

add warning & default init recipelist

Browse source
This commit is contained in:
pakintada@gmail.com 2024-02-06 16:35:39 +07:00
parent 18ea640282
commit 1d536309e1
3 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -121,6 +121,8 @@ export class RecipeListComponent implements OnInit {
});
// this do not fetch recipe list when initialized
// use when doing `topping`
if(!this.noFetch){
(await this._recipeService
.getRecipeDetailMat(this.productCode))
@ -338,13 +340,13 @@ export class RecipeListComponent implements OnInit {
materialPathId: [{ value: 0, disabled: !this.isEditable() }],
name: [{ value: "", disabled: true }],
mixOrder: [{ value: "", disabled: !this.isEditable() }],
stirTime: [{ value: 0 / 10, disabled: !this.isEditable() }],
powderGram: [{ value: 0, disabled: !this.isEditable() }],
stirTime: [{ value: 1, disabled: !this.isEditable() }],
powderGram: [{ value: 1, disabled: !this.isEditable() }],
powderTime: [{ value: 0, disabled: !this.isEditable() }],
syrupGram: [{ value: 0, disabled: !this.isEditable() }],
syrupGram: [{ value: 1, disabled: !this.isEditable() }],
syrupTime: [{ value: 0, disabled: !this.isEditable() }],
waterCold: [{ value: 0, disabled: !this.isEditable() }],
waterYield: [{ value: 0, disabled: !this.isEditable() }],
waterCold: [{ value: 1, disabled: !this.isEditable() }],
waterYield: [{ value: 1, disabled: !this.isEditable() }],
feedPattern: [{ value: "", disabled: !this.isEditable() }],
feedParameter: [{ value: "", disabled: !this.isEditable() }],
StringParam: [{ value: "", disabled: !this.isEditable() }],
@ -572,11 +574,6 @@ export class RecipeListComponent implements OnInit {
timeoutHandler: any;
timeout: number = 0;
initHoldEvent() {
// if(this.timeoutHandler){
// clearInterval(this.timeoutHandler);
// this.timeoutHandler = undefined;
// }
// let timeout = 0;
this.timeoutHandler = setInterval(() => {
this.timeout += 1;
}, 100);
@ -586,7 +583,7 @@ export class RecipeListComponent implements OnInit {
await Promise.resolve();
if (this.timeoutHandler) {
// console.log("timeout get", this.timeout);
if (this.timeout >= 20) {
// alert("Opening Recipe List Editor in detail")
if (confirm("Are you sure you want to open Recipe List Editor in detail?")) {

6
client/src/app/features/toppings/toppings.component.html
View file

@ -152,7 +152,13 @@
<input class="input input-sm input-bordered" formControlName="Desc" />
</td>
<!-- <td>{{tpg.idDefault}}</td> -->
<div class="tooltip" data-tip="Default select id not in group or does not set" *ngIf="!isDefaultInMember(getAttrFromForm(i, 'groupID'), getAttrFromForm(i, 'idDefault'))">
<p class="text-red-500 text-5xl">⚠️</p>
</div>
<td class="grid grid-flow-row grid-cols-3 rounded-md gap-2">
<div
*ngFor="let m of getMemberByGroupId(getAttrFromForm(i, 'groupID'))"
>

7
client/src/app/features/toppings/toppings.component.ts
View file

@ -212,4 +212,11 @@ export class ToppingsComponent implements OnInit {
targetDefault?.setValue(member);
};
// boolean checking if default is within the member of set group
isDefaultInMember = (group: string, member: string) => {
// get member from group
// console.log('isDefaultInMember', group, member, this.getMemberByGroupId(group), this.getMemberByGroupId(group).includes(member.toString()));
return this.getMemberByGroupId(group).includes(member.toString());
};
}