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

update git module

Browse source
This commit is contained in:
Kenta420 2023-10-03 17:00:35 +07:00
parent b5cb469a30
commit b529a5eaa2
7 changed files with 62 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitmodules vendored
View file

@ -1,3 +1,4 @@
[submodule "server/cofffeemachineConfig"] [submodule "cofffeemachineConfig"]
path = server/cofffeemachineConfig path = cofffeemachineConfig
url = ssh://poomipat@kong/1TBHDD/ikong/repo/cofffeemachineConfig url = ssh://ikong@192.168.10.159/1TBHDD/ikong/repo/cofffeemachineConfig
branch = master

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

@ -30,7 +30,7 @@ export interface Recipe01 {
RemainingCups: string; RemainingCups: string;
StringParam: string; StringParam: string;
TextForWarningBeforePay: string[]; TextForWarningBeforePay: string[];
cashPrice: string; cashPrice: number;
changerecipe: string; changerecipe: string;
disable: string; disable: string;
disable_by_cup: string; disable_by_cup: string;

2
client/src/app/features/dashboard/dashboard.component.html
View file

@ -1,5 +1,5 @@
<main <main
class="relative overflow-auto max-h-[610px] shadow-md sm:rounded-lg" class="relative overflow-auto max-h-[900px] shadow-md sm:rounded-lg"
#table #table
> >
<table *ngIf="isLoaded" class="table"> <table *ngIf="isLoaded" class="table">

2
client/src/app/features/dashboard/dashboard.component.ts
View file

@ -30,7 +30,7 @@ export class DashboardComponent implements OnInit {
'Last Updated', 'Last Updated',
]; ];
private offset = 0; private offset = 0;
private take = 10; private take = 20;
private recipeVersionData: string[] = []; private recipeVersionData: string[] = [];
private currentRecipeVersion: string = 'coffeethai02_580.json'; private currentRecipeVersion: string = 'coffeethai02_580.json';

92
client/src/app/shared/modal/recipe-modal.component.html
View file

@ -18,47 +18,57 @@
<dialog class="modal" #detailModal> <dialog class="modal" #detailModal>
<div class="modal-box w-11/12 max-w-5xl"> <div class="modal-box w-11/12 max-w-5xl">
<h3 class="font-bold text-lg mb-3">{{ title }}</h3> <div>
<form class="flex flex-col gap-2" [formGroup]="recipeDetail"> <h3 class="font-bold text-lg mb-3">{{ title }}</h3>
<div class="flex flex-col gap-1"> </div>
<label> <div class="modal-scroll">
<span class="text-base label-text">Product Code: </span> <form class="flex flex-col gap-2" [formGroup]="recipeDetail">
</label> <div class="flex flex-wrap">
<input <div class="flex flex-col gap-1">
type="text" <label><span class="text-base label-text">Name: </span> </label>
class="w-full input input-sm input-bordered input-ghost" <input
formControlName="productCode" type="text"
/> class="w-full input input-sm input-bordered input-ghost"
</div> formControlName="name"
<div class="flex flex-col gap-1"> />
<label><span class="text-base label-text">Name: </span> </label> </div>
<input <div class="flex flex-col gap-1">
type="text" <label
class="w-full input input-sm input-bordered input-ghost" ><span class="text-base label-text"> Other Name:</span>
formControlName="name" </label>
/> <input
</div> type="text"
<div class="flex flex-col gap-1"> class="w-full input input-sm input-bordered input-ghost"
<label><span class="text-base label-text"> Other Name:</span> </label> formControlName="otherName"
<input />
type="text" </div>
class="w-full input input-sm input-bordered input-ghost" <div class="flex flex-row items-center justify-between gap-2">
formControlName="otherName" <div class="flex flex-col gap-1 w-1/2">
/> <label
</div> ><span class="text-base label-text"> Description:</span>
<div class="flex flex-col gap-1"> </label>
<label><span class="text-base label-text"> Description:</span> </label> <input
<input type="text"
type="text" class="w-full input input-sm input-bordered input-ghost"
class="w-full input input-sm input-bordered input-ghost" formControlName="description"
formControlName="description" />
/> </div>
</div> <div class="flex flex-col gap-1 w-1/2">
<div class="modal-action"> <label><span class="text-baase label-text">Price:</span></label>
<a class="btn px-10" (click)="save()">Save</a> <input
<a class="btn" (click)="close()">Close</a> type="number"
</div> class="w-full input input-sm input-bordered input-ghost"
</form> formControlName="price"
/>
</div>
</div>
</div>
<div class="modal-action">
<a class="btn px-10" (click)="save()">Save</a>
<a class="btn" (click)="close()">Close</a>
</div>
</form>
</div>
</div> </div>
</dialog> </dialog>

4
client/src/app/shared/modal/recipe-modal.component.ts
View file

@ -8,6 +8,7 @@ interface RecipeDetail {
name: string; name: string;
otherName: string; otherName: string;
description: string; description: string;
price: number;
} }
@Component({ @Component({
@ -26,6 +27,7 @@ export class RecipeModalComponent {
name: new FormControl<string>(''), name: new FormControl<string>(''),
otherName: new FormControl<string>(''), otherName: new FormControl<string>(''),
description: new FormControl<string>(''), description: new FormControl<string>(''),
price: new FormControl<number>(0),
}); });
originalRecipeDetail: RecipeDetail | null = null; originalRecipeDetail: RecipeDetail | null = null;
@ -60,6 +62,7 @@ export class RecipeModalComponent {
name: recipe.name, name: recipe.name,
otherName: recipe.otherName, otherName: recipe.otherName,
description: recipe.Description, description: recipe.Description,
price: recipe.cashPrice,
}, },
{ emitEvent: false } { emitEvent: false }
); );
@ -68,6 +71,7 @@ export class RecipeModalComponent {
name: recipe.name, name: recipe.name,
otherName: recipe.otherName, otherName: recipe.otherName,
description: recipe.Description, description: recipe.Description,
price: recipe.cashPrice,
}; };
}); });
} }

4
server/.gitmodules vendored
View file

@ -1,4 +0,0 @@
[submodule "cofffeemachineConfig"]
path = cofffeemachineConfig
url = ssh://ikong@192.168.10.159/1TBHDD/ikong/repo/cofffeemachineConfig
branch = master