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

fix default file reader bug

Browse source
This commit is contained in:
pakintada@gmail.com 2024-01-17 17:38:23 +07:00
parent 21109e4bf9
commit db131d10c0
15 changed files with 636 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,19 +7,17 @@
class="block p-6 bg-white border border-gray-200 rounded-lg shadow w-full"
>
<div *ngIf="isLoaded; else indicator" [@inOutAnimation]>
<!-- productCode -->
<div>
<input
class="input input-bordered input-xs text-lg text-gray-900 my-2"
type="text"
name="productCode"
[value]="productCode"
(keyup)="onProductCodeChange($event)"
[disabled]="!isEditable()"
/>
</div>
<!-- productCode -->
<div>
<input
class="input input-bordered input-xs text-lg text-gray-900 my-2"
type="text"
name="productCode"
[value]="productCode"
(keyup)="onProductCodeChange($event)"
[disabled]="!isEditable()"
/>
</div>
<div class="flex flex-wrap">
<h5 class="mb-2 text-xl font-bold text-gray-900">
@ -29,7 +27,6 @@
<h5 class="mb-2 text-xl font-bold text-gray-900">
{{ recipeDetailForm.getRawValue().otherName }}
</h5>
</div>
<div class="flex items-center mb-2">
<div class="flex items-center">
@ -110,7 +107,12 @@
<div *ngIf="hasSubmenu()">
<div *ngFor="let sub of listSubMenuProductcodes()">
<button class="btn btn-sm btn-primary m-2" (click)="selectSubmenu(sub)">{{sub}}</button>
<button
class="btn btn-sm btn-primary m-2"
(click)="selectSubmenu(sub)"
>
{{ sub }}
</button>
</div>
</div>
</div>
@ -118,45 +120,52 @@
</div>
<div id="recipeList" class="carousel-item w-full">
<div
class="overflow-auto h-[75vh] mb-4 rounded bg-white border border-gray-200 shadow w-1/2"
>
<app-recipe-list
[productCode]="productCode"
[isSubMenu]="false"
(recipeListFormChange)="onRecipeListFormChange($event)"
></app-recipe-list>
</div>
</div>
<div id="toppingSet" class="carousel-item w-full">
<div class="overflow-auto h-[75vh] mb-4 rounded bg-white border border-gray-200 shadow">
<app-recipe-toppingset
[productCode]="productCode"
(toppingSetChange)="onToppingListChange($event)"
></app-recipe-toppingset>
class="overflow-auto h-[75vh] mb-4 rounded bg-white border border-gray-200 shadow"
>
<app-recipe-list
[productCode]="productCode"
[isSubMenu]="false"
(recipeListFormChange)="onRecipeListFormChange($event)"
></app-recipe-list>
</div>
</div>
<div id="toppingSet" class="carousel-item w-full">
<div
class="overflow-auto h-[75vh] mb-4 rounded bg-white border border-gray-200 shadow max-w-screen-xl"
>
<app-recipe-toppingset
[productCode]="productCode"
(toppingSetChange)="onToppingListChange($event)"
></app-recipe-toppingset>
</div>
</div>
</div>
<!-- try pop up modal -->
<!-- TODO: do topping -->
<div
class="sticky bottom-0 col-span-3 max-w-screen-lg flex justify-end bg-white rounded-full drop-shadow-2xl p-3"
>
<div class="flex justify-center w-full start-0 py-2">
<a href="{{department}}/recipe/{{productCode}}#name" class="btn btn-xs">1</a>
<a href="{{department}}/recipe/{{productCode}}#recipeList" class="btn btn-xs">2</a>
<a href="{{department}}/recipe/{{productCode}}#toppingSet" class="btn btn-xs">3</a>
</div>
<div class="flex justify-center w-full start-0 py-2">
<a
href="{{ department }}/recipe/{{ productCode }}#name"
class="btn btn-xs"
>1</a
>
<a
href="{{ department }}/recipe/{{ productCode }}#recipeList"
class="btn btn-xs"
>2</a
>
<a
href="{{ department }}/recipe/{{ productCode }}#toppingSet"
class="btn btn-xs"
>3</a
>
</div>
<!-- <div> Commit Message </div> -->
<!-- <p class="text-2xl mr-8 text-gray-400 dark:text-gray-500">Commit Message</p> -->

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

@ -109,7 +109,7 @@ export class RecipeDetailsComponent implements OnInit {
this.recipeOriginalDetail = { ...this.recipeDetailForm.getRawValue() };
});
this._recipeService.getSubMenus(this._recipeService.getCurrentCountry(), this._recipeService.getCurrentFile(), this.productCode).subscribe((data) => {
this._recipeService.getSubMenus(this._recipeService.getCurrentCountry(this.department), this._recipeService.getCurrentFile(), this.productCode).subscribe((data) => {
console.log('Submenus', data);
this.submenus = data;
});
@ -177,7 +177,7 @@ export class RecipeDetailsComponent implements OnInit {
// TODO: update value in targeted recipe
console.log('to_send', to_send);
this._recipeService.editChanges(
this._recipeService.getCurrentCountry(),
this._recipeService.getCurrentCountry(this.department),
this._recipeService.getCurrentFile(),
{
...to_send,

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

@ -4,7 +4,8 @@
<th class="px-6 py-3">Is Use</th>
<th class="px-6 py-3">Material ID</th>
<th class="px-6 py-3">Material Name</th>
<th class="px-6 py-3">Settings</th>
<th class="px-6 py-3">Volume</th>
<th class="">Settings</th>
</tr>
</thead>
<tbody
@ -12,32 +13,28 @@
*ngFor="let mat of recipeListData.controls; let i = index"
>
<tr
class="bg-white la border-b hover:bg-secondary"
class="bg-white border-b hover:bg-secondary max-h-4"
formGroupName="{{ i }}"
(mousedown)="initHoldEvent()"
(mouseup)="openRecipeListEditor(i)"
>
<td class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap">
<td class="font-medium text-gray-900 whitespace-nowrap sticky left-0">
<input type="checkbox" class="toggle" formControlName="isUse" />
</td>
<td class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap">
<td class="font-medium text-gray-900 whitespace-nowrap sticky">
<input
type="text"
class="input"
class="input w-20"
formControlName="materialPathId"
(click)="openMaterialList(i)"
/>
</td>
<td class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap">
<td class="font-medium text-gray-900 whitespace-nowrap sticky">
<input type="text" class="input" formControlName="name" />
</td>
<!-- powder -->
<!-- <div *ngIf="getTypeForRecipeListAtIndex(i)['category'] == 'powder'">
</div> -->
<td
class="m-2 px-4 py-4 font-medium text-gray-900 whitespace-nowrap"
class="font-medium text-gray-900 whitespace-nowrap"
*ngIf="
displayByCond(i, 'powderGram', 'not-zero', { compare: undefined })
"
@ -52,89 +49,100 @@
</td>
<td
class="m-2 px-4 py-4 font-medium text-gray-900 whitespace-nowrap"
*ngIf="
displayByCond(i, 'syrupGram', 'not-zero', { compare: undefined }) &&
getTypeForRecipeListAtIndex(i)['category'] == 'syrup'
"
class="font-medium text-gray-900 whitespace-nowrap"
*ngIf="displayByCond(i, 'powderGram', 'zero', { compare: undefined })"
>
<div class="flex items-center space-x-2 bg-purple-300 rounded-md">
<div
class="flex items-center space-x-2 bg-purple-300 rounded-md"
*ngIf="
displayByCond(i, 'syrupGram', 'not-zero', { compare: undefined }) &&
getTypeForRecipeListAtIndex(i)['category'] == 'syrup'
"
>
<p>Volume</p>
<input type="text" class="input w-16" formControlName="syrupGram" />
<p>gram</p>
</div>
</td>
<td
class="m-2 px-4 py-4 space-y-2 font-medium text-gray-900 whitespace-nowrap"
>
<div class="flex items-center justify-center space-x-4 bg-gray-200">
<div
class="flex items-center rounded-md"
*ngIf="isStringParamExist(i)"
>
<div
class="flex items-center rounded-md "
*ngFor="let param of getStringParamOfIndex(i)"
>
<!-- <p>&nbsp;</p> -->
<p *ngIf="param.pkey == 'notail'">tail</p>
<input
type="text"
class="input input-bordered w-16"
placeholder="{{ param.pvalue }}"
(click)="openStringParamEditor(i)"
/>
<p class="m-4" *ngIf="param.pkey == 'esp-v2-press-value'">
mA
</p>
<td class="font-medium text-gray-900 whitespace-nowrap">
<div class="flex flex-row p-2 space-x-3">
<div class="flex items-center justify-center bg-gray-200">
<div class="items-center rounded-md" *ngIf="isStringParamExist(i)">
<div
class="flex items-center rounded-md tooltip"
[attr.data-tip]="param.pkey"
*ngFor="let param of getStringParamOfIndex(i)"
>
<!-- <p>&nbsp;</p> -->
<p *ngIf="param.pkey == 'notail'">tail</p>
<input
type="text"
class="w-8 bg-transparent"
placeholder="{{ param.pvalue }}"
(click)="openStringParamEditor(i)"
/>
<p *ngIf="param.pkey == 'esp-v2-press-value'">mA</p>
</div>
</div>
</div>
</div>
<div
class="flex items-center justify-center space-x-2 rounded-md bg-red-200"
*ngIf="
displayByCond(i, 'waterYield', 'not-zero', { compare: undefined })
"
>
<p>Hot</p>
<input type="text" class="input w-16" formControlName="waterYield" />
<p>ml</p>
</div>
<div
class="flex items-center justify-center space-x-2 rounded-md bg-blue-200"
*ngIf="
displayByCond(i, 'waterCold', 'not-zero', { compare: undefined })
"
>
<p>Cold</p>
<input type="text" class="input w-16" formControlName="waterCold" />
<p>ml</p>
</div>
<div
class="flex items-center justify-center space-x-2 rounded-md bg-green-300"
*ngIf="
displayByCond(i, 'stirTime', 'not-zero', { compare: undefined }) &&
getTypeForRecipeListAtIndex(i)['category'] != 'cup' &&
!isTopping(getTypeForRecipeListAtIndex(i)['id'])
"
>
<p *ngIf="getTypeForRecipeListAtIndex(i)['category'] == 'bean'">
Grinder
</p>
<p *ngIf="getTypeForRecipeListAtIndex(i)['category'] == 'whipper'">
Mix
</p>
<p
<div
class="tooltip flex items-center justify-evenly space-x-2 rounded-md bg-red-200 p-2"
data-tip="Hot"
*ngIf="
getTypeForRecipeListAtIndex(i)['category'] == 'others' &&
(getTypeForRecipeListAtIndex(i)['id'] == 8001 ||
getTypeForRecipeListAtIndex(i)['id'] == 8002)
displayByCond(i, 'waterYield', 'not-zero', { compare: undefined })
"
>
Clean
</p>
<input type="text" class="input w-16" formControlName="stirTime" />
<p>sec</p>
<p>Hot</p>
<input
type="text"
class="w-8 bg-transparent"
formControlName="waterYield"
/>
<p>ml</p>
</div>
<div
class="tooltip flex items-center justify-center space-x-2 rounded-md bg-blue-200 p-2"
data-tip="Cold"
*ngIf="
displayByCond(i, 'waterCold', 'not-zero', { compare: undefined })
"
>
<p>Cold</p>
<input
type="text"
class="w-8 bg-transparent"
formControlName="waterCold"
/>
<p>ml</p>
</div>
<div
class="tooltip flex items-center justify-center space-x-2 rounded-md bg-green-300 p-2"
[attr.data-tip]="
getTooltipForStirTime(getTypeForRecipeListAtIndex(i))
"
*ngIf="
displayByCond(i, 'stirTime', 'not-zero', {
compare: undefined
}) &&
getTypeForRecipeListAtIndex(i)['category'] != 'cup' &&
!isTopping(getTypeForRecipeListAtIndex(i)['id'])
"
>
<p>{{getTooltipForStirTime(getTypeForRecipeListAtIndex(i))}}</p>
<input
type="text"
class="bg-transparent w-8"
formControlName="stirTime"
/>
<p>sec</p>
</div>
</div>
<div class="collapse collapse-open" *ngIf="isTopping(getTypeForRecipeListAtIndex(i)['id'])">
<div class="collapse-title">Topping Settings</div>
<div class="collapse-content">
<app-recipe-topping></app-recipe-topping>
</div>
</div>
</td>
</tr>
@ -291,7 +299,11 @@
<summary class="cursor-pointer">Water</summary>
<div class="flex items-center space-x-2">
<p class="text-base m-4">Hot (waterYield)</p>
<input type="text" class="input w-16" formControlName="waterYield" />
<input
type="text"
class="input w-16"
formControlName="waterYield"
/>
<p class="text-base m-4">ml</p>
</div>

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

@ -32,11 +32,13 @@ import {
inRange
} from 'src/app/shared/helpers/recipe';
import { RecipeToppingComponent } from '../recipe-topping/recipe-topping.component';
@Component({
selector: 'app-recipe-list',
templateUrl: './recipe-list.component.html',
standalone: true,
imports: [NgIf, NgFor, ReactiveFormsModule, FormsModule],
selector: 'app-recipe-list',
templateUrl: './recipe-list.component.html',
standalone: true,
imports: [NgIf, NgFor, ReactiveFormsModule, FormsModule, RecipeToppingComponent]
})
export class RecipeListComponent implements OnInit {
@Input({ required: true }) productCode!: string;
@ -324,9 +326,17 @@ export class RecipeListComponent implements OnInit {
// console.log("make material list by category", this.makeListCategory());
this.showMaterialSelector = false;
this.recipeListData.at(i).get('materialPathId')?.setValue(material);
console.log('set mat ', material, 'to slot', i);
// query material for its name
let materialName = this.fullMaterialList!.find(
(mat) => mat.materialId == material
)!.name;
this.recipeListData.at(i).get('name')?.setValue(
materialName
);
console.log('set mat ', material, materialName,'to slot', i);
}
getTypeForRecipeListAtIndex(i: any) {
@ -501,4 +511,28 @@ export class RecipeListComponent implements OnInit {
this.recipeListData.value[i][key]
);
}
getTooltipForStirTime = (cat: {
category: string;
name: any;
id: any;
}) => {
switch (cat.category) {
case 'whipper':
return 'Mix';
case 'bean':
return 'Grinder';
case 'others':
if(inRange(8001, 8002, cat.id)){
return 'Clean';
}
break;
default:
break;
}
return '';
};
}

27
client/src/app/features/recipes/recipe-details/recipe-topping/recipe-topping.component.html Normal file
View file

@ -0,0 +1,27 @@
<div>
<input type="checkbox" />
<!-- toppingGroup -->
<ng-select
appendTo="body"
[clearable]="false"
[compareWith]="this.compareFunc"
formControlName="groupID"
>
<ng-option
*ngFor="let item of allToppingsDefinitions"
[value]="item.groupId.toString()"
>
<div>{{ item.name }} ({{ item.groupId }})</div>
</ng-option>
</ng-select>
<!-- defaultSelect -->
<ng-select
>
<!-- <ng-option
*ngFor="let item of getMembersByGroupId(getGroupIdByIndex(this.index))"
[value]="item.defaultId.toString()"
>
<div>{{ item.name }} ({{ item.defaultId }})</div>
</ng-option> -->
</ng-select>
</div>

91
client/src/app/features/recipes/recipe-details/recipe-topping/recipe-topping.component.ts Normal file
View file

@ -0,0 +1,91 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { CommonModule } from '@angular/common';
import { NgSelectModule } from '@ng-select/ng-select';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { RecipeService } from 'src/app/core/services/recipe.service';
import { ToppingService } from 'src/app/core/services/topping.service';
import { Topping, ToppingGroup, ToppingSet } from 'src/app/core/models/recipe.model';
@Component({
selector: 'app-recipe-topping',
standalone: true,
imports: [CommonModule, NgSelectModule, FormsModule, ReactiveFormsModule],
templateUrl: './recipe-topping.component.html',
})
export class RecipeToppingComponent implements OnInit {
@Input() index: number = 0;
@Input() toppingSet!: ToppingSet;
@Output() toppingSetChange = new EventEmitter<unknown[]>();
allToppings: Topping | undefined = undefined;
allToppingsDefinitions:
| { groupId: string; name: string; members: string; default: string }[]
| null = [{ groupId: '0', name: 'none', members: '0', default: '0' }];
allToppingMembersByGroup: {
id: string;
members: { id: string; name: string }[];
}[] = [];
constructor(
private _recipeService: RecipeService,
private _toppingService: ToppingService
) {}
ngOnInit(): void {
this._toppingService
.getToppings(
this._recipeService.getCurrentCountry(),
this._recipeService.getCurrentFile()
)
.subscribe((data) => {
this.allToppings = data;
// console.log('allToppings', data);
data.ToppingGroup.forEach((group: ToppingGroup) => {
if (this.allToppingsDefinitions != null) {
// this.allToppingsDefinitions = {};
this.allToppingsDefinitions.push({
groupId: group.groupID,
name: group.name,
members: group.idInGroup,
default: group.idDefault,
});
this.allToppingMembersByGroup.push({
id: group.groupID,
members: this.mapToppingListToMember(group.idInGroup.split(',')),
});
}
});
// console.log(this.allToppingsDefinitions);
// console.log('allToppingMembersByGroup', this.allToppingMembersByGroup);
});
}
compareFunc = (a: any, b: any) => a.toString() === b.toString();
mapToppingListToMember = (mm: string[]) =>
mm.map((m) => {
// find actual topping from toppingList
let actualTopping = this.allToppings!.ToppingList.find((t) => t.id == m);
return {
id: actualTopping!.id,
name: actualTopping?.name == null ? m : actualTopping!.name,
};
});
getMembersByGroupId(groupID: string) {
return this.allToppingMembersByGroup.find((x) => x.id == groupID)?.members;
}
getGroupIdByIndex(i: number) {
// console.log("getGroupId",this.toppingList.value![i])
// return (this.toppingList.value![i] as any).groupID as string;
}
// services
}

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

@ -11,7 +11,7 @@
<div class="flex flex-row py-3 justify-between items-center">
<div class="flex flex-col">
<span
>Recipe Version {{ recipesDashboard.configNumber }} |
>Recipe Version {{ currentVersion }} |
{{ recipesDashboard.filename }}</span
>
</div>

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

@ -1,4 +1,5 @@
import {
AfterViewInit,
Component,
ElementRef,
OnDestroy,
@ -24,7 +25,7 @@ import {
tap,
} from 'rxjs';
import * as lodash from 'lodash';
import { ActivatedRoute, RouterLink } from '@angular/router';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { NgSelectModule } from '@ng-select/ng-select';
import { FormsModule } from '@angular/forms';
import { MaterialService } from 'src/app/core/services/material.service';
@ -32,6 +33,7 @@ import { UserService } from 'src/app/core/services/user.service';
import { UserPermissions } from 'src/app/core/auth/userPermissions';
import { ToppingService } from 'src/app/core/services/topping.service';
import { copy, transformToTSV } from 'src/app/shared/helpers/copy';
import { getCountryMapSwitcher } from 'src/app/shared/helpers/recipe';
@Component({
selector: 'app-recipes',
@ -46,7 +48,7 @@ import { copy, transformToTSV } from 'src/app/shared/helpers/copy';
],
templateUrl: './recipes.component.html',
})
export class RecipesComponent implements OnInit, OnDestroy {
export class RecipesComponent implements OnInit, OnDestroy, AfterViewInit {
recipesDashboard$!: Observable<RecipesDashboard>;
recipeOverviewList!: RecipeOverview[];
selectMaterialFilter: number[] | null = null;
@ -89,9 +91,9 @@ export class RecipesComponent implements OnInit, OnDestroy {
department: string = this.route.parent!.snapshot.params['department'];
copyList: any[] = [];
@ViewChild('table', { static: false }) set content(table: ElementRef) {
// expose element ref for other fn
currentVersion: number | undefined = undefined;
@ViewChild('table', { static: false }) set content(table: ElementRef) {
table.nativeElement.addEventListener(
'scroll',
() => {
@ -109,7 +111,7 @@ export class RecipesComponent implements OnInit, OnDestroy {
take: this.take,
search: this.oldSearchStr,
filename: this._recipeService.getCurrentFile(),
country: this._recipeService.getCurrentCountry(),
country: this._recipeService.getCurrentCountry(this.department),
materialIds: this.selectMaterialFilter || [],
})
.subscribe(({ result, hasMore, totalCount }) => {
@ -134,14 +136,16 @@ export class RecipesComponent implements OnInit, OnDestroy {
private _materialService: MaterialService,
private _toppingService: ToppingService,
private route: ActivatedRoute,
private _userService: UserService
private _userService: UserService,
private _router: Router
) {}
ngOnInit(): void {
console.log('Trigger onInit where department = ', this.department);
this.recipesDashboard$ = this._recipeService
.getRecipesDashboard({
filename: this._recipeService.getCurrentFile(),
country: this._recipeService.getCurrentCountry(),
country: this._recipeService.getCurrentCountry(this.department!),
})
.pipe(
finalize(() => {
@ -151,7 +155,7 @@ export class RecipesComponent implements OnInit, OnDestroy {
take: this.take,
search: this.oldSearchStr,
filename: this._recipeService.getCurrentFile(),
country: this._recipeService.getCurrentCountry(),
country: this._recipeService.getCurrentCountry(this.department!),
materialIds: this.selectMaterialFilter || [],
})
.subscribe(({ result, hasMore, totalCount }) => {
@ -163,9 +167,34 @@ export class RecipesComponent implements OnInit, OnDestroy {
})
);
// FIXME: Lag assigned
this.recipesDashboard$.subscribe((data) => {
this.currentVersion = data.configNumber;
console.log('current version', this.currentVersion);
});
console.log('ngAfterViewInit::department', this.department);
console.log('::CurrentFile', this._recipeService.getCurrentFile());
this._materialService
.getFullMaterialDetail(
this.department,
this._recipeService.getCurrentFile()
)
.subscribe((mat) => {
this.materialDetail = mat;
console.log(this.materialDetail?.length);
// check material detail
console.log('first material', this.materialDetail![0]);
});
// end of FIXME
this._recipeService
.getSavedTmp(
this._recipeService.getCurrentCountry(),
this._recipeService.getCurrentCountry(this.department),
this._recipeService.getCurrentFile()
)
.subscribe({
@ -209,16 +238,6 @@ export class RecipesComponent implements OnInit, OnDestroy {
this.materialList = materials;
});
this._materialService
.getFullMaterialDetail(
this.department,
this._recipeService.getCurrentFile()
)
.subscribe((mat) => {
this.materialDetail = mat;
console.log(this.materialDetail?.length);
});
this._toppingService
.getToppings(this.department, this._recipeService.getCurrentFile())
.subscribe((tp) => {
@ -232,6 +251,10 @@ export class RecipesComponent implements OnInit, OnDestroy {
this.initRecipeSelection();
}
ngAfterViewInit(): void {
console.log('After view on init trigger');
}
setSearch(event: Event) {
console.log((event.target as HTMLInputElement).value);
this.searchStr = (event.target as HTMLInputElement).value;
@ -247,7 +270,7 @@ export class RecipesComponent implements OnInit, OnDestroy {
take: this.take,
search: this.oldSearchStr,
filename: this._recipeService.getCurrentFile(),
country: this._recipeService.getCurrentCountry(),
country: this._recipeService.getCurrentCountry(this.department),
materialIds: this.selectMaterialFilter || [],
})
.subscribe(({ result, hasMore, totalCount }) => {
@ -400,7 +423,14 @@ export class RecipesComponent implements OnInit, OnDestroy {
countrySelected(country: string) {
this.selectedCountry = country;
this.isCountrySelected = true;
localStorage.setItem('currentRecipeCountry', country);
// localStorage.setItem('currentRecipeCountry', country);
// force reload, will fix this later
void this._router
.navigate([`/${getCountryMapSwitcher(country)}/recipes`])
.then(() => {
window.location.reload();
});
}
loadRecipe(recipeFileName: string) {
@ -409,11 +439,18 @@ export class RecipesComponent implements OnInit, OnDestroy {
this.isHasMore = true;
this.isLoadMore = true;
this.oldSearchStr = '';
localStorage.setItem('currentRecipeFile', recipeFileName);
// localStorage.setItem('currentRecipeFile', recipeFileName);
console.log('loadRecipe', recipeFileName, "currentCountry", this.department);
this.recipesDashboard$ = this._recipeService.getRecipesDashboard({
filename: recipeFileName,
country: this.selectedCountry!,
country: this.department!,
});
this.recipesDashboard$.subscribe((data) => {
this.currentVersion = data.configNumber;
console.log('current version', this.currentVersion);
});
this._recipeService
@ -438,7 +475,9 @@ export class RecipesComponent implements OnInit, OnDestroy {
openJsonTab() {
window.open(
environment.api +
`/recipes/${this._recipeService.getCurrentCountry()}/${this._recipeService.getCurrentFile()}/json`,
`/recipes/${this._recipeService.getCurrentCountry(
this.department
)}/${this._recipeService.getCurrentFile()}/json`,
'_blank'
);
}
@ -503,26 +542,22 @@ export class RecipesComponent implements OnInit, OnDestroy {
item.name.toLowerCase().includes(term.toLowerCase()) ||
item.materialId.toString().includes(term);
addToCopyList(data: any){
if(this.copyList.includes(data)){
addToCopyList(data: any) {
if (this.copyList.includes(data)) {
let index = this.copyList.indexOf(data);
this.copyList.splice(index, 1);
} else {
this.copyList = [...this.copyList, data];
}
}
async copyToTsv(data: any){
await copy(transformToTSV(data)).then( (value) => {
async copyToTsv(data: any) {
await copy(transformToTSV(data))
.then((value) => {
console.log('copyToTsv', value);
}).catch( (err) => {
})
.catch((err) => {
console.log('copyToTsvErr', err);
});
}
}
}