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

update getting file recipe

Browse source
This commit is contained in:
Kenta420 2023-10-24 18:01:52 +07:00
parent ea506b8128
commit 3bfbbd778a
10 changed files with 243 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/src/app/core/services/material.service.ts
View file

@ -10,13 +10,15 @@ export class MaterialService {
getMaterialCodes(
matIds?: number[],
version?: string
country?: string,
filename?: string
): Observable<MaterialCode[]> {
return this._httpClient.get<MaterialCode[]>(
`${environment.api}/materials/code`,
{
params: {
version: version || '',
country: country || '',
filename: filename || '',
mat_ids: matIds?.join(',') || '',
},
withCredentials: true,
@ -26,13 +28,15 @@ export class MaterialService {
getMaterialSettingById(
id: number,
version?: string
country?: string,
filename?: string
): Observable<MaterialSetting> {
return this._httpClient.get<MaterialSetting>(
`${environment.api}/materials/setting/${id}`,
{
params: {
version: version || '',
country: country || '',
filename: filename || '',
},
withCredentials: true,
}

97
client/src/app/core/services/recipe.service.ts
View file

@ -6,7 +6,8 @@ import { environment } from 'src/environments/environment';
import { RecipeMetaData } from 'src/app/shared/types/recipe';
interface RecipeParams {
version: string;
filename: string;
country: string;
offset: number;
take: number;
search: string;
@ -28,46 +29,49 @@ export class RecipeService {
take: 10,
offset: 0,
search: '',
version: this.getCurrentVersion(),
country: this.getCurrentCountry(),
filename: this.getCurrentFile(),
}
): Observable<{
fileName: string;
recipes: Recipe;
hasMore: boolean;
}> {
return this._httpClient
.get<{
fileName: string;
recipes: Recipe;
hasMore: boolean;
}>(environment.api + '/recipes', {
params: {
offset: params.offset,
take: params.take,
search: params.search,
version: params.version,
},
withCredentials: true,
responseType: 'json',
})
.pipe(
tap((data) => {
if (data.fileName !== this.getCurrentVersion()) {
localStorage.setItem('currentRecipeVersion', data.fileName);
}
})
);
return this._httpClient.get<{
fileName: string;
recipes: Recipe;
hasMore: boolean;
}>(environment.api + '/recipes', {
params: {
offset: params.offset,
take: params.take,
search: params.search,
country: params.country,
filename: params.filename,
},
withCredentials: true,
responseType: 'json',
});
}
getCurrentVersion(): string {
const currentRecipeVersion = localStorage.getItem('currentRecipeVersion');
if (currentRecipeVersion) {
return currentRecipeVersion;
getCurrentFile(): string {
const currentRecipeFile = localStorage.getItem('currentRecipeFile');
if (currentRecipeFile) {
return currentRecipeFile;
}
return 'coffeethai02_580.json';
}
getCurrentCountry(): string {
const currentRecipeCountry = localStorage.getItem('currentRecipeCountry');
if (currentRecipeCountry) {
return currentRecipeCountry;
}
return 'Thailand';
}
getRecipesById(id: string): Observable<{
recipe: Recipe01;
recipeMetaData: RecipeMetaData;
@ -103,23 +107,28 @@ export class RecipeService {
return this.countries;
}
getRecipeFileNames(country: string): string[] {
return this.recipeFiles[country];
getRecipeFileNames(country: string): string[] | null {
return this.recipeFiles[country] ?? null;
}
editChanges(version: string, change: any){
console.log("target version = ", version);
console.log("change in edit: ",change.value)
return this._httpClient.post<{
status: string
}>(
environment.api + ('/recipes/edit/'+version),
change.value,
{ withCredentials: true, responseType: 'json', }
).subscribe({
next(value) {
console.log(value, change.value)
},
});
editChanges(country: string, filename: string, change: any) {
console.log('target version = ', filename);
console.log('change in edit: ', change.value);
return this._httpClient
.post<{
status: string;
}>(
environment.api + ('/recipes/edit/' + country + '/' + filename),
change.value,
{
withCredentials: true,
responseType: 'json',
}
)
.subscribe({
next(value) {
console.log(value, change.value);
},
});
}
}

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

@ -188,12 +188,13 @@ export class RecipeDetailsComponent implements OnInit {
console.log('confirm save');
// TODO: update value in targeted recipe
this._recipeService.editChanges(
this._recipeService.getCurrentVersion(),
this._recipeService.getCurrentCountry(),
this._recipeService.getCurrentFile(),
{
...this.recipeDetail
...this.recipeDetail,
}
);
console.log("Sending changes")
console.log('Sending changes');
this._router.navigate(['/recipes']);
},
};

14
client/src/app/features/recipes/recipes.component.html
View file

@ -27,11 +27,12 @@
<div class="flex flex-row gap-5">
<div class="dropdown dropdown-end">
<input
type="text"
tabindex="0"
#countryInput
type="search"
tabindex="1"
placeholder="Select Country"
class="input input-bordered input-sm w-full max-w-xs"
[value]="currentCountryFilter.getValue()"
[value]="selectedCountry"
(input)="setCountryFilter($event)"
(focus)="getRecipeCountries()"
/>
@ -39,7 +40,7 @@
class="dropdown-content z-[1000] min-w-[200px] max-h-[500px] overflow-y-auto"
>
<ul
tabindex="0"
tabindex="1"
class="menu p-2 shadow bg-base-100 rounded-box w-auto"
>
<li *ngFor="let country of recipeCountryFiltered">
@ -52,12 +53,13 @@
</div>
<div *ngIf="isCountrySelected" class="dropdown dropdown-end">
<input
type="text"
#fileInput
type="search"
tabindex="1"
placeholder="เลือก Recipe File"
class="input input-bordered input-sm w-full max-w-xs"
(input)="setFileFilter($event)"
(focus)="getRecipeFileCountries()"
(focus)="getRecipeFiles()"
/>
<div
class="dropdown-content z-[1000] min-w-[200px] max-h-[500px] overflow-y-auto"

69
client/src/app/features/recipes/recipes.component.ts
View file

@ -66,7 +66,8 @@ export class DashboardComponent implements OnInit, OnDestroy {
offset: this.offset,
take: this.take,
search: this.oldSearchStr,
version: this._recipeService.getCurrentVersion(),
filename: this._recipeService.getCurrentFile(),
country: this._recipeService.getCurrentCountry(),
})
.subscribe(({ recipes, hasMore, fileName }) => {
const { Recipe01, ...recipesWithoutRecipe01 } = recipes;
@ -98,7 +99,8 @@ export class DashboardComponent implements OnInit, OnDestroy {
offset: this.offset,
take: this.take,
search: this.oldSearchStr,
version: this._recipeService.getCurrentVersion(),
filename: this._recipeService.getCurrentFile(),
country: this._recipeService.getCurrentCountry(),
})
.subscribe(({ recipes, hasMore, fileName }) => {
const { Recipe01, ...recipesWithoutRecipe01 } = recipes;
@ -132,7 +134,8 @@ export class DashboardComponent implements OnInit, OnDestroy {
offset: this.offset,
take: this.take,
search: this.searchStr,
version: this._recipeService.getCurrentVersion(),
filename: this._recipeService.getCurrentFile(),
country: this._recipeService.getCurrentCountry(),
})
.subscribe(({ recipes, hasMore, fileName }) => {
const { Recipe01, ...recipesWithoutRecipe01 } = recipes;
@ -163,6 +166,23 @@ export class DashboardComponent implements OnInit, OnDestroy {
selectedCountry: string | null = null;
isCountrySelected: boolean = false;
private countryInputEl?: ElementRef<HTMLInputElement>;
private fileInputEl?: ElementRef<HTMLInputElement>;
@ViewChild('countryInput', { static: false }) set countryInput(
countryInput: ElementRef<HTMLInputElement>
) {
this.countryInputEl = countryInput;
}
@ViewChild('fileInput', { static: false }) set fileInput(
fileInput: ElementRef<HTMLInputElement>
) {
this.fileInputEl = fileInput;
}
private firstTimeOpenModal = true;
initRecipeSelection() {
if (this._recipeService.getRecipeFileCountries().length == 0) {
this._recipeService.getRecipeCountries().subscribe((countries) => {
@ -180,27 +200,46 @@ export class DashboardComponent implements OnInit, OnDestroy {
}
getRecipeCountries() {
if (this.firstTimeOpenModal) {
this.countryInputEl!.nativeElement.blur();
this.firstTimeOpenModal = false;
}
this.currentCountryFilterSubScription = this.currentCountryFilter.subscribe(
(c) => {
const countries = this._recipeService.getRecipeFileCountries();
if (countries.length > 0) {
this.recipeFileCountries = lodash.filter(countries, (country) =>
country.includes(c)
this.recipeCountryFiltered = lodash.filter(countries, (country) =>
country.toLowerCase().includes(c.toLowerCase())
);
}
}
);
}
getRecipeFileCountries() {
getRecipeFiles() {
this.currentFileFilterSubScription = this.currentFileFilter.subscribe(
(c) => {
const countries = this._recipeService.getRecipeFileCountries();
if (countries.length > 0) {
this.recipeCountryFiltered = lodash.filter(countries, (country) =>
country.includes(c)
);
if (this.selectedCountry === null) {
return;
}
const fileNames = this._recipeService.getRecipeFileNames(
this.selectedCountry
);
if (fileNames && fileNames.length > 0) {
this.recipeFileCountries = lodash.filter(fileNames, (file) =>
file.toLowerCase().includes(c.toLowerCase())
);
} else {
this._recipeService
.getRecipeFiles(this.selectedCountry)
.subscribe((files) => {
this.recipeFileCountries = lodash.filter(files, (file) =>
file.toLowerCase().includes(c.toLowerCase())
);
});
}
console.log(this.recipeFileCountries);
}
);
}
@ -208,6 +247,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
countrySelected(country: string) {
this.selectedCountry = country;
this.isCountrySelected = true;
localStorage.setItem('currentRecipeCountry', country);
}
loadRecipe(recipeFileName: string) {
@ -219,13 +259,15 @@ export class DashboardComponent implements OnInit, OnDestroy {
this.isHasMore = true;
this.isLoadMore = false;
this.oldSearchStr = '';
localStorage.setItem('currentRecipeFile', recipeFileName);
this._recipeService
.getRecipes({
offset: this.offset,
take: this.take,
search: this.oldSearchStr,
version: recipeFileName,
filename: recipeFileName,
country: this.selectedCountry!,
})
.subscribe(({ recipes, hasMore, fileName }) => {
const { Recipe01, ...recipesWithoutRecipe01 } = recipes;
@ -249,8 +291,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
openJsonTab() {
window.open(
environment.api +
`/recipes/${this._recipeService.getCurrentVersion()}/json`,
environment.api + `/recipes/${this._recipeService.getCurrentFile()}/json`,
'_blank'
);
}