Merge branch 'login4H' into main

gamondue · Apr 1, 2021 · 25ebe46 · 25ebe46
2 parents a92616a + 723ab50
commit 25ebe46
Show file tree

Hide file tree

Showing 8 changed files with 270 additions and 2 deletions.
diff --git a/BusinessLayer/BusinessLayer.cs b/BusinessLayer/BusinessLayer.cs
@@ -21,6 +21,12 @@ internal User GetUser(string Username)
         {
             return dl.GetUser(Username);
         }
+
+        internal List<User> GetAllUsers()
+        {
+            return dl.GetAllUsers();
+        }
+
         internal bool UserHasLoginPermission(string Username, string Password)
         {
             User uFromDb = GetUser(Username);
@@ -39,6 +45,7 @@ internal bool IsUserAllowed(User CredentialsFromUser)
 
         internal void UpdateUser(User User)
         {
+            // possible filter on user 
             dl.UpdateUser(User); 
         }
 

diff --git a/DataLayer/DataLayer.cs b/DataLayer/DataLayer.cs
@@ -1,5 +1,6 @@
 using SchoolGrades.DbClasses;
 using System;
+using System.Collections.Generic;
 using System.Data.Common;
 using System.Data.SQLite;
 
@@ -24,6 +25,28 @@ public DataLayer()
             }
             dbName = Commons.PathAndFileDatabase;
         }
+        internal List<User> GetAllUsers()
+        {
+            List<User> l = new List<User>();
+            using (DbConnection conn = Connect())
+            {
+                DbCommand cmd = conn.CreateCommand();
+                string query = "SELECT *" +
+                    " FROM Users";
+                cmd = new SQLiteCommand(query);
+                cmd.Connection = conn;
+                DbDataReader dRead = cmd.ExecuteReader();
+                while (dRead.Read())
+                {
+                    User u = GetUserFromRow(dRead);
+                    l.Add(u);
+                }
+                dRead.Dispose();
+                cmd.Dispose();
+            }
+            return l;
+        }
+
         public DataLayer(string PathAndFile)
         {
             if (!System.IO.File.Exists(PathAndFile))

diff --git a/DbClasses/User.cs b/DbClasses/User.cs
@@ -34,5 +34,10 @@ public User(string Username, string Password)
             this.username = Username;
             this.password = Password;
         }
+
+        public override string ToString()
+        {
+            return Username +";" + Description;
+        }
     }
 }
diff --git a/SchoolGrades/frmMain.Designer.cs b/SchoolGrades/frmMain.Designer.cs
diff --git a/SchoolGrades/frmMain.cs b/SchoolGrades/frmMain.cs
@@ -900,7 +900,7 @@ private int indexInList(string firstLastName)
             }
             return indexInList;
         }
-        private void BtnSetup_Click(object sender, EventArgs e)
+        private void btnSetup_Click(object sender, EventArgs e)
         {
             // save current students because can be used by setup windows
             SaveStudentsOfClassIfEligibleHasChanged();

diff --git a/SchoolGrades/frmUserManagement.Designer.cs b/SchoolGrades/frmUserManagement.Designer.cs
diff --git a/SchoolGrades/frmUserManagement.cs b/SchoolGrades/frmUserManagement.cs
@@ -0,0 +1,49 @@
+using SchoolGrades.DbClasses;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace SchoolGrades
+{
+    public partial class frmUserManagement : Form
+    {
+        User currentUser;
+        SchoolGrades.BusinessLayer.BusinessLayer bl = new BusinessLayer.BusinessLayer(); 
+
+        public frmUserManagement()
+        {
+            InitializeComponent();
+
+
+        }
+        private void frmUserManagement_Load(object sender, EventArgs e)
+        {
+            // starts when the calling program calls Show()
+
+        }
+        private void lstUser_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            lstUser.DataSource = bl.GetAllUsers();
+            currentUser = (User)sender;
+            FromClassToUi(); 
+        }
+
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+            FromUiToClass(); 
+            bl.UpdateUser(currentUser); 
+        }
+        /// <summary>
+        /// Read the Class User from UI
+        /// </summary>
+        private void FromUiToClass()
+        {
+            currentUser.LastName = txtLastName.Text; 
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/SchoolGrades/frmUserManagement.resx b/SchoolGrades/frmUserManagement.resx
@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>