diff --git a/ISEN-Repair Inventory Manager/AddMachine.vb b/ISEN-Repair Inventory Manager/AddMachine.vb
index e3b18d5..bda5c5a 100644
--- a/ISEN-Repair Inventory Manager/AddMachine.vb
+++ b/ISEN-Repair Inventory Manager/AddMachine.vb
@@ -39,6 +39,7 @@ Public Class AddMachine
If cmd.ExecuteNonQuery() <> 1 Then MsgBox("Erreur inconnue au niveau de la base de données !", 16, "Defaillance générale !") : End
con.Close()
End Using
+ Main.log.Info("Computer " & NewIDBox.Text & " added")
Main.StatusLabel.Text = "Ordinateur ajouté avec succés dans la base de données."
Main.ListAllInv()
Me.Close()
diff --git a/ISEN-Repair Inventory Manager/EditSpecs.Designer.vb b/ISEN-Repair Inventory Manager/EditSpecs.Designer.vb
index 1d727ae..2eaee28 100644
--- a/ISEN-Repair Inventory Manager/EditSpecs.Designer.vb
+++ b/ISEN-Repair Inventory Manager/EditSpecs.Designer.vb
@@ -34,7 +34,7 @@ Partial Class EditSpecs
Me.OSCheck = New System.Windows.Forms.CheckBox()
Me.HWCheck = New System.Windows.Forms.CheckBox()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
- Me.NewIDBox = New System.Windows.Forms.TextBox()
+ Me.IDBox = New System.Windows.Forms.TextBox()
Me.GivedByBox = New System.Windows.Forms.TextBox()
Me.Label8 = New System.Windows.Forms.Label()
Me.EtatBox = New System.Windows.Forms.TextBox()
@@ -168,7 +168,7 @@ Partial Class EditSpecs
'
'GroupBox2
'
- Me.GroupBox2.Controls.Add(Me.NewIDBox)
+ Me.GroupBox2.Controls.Add(Me.IDBox)
Me.GroupBox2.Controls.Add(Me.GivedByBox)
Me.GroupBox2.Controls.Add(Me.Label8)
Me.GroupBox2.Controls.Add(Me.EtatBox)
@@ -188,14 +188,14 @@ Partial Class EditSpecs
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Information et détails"
'
- 'NewIDBox
+ 'IDBox
'
- Me.NewIDBox.Location = New System.Drawing.Point(37, 16)
- Me.NewIDBox.Name = "NewIDBox"
- Me.NewIDBox.ReadOnly = True
- Me.NewIDBox.Size = New System.Drawing.Size(79, 20)
- Me.NewIDBox.TabIndex = 17
- Me.NewIDBox.TabStop = False
+ Me.IDBox.Location = New System.Drawing.Point(37, 16)
+ Me.IDBox.Name = "IDBox"
+ Me.IDBox.ReadOnly = True
+ Me.IDBox.Size = New System.Drawing.Size(79, 20)
+ Me.IDBox.TabIndex = 17
+ Me.IDBox.TabStop = False
'
'GivedByBox
'
@@ -361,7 +361,7 @@ Partial Class EditSpecs
Friend WithEvents Label4 As Label
Friend WithEvents Label2 As Label
Friend WithEvents Label1 As Label
- Friend WithEvents NewIDBox As TextBox
+ Friend WithEvents IDBox As TextBox
Friend WithEvents RAMCmbBox As ComboBox
Friend WithEvents ProcArchCmbBox As ComboBox
Friend WithEvents OSCmbBox As ComboBox
diff --git a/ISEN-Repair Inventory Manager/EditSpecs.vb b/ISEN-Repair Inventory Manager/EditSpecs.vb
index ad9f77e..b676e60 100644
--- a/ISEN-Repair Inventory Manager/EditSpecs.vb
+++ b/ISEN-Repair Inventory Manager/EditSpecs.vb
@@ -8,7 +8,7 @@ Public Class EditSpecs
InitializeComponent()
' Ajoutez une initialisation quelconque après l'appel InitializeComponent().
- NewIDBox.Text = id
+ IDBox.Text = id
NameBox.Text = name
EtatBox.Text = stat
GivedByBox.Text = givedBy
@@ -68,13 +68,14 @@ Public Class EditSpecs
Using con As New SQLiteConnection("URI=file:db.sqlite")
con.Open()
Dim cmd As New SQLiteCommand(con)
- cmd.CommandText = "UPDATE `computers_desc` SET `giveTo`='" & EmprunterName.Text & "', `gived`=" & BooleanToNumeric(EmpruntCheckBox.Checked) & " WHERE id='" & NewIDBox.Text & "';"
+ cmd.CommandText = "UPDATE `computers_desc` SET `giveTo`='" & EmprunterName.Text & "', `gived`=" & BooleanToNumeric(EmpruntCheckBox.Checked) & " WHERE id='" & IDBox.Text & "';"
If cmd.ExecuteNonQuery() <> 1 Then MsgBox("Erreur inconnue au niveau de la base de données !", 16, "Defaillance générale !") : End
- cmd.CommandText = "UPDATE `computers_progress` SET `hardware_complete`=" & BooleanToNumeric(HWCheck.Checked) & ", `os_complete`=" & BooleanToNumeric(OSCheck.Checked) & ", `drivers_complete`=" & BooleanToNumeric(DrvCheck.Checked) & ", `activate_complete`=" & BooleanToNumeric(ActivateCheck.Checked) & ", `soft_complete`=" & BooleanToNumeric(SoftCheck.Checked) & ", `arch`=" & (ProcArchCmbBox.SelectedIndex + 1) & ", `ram`=" & (RAMCmbBox.SelectedIndex + 1) & ", `os`=" & (OSCmbBox.SelectedIndex + 1) & " WHERE id='" & NewIDBox.Text & "';"
+ cmd.CommandText = "UPDATE `computers_progress` SET `hardware_complete`=" & BooleanToNumeric(HWCheck.Checked) & ", `os_complete`=" & BooleanToNumeric(OSCheck.Checked) & ", `drivers_complete`=" & BooleanToNumeric(DrvCheck.Checked) & ", `activate_complete`=" & BooleanToNumeric(ActivateCheck.Checked) & ", `soft_complete`=" & BooleanToNumeric(SoftCheck.Checked) & ", `arch`=" & (ProcArchCmbBox.SelectedIndex + 1) & ", `ram`=" & (RAMCmbBox.SelectedIndex + 1) & ", `os`=" & (OSCmbBox.SelectedIndex + 1) & " WHERE id='" & IDBox.Text & "';"
If cmd.ExecuteNonQuery() <> 1 Then MsgBox("Erreur inconnue au niveau de la base de données !", 16, "Defaillance générale !") : End
con.Close()
End Using
Main.StatusLabel.Text = "Ordinateur enregistré avec succès !"
+ Main.log.Info("Edited computer " & IDBox.Text)
Catch ex As Exception
Main.StatusLabel.Text = "Une erreur avec la base SQLite s'est produite !"
MsgBox(ex.Message)
diff --git a/ISEN-Repair Inventory Manager/ISEN-Repair Inventory Manager.vbproj b/ISEN-Repair Inventory Manager/ISEN-Repair Inventory Manager.vbproj
index 977ea89..c7369b3 100644
--- a/ISEN-Repair Inventory Manager/ISEN-Repair Inventory Manager.vbproj
+++ b/ISEN-Repair Inventory Manager/ISEN-Repair Inventory Manager.vbproj
@@ -33,7 +33,7 @@
ISEN-Repair
0.8.1.0
true
- publish.htm
+ index.htm
false
2
0.9.5.%2a
@@ -171,6 +171,7 @@
Form
+
Form
diff --git a/ISEN-Repair Inventory Manager/Logger.vb b/ISEN-Repair Inventory Manager/Logger.vb
new file mode 100644
index 0000000..a3eefa2
--- /dev/null
+++ b/ISEN-Repair Inventory Manager/Logger.vb
@@ -0,0 +1,42 @@
+Imports System.IO
+
+Public Class Logger
+ 'DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")
+
+ Dim logFileName As String = "logs\" & DateTime.Now.ToString("yyyy-MM-dd") & ".txt"
+
+ Public Sub Load()
+ If Not My.Computer.FileSystem.DirectoryExists("logs") Then My.Computer.FileSystem.CreateDirectory("logs")
+ If Not My.Computer.FileSystem.FileExists(logFileName) Then File.WriteAllLines(logFileName, {"LOG FILE - " & DateTime.Now.ToString("dd/MM/yyyy"), "--------------------", "[" & DateTime.Now.ToString("HH:mm:ss") & "][INFO] Loading software"})
+ End Sub
+
+ Public Sub Info(str As String)
+ Dim objWriter As New StreamWriter(logFileName, True)
+ Try
+ objWriter.WriteLineAsync("[" & DateTime.Now.ToString("HH:mm:ss") & "][INFO] " & str)
+ Catch ex As Exception
+ MsgBox(ex.ToString)
+ End Try
+ objWriter.Close()
+ End Sub
+
+ Public Sub Warn(str As String)
+ Dim objWriter As New StreamWriter(logFileName, True)
+ Try
+ objWriter.WriteLineAsync("[" & DateTime.Now.ToString("HH:mm:ss") & "][WARN] " & str)
+ Catch ex As Exception
+ MsgBox(ex.ToString)
+ End Try
+ objWriter.Close()
+ End Sub
+
+ Public Sub Critical(str As String)
+ Dim objWriter As New StreamWriter(logFileName, True)
+ Try
+ objWriter.WriteLineAsync("[" & DateTime.Now.ToString("HH:mm:ss") & "][CRITICAL] " & str)
+ Catch ex As Exception
+ MsgBox(ex.ToString)
+ End Try
+ objWriter.Close()
+ End Sub
+End Class
diff --git a/ISEN-Repair Inventory Manager/Main.vb b/ISEN-Repair Inventory Manager/Main.vb
index bfc2e15..61f7d31 100644
--- a/ISEN-Repair Inventory Manager/Main.vb
+++ b/ISEN-Repair Inventory Manager/Main.vb
@@ -4,8 +4,10 @@ Imports System.Text
Public Class Main
Dim manualID_selected As Boolean = False
Dim idList As New ArrayList
+ Public log As New Logger
Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ log.Load()
CheckIfFirstRun()
ListAllInv()
End Sub
@@ -14,8 +16,9 @@ Public Class Main
''' Function to check if app is running for the first time
'''
Private Sub CheckIfFirstRun()
+ log.Info("Check and load of database")
If Not My.Computer.FileSystem.FileExists("db.sqlite") Then
- If MsgBox("La base de données SQLite est introuvable ou inaccesible, souhaitez-vous la régénérer ?", 4161, "Base SQLite absente ou inacessible") = 1 Then
+ If MsgBox("La base de données SQLite est introuvable ou inaccessible, souhaitez-vous la régénérer ?", 4161, "Base SQLite absente ou inaccessible") = 1 Then
RegenerateDB()
Else
End
@@ -106,6 +109,7 @@ Public Class Main
''' Construct the basic structure of SQLite DB
'''
Private Sub RegenerateDB()
+ log.Warn("Reconstruct database...")
Dim genesis_seq As String = "
CREATE TABLE `computers_desc` (
`id` TEXT NOT NULL DEFAULT 0000000000 UNIQUE,