diff --git a/CanYouBuildIt/Data/UserData.xml b/CanYouBuildIt/Data/UserData.xml index 4444739..cbaa0cf 100644 --- a/CanYouBuildIt/Data/UserData.xml +++ b/CanYouBuildIt/Data/UserData.xml @@ -15,7 +15,7 @@ Processeur - Ryzen 5 5800X + Ryzen 7 5800X https://www.amazon.fr/AMD-Ryzen-7-5800X-RyzenTM/dp/B0815XFSGK/ 218.98 Processeur @@ -103,7 +103,7 @@ Processeur - Ryzen 5 5800X + Ryzen 7 5800X https://www.amazon.fr/AMD-Ryzen-7-5800X-RyzenTM/dp/B0815XFSGK/ 218.98 Processeur @@ -184,7 +184,95 @@ 1 pc2.png - 1288.0999 + 1288.1 + + + + + RAM + + Corsair Vengeance LPX 16GB (2x8GB) DDR4 3200MHz C16 - Noir + https://www.amazon.fr/Corsair-Vengeance-16GB-2x8GB-3200MHz/dp/B07RS1G6XW/ref=asc_df_B07RS1G6XW/?tag=go + 48.89 + RAM + + + + SSD + + Disque SSD Interne Kingston FURY Renegade 1000 Go Noir + https://www.fnac.com/Disque-SSD-Interne-Kingston-FURY-Renegade-1000-Go-Noir/a17744537/w-4?Origin=SEA_GOOGLE_PLA_MICRO&esl-k=sem-google%7cnx%7cc%7cm%7ckpla%7cp%7ct%7cdc%7ca%7cg19917047259&gclid=CjwKCAjwvpCkBhB4EiwAujULMrICm_eRaleVBUXER177e-Bw14n1mBVECGMwnR1fDSr5hJF5w5V1GRoCnIMQAvD_BwE&gclsrc=aw.ds + 99.99 + SSD + + + + Alimentation + + Corsair CV Series CV550Watt, 80 Plus Bronze + https://www.amazon.fr/Alimentation-Corsair-CV550Watt-Plus-Bronze/dp/B07YVWW7MW/ref=asc_df_B07YVWW7MW/?tag=googshopfr-21&linkCode=df0&hvadid=411330562965&hvpos=&hvnetw=g&hvrand=991396465070491192&hvpone=&hvptwo=&hvqmt=&hvdev=c&hvdvcmdl=&hvlocint=&hvlocphy=9055886&hvtargid=pla-896516658390&psc=1&tag=&ref=&adgrpid=94631885692&hvpone=&hvptwo=&hvadid=411330562965&hvpos=&hvnetw=g&hvrand=991396465070491192&hvqmt=&hvdev=c&hvdvcmdl=&hvlocint=&hvlocphy=9055886&hvtargid=pla-896516658390 + 64.99 + Alimentation + + + + Processeur + + Intel® Core™ i5-13400F + https://www.rueducommerce.fr/p-intel-core-i5-13400f-25ghz46ghz-intel-3436638-18383.html?gclid=CjwKCAjwvpCkBhB4EiwAujULMpR3j0-QYXXpmJ-8xhkSlYtW14MqWqznls6gKGuzZlqd3xovMzKOORoCdLsQAvD_BwE + 214.65 + Processeur + + + + CarteMere + + ASUS TUF GAMING B760-PLUS WIFI D4 + https://infomaxparis.com/fr/carte-mere-pc-gamer/32759-carte-mere-gamer-asus-tuf-gaming-b760-plus-wifi-d4-4711387009499.html?gclid=CjwKCAjwvpCkBhB4EiwAujULMjBU334W9KjPkQBMo9KIFlDEidI-7XWt9RZZ6cAzXeYFOj5IGoHojhoCUp0QAvD_BwE + 219.9 + CarteMere + + + + Ventirad + + be quiet! Pure Rock 2 Black + https://www.ldlc.com/fiche/PB00340585.html?utm_source=google&utm_medium=cpc&utm_campaign=Google+Ads&gclid=CjwKCAjwvpCkBhB4EiwAujULMkokWrjANEI5KX2M0RDxb1ahQCIdgPRw-hO3Xhr7HltyvzzGtdcHIhoCf8wQAvD_BwE + 44.95 + Ventirad + + + + HDD + + Seagate BarraCuda 2 To (ST2000DM005) + https://www.ldlc.com/fiche/PB00254339.html + 62.95 + HDD + + + + CarteGraphique + + ASUS RTX 3060 + https://www.amazon.fr/ASUS-DUAL-NVIDIA-GeForce-GDDR6/dp/B096658ZWP + 453.99 + CarteGraphique + + + + Boitier + + Boitier PC Corsair 4000X RGB - Blanc + https://infomaxparis.com/fr/boitier-pc-gamer/31342-corsair-4000x-rgb-blanc-840006626657.html?gclid=CjwKCAjwvpCkBhB4EiwAujULMn3Y0EsT_TRsUKqczvsf5X3J3T052ep45BDBF7_qmUTDIFaLXNHY6xoCQDYQAvD_BwE + 125.9 + Boitier + + + + 2 + pc3.png + 1336.2101 @@ -195,7 +283,7 @@ Boitier - Ryzen 5 5800X + Ryzen 7 5800X https://www.amazon.fr/AMD-Ryzen-7-5800X-RyzenTM/dp/B0815XFSGK/ 218.98 Processeur @@ -266,6 +354,48 @@ 10.9 Ventilateur + + Corsair Vengeance LPX 16GB (2x8GB) DDR4 3200MHz C16 - Noir + https://www.amazon.fr/Corsair-Vengeance-16GB-2x8GB-3200MHz/dp/B07RS1G6XW/ref=asc_df_B07RS1G6XW/?tag=go + 48.89 + RAM + + + Disque SSD Interne Kingston FURY Renegade 1000 Go Noir + https://www.fnac.com/Disque-SSD-Interne-Kingston-FURY-Renegade-1000-Go-Noir/a17744537/w-4?Origin=SEA_GOOGLE_PLA_MICRO&esl-k=sem-google%7cnx%7cc%7cm%7ckpla%7cp%7ct%7cdc%7ca%7cg19917047259&gclid=CjwKCAjwvpCkBhB4EiwAujULMrICm_eRaleVBUXER177e-Bw14n1mBVECGMwnR1fDSr5hJF5w5V1GRoCnIMQAvD_BwE&gclsrc=aw.ds + 99.99 + SSD + + + Corsair CV Series CV550Watt, 80 Plus Bronze + https://www.amazon.fr/Alimentation-Corsair-CV550Watt-Plus-Bronze/dp/B07YVWW7MW/ref=asc_df_B07YVWW7MW/?tag=googshopfr-21&linkCode=df0&hvadid=411330562965&hvpos=&hvnetw=g&hvrand=991396465070491192&hvpone=&hvptwo=&hvqmt=&hvdev=c&hvdvcmdl=&hvlocint=&hvlocphy=9055886&hvtargid=pla-896516658390&psc=1&tag=&ref=&adgrpid=94631885692&hvpone=&hvptwo=&hvadid=411330562965&hvpos=&hvnetw=g&hvrand=991396465070491192&hvqmt=&hvdev=c&hvdvcmdl=&hvlocint=&hvlocphy=9055886&hvtargid=pla-896516658390 + 64.99 + Alimentation + + + Intel® Core™ i5-13400F + https://www.rueducommerce.fr/p-intel-core-i5-13400f-25ghz46ghz-intel-3436638-18383.html?gclid=CjwKCAjwvpCkBhB4EiwAujULMpR3j0-QYXXpmJ-8xhkSlYtW14MqWqznls6gKGuzZlqd3xovMzKOORoCdLsQAvD_BwE + 214.65 + Processeur + + + ASUS TUF GAMING B760-PLUS WIFI D4 + https://infomaxparis.com/fr/carte-mere-pc-gamer/32759-carte-mere-gamer-asus-tuf-gaming-b760-plus-wifi-d4-4711387009499.html?gclid=CjwKCAjwvpCkBhB4EiwAujULMjBU334W9KjPkQBMo9KIFlDEidI-7XWt9RZZ6cAzXeYFOj5IGoHojhoCUp0QAvD_BwE + 219.9 + CarteMere + + + be quiet! Pure Rock 2 Black + https://www.ldlc.com/fiche/PB00340585.html?utm_source=google&utm_medium=cpc&utm_campaign=Google+Ads&gclid=CjwKCAjwvpCkBhB4EiwAujULMkokWrjANEI5KX2M0RDxb1ahQCIdgPRw-hO3Xhr7HltyvzzGtdcHIhoCf8wQAvD_BwE + 44.95 + Ventirad + + + Boitier PC Corsair 4000X RGB - Blanc + https://infomaxparis.com/fr/boitier-pc-gamer/31342-corsair-4000x-rgb-blanc-840006626657.html?gclid=CjwKCAjwvpCkBhB4EiwAujULMn3Y0EsT_TRsUKqczvsf5X3J3T052ep45BDBF7_qmUTDIFaLXNHY6xoCQDYQAvD_BwE + 125.9 + Boitier + diff --git a/CanYouBuildIt/Model/Build.cs b/CanYouBuildIt/Model/Build.cs index 1d9bead..4931e69 100644 --- a/CanYouBuildIt/Model/Build.cs +++ b/CanYouBuildIt/Model/Build.cs @@ -17,7 +17,7 @@ namespace CanYouBuildIt.Model [DataMember] public int id { get; private set; } [DataMember] - public float prix { get; private set; } + public float prix { get; private set; } = new float(); [DataMember] public string image { get; private set; } [DataMember] @@ -31,10 +31,11 @@ namespace CanYouBuildIt.Model nbId = nbId +1; this.image = image; dComp = new Dictionary(); + prix = 0; //Ajoue de chaque élément + calcule du prix total dComp.Add(v1.type,v1); - prix = prix + v1.prix; + prix += v1.prix; dComp.Add(v2.type,v2); prix = prix + v2.prix; dComp.Add(v3.type,v3); @@ -47,6 +48,9 @@ namespace CanYouBuildIt.Model prix = prix + v6.prix; dComp.Add(v7.type,v7); prix = prix + v7.prix; + + prix = (float)Math.Round(prix, 2); + //verifie si les valeurs "non obligatoire" ne sois pas null, et les rentre dans le dictionnaire if (v8 != null) { diff --git a/CanYouBuildIt/Model/Stub.cs b/CanYouBuildIt/Model/Stub.cs index 2cc5cec..7f9909b 100644 --- a/CanYouBuildIt/Model/Stub.cs +++ b/CanYouBuildIt/Model/Stub.cs @@ -27,7 +27,7 @@ namespace CanYouBuildIt.Model //-- Test pour 1 build entier --// lc.Add(new Composant("Zalman Z10 Plus", TypeComposant.Boitier,(float)119.95, "https://www.ldlc.com/fiche/PB00502897.html")); - lc.Add(new Composant("Ryzen 5 5800X",TypeComposant.Processeur,(float)218.98, "https://www.amazon.fr/AMD-Ryzen-7-5800X-RyzenTM/dp/B0815XFSGK/")); + lc.Add(new Composant("Ryzen 7 5800X",TypeComposant.Processeur,(float)218.98, "https://www.amazon.fr/AMD-Ryzen-7-5800X-RyzenTM/dp/B0815XFSGK/")); lc.Add(new Composant("Cooler Master MasterLiquid ML240L V2 ARGB Black Edition ",TypeComposant.Ventirad,(float)89.95, "https://www.ldlc.com/fiche/PB00454454.html")); lc.Add(new Composant("Gigabyte B550M AORUS ELITE ",TypeComposant.CarteMere,(float)129.95, "https://www.ldlc.com/fiche/PB00357556.html")); lc.Add(new Composant("be quiet! Pure Power 11 600W 80PLUS Gold", TypeComposant.Alimentation,(float)93.95, "https://www.ldlc.com/fiche/PB00261005.html")); @@ -46,10 +46,10 @@ namespace CanYouBuildIt.Model //8 lc.Add(new Composant("Corsair CV Series CV550Watt, 80 Plus Bronze", TypeComposant.Alimentation, (float)64.99, "https://www.amazon.fr/Alimentation-Corsair-CV550Watt-Plus-Bronze/dp/B07YVWW7MW/ref=asc_df_B07YVWW7MW/?tag=googshopfr-21&linkCode=df0&hvadid=411330562965&hvpos=&hvnetw=g&hvrand=991396465070491192&hvpone=&hvptwo=&hvqmt=&hvdev=c&hvdvcmdl=&hvlocint=&hvlocphy=9055886&hvtargid=pla-896516658390&psc=1&tag=&ref=&adgrpid=94631885692&hvpone=&hvptwo=&hvadid=411330562965&hvpos=&hvnetw=g&hvrand=991396465070491192&hvqmt=&hvdev=c&hvdvcmdl=&hvlocint=&hvlocphy=9055886&hvtargid=pla-896516658390")); //5 - lc.Add(new Composant("Intel® Core™ i5-13400F", TypeComposant., (float), "https://www.rueducommerce.fr/p-intel-core-i5-13400f-25ghz46ghz-intel-3436638-18383.html?gclid=CjwKCAjwvpCkBhB4EiwAujULMpR3j0-QYXXpmJ-8xhkSlYtW14MqWqznls6gKGuzZlqd3xovMzKOORoCdLsQAvD_BwE")); - lc.Add(new Composant("", TypeComposant., (float), "")); - lc.Add(new Composant("", TypeComposant., (float), "")); - + lc.Add(new Composant("Intel® Core™ i5-13400F", TypeComposant.Processeur, (float)214.65, "https://www.rueducommerce.fr/p-intel-core-i5-13400f-25ghz46ghz-intel-3436638-18383.html?gclid=CjwKCAjwvpCkBhB4EiwAujULMpR3j0-QYXXpmJ-8xhkSlYtW14MqWqznls6gKGuzZlqd3xovMzKOORoCdLsQAvD_BwE")); + lc.Add(new Composant("ASUS TUF GAMING B760-PLUS WIFI D4", TypeComposant.CarteMere, (float)219.90, "https://infomaxparis.com/fr/carte-mere-pc-gamer/32759-carte-mere-gamer-asus-tuf-gaming-b760-plus-wifi-d4-4711387009499.html?gclid=CjwKCAjwvpCkBhB4EiwAujULMjBU334W9KjPkQBMo9KIFlDEidI-7XWt9RZZ6cAzXeYFOj5IGoHojhoCUp0QAvD_BwE")); + lc.Add(new Composant("be quiet! Pure Rock 2 Black", TypeComposant.Ventirad, (float)44.95, "https://www.ldlc.com/fiche/PB00340585.html?utm_source=google&utm_medium=cpc&utm_campaign=Google+Ads&gclid=CjwKCAjwvpCkBhB4EiwAujULMkokWrjANEI5KX2M0RDxb1ahQCIdgPRw-hO3Xhr7HltyvzzGtdcHIhoCf8wQAvD_BwE")); + lc.Add(new Composant("Boitier PC Corsair 4000X RGB - Blanc", TypeComposant.Boitier,(float)125.90,"https://infomaxparis.com/fr/boitier-pc-gamer/31342-corsair-4000x-rgb-blanc-840006626657.html?gclid=CjwKCAjwvpCkBhB4EiwAujULMn3Y0EsT_TRsUKqczvsf5X3J3T052ep45BDBF7_qmUTDIFaLXNHY6xoCQDYQAvD_BwE")); DataToPersist data = new DataToPersist(); @@ -59,6 +59,7 @@ namespace CanYouBuildIt.Model Build b1 = new Build("pc1.png", lc[0], lc[1], lc[2], lc[3], lc[4], lc[5], lc[6], lc[7], lc[8]); data.lb.Add(b1); data.lb.Add(new Build("pc2.png", lc[11], lc[1], lc[2], lc[3], lc[4], lc[5], lc[9], lc[8], lc[10], lc[12])); + data.lb.Add(new Build("pc3.png", lc[13], lc[14], lc[15], lc[16], lc[17], lc[18], lc[8], lc[5], lc[19])); return data; diff --git a/CanYouBuildIt/Resources/Images/Pc/pc3.png b/CanYouBuildIt/Resources/Images/Pc/pc3.png index 64360a1..b20725f 100644 Binary files a/CanYouBuildIt/Resources/Images/Pc/pc3.png and b/CanYouBuildIt/Resources/Images/Pc/pc3.png differ diff --git a/CanYouBuildIt/Views/Credits.xaml b/CanYouBuildIt/Views/Credits.xaml index 0d05e40..e0bbe30 100644 --- a/CanYouBuildIt/Views/Credits.xaml +++ b/CanYouBuildIt/Views/Credits.xaml @@ -47,6 +47,15 @@ Source="logodenicheur.png"/> - + +