worked on system, added member, advisor & admin management.

models/city.py

@@ -45,7 +45,7 @@ class City:
         cur = self.connection.cursor()
         cur.execute("""
             UPDATE cities SET
-                name = ?,
+                name = ?
             WHERE id = ?
             """, (self.name, self.id))
 
@@ -53,6 +53,13 @@ class City:
         cur.close()
         return True
     
+    def delete(self):
+        cur = self.connection.cursor()
+        cur.execute("""DELETE FROM logs WHERE id = ?""", (self.id))
+        self.connection.commit()
+        cur.close()
+        return True
+    
     def _set_row_values(self, row):
         self.id = row[0]
         self.name = row[1]

models/database.py

@@ -27,7 +27,7 @@ class Database:
                 time TEXT,
                 description TEXT,
                 additional_information TEXT,
-                suspicious BOOL
+                suspicious BOOLEAN
             )
         """)
         cursor.close()
@@ -47,7 +47,8 @@ class Database:
                 email TEXT, 
                 phone TEXT,
                 password TEXT,
-                role TEXT
+                role TEXT,
+                created TEXT
             )
         """)
         cursor.close()

models/log.py

@@ -43,7 +43,7 @@ class Log:
                 date = ?,
                 description = ?,
                 additional_information = ?,
-                suspicious = ?,
+                suspicious = ?
             WHERE id = ?
             """, (self.firstname, self.lastname, self.zipcode, self.city_id, self.email, self.phone, self.password, self.role, self.id))
 
@@ -51,6 +51,13 @@ class Log:
         cur.close()
         return True
     
+    def delete(self):
+        cur = self.connection.cursor()
+        cur.execute("""DELETE FROM logs WHERE id = ?""", (self.id))
+        self.connection.commit()
+        cur.close()
+        return True
+    
     def _set_row_values(self, row):
         self.id = row[0]
         self.username = row[1]

models/user.py

@@ -1,5 +1,5 @@
 import sqlite3
-from models.database import Database
+from datetime import datetime
 
 class User:
     def __init__(self, connection : sqlite3.Connection, id = None, username = None, firstname = None, lastname = None, address = None, zipcode = None, city_id = None, email = None, phone = None, password = None, role = None):
@@ -17,7 +17,7 @@ class User:
         self.role = role
 
     def load_by_id(self):
-        cur = Database.connection.cursor()
+        cur = self.connection.cursor()
         row = cur.execute("SELECT * FROM users WHERE id = ?", (self.id,)).fetchone()
         
         if row == None:
@@ -29,7 +29,7 @@ class User:
         return True
 
     def load_by_username(self):
-        cur = Database.connection.cursor()
+        cur = self.connection.cursor()
         row = cur.execute("SELECT * FROM users WHERE username = ?", (self.username,)).fetchone()
         
         if row == None:
@@ -41,18 +41,19 @@ class User:
         return True
 
     def save(self):
-        cur = Database.connection.cursor()
+        cur = self.connection.cursor()
+        current_date = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
         cur.execute("""
             INSERT INTO users 
-            (id, username, firstname, lastname, address, zipcode, city_id, email, phone, password, role) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-            """, (self.id, self.username, self.firstname, self.lastname, self.address, self.zipcode, self.city_id, self.email, self.phone, self.password, self.role))
+            (id, username, firstname, lastname, address, zipcode, city_id, email, phone, password, role, created) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            """, (self.id, self.username, self.firstname, self.lastname, self.address, self.zipcode, self.city_id, self.email, self.phone, self.password, self.role, current_date))
 
-        Database.connection.commit()
+        self.connection.commit()
         cur.close()
         return True
 
     def update(self):
-        cur = Database.connection.cursor()
+        cur = self.connection.cursor()
         cur.execute("""
             UPDATE users SET
                 username = ?,
@@ -64,14 +65,21 @@ class User:
                 email = ?,
                 phone = ?,
                 password = ?,
-                role = ?,
-            WHERE id = ?
-            """, (self.username, self.firstname, self.lastname, self.zipcode, self.city_id, self.email, self.phone, self.password, self.role, self.id))
+                role = ?
+                WHERE id = ?
+            """, (self.username, self.firstname, self.lastname, self.address, self.zipcode, self.city_id, self.email, self.phone, self.password, self.role, self.id))
 
-        Database.connection.commit()
+        self.connection.commit()
         cur.close()
         return True
     
+    def delete(self):
+        cur = self.connection.cursor()
+        cur.execute("""DELETE FROM users WHERE id = ?""", (self.id))
+        self.connection.commit()
+        cur.close()
+        return True
+
     def _set_row_values(self, row):
         self.id = row[0]
         self.username = row[1]
@@ -84,4 +92,5 @@ class User:
         self.phone = row[8]
         self.password = row[9]
         self.role = row[10]
-        
+        self.created = row[11]
+        return self