diff --git a/PROMS/DataLoader/frmLoader.cs b/PROMS/DataLoader/frmLoader.cs index 72d85659..2ef18c31 100644 --- a/PROMS/DataLoader/frmLoader.cs +++ b/PROMS/DataLoader/frmLoader.cs @@ -911,7 +911,8 @@ namespace DataLoader { Database.VEPROMS_Connection = MySettings.ConnectionString.Replace("{DBName}", MySettings.DBName); ProcessTime = DateTime.Now; - LoadApprovedData(); + if (LoadApprovedData()) + { if (MessageBox.Show("Backup Database?", "Backup", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { Status = "Backing up Data"; @@ -919,16 +920,19 @@ namespace DataLoader MyInfo = "Backup Complete"; } Status = "Processing Complete"; - //Status = "Loading 16 Bit Approval Data Complete"; + } + else + Status = "Loading 16 Bit Approval Data Failed"; //MessageBox.Show("Loading 16 Bit Approval Data Complete", "Status", MessageBoxButtons.OK, MessageBoxIcon.Information); } - private void LoadApprovedData() + private bool LoadApprovedData() { Database.VEPROMS_Connection = MySettings.ConnectionString.Replace("{DBName}", MySettings.DBName); Status = "Converting 16-Bit Approved Data"; Database.VEPROMS_Connection = MySettings.ConnectionString.Replace("{DBName}", MySettings.DBName); bool ok = ldr.BuildApprovedRevision(); Status = "Conversion " + (ok ? "Succeeded" : "Failed"); + return ok; } private void fixesToolStripMenuItem_Click(object sender, EventArgs e) {