fix bug Database previous merge conflict

2 years ago · 7af8f8cb0d
parent ab50893242
commit 7af8f8cb0d
2 changed files with 5 additions and 8 deletions
--- a/notus/Biblioteque_de_Class/Database.cs
+++ b/notus/Biblioteque_de_Class/Database.cs
@ -19,14 +19,14 @@ namespace Biblioteque_de_Class
        [DataMember]
        public List<Theme> ThemeList { get; private set; }
        [DataMember]
-        private List<User> UserList = null!;
-        public List<User> Users { get => UserList; private set
+        public List<User> Users;
+        public List<User> UserList
        {
-                UserList = value;
+            get => Users; private set
+            {
+                Users = value;
            }
        }
-        [DataMember]
-        private Dictionary<User, List<Theme>> AddedThemeList;

        public Database()
        {
--- a/notus/notus_vue/notus_vue.csproj
+++ b/notus/notus_vue/notus_vue.csproj
@ -56,9 +56,6 @@
 	<ItemGroup>
 	  <ProjectReference Include="..\Biblioteque_de_Class\Biblioteque_de_Class.csproj" />
 	  <ProjectReference Include="..\Notus_Persistence\Notus_Persistance.csproj" />
-	  <ProjectReference Include="..\Tests\Notus_UnitTest_Database\Notus_UnitTest_Database.csproj" />
-	  <ProjectReference Include="..\Tests\Notus_UnitTest_Note\Notus_UnitTest_Note.csproj" />
-	  <ProjectReference Include="..\Tests\Notus_UnitTest_User\Notus_UnitTest_User.csproj" />
 	</ItemGroup>

 	<ItemGroup>