From 8b7afd50a4f57078ffcbadc872a12725e5061d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tommy=20=C3=96man?= <tommy@oeman.se>
Date: Thu, 21 Aug 2025 22:08:06 +0200
Subject: [PATCH] Finalized Maui-series for vs development

---
 AdventureWorks.MAUI/AppShell.xaml.cs          |  1 +
 .../ProductViewModelCommands.cs               | 39 +++++++++++++++++++
 .../CommandClasses/UserViewModelCommands.cs   | 20 +++++++++-
 .../Views/ProductDetailView.xaml              |  4 +-
 .../Views/ProductDetailView.xaml.cs           | 23 +++++++++--
 .../Views/ProductListView.xaml                |  5 ++-
 .../Views/UserDetailView.xaml.cs              |  5 ++-
 AdventureWorks.MAUI/Views/UserListView.xaml   |  6 ++-
 .../ViewModelClasses/ProductViewModel.cs      |  3 +-
 .../ViewModelClasses/UserViewModel.cs         |  2 +-
 10 files changed, 95 insertions(+), 13 deletions(-)

diff --git a/AdventureWorks.MAUI/AppShell.xaml.cs b/AdventureWorks.MAUI/AppShell.xaml.cs
index 7e4e4d3..3d7b441 100644
--- a/AdventureWorks.MAUI/AppShell.xaml.cs
+++ b/AdventureWorks.MAUI/AppShell.xaml.cs
@@ -8,6 +8,7 @@
 
             // Register routes for navigation
             Routing.RegisterRoute(nameof(Views.UserDetailView), typeof(Views.UserDetailView));
+            Routing.RegisterRoute(nameof(Views.ProductDetailView), typeof(Views.ProductDetailView));
 
         }
     }
diff --git a/AdventureWorks.MAUI/CommandClasses/ProductViewModelCommands.cs b/AdventureWorks.MAUI/CommandClasses/ProductViewModelCommands.cs
index e8b42cc..d173c93 100644
--- a/AdventureWorks.MAUI/CommandClasses/ProductViewModelCommands.cs
+++ b/AdventureWorks.MAUI/CommandClasses/ProductViewModelCommands.cs
@@ -1,6 +1,7 @@
 using AdventureWorks.EntityLayer;
 using AdventureWorks.ViewModelLayer.ViewModelClasses;
 using Common.Library;
+using System.Windows.Input;
 
 namespace AdventureWorks.MAUI.CommandClasses
 {
@@ -14,6 +15,44 @@ namespace AdventureWorks.MAUI.CommandClasses
         {
         }
         #endregion
+
+        public ICommand SaveCommand { get; private set; }
+        public ICommand EditCommand { get; private set; }
+
+        private bool _IsSaveCommandEnabled = true;
+        public bool IsSaveCommandEnabled
+        {
+            get { return _IsSaveCommandEnabled; }
+            set
+            {
+                _IsSaveCommandEnabled = value;
+                RaisePropertyChanged(nameof(IsSaveCommandEnabled));
+            }
+        }
+
+        public override void Init()
+        {
+            base.Init();
+            SaveCommand = new Command(async () => await SaveAsync(), () => IsSaveCommandEnabled);
+            EditCommand = new Command<int>(async (id) => await EditAsync(id), (id) => id > 0);
+        }
+
+        public async Task<bool> SaveAsync()
+        {
+            var ret = base.Save();
+            if (ret)
+            {
+                await Shell.Current.GoToAsync("..");
+            }
+
+            return ret;
+        }
+
+        protected async Task EditAsync(int id)
+        {
+            await Shell.Current.GoToAsync($"{nameof(Views.ProductDetailView)}?id={id}");
+        }
+
         public void LoadProducts()
         {
             Get();
diff --git a/AdventureWorks.MAUI/CommandClasses/UserViewModelCommands.cs b/AdventureWorks.MAUI/CommandClasses/UserViewModelCommands.cs
index 78d693b..932a10d 100644
--- a/AdventureWorks.MAUI/CommandClasses/UserViewModelCommands.cs
+++ b/AdventureWorks.MAUI/CommandClasses/UserViewModelCommands.cs
@@ -38,16 +38,34 @@ public class UserViewModelCommands : UserViewModel
 
     #region Commands
     public ICommand SaveCommand { get; private set; }
+    public ICommand EditCommand { get; private set; }
     #endregion
 
     #region Init Method
     public override void Init()
     {
         base.Init();
-        SaveCommand = new Command(() => Save(), () => IsSaveCommandEnabled);
+        SaveCommand = new Command(async () => SaveAsync(), () => IsSaveCommandEnabled);
+        EditCommand = new Command<int>(async (id) => await EditAsync(id), (id) => id > 0);
     }
     #endregion
 
+    protected async Task EditAsync(int id)
+    {
+        await Shell.Current.GoToAsync($"{nameof(Views.UserDetailView)}?id={id}");
+    }
+
+    public async Task<bool> SaveAsync()
+    {
+        var ret = base.Save();
+        if (ret)
+        {
+            await Shell.Current.GoToAsync("..");
+        }
+
+        return ret;
+    }
+
 }
 
 
diff --git a/AdventureWorks.MAUI/Views/ProductDetailView.xaml b/AdventureWorks.MAUI/Views/ProductDetailView.xaml
index 63bb122..ed4bbdf 100644
--- a/AdventureWorks.MAUI/Views/ProductDetailView.xaml
+++ b/AdventureWorks.MAUI/Views/ProductDetailView.xaml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:partial="clr-namespace:AdventureWorks.MAUI.ViewsPartial"
+             xmlns:vm="clr-namespace:AdventureWorks.MAUI.CommandClasses"
              x:Class="AdventureWorks.MAUI.Views.ProductDetailView"
-            xmlns:partial="clr-namespace:AdventureWorks.MAUI.ViewsPartial"
+             x:DataType="vm:ProductViewModelCommands"
              Title="Product Information">
 
     <Border Style="{StaticResource Border.Page}">
diff --git a/AdventureWorks.MAUI/Views/ProductDetailView.xaml.cs b/AdventureWorks.MAUI/Views/ProductDetailView.xaml.cs
index 3bcca9d..629e55b 100644
--- a/AdventureWorks.MAUI/Views/ProductDetailView.xaml.cs
+++ b/AdventureWorks.MAUI/Views/ProductDetailView.xaml.cs
@@ -1,9 +1,24 @@
+using AdventureWorks.MAUI.CommandClasses;
 namespace AdventureWorks.MAUI.Views;
 
+[QueryProperty(nameof(ProductId), "id")]
 public partial class ProductDetailView : ContentPage
 {
-	public ProductDetailView()
-	{
-		InitializeComponent();
-	}
+    public ProductDetailView(ProductViewModelCommands viewModel)
+    {
+        InitializeComponent();
+        ViewModel = viewModel;
+    }
+
+    public ProductViewModelCommands ViewModel { get; set; }
+    public int ProductId { get; set; }
+
+    protected override void OnAppearing()
+    {
+        base.OnAppearing();
+        BindingContext = ViewModel;
+        //ViewModel.GetProductCategories();
+        //ViewModel.GetProductModels();
+        ViewModel.Get(ProductId);
+    }
 }
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/ProductListView.xaml b/AdventureWorks.MAUI/Views/ProductListView.xaml
index 1bcdf04..3b9558c 100644
--- a/AdventureWorks.MAUI/Views/ProductListView.xaml
+++ b/AdventureWorks.MAUI/Views/ProductListView.xaml
@@ -6,6 +6,7 @@
              xmlns:vm="clr-namespace:AdventureWorks.MAUI.CommandClasses"
              xmlns:model="clr-namespace:AdventureWorks.EntityLayer;assembly=AdventureWorks.EntityLayer"  
              x:DataType="vm:ProductViewModelCommands"
+             x:Name="ProductListPage"
              Title="ProductListView">
     <Border Style="{StaticResource Screen.Border}">
         <Grid>
@@ -36,7 +37,9 @@
                                     <Label Text="{Binding ListPrice, StringFormat='{0:C}'}" />
                                 </HorizontalStackLayout>
                                 <HorizontalStackLayout>
-                                    <Button Text="Edit"  />
+                                    <Button Text="Edit" 
+                                            CommandParameter="{Binding ProductID}"
+                                            Command="{Binding Source={x:Reference ProductListPage}, Path=BindingContext.EditCommand}"/>
                                     <Button Text="Delete"  />
                                 </HorizontalStackLayout>
                             </VerticalStackLayout>
diff --git a/AdventureWorks.MAUI/Views/UserDetailView.xaml.cs b/AdventureWorks.MAUI/Views/UserDetailView.xaml.cs
index 375262f..73fe9b2 100644
--- a/AdventureWorks.MAUI/Views/UserDetailView.xaml.cs
+++ b/AdventureWorks.MAUI/Views/UserDetailView.xaml.cs
@@ -1,7 +1,7 @@
 using AdventureWorks.MAUI.CommandClasses;
 
 namespace AdventureWorks.MAUI.Views;
-
+[QueryProperty(nameof(UserId), "id")]
 public partial class UserDetailView : ContentPage
 {
     public UserDetailView(UserViewModelCommands viewModel)
@@ -11,6 +11,7 @@ public partial class UserDetailView : ContentPage
     }
 
     public UserViewModelCommands ViewModel { get; set; }
+    public int UserId { get; set; }
 
     protected override void OnAppearing()
     {
@@ -20,7 +21,7 @@ public partial class UserDetailView : ContentPage
 
         ViewModel.GetPhoneTypes();
 
-        ViewModel.Get(1); // Assuming you want to get the user with ID 1
+        ViewModel.Get(UserId);
     }
 
 }
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/UserListView.xaml b/AdventureWorks.MAUI/Views/UserListView.xaml
index 99aa408..99f56a3 100644
--- a/AdventureWorks.MAUI/Views/UserListView.xaml
+++ b/AdventureWorks.MAUI/Views/UserListView.xaml
@@ -6,7 +6,7 @@
              xmlns:model="clr-namespace:AdventureWorks.EntityLayer;assembly=AdventureWorks.EntityLayer"
              x:Class="AdventureWorks.MAUI.Views.UserListView"
              x:DataType="vm:UserViewModelCommands"
-             
+             x:Name="UserListPage"
              Title="User List">
 
     <Border Style="{StaticResource Screen.Border}">
@@ -35,7 +35,9 @@
                                         <Label Text="{Binding Email}" />
                                     </HorizontalStackLayout>
                                     <HorizontalStackLayout>
-                                        <Button Text="Edit" />
+                                        <Button Text="Edit"
+                                                CommandParameter="{Binding UserId}"
+                                                Command="{Binding Source={x:Reference UserListPage}, Path=BindingContext.EditCommand}" />
                                         <Button Text="Delete" />
                                     </HorizontalStackLayout>
                                 </VerticalStackLayout>
diff --git a/AdventureWorks.ViewModelLayer/ViewModelClasses/ProductViewModel.cs b/AdventureWorks.ViewModelLayer/ViewModelClasses/ProductViewModel.cs
index 2344583..15ad38d 100644
--- a/AdventureWorks.ViewModelLayer/ViewModelClasses/ProductViewModel.cs
+++ b/AdventureWorks.ViewModelLayer/ViewModelClasses/ProductViewModel.cs
@@ -85,7 +85,8 @@ public class ProductViewModel : ViewModelBase
 
     public bool Save()
     {
-        throw new NotImplementedException("Save method is not implemented yet.");
+        // TODO: Implement Save logic
+        return true;
     }
 
 }
diff --git a/AdventureWorks.ViewModelLayer/ViewModelClasses/UserViewModel.cs b/AdventureWorks.ViewModelLayer/ViewModelClasses/UserViewModel.cs
index 10e0bca..edce291 100644
--- a/AdventureWorks.ViewModelLayer/ViewModelClasses/UserViewModel.cs
+++ b/AdventureWorks.ViewModelLayer/ViewModelClasses/UserViewModel.cs
@@ -138,7 +138,7 @@ public class UserViewModel : ViewModelBase
     #region Save Method
     public virtual bool Save()
     {
-        System.Diagnostics.Debugger.Break();
+        // System.Diagnostics.Debugger.Break();
         return true;
     }
     #endregion