From f437291ab505d5115f3c600de7b4af2361cd512d Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Mon, 19 Jun 2017 10:58:51 +0200 Subject: [PATCH] Fixed checkbox bugs and version display --- ISEN-Repair Inventory Manager/About.vb | 2 +- ISEN-Repair Inventory Manager/Main.vb | 10 +++++----- .../My Project/AssemblyInfo.vb | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ISEN-Repair Inventory Manager/About.vb b/ISEN-Repair Inventory Manager/About.vb index 0216cbd..0fcfe28 100644 --- a/ISEN-Repair Inventory Manager/About.vb +++ b/ISEN-Repair Inventory Manager/About.vb @@ -13,7 +13,7 @@ ' TODO: personnalisez les informations d'assembly de l'application dans le volet "Application" de la ' boîte de dialogue Propriétés du projet (sous le menu "Projet"). Me.LabelProductName.Text = My.Application.Info.ProductName - Me.LabelVersion.Text = String.Format("Version {0}", My.Application.Info.Version.ToString) + Me.LabelVersion.Text = String.Format("Version {0}.{1}", My.Application.Info.Version.Major, My.Application.Info.Version.Minor) Me.LabelCopyright.Text = My.Application.Info.Copyright Me.LabelCompanyName.Text = My.Application.Info.CompanyName Me.TextBoxDescription.Text = My.Application.Info.Description diff --git a/ISEN-Repair Inventory Manager/Main.vb b/ISEN-Repair Inventory Manager/Main.vb index 0865858..215561d 100644 --- a/ISEN-Repair Inventory Manager/Main.vb +++ b/ISEN-Repair Inventory Manager/Main.vb @@ -52,7 +52,7 @@ Public Class Main `etat` INTEGER NOT NULL DEFAULT 0, `serial` NUMERIC NOT NULL DEFAULT 0, `comms` TEXT NOT NULL DEFAULT 'N/A', - `gived` INTEGER NOT NULL DEFAULT 0, + `gived` NUMERIC NOT NULL DEFAULT 0, `giveTo` TEXT NOT NULL DEFAULT 'N/A', `getBy` TEXT NOT NULL DEFAULT 'ISEN' ); @@ -141,9 +141,9 @@ Public Class Main ElseIf dtr.GetInt32(2) = 3 Then EtatBox.Text = "Neuf" End If - If dtr.GetInt32(3) = 1 Then SerieCheckBox.Checked = True + SerieCheckBox.Checked = dtr.GetBoolean(3) DetailsBox.Text = dtr.GetString(4) - If dtr.GetInt32(5) = 1 Then EmpruntCheckBox.Checked = True + EmpruntCheckBox.Checked = dtr.GetBoolean(5) EmprunterName.Text = dtr.GetString(6) GivenByBox.Text = dtr.GetString(7) RequestComputerProgress(IDBox.Text) @@ -210,9 +210,9 @@ Public Class Main ElseIf dtr.GetInt32(2) = 3 Then EtatBox.Text = "Neuf" End If - If dtr.GetInt32(3) = 1 Then SerieCheckBox.Checked = True + SerieCheckBox.Checked = dtr.GetBoolean(3) DetailsBox.Text = dtr.GetString(4) - If dtr.GetInt32(5) = 1 Then EmpruntCheckBox.Checked = True + EmpruntCheckBox.Checked = dtr.GetBoolean(5) EmprunterName.Text = dtr.GetString(6) GivenByBox.Text = dtr.GetString(7) RequestComputerProgress(IDBox.Text) diff --git a/ISEN-Repair Inventory Manager/My Project/AssemblyInfo.vb b/ISEN-Repair Inventory Manager/My Project/AssemblyInfo.vb index 975ac56..838f46d 100644 --- a/ISEN-Repair Inventory Manager/My Project/AssemblyInfo.vb +++ b/ISEN-Repair Inventory Manager/My Project/AssemblyInfo.vb @@ -10,7 +10,7 @@ Imports System.Runtime.InteropServices - +