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

fix skipping recipe list bug

Browse source
This commit is contained in:
pakintada@gmail.com 2024-02-08 09:18:11 +07:00
parent ece4cef205
commit b3b55be388
6 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/src/app/app-routing.module.ts
View file

@ -117,7 +117,7 @@ const routes: Routes = [
),
canActivate: [
authGuard,
permissionsGuard(UserPermissions.THAI_PERMISSION),
permissionsGuard(UserPermissions.VIEWER, UserPermissions.EDITOR),
],
},
{
@ -128,7 +128,7 @@ const routes: Routes = [
).then((m) => m.RecipeDetailsComponent),
canActivate: [
authGuard,
permissionsGuard(UserPermissions.THAI_PERMISSION),
permissionsGuard(UserPermissions.VIEWER, UserPermissions.EDITOR),
],
},
{
@ -166,14 +166,14 @@ const routes: Routes = [
(m) => m.UnauthorizedComponent
),
},
{
path: 'notfound',
loadComponent: () =>
import('./core/notfound.component').then((m) => m.NotfoundComponent),
},
// {
// path: 'notfound',
// loadComponent: () =>
// import('./core/notfound.component').then((m) => m.NotfoundComponent),
// },
{
path: '**',
redirectTo: 'notfound',
redirectTo: 'departments',
},
];

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

@ -25,7 +25,7 @@
</svg>
</button>
<a
routerLink="/{{ current_department }}/recipes"
routerLink="/departments"
class="flex ml-14 max-sm:hidden"
>
<img

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

@ -28,6 +28,7 @@
>
<td class="font-medium text-gray-900 whitespace-nowrap sticky left-0">
<input type="checkbox" class="toggle" formControlName="isUse" />
<p>{{i}}</p>
</td>
<td class="font-medium text-gray-900 whitespace-nowrap sticky">
<input

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

@ -208,6 +208,7 @@ export class RecipesComponent implements OnInit, OnDestroy, AfterViewInit {
.subscribe({
next: (files: any) => {
console.log('Obtain saves: ', typeof files, files);
this.showSaveNoti = false;
if (files != undefined && typeof files === 'object') {
if (files.files != null) {
console.log(

9
server/routers/recipe.go
View file

@ -491,11 +491,20 @@ func (rr *RecipeRouter) updateRecipe(w http.ResponseWriter, r *http.Request) {
// partial
// err = encoder.Encode(changes)
// put changes to redis
if err != nil {
rr.taoLogger.Log.Error("RecipeRouter.UpdateRecipe", zap.Error(errors.WithMessage(err, "Error when write file")))
http.Error(w, "Internal Error", http.StatusInternalServerError)
return
}
err = rr.cache_db.SetToKey(commit_hash+"_"+filename, changes)
if err != nil {
rr.taoLogger.Log.Error("RecipeRouter.UpdateRecipeCache", zap.Error(errors.WithMessage(err, "Error when write file")))
http.Error(w, "Internal Error", http.StatusInternalServerError)
return
}
w.Header().Add("Content-Type", "application/json")
json.NewEncoder(w).Encode(map[string]interface{}{

20
server/services/recipe/recipe.go
View file

@ -141,6 +141,26 @@ func (rs *recipeService) GetRecipeDetailMat(request *contracts.RecipeDetailReque
WaterYield: v.WaterYield,
})
break
} else if v.MaterialPathId == 0 {
// this is empty material slot
result.Result = append(result.Result, contracts.RecipeDetailMat{
StringParam: "",
IsUse: false,
MaterialID: 0,
Name: "",
MixOrder: 0,
FeedParameter: 0,
FeedPattern: 0,
MaterialPathId: 0,
PowderGram: 0,
PowderTime: 0,
StirTime: 0,
SyrupGram: 0,
SyrupTime: 0,
WaterCold: 0,
WaterYield: 0,
})
break
}
}
}