Tai/Aberwyn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimized menu
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
elias
2025-06-05 20:15:11 +02:00
parent eba00ffbf2
commit bc77e39c72
15 changed files with 922 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
Aberwyn/wwwroot/js/menu.js
View File

@@ -4,79 +4,46 @@
}
angular.module('mealMenuApp', ['ngSanitize'])
.controller('MealMenuController', function ($scope, $http, $sce) {
.controller('MealMenuController', function ($scope, $http, $sce, $timeout) {
console.log("Controller initierad");
const savedView = localStorage.getItem('mealViewMode');
$scope.viewMode = savedView === 'card' || savedView === 'list' ? savedView : 'card';
$scope.tooltip = {};
$scope.meals = [];
$scope.menu = {};
const today = new Date();
$scope.selectedWeek = getWeek(today);
$scope.selectedYear = today.getFullYear();
$scope.daysOfWeek = ["Måndag", "Tisdag", "Onsdag", "Torsdag", "Fredag", "Lördag", "Söndag"];
$scope.loadMeals = function () {
console.log("Hämtar måltider...");
return $http.get('/api/mealMenuApi/getMeals')
.then(res => {
console.log("Måltider hämtade:", res.data);
$scope.meals = res.data;
console.log("Alla måltider med bilder:", $scope.meals);
return res;
})
.catch(err => console.error("Fel vid hämtning av måltider:", err));
};
$scope.loadMenu = function () {
console.log("Hämtar meny för vecka:", $scope.selectedWeek, $scope.selectedYear);
$http.get('/api/mealMenuApi/menu', {
$http.get('/api/mealMenuApi/getWeeklyMenu', {
params: { weekNumber: $scope.selectedWeek, year: $scope.selectedYear }
}).then(res => {
console.log("Menyposter hämtade:", res.data);
const rawMenu = res.data;
$scope.menu = {};
res.data.forEach(item => {
rawMenu.forEach(item => {
const dayIndex = item.DayOfWeek - 1;
if (dayIndex < 0 || dayIndex >= $scope.daysOfWeek.length) {
console.warn("Ogiltig dag:", item.DayOfWeek);
return;
}
const day = $scope.daysOfWeek[dayIndex];
$scope.menu[day] = {};
['breakfast', 'lunch', 'dinner'].forEach(type => {
// Konvertera till PascalCase
const capitalType = type.charAt(0).toUpperCase() + type.slice(1);
const idKey = capitalType + 'MealId';
const nameKey = capitalType + 'MealName';
if (item[idKey]) {
const m = $scope.meals.find(x => x.Id == item[idKey]);
console.log(`Match för ${type} (${day}):`, m);
$scope.menu[day][type + 'MealId'] = item[idKey];
$scope.menu[day][type + 'MealName'] = m?.Name || item[nameKey] || 'Okänd rätt';
if (m && !$scope.menu[day].imageUrl) {
if (m.ImageData) {
const mime = m.ImageMimeType || "image/jpeg";
$scope.menu[day].imageUrl = `data:${mime};base64,${m.ImageData}`;
} else if (m.ImageUrl) {
$scope.menu[day].imageUrl = m.ImageUrl.startsWith('/')
? m.ImageUrl
: '/' + m.ImageUrl;
}
}
}
});
console.warn("Item:", item);
console.log("day: " + day + "(" + dayIndex + " ) item: " + item.DinnerMealName);
const thumb = item.DinnerMealThumbnail;
$scope.menu[day] = {
breakfastMealId: item.BreakfastMealId,
breakfastMealName: item.BreakfastMealName,
lunchMealId: item.LunchMealId,
lunchMealName: item.LunchMealName,
dinnerMealId: item.DinnerMealId,
dinnerMealName: item.DinnerMealName,
imageUrl: thumb ? `data:image/webp;base64,${thumb}` : '/img/default-thumbnail.webp'
};
});
console.log("Byggd meny:", $scope.menu);
}).catch(err => console.error("Fel vid hämtning av veckomeny:", err));
}).catch(err => console.error("Fel vid hämtning av meny:", err));
};
$scope.openMeal = function (mealId) {
@@ -85,7 +52,7 @@ angular.module('mealMenuApp', ['ngSanitize'])
};
$scope.getDayImage = function (day) {
return $scope.menu[day]?.imageUrl || '/images/default-meal.jpg';
return $scope.menu[day]?.imageUrl || '/img/default-thumbnail.webp';
};
$scope.getMealIdByDay = function (day) {
@@ -120,34 +87,24 @@ angular.module('mealMenuApp', ['ngSanitize'])
const yearStart = new Date(d.getFullYear(), 0, 1);
return Math.ceil((((d - yearStart) / 86400000) + 1) / 7);
}
$scope.getViewIcon = function () {
return $scope.viewMode === 'list' ? '🗒️' : '▣';
};
$scope.toggleView = function () {
$scope.viewMode = $scope.viewMode === 'list' ? 'card' : 'list';
localStorage.setItem('mealViewMode', $scope.viewMode); // ← spara läget
localStorage.setItem('mealViewMode', $scope.viewMode);
$timeout(() => {
const viewBtn = document.getElementById('toggle-view');
if (viewBtn) viewBtn.textContent = $scope.getViewIcon();
}, 0);
};
console.log("Initierar måltidsladdning...");
$scope.loadMeals().then(() => {
console.log("Laddar meny efter måltider...");
$scope.loadMenu();
setTimeout(() => {
const viewBtn = document.getElementById('toggle-view');
if (viewBtn) viewBtn.textContent = $scope.getViewIcon();
}, 0);
});
console.log("Initierar meny och måltidsladdning...");
$scope.loadMenu();
});
document.addEventListener("DOMContentLoaded", function () {
const themeBtn = document.getElementById('toggle-theme');
const viewBtn = document.getElementById('toggle-view');
@@ -168,7 +125,4 @@ document.addEventListener("DOMContentLoaded", function () {
const systemPrefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
setTheme(systemPrefersDark ? 'dark' : 'light');
}
// Initiera ikon för vy
});