diff --git a/Extension/background.js b/Extension/background.js index 567d868..047cebb 100644 --- a/Extension/background.js +++ b/Extension/background.js @@ -36,7 +36,7 @@ function updateHorseButton() { const activeTabId = tabs[0].id; // Schritt 1: Basisdaten des Pferdes holen - sendMessageAsync(activeTabId, { action: "getHorseBasicData" }) + return sendMessageAsync(activeTabId, { action: "getHorseBasicData" }) .then((basicDataResponse) => { if (!basicDataResponse || !basicDataResponse.success) { console.error("Failed to get horse basic data:", basicDataResponse ? basicDataResponse.message : "No response"); @@ -46,10 +46,15 @@ function updateHorseButton() { const horseData = basicDataResponse.data; // Pferd beim Backend prüfen - getHorseLoadStateAPIAsync(horseData.id) + return getHorseLoadStateAPIAsync(horseData.id) + .then((existingHorse) => { + if (!existingHorse || existingHorse.message === "Horse not found") { + console.warn("Horse not found in the API."); + return; // Beende die Kette + } // Basisdaten an die API senden - setBaseDataHorseAPI(horseData.id, horseData) + return setBaseDataHorseAPI(horseData.id, horseData) .then(() => { console.log("Base data updated in API for horse ID:", horseData.id); // Schritt 2: Aktuelle Horse-Daten holen (abhängig vom aktiven Tab) @@ -63,8 +68,10 @@ function updateHorseButton() { console.log("Current horse data received:", currentDataResponse.data); }); }); - - console.error("Error updating horse data:", error); + }); + }); + }) + .catch((error) => { + console.error("Error in updateHorseButton:", error); }); -}); -} \ No newline at end of file +} diff --git a/Extension/ui.js b/Extension/ui.js index d3f58c1..57ec322 100644 --- a/Extension/ui.js +++ b/Extension/ui.js @@ -160,7 +160,7 @@ document.addEventListener("DOMContentLoaded", function () { async function updateLoadStateUI(horseId) { const loadState = await getHorseLoadStateAPIAsync(horseId); if (!loadState) { - console.error("Failed to retrieve load state."); + console.info("Failed to retrieve load state."); return; } diff --git a/HRServer-Exporter/.vs/HRServer-Exporter/v17/.suo b/HRServer-Exporter/.vs/HRServer-Exporter/v17/.suo index d8073a0..68cc08e 100644 Binary files a/HRServer-Exporter/.vs/HRServer-Exporter/v17/.suo and b/HRServer-Exporter/.vs/HRServer-Exporter/v17/.suo differ diff --git a/HRServer-Exporter/.vs/HRServer-Exporter/v17/DocumentLayout.backup.json b/HRServer-Exporter/.vs/HRServer-Exporter/v17/DocumentLayout.backup.json index 0076414..ff8cf51 100644 --- a/HRServer-Exporter/.vs/HRServer-Exporter/v17/DocumentLayout.backup.json +++ b/HRServer-Exporter/.vs/HRServer-Exporter/v17/DocumentLayout.backup.json @@ -40,7 +40,7 @@ "RelativeDocumentMoniker": "HorseViewer\\Models\\Horse.cs", "ToolTip": "Z:\\[01] Kribitz Development\\[02] Projekte\\HR-Collector\\HRServer-Exporter\\HorseViewer\\Models\\Horse.cs", "RelativeToolTip": "HorseViewer\\Models\\Horse.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAA0AAAAJAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAOAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-08T19:13:28.722Z", "EditorCaption": "" @@ -53,7 +53,7 @@ "RelativeDocumentMoniker": "HorseViewer\\Form1.cs", "ToolTip": "Z:\\[01] Kribitz Development\\[02] Projekte\\HR-Collector\\HRServer-Exporter\\HorseViewer\\Form1.cs", "RelativeToolTip": "HorseViewer\\Form1.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAA==", + "ViewState": "AgIAAA8AAAAAAAAAAAAIwCAAAAAcAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-08T18:52:40.109Z", "EditorCaption": "" diff --git a/HRServer-Exporter/HRServer/bin/Debug/net8.0/horses.json b/HRServer-Exporter/HRServer/bin/Debug/net8.0/horses.json new file mode 100644 index 0000000..f6e2092 --- /dev/null +++ b/HRServer-Exporter/HRServer/bin/Debug/net8.0/horses.json @@ -0,0 +1 @@ +{"19055499":{"id":19055499,"age":6,"name":"Foal Doe 19055499","gender":"Mare","breed":"Akhal-Teke","link":"https://www.horsereality.com/horses/19055499/foal-doe-19055499","lastDrawnDate":"2024-12-08T20:07:41.1057801+01:00","Summary":{"RelatedIds":["https://www.horsereality.com/horses/1922256/gozgan","https://www.horsereality.com/horses/1922245/guljady"]},"Training":{"Training":""},"Genetics":{"GP":679,"GeneticPotential":{"Acceleration":73,"Agility":65,"Balance":68,"Bascule":64,"Pulling power":33,"Speed":74,"Sprint":69,"Stamina":90,"Strength":59,"Surefootedness":84},"Disciplines":{"Dressage":192,"Driving":321,"Endurance":307,"Eventing":349,"Flat Racing":306,"Show Jumping":330,"Western Reining":290},"Colors":{"Extension":"? / ?","Agouti":"? / ?","Grey":"? / ?","Creampearl":"? / ?","Dun":"? / ?","Champagne":"? / ?","Silver":"? / ?","Mushroom":"? / ?","Frame":"? / ?","Appaloosa":"? / ?","PATN1":"? / ?","MITF":"? / ?","SW2":"? / ?","KIT":"? / ?"}},"Achievements":{"ShowResults":[],"Conformation":{"Walk":"Average","Trot":"Average","Canter":"Good","Gallop":"Below average","Posture":"Good","Head":"Average","Neck":"Good","Back":"Average","Shoulders":"Average","Frontlegs":"Good","Hindquarters":"Below average","Socks":"Average"},"ShortConformation":"6A 4G 2BA","MaxShowResult":-1,"MinShowResult":-1,"MaxCompetitionResult":-1,"MinCompetitionResult":-1},"Health":{"Health":{}},"LoadState":{"BasicInfoLoaded":true,"BasicInfoNeedsRefresh":false,"SummaryLoaded":true,"SummaryNeedsRefresh":false,"TrainingLoaded":false,"TrainingNeedsRefresh":false,"GeneticsLoaded":true,"GeneticsNeedsRefresh":false,"AchievementsLoaded":true,"AchievementsNeedsRefresh":false,"HealthLoaded":false,"HealthNeedsRefresh":false}},"17848165":{"id":17848165,"age":5,"name":"Foal Doe 17848165","gender":"Stallion","breed":"Cleveland Bay","link":"https://www.horsereality.com/horses/17848165/foal-doe-17848165","lastDrawnDate":"2024-12-08T20:08:00.3404896+01:00","Summary":{"RelatedIds":[]},"Training":{"Training":""},"Genetics":{"GP":671,"GeneticPotential":{"Acceleration":66,"Agility":57,"Balance":72,"Bascule":75,"Pulling power":78,"Speed":67,"Sprint":53,"Stamina":72,"Strength":75,"Surefootedness":56},"Disciplines":{"Dressage":204,"Driving":349,"Endurance":270,"Eventing":345,"Flat Racing":258,"Show Jumping":326,"Western Reining":251},"Colors":{"Extension":"? / ?","Agouti":"? / ?","Grey":"? / ?","Creampearl":"? / ?","Dun":"? / ?","Champagne":"? / ?","Silver":"? / ?","Mushroom":"? / ?","Frame":"? / ?","Appaloosa":"? / ?","PATN1":"? / ?","MITF":"? / ?","SW2":"? / ?","KIT":"? / ?"}},"Achievements":{"ShowResults":[],"Conformation":{},"ShortConformation":"","MaxShowResult":0,"MinShowResult":0,"MaxCompetitionResult":0,"MinCompetitionResult":0},"Health":{"Health":{}},"LoadState":{"BasicInfoLoaded":true,"BasicInfoNeedsRefresh":false,"SummaryLoaded":false,"SummaryNeedsRefresh":false,"TrainingLoaded":false,"TrainingNeedsRefresh":false,"GeneticsLoaded":true,"GeneticsNeedsRefresh":false,"AchievementsLoaded":false,"AchievementsNeedsRefresh":false,"HealthLoaded":false,"HealthNeedsRefresh":false}}} \ No newline at end of file diff --git a/HRServer-Exporter/HRServer/horses.json b/HRServer-Exporter/HRServer/horses.json index f6e2092..41cc4e9 100644 --- a/HRServer-Exporter/HRServer/horses.json +++ b/HRServer-Exporter/HRServer/horses.json @@ -1 +1 @@ -{"19055499":{"id":19055499,"age":6,"name":"Foal Doe 19055499","gender":"Mare","breed":"Akhal-Teke","link":"https://www.horsereality.com/horses/19055499/foal-doe-19055499","lastDrawnDate":"2024-12-08T20:07:41.1057801+01:00","Summary":{"RelatedIds":["https://www.horsereality.com/horses/1922256/gozgan","https://www.horsereality.com/horses/1922245/guljady"]},"Training":{"Training":""},"Genetics":{"GP":679,"GeneticPotential":{"Acceleration":73,"Agility":65,"Balance":68,"Bascule":64,"Pulling power":33,"Speed":74,"Sprint":69,"Stamina":90,"Strength":59,"Surefootedness":84},"Disciplines":{"Dressage":192,"Driving":321,"Endurance":307,"Eventing":349,"Flat Racing":306,"Show Jumping":330,"Western Reining":290},"Colors":{"Extension":"? / ?","Agouti":"? / ?","Grey":"? / ?","Creampearl":"? / ?","Dun":"? / ?","Champagne":"? / ?","Silver":"? / ?","Mushroom":"? / ?","Frame":"? / ?","Appaloosa":"? / ?","PATN1":"? / ?","MITF":"? / ?","SW2":"? / ?","KIT":"? / ?"}},"Achievements":{"ShowResults":[],"Conformation":{"Walk":"Average","Trot":"Average","Canter":"Good","Gallop":"Below average","Posture":"Good","Head":"Average","Neck":"Good","Back":"Average","Shoulders":"Average","Frontlegs":"Good","Hindquarters":"Below average","Socks":"Average"},"ShortConformation":"6A 4G 2BA","MaxShowResult":-1,"MinShowResult":-1,"MaxCompetitionResult":-1,"MinCompetitionResult":-1},"Health":{"Health":{}},"LoadState":{"BasicInfoLoaded":true,"BasicInfoNeedsRefresh":false,"SummaryLoaded":true,"SummaryNeedsRefresh":false,"TrainingLoaded":false,"TrainingNeedsRefresh":false,"GeneticsLoaded":true,"GeneticsNeedsRefresh":false,"AchievementsLoaded":true,"AchievementsNeedsRefresh":false,"HealthLoaded":false,"HealthNeedsRefresh":false}},"17848165":{"id":17848165,"age":5,"name":"Foal Doe 17848165","gender":"Stallion","breed":"Cleveland Bay","link":"https://www.horsereality.com/horses/17848165/foal-doe-17848165","lastDrawnDate":"2024-12-08T20:08:00.3404896+01:00","Summary":{"RelatedIds":[]},"Training":{"Training":""},"Genetics":{"GP":671,"GeneticPotential":{"Acceleration":66,"Agility":57,"Balance":72,"Bascule":75,"Pulling power":78,"Speed":67,"Sprint":53,"Stamina":72,"Strength":75,"Surefootedness":56},"Disciplines":{"Dressage":204,"Driving":349,"Endurance":270,"Eventing":345,"Flat Racing":258,"Show Jumping":326,"Western Reining":251},"Colors":{"Extension":"? / ?","Agouti":"? / ?","Grey":"? / ?","Creampearl":"? / ?","Dun":"? / ?","Champagne":"? / ?","Silver":"? / ?","Mushroom":"? / ?","Frame":"? / ?","Appaloosa":"? / ?","PATN1":"? / ?","MITF":"? / ?","SW2":"? / ?","KIT":"? / ?"}},"Achievements":{"ShowResults":[],"Conformation":{},"ShortConformation":"","MaxShowResult":0,"MinShowResult":0,"MaxCompetitionResult":0,"MinCompetitionResult":0},"Health":{"Health":{}},"LoadState":{"BasicInfoLoaded":true,"BasicInfoNeedsRefresh":false,"SummaryLoaded":false,"SummaryNeedsRefresh":false,"TrainingLoaded":false,"TrainingNeedsRefresh":false,"GeneticsLoaded":true,"GeneticsNeedsRefresh":false,"AchievementsLoaded":false,"AchievementsNeedsRefresh":false,"HealthLoaded":false,"HealthNeedsRefresh":false}}} \ No newline at end of file +{"19055499":{"id":19055499,"age":6,"name":"Foal Doe 19055499","gender":"Mare","breed":"Akhal-Teke","link":"https://www.horsereality.com/horses/19055499/foal-doe-19055499","lastDrawnDate":"2024-12-08T20:07:41.1057801+01:00","Summary":{"RelatedIds":["https://www.horsereality.com/horses/1922256/gozgan","https://www.horsereality.com/horses/1922245/guljady"]},"Training":{"Training":""},"Genetics":{"GP":679,"GeneticPotential":{"Acceleration":73,"Agility":65,"Balance":68,"Bascule":64,"Pulling power":33,"Speed":74,"Sprint":69,"Stamina":90,"Strength":59,"Surefootedness":84},"Disciplines":{"Dressage":192,"Driving":321,"Endurance":307,"Eventing":349,"Flat Racing":306,"Show Jumping":330,"Western Reining":290},"Colors":{"Extension":"? / ?","Agouti":"? / ?","Grey":"? / ?","Creampearl":"? / ?","Dun":"? / ?","Champagne":"? / ?","Silver":"? / ?","Mushroom":"? / ?","Frame":"? / ?","Appaloosa":"? / ?","PATN1":"? / ?","MITF":"? / ?","SW2":"? / ?","KIT":"? / ?"}},"Achievements":{"ShowResults":[],"Conformation":{"Walk":"Average","Trot":"Average","Canter":"Good","Gallop":"Below average","Posture":"Good","Head":"Average","Neck":"Good","Back":"Average","Shoulders":"Average","Frontlegs":"Good","Hindquarters":"Below average","Socks":"Average"},"ShortConformation":"6A 4G 2BA","MaxShowResult":-1,"MinShowResult":-1,"MaxCompetitionResult":-1,"MinCompetitionResult":-1},"Health":{"Health":{}},"LoadState":{"BasicInfoLoaded":true,"BasicInfoNeedsRefresh":false,"SummaryLoaded":true,"SummaryNeedsRefresh":false,"TrainingLoaded":false,"TrainingNeedsRefresh":false,"GeneticsLoaded":true,"GeneticsNeedsRefresh":false,"AchievementsLoaded":true,"AchievementsNeedsRefresh":false,"HealthLoaded":false,"HealthNeedsRefresh":false}},"17848165":{"id":17848165,"age":5,"name":"Foal Doe 17848165","gender":"Stallion","breed":"Cleveland Bay","link":"https://www.horsereality.com/horses/17848165/foal-doe-17848165","lastDrawnDate":"2024-12-08T20:08:00.3404896+01:00","Summary":{"RelatedIds":[]},"Training":{"Training":"Basic Training"},"Genetics":{"GP":671,"GeneticPotential":{"Acceleration":66,"Agility":57,"Balance":72,"Bascule":75,"Pulling power":78,"Speed":67,"Sprint":53,"Stamina":72,"Strength":75,"Surefootedness":56},"Disciplines":{"Dressage":204,"Driving":349,"Endurance":270,"Eventing":345,"Flat Racing":258,"Show Jumping":326,"Western Reining":251},"Colors":{"Extension":"? / ?","Agouti":"? / ?","Grey":"? / ?","Creampearl":"? / ?","Dun":"? / ?","Champagne":"? / ?","Silver":"? / ?","Mushroom":"? / ?","Frame":"? / ?","Appaloosa":"? / ?","PATN1":"? / ?","MITF":"? / ?","SW2":"? / ?","KIT":"? / ?"}},"Achievements":{"ShowResults":[],"Conformation":{"Walk":"Good","Trot":"Good","Canter":"Good","Gallop":"Good","Posture":"Good","Head":"Average","Neck":"Good","Back":"Average","Shoulders":"Good","Frontlegs":"Good","Hindquarters":"Average","Socks":"Average"},"ShortConformation":"8G 4A","MaxShowResult":-1,"MinShowResult":-1,"MaxCompetitionResult":-1,"MinCompetitionResult":-1},"Health":{"Health":{"Fertility":"Good","Colic resistance":"Good","Hoof quality":"Good","Back problems":"Excellent","Respiratory disease":"Good","Resistance to lameness":"Excellent"}},"LoadState":{"BasicInfoLoaded":true,"BasicInfoNeedsRefresh":false,"SummaryLoaded":false,"SummaryNeedsRefresh":false,"TrainingLoaded":true,"TrainingNeedsRefresh":false,"GeneticsLoaded":true,"GeneticsNeedsRefresh":false,"AchievementsLoaded":true,"AchievementsNeedsRefresh":false,"HealthLoaded":true,"HealthNeedsRefresh":false}}} \ No newline at end of file