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

fix(topping): 🐛 fix missing topping after saved

Browse source 
Ensure topping data in slots with padding if only use in some slots.

Topping saving
This commit is contained in:
pakintada@gmail.com 2024-03-02 13:22:23 +07:00
parent 517e051f2d
commit 292c7697a4
4 changed files with 466 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

30
client/src/app/core/layout/layout.component.html
View file

@ -41,26 +41,28 @@
</div>
<!-- File Change Status -->
<button onclick="patch_merge_modal.showModal()" *ngIf="isCommitLoaded | async">
<div *ngIf="isCommitLoaded | async">
<button onclick="patch_merge_modal.showModal()" >
<h1 class="text-center font-extrabold text-2xl text-red-500 animate-pulse">Detect Changes! Click</h1>
<h1 class="text-center font-extrabold text-2xl text-red-500 animate-pulse">Detect Changes! Click</h1>
</button>
<dialog id="patch_merge_modal" class="modal">
</button>
<dialog id="patch_merge_modal" class="modal">
<div class="modal-box max-w-screen-2xl">
<app-merge
[commit]="changesCommit"
></app-merge>
<div class="modal-action sticky bottom-0 right-0">
<form method="dialog">
<button class="btn btn-warning">Close</button>
</form>
</div>
<div class="modal-box max-w-screen-2xl">
<app-merge
[commit]="changesCommit"
></app-merge>
<div class="modal-action sticky bottom-0 right-0">
<form method="dialog">
<button class="btn btn-warning">Close</button>
</form>
</div>
</div>
</dialog>
</dialog>
</div>
<div class="flex items-center">
<div class="flex items-center ml-3">

92
client/src/app/core/layout/layout.component.ts
View file

@ -1,4 +1,4 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import { Component, OnDestroy, OnInit, OnChanges, SimpleChanges, AfterViewInit } from '@angular/core';
import { ActivatedRoute, RouterModule } from '@angular/router';
import { CommonModule, DatePipe, NgFor, NgIf, NgOptimizedImage } from '@angular/common';
import { GoogleButtonComponent } from 'src/app/shared/googleButton/googleButton.component';
@ -32,7 +32,7 @@ interface MenuItem {
MergeComponent
]
})
export class LayoutComponent implements OnInit, OnDestroy {
export class LayoutComponent implements OnInit, AfterViewInit, OnDestroy {
current_department = this._router.snapshot.paramMap.get('department')!;
menuItems: MenuItem[] = [
@ -70,6 +70,40 @@ export class LayoutComponent implements OnInit, OnDestroy {
private _recipeService: RecipeService
) {}
// acticvate after ngOnInit
async ngAfterViewInit(): Promise<void> {
// check if saves existed
this._recipeService.getSavedTmp(
await this._recipeService.getCurrentCountry(),
this._recipeService.getCurrentFile()
).subscribe({
next: async (data: any) => {
console.log("get saved tmp", data);
if(data != null && data != undefined){
this.isCommitLoaded = Promise.resolve(true);
}
// TODO: optimize
if(data != undefined && typeof data === 'object'){
// check if attr exists
if(data.files != null && data.files != undefined){
this.showDetectChanges = true;
await AsyncStorage.setItem("detectChanges", "true");
this.changesCommit = data.files;
console.log("get commits", this.changesCommit);
} else {
this.showDetectChanges = false;
await AsyncStorage.setItem("detectChanges", "false");
}
} else {
this.showDetectChanges = false;
await AsyncStorage.setItem("detectChanges", "false");
}
}
});
}
async ngOnInit(): Promise<void> {
this._userService.currentUser
.pipe(takeUntil(this.exit$))
@ -89,35 +123,35 @@ export class LayoutComponent implements OnInit, OnDestroy {
});
// check if saves existed
this._recipeService.getSavedTmp(
await this._recipeService.getCurrentCountry(),
this._recipeService.getCurrentFile()
).subscribe({
next: async (data: any) => {
console.log("get saved tmp", data);
// this._recipeService.getSavedTmp(
// await this._recipeService.getCurrentCountry(),
// this._recipeService.getCurrentFile()
// ).subscribe({
// next: async (data: any) => {
// console.log("get saved tmp", data);
if(data != null && data != undefined){
this.isCommitLoaded = Promise.resolve(true);
}
// if(data != null && data != undefined){
// this.isCommitLoaded = Promise.resolve(true);
// }
// TODO: optimize
if(data != undefined && typeof data === 'object'){
// check if attr exists
if(data.files != null && data.files != undefined){
this.showDetectChanges = true;
await AsyncStorage.setItem("detectChanges", "true");
this.changesCommit = data.files;
console.log("get commits", this.changesCommit);
} else {
this.showDetectChanges = false;
await AsyncStorage.setItem("detectChanges", "false");
}
} else {
this.showDetectChanges = false;
await AsyncStorage.setItem("detectChanges", "false");
}
}
});
// // TODO: optimize
// if(data != undefined && typeof data === 'object'){
// // check if attr exists
// if(data.files != null && data.files != undefined){
// this.showDetectChanges = true;
// await AsyncStorage.setItem("detectChanges", "true");
// this.changesCommit = data.files;
// console.log("get commits", this.changesCommit);
// } else {
// this.showDetectChanges = false;
// await AsyncStorage.setItem("detectChanges", "false");
// }
// } else {
// this.showDetectChanges = false;
// await AsyncStorage.setItem("detectChanges", "false");
// }
// }
// });
}
ngOnDestroy() {

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

File diff suppressed because it is too large Load diff

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

@ -142,24 +142,26 @@ export class RecipeToppingComponent implements OnInit, OnChanges {
})
);
}
} else {
// padding
// TODO: move padding to recipelist then insert padding between original last index and this index
if (this.index! > data.length) {
for (
let init = this.toppingList.length - 1;
this.toppingList.at(this.index!) == undefined &&
init < this.index!;
init++
) {
this.toppingList.push(
this._formBuilder.group({
isUse: false,
groupID: "0",
defaultIDSelect: 0,
ListGroupID: [0, 0, 0, 0],
})
);
}
// for (
// let init = this.toppingList.length - 1;
// this.toppingList.at(this.index!) == undefined &&
// init < this.index!;
// init++
// ) {
// }
this.toppingList.push(
this._formBuilder.group({
isUse: false,
groupID: "0",
defaultIDSelect: 0,
ListGroupID: [0, 0, 0, 0],
})
);
}
console.log(
@ -208,7 +210,7 @@ export class RecipeToppingComponent implements OnInit, OnChanges {
// apply on read mode
ngOnChanges(changes: SimpleChanges): void {
console.log('changes on topping', changes);
// console.log('changes on topping', changes);
if (changes['preFetchedData']) {
let toppingSet = changes['preFetchedData'].currentValue as Array<any>;