diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dd7a15b..20ed520 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dd7a15b..20ed520 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/Model/RecentUseModel.cs b/SubCabinetSolution/Model/RecentUseModel.cs new file mode 100644 index 0000000..c389921 --- /dev/null +++ b/SubCabinetSolution/Model/RecentUseModel.cs @@ -0,0 +1,26 @@ +namespace SubCabinetSolution.Model +{ + public class RecentUseModel + { + // jxDate jx近效期 + public RecentUseModel(string goodsName, string specification, string cabinetNum, string jxDate, string batch, + string validityPeriod, string rfId) + { + GoodsName = goodsName; + Specification = specification; + CabinetNum = cabinetNum; + JxDate = jxDate; + Batch = batch; + ValidityPeriod = validityPeriod; + RFID = rfId; + } + + public string GoodsName { get; } + public string Specification { get; } + public string CabinetNum { get; } + public string JxDate { get; } + public string Batch { get; } + public string ValidityPeriod { get; } + public string RFID { get; } + } +} \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dd7a15b..20ed520 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/Model/RecentUseModel.cs b/SubCabinetSolution/Model/RecentUseModel.cs new file mode 100644 index 0000000..c389921 --- /dev/null +++ b/SubCabinetSolution/Model/RecentUseModel.cs @@ -0,0 +1,26 @@ +namespace SubCabinetSolution.Model +{ + public class RecentUseModel + { + // jxDate jx近效期 + public RecentUseModel(string goodsName, string specification, string cabinetNum, string jxDate, string batch, + string validityPeriod, string rfId) + { + GoodsName = goodsName; + Specification = specification; + CabinetNum = cabinetNum; + JxDate = jxDate; + Batch = batch; + ValidityPeriod = validityPeriod; + RFID = rfId; + } + + public string GoodsName { get; } + public string Specification { get; } + public string CabinetNum { get; } + public string JxDate { get; } + public string Batch { get; } + public string ValidityPeriod { get; } + public string RFID { get; } + } +} \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 984a7fb..336a9ca 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -152,6 +152,7 @@ Designer + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dd7a15b..20ed520 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/Model/RecentUseModel.cs b/SubCabinetSolution/Model/RecentUseModel.cs new file mode 100644 index 0000000..c389921 --- /dev/null +++ b/SubCabinetSolution/Model/RecentUseModel.cs @@ -0,0 +1,26 @@ +namespace SubCabinetSolution.Model +{ + public class RecentUseModel + { + // jxDate jx近效期 + public RecentUseModel(string goodsName, string specification, string cabinetNum, string jxDate, string batch, + string validityPeriod, string rfId) + { + GoodsName = goodsName; + Specification = specification; + CabinetNum = cabinetNum; + JxDate = jxDate; + Batch = batch; + ValidityPeriod = validityPeriod; + RFID = rfId; + } + + public string GoodsName { get; } + public string Specification { get; } + public string CabinetNum { get; } + public string JxDate { get; } + public string Batch { get; } + public string ValidityPeriod { get; } + public string RFID { get; } + } +} \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 984a7fb..336a9ca 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -152,6 +152,7 @@ Designer + diff --git a/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs b/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs index 929dd4a..f1a1bb3 100644 --- a/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs @@ -1,7 +1,53 @@ -namespace SubCabinetSolution.ViewModel +using System.Collections.Generic; +using System.Collections.ObjectModel; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; + +namespace SubCabinetSolution.ViewModel { - public class RecentUsePageViewModel + public class RecentUsePageViewModel : ViewModelBase { - + public List TimeSelections { get; set; } + public ObservableCollection RecentUseModels { get; set; } + + public RecentUsePageViewModel() + { + this.TimeSelections = new List + { + "近30天", "近90天", "近180天", "近365天" + }; + + this.RecentUseModels = new ObservableCollection + { + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344") + }; + } } } \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dd7a15b..20ed520 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/Model/RecentUseModel.cs b/SubCabinetSolution/Model/RecentUseModel.cs new file mode 100644 index 0000000..c389921 --- /dev/null +++ b/SubCabinetSolution/Model/RecentUseModel.cs @@ -0,0 +1,26 @@ +namespace SubCabinetSolution.Model +{ + public class RecentUseModel + { + // jxDate jx近效期 + public RecentUseModel(string goodsName, string specification, string cabinetNum, string jxDate, string batch, + string validityPeriod, string rfId) + { + GoodsName = goodsName; + Specification = specification; + CabinetNum = cabinetNum; + JxDate = jxDate; + Batch = batch; + ValidityPeriod = validityPeriod; + RFID = rfId; + } + + public string GoodsName { get; } + public string Specification { get; } + public string CabinetNum { get; } + public string JxDate { get; } + public string Batch { get; } + public string ValidityPeriod { get; } + public string RFID { get; } + } +} \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 984a7fb..336a9ca 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -152,6 +152,7 @@ Designer + diff --git a/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs b/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs index 929dd4a..f1a1bb3 100644 --- a/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs @@ -1,7 +1,53 @@ -namespace SubCabinetSolution.ViewModel +using System.Collections.Generic; +using System.Collections.ObjectModel; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; + +namespace SubCabinetSolution.ViewModel { - public class RecentUsePageViewModel + public class RecentUsePageViewModel : ViewModelBase { - + public List TimeSelections { get; set; } + public ObservableCollection RecentUseModels { get; set; } + + public RecentUsePageViewModel() + { + this.TimeSelections = new List + { + "近30天", "近90天", "近180天", "近365天" + }; + + this.RecentUseModels = new ObservableCollection + { + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344") + }; + } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml index 30eeb89..8436019 100644 --- a/SubCabinetSolution/Views/AddUserDialog.xaml +++ b/SubCabinetSolution/Views/AddUserDialog.xaml @@ -35,11 +35,8 @@ VerticalAlignment="Center" /> - - - - + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dd7a15b..20ed520 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/Model/RecentUseModel.cs b/SubCabinetSolution/Model/RecentUseModel.cs new file mode 100644 index 0000000..c389921 --- /dev/null +++ b/SubCabinetSolution/Model/RecentUseModel.cs @@ -0,0 +1,26 @@ +namespace SubCabinetSolution.Model +{ + public class RecentUseModel + { + // jxDate jx近效期 + public RecentUseModel(string goodsName, string specification, string cabinetNum, string jxDate, string batch, + string validityPeriod, string rfId) + { + GoodsName = goodsName; + Specification = specification; + CabinetNum = cabinetNum; + JxDate = jxDate; + Batch = batch; + ValidityPeriod = validityPeriod; + RFID = rfId; + } + + public string GoodsName { get; } + public string Specification { get; } + public string CabinetNum { get; } + public string JxDate { get; } + public string Batch { get; } + public string ValidityPeriod { get; } + public string RFID { get; } + } +} \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 984a7fb..336a9ca 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -152,6 +152,7 @@ Designer + diff --git a/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs b/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs index 929dd4a..f1a1bb3 100644 --- a/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs @@ -1,7 +1,53 @@ -namespace SubCabinetSolution.ViewModel +using System.Collections.Generic; +using System.Collections.ObjectModel; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; + +namespace SubCabinetSolution.ViewModel { - public class RecentUsePageViewModel + public class RecentUsePageViewModel : ViewModelBase { - + public List TimeSelections { get; set; } + public ObservableCollection RecentUseModels { get; set; } + + public RecentUsePageViewModel() + { + this.TimeSelections = new List + { + "近30天", "近90天", "近180天", "近365天" + }; + + this.RecentUseModels = new ObservableCollection + { + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344") + }; + } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml index 30eeb89..8436019 100644 --- a/SubCabinetSolution/Views/AddUserDialog.xaml +++ b/SubCabinetSolution/Views/AddUserDialog.xaml @@ -35,11 +35,8 @@ VerticalAlignment="Center" /> - - - - + diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml.cs b/SubCabinetSolution/Views/AddUserDialog.xaml.cs index f9c98e1..520765d 100644 --- a/SubCabinetSolution/Views/AddUserDialog.xaml.cs +++ b/SubCabinetSolution/Views/AddUserDialog.xaml.cs @@ -1,8 +1,6 @@ -using System.Windows; - -namespace SubCabinetSolution.Views +namespace SubCabinetSolution.Views { - public partial class AddUserDialog : Window + public partial class AddUserDialog { public AddUserDialog() { diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dd7a15b..20ed520 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/Model/RecentUseModel.cs b/SubCabinetSolution/Model/RecentUseModel.cs new file mode 100644 index 0000000..c389921 --- /dev/null +++ b/SubCabinetSolution/Model/RecentUseModel.cs @@ -0,0 +1,26 @@ +namespace SubCabinetSolution.Model +{ + public class RecentUseModel + { + // jxDate jx近效期 + public RecentUseModel(string goodsName, string specification, string cabinetNum, string jxDate, string batch, + string validityPeriod, string rfId) + { + GoodsName = goodsName; + Specification = specification; + CabinetNum = cabinetNum; + JxDate = jxDate; + Batch = batch; + ValidityPeriod = validityPeriod; + RFID = rfId; + } + + public string GoodsName { get; } + public string Specification { get; } + public string CabinetNum { get; } + public string JxDate { get; } + public string Batch { get; } + public string ValidityPeriod { get; } + public string RFID { get; } + } +} \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 984a7fb..336a9ca 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -152,6 +152,7 @@ Designer + diff --git a/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs b/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs index 929dd4a..f1a1bb3 100644 --- a/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/RecentUsePageViewModel.cs @@ -1,7 +1,53 @@ -namespace SubCabinetSolution.ViewModel +using System.Collections.Generic; +using System.Collections.ObjectModel; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; + +namespace SubCabinetSolution.ViewModel { - public class RecentUsePageViewModel + public class RecentUsePageViewModel : ViewModelBase { - + public List TimeSelections { get; set; } + public ObservableCollection RecentUseModels { get; set; } + + public RecentUsePageViewModel() + { + this.TimeSelections = new List + { + "近30天", "近90天", "近180天", "近365天" + }; + + this.RecentUseModels = new ObservableCollection + { + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344"), + new RecentUseModel("一次性双极电凝切割钳", "5*330直头KJ-SJ02", "1", "53", "20102515", "2022-10-24", + "8821033009373344") + }; + } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml index 30eeb89..8436019 100644 --- a/SubCabinetSolution/Views/AddUserDialog.xaml +++ b/SubCabinetSolution/Views/AddUserDialog.xaml @@ -35,11 +35,8 @@ VerticalAlignment="Center" /> - - - - + diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml.cs b/SubCabinetSolution/Views/AddUserDialog.xaml.cs index f9c98e1..520765d 100644 --- a/SubCabinetSolution/Views/AddUserDialog.xaml.cs +++ b/SubCabinetSolution/Views/AddUserDialog.xaml.cs @@ -1,8 +1,6 @@ -using System.Windows; - -namespace SubCabinetSolution.Views +namespace SubCabinetSolution.Views { - public partial class AddUserDialog : Window + public partial class AddUserDialog { public AddUserDialog() { diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml index c4a480b..951ca30 100644 --- a/SubCabinetSolution/Views/RecentUsePage.xaml +++ b/SubCabinetSolution/Views/RecentUsePage.xaml @@ -3,12 +3,279 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="RecentUsePage" - Width="800" - Height="450" - Background="BurlyWood" + d:DesignHeight="450" + d:DesignWidth="800" + Background="White" mc:Ignorable="d"> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file