diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index 383ac6e..6eb67a2 100644 Binary files a/.vs/Mip_v1/v16/.suo and b/.vs/Mip_v1/v16/.suo differ diff --git a/Mip/frmMain.cs b/Mip/frmMain.cs index be77cc6..febf167 100644 --- a/Mip/frmMain.cs +++ b/Mip/frmMain.cs @@ -6196,7 +6196,7 @@ namespace Mip private void button95_Click(object sender, EventArgs e) { classGlobal.DeleteRamDisk(); classGlobal.CreateRamDisk(); - classSQL.ExportFormToHDD("Zoznam zo skladu.xls", @"W:\zzs.xls"); + classSQL.ExportFormToHDD("ZoznanZoSkladu.xls", @"W:\zzs.xls"); Excel.Application xlApp; Excel.Workbook xlWorkBook; @@ -6229,13 +6229,14 @@ namespace Mip xlWorkSheet.Range["F" + excelRowIndex.ToString()].Value = dtrSklad["RozlisZnakKonecnaOp"].ToString(); xlWorkSheet.Range["G" + excelRowIndex.ToString()].Value = dtrSklad["Alias"].ToString(); xlWorkSheet.Range["H" + excelRowIndex.ToString()].Value = dtrSklad["PocetSegmentov"].ToString(); - xlWorkSheet.Range["I" + excelRowIndex.ToString()].Value = dtrSklad["Počet na sklade"].ToString(); + xlWorkSheet.Range["I" + excelRowIndex.ToString()].Value = $"{dtrSklad["Vážená cena"].ToString()}, {dtrSklad["Priemerná cena"].ToString()}"; + xlWorkSheet.Range["J" + excelRowIndex.ToString()].Value = dtrSklad["Počet na sklade"].ToString(); } //vypocet poslednej strany tlacenia double dNumber = Convert.ToDouble(tblSklad.Rows.Count) / Convert.ToDouble(31); int lastrow = Convert.ToInt16(Math.Ceiling(dNumber) * 31); //'odpocita cislo prvej bunky kont tab., vydeli poctom riadkov na stramu (40), zaokruhli hore, a vynasobi poctom riadkov na stranu - xlWorkSheet.PageSetup.PrintArea = "$B$2:$I$" + (lastrow + 2); + xlWorkSheet.PageSetup.PrintArea = "$B$2:$J$" + (lastrow + 2); xlApp.Visible = true; xlApp.ActiveWindow.Activate(); diff --git a/Mip/frmVydajZoSkladu.cs b/Mip/frmVydajZoSkladu.cs index bdd7489..bc77898 100644 --- a/Mip/frmVydajZoSkladu.cs +++ b/Mip/frmVydajZoSkladu.cs @@ -1,11 +1,5 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace Mip @@ -36,7 +30,7 @@ namespace Mip textBox1.Enabled = false; comboBox1.Enabled = false; } - if(Convert.ToInt32(label15.Text) == 0) comboBox1.Items.RemoveAt(comboBox1.SelectedIndex); + if (Convert.ToInt32(label15.Text) == 0) comboBox1.Items.RemoveAt(comboBox1.SelectedIndex); tblForGridView.Rows.Add(newdr); tblForGridView.AcceptChanges(); dataGridView1.DataSource = tblForGridView; @@ -99,10 +93,10 @@ namespace Mip string cmd3 = ""; cmd3 = "SELECT * FROM `pohladkrabiceskop` WHERE `IDvyr` = " + idnajdivyrobok.ToString() + ";"; classSQL.SQL(cmd3, out tblVsetkyKrabicoveOperacie); - + DataTable tblCBHodnoty = new DataTable(); string cmd4 = ""; - cmd4 = "SELECT DISTINCT `CisloKrabice` FROM `pohladkrabiceskop` WHERE `IDvyr` = " + idnajdivyrobok.ToString() + ";"; + cmd4 = $"SELECT DISTINCT `CisloKrabice` FROM `pohladkrabiceskop` WHERE `IDvyr` = {idnajdivyrobok.ToString()} AND `MaterialSUpravouMat` = '{dr0["MaterialSUpravouMat"].ToString()}';"; classSQL.SQL(cmd4, out tblCBHodnoty); comboBox1.Items.Clear(); @@ -110,20 +104,22 @@ namespace Mip string strPocetVKrabici; foreach (DataRow CBRow in tblCBHodnoty.Rows) { - - string cmd5 = @"SELECT DISTINCT + + string cmd5 = $@"SELECT DISTINCT (IFNULL((SELECT SUM(`PocetKusov`) FROM `pohladkrabiceskop` - WHERE (`IDvyr` = " + idnajdivyrobok.ToString() + - @" AND (`SkladOperacia` = 'Príjem' OR `SkladOperacia` = 'Inventárny príjem') - AND `StatusSkladOperacie` = 'Vybavený' - AND `CisloKrabice` = " + CBRow["CisloKrabice"].ToString() + @")),0) + WHERE (`IDvyr` = {idnajdivyrobok.ToString()} + AND (`SkladOperacia` = 'Príjem' OR `SkladOperacia` = 'Inventárny príjem') + AND `StatusSkladOperacie` = 'Vybavený' + AND `MaterialSUpravouMat` = '{dr0["MaterialSUpravouMat"].ToString()}' + AND `CisloKrabice` = {CBRow["CisloKrabice"].ToString()})),0) - IFNULL((SELECT SUM(`PocetKusov`) FROM `pohladkrabiceskop` - WHERE (`IDvyr` = " + idnajdivyrobok.ToString() + - @" AND (`SkladOperacia` = 'Výdaj' OR `SkladOperacia` = 'Inventárny výdaj') - AND `CisloKrabice` = " + CBRow["CisloKrabice"].ToString() + @")),0) + WHERE (`IDvyr` = {idnajdivyrobok.ToString()} + AND (`SkladOperacia` = 'Výdaj' OR `SkladOperacia` = 'Inventárny výdaj') + AND `MaterialSUpravouMat` = '{dr0["MaterialSUpravouMat"].ToString()}' + AND `CisloKrabice` = {CBRow["CisloKrabice"].ToString()})),0) ) as `PocKus` FROM `pohladkrabiceskop`"; classSQL.SQL(cmd5, out strPocetVKrabici); @@ -160,10 +156,10 @@ namespace Mip private void comboBox1_SelectedValueChanged(object sender, EventArgs e) { string searchValue = comboBox1.Text; - + dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; foreach (DataGridViewRow row in dataGridView1.Rows) if (row.Cells["Krabica"].Value.ToString().Equals(searchValue)) label15.Text = row.Cells["Počet kusov"].Value.ToString(); - + if (comboBox1.Text != "" && textBox1.Text != "") button2.Enabled = true; else button2.Enabled = false; diff --git a/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache b/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache index d5fe7e7..e2d66fc 100644 Binary files a/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache and b/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache differ diff --git a/MipInstaller/MipInstaller.vdproj b/MipInstaller/MipInstaller.vdproj index 8ea0666..fed241c 100644 --- a/MipInstaller/MipInstaller.vdproj +++ b/MipInstaller/MipInstaller.vdproj @@ -15,7 +15,49 @@ { "Entry" { - "MsmKey" = "8:_2282574CEC529775C09EFA72207A8394" + "MsmKey" = "8:_143DC01043004BDAB7063DEF30B3AF42" + "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1C1FA7A874FD17FDF678B115E7DEA9FA" + "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1C1FA7A874FD17FDF678B115E7DEA9FA" + "OwnerKey" = "8:_CA144385826D77ECA7AB24D7B09F056E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2031DBE1BCCCCD2740B49963F05431CF" + "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2411BC6BB72BB1A300BF59D588C5D2FB" + "OwnerKey" = "8:_6B0AA5AACC5751C10AE8FF6933F0938C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2411BC6BB72BB1A300BF59D588C5D2FB" + "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_358BCC0B3B4A85C99AE7A5507212FA51" + "OwnerKey" = "8:_6B0AA5AACC5751C10AE8FF6933F0938C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_358BCC0B3B4A85C99AE7A5507212FA51" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" } @@ -27,37 +69,31 @@ } "Entry" { - "MsmKey" = "8:_5337F059BB86E73FCB386507FC8ECC2E" + "MsmKey" = "8:_6B0AA5AACC5751C10AE8FF6933F0938C" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5337F059BB86E73FCB386507FC8ECC2E" - "OwnerKey" = "8:_E2134F16CD8C975272DF7EB26BA09020" + "MsmKey" = "8:_754FD60E24B3F404402A8AFB95AF0FD0" + "OwnerKey" = "8:_358BCC0B3B4A85C99AE7A5507212FA51" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_762E532DE989BC199CE6FCC3B93C0D16" - "OwnerKey" = "8:_A36491C2E084BBC2D9CB35A2E30A3A86" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_762E532DE989BC199CE6FCC3B93C0D16" + "MsmKey" = "8:_754FD60E24B3F404402A8AFB95AF0FD0" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8959F6059840D2EED306A258C4BB535B" + "MsmKey" = "8:_88BA7D22227A4C1FD6976D0407DA89B2" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A36491C2E084BBC2D9CB35A2E30A3A86" + "MsmKey" = "8:_CA144385826D77ECA7AB24D7B09F056E" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" } @@ -69,96 +105,6 @@ } "Entry" { - "MsmKey" = "8:_E2134F16CD8C975272DF7EB26BA09020" - "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E2134F16CD8C975272DF7EB26BA09020" - "OwnerKey" = "8:_A36491C2E084BBC2D9CB35A2E30A3A86" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E3A1CB7C126E96889D733CA72744D00D" - "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E3A1CB7C126E96889D733CA72744D00D" - "OwnerKey" = "8:_8959F6059840D2EED306A258C4BB535B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_FD506AE2787A39200FA3CA8E8BFC8A53" - "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_FE368536F3EA18C760584D712F360826" - "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2282574CEC529775C09EFA72207A8394" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FD506AE2787A39200FA3CA8E8BFC8A53" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8959F6059840D2EED306A258C4BB535B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E3A1CB7C126E96889D733CA72744D00D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FE368536F3EA18C760584D712F360826" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_762E532DE989BC199CE6FCC3B93C0D16" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A36491C2E084BBC2D9CB35A2E30A3A86" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E2134F16CD8C975272DF7EB26BA09020" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5337F059BB86E73FCB386507FC8ECC2E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" @@ -166,9 +112,63 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_143DC01043004BDAB7063DEF30B3AF42" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_88BA7D22227A4C1FD6976D0407DA89B2" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_CA144385826D77ECA7AB24D7B09F056E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_1C1FA7A874FD17FDF678B115E7DEA9FA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_2031DBE1BCCCCD2740B49963F05431CF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_36B97FFE31849B72D6493D6218848D7A" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_6B0AA5AACC5751C10AE8FF6933F0938C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_2411BC6BB72BB1A300BF59D588C5D2FB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_358BCC0B3B4A85C99AE7A5507212FA51" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_754FD60E24B3F404402A8AFB95AF0FD0" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -264,14 +264,14 @@ } "File" { - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2282574CEC529775C09EFA72207A8394" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_143DC01043004BDAB7063DEF30B3AF42" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:MyTools, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_2282574CEC529775C09EFA72207A8394" + "_143DC01043004BDAB7063DEF30B3AF42" { "Name" = "8:MyTools.dll" "Attributes" = "3:512" @@ -295,6 +295,130 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1C1FA7A874FD17FDF678B115E7DEA9FA" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:GMap.NET.Core, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_1C1FA7A874FD17FDF678B115E7DEA9FA" + { + "Name" = "8:GMap.NET.Core.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:GMap.NET.Core.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2031DBE1BCCCCD2740B49963F05431CF" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:MonthCalendar, Version=1.0.1.140, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_2031DBE1BCCCCD2740B49963F05431CF" + { + "Name" = "8:MonthCalendar.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:MonthCalendar.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2411BC6BB72BB1A300BF59D588C5D2FB" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Syncfusion.Shared.Base, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_2411BC6BB72BB1A300BF59D588C5D2FB" + { + "Name" = "8:Syncfusion.Shared.Base.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Syncfusion.Shared.Base.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_358BCC0B3B4A85C99AE7A5507212FA51" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Syncfusion.Pdf.Base, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_358BCC0B3B4A85C99AE7A5507212FA51" + { + "Name" = "8:Syncfusion.Pdf.Base.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Syncfusion.Pdf.Base.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_36B97FFE31849B72D6493D6218848D7A" { "AssemblyRegister" = "3:1" @@ -326,102 +450,14 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5337F059BB86E73FCB386507FC8ECC2E" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Syncfusion.Compression.Base, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Syncfusion.Compression.Base.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_762E532DE989BC199CE6FCC3B93C0D16" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Syncfusion.Shared.Base, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_762E532DE989BC199CE6FCC3B93C0D16" - { - "Name" = "8:Syncfusion.Shared.Base.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Syncfusion.Shared.Base.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8959F6059840D2EED306A258C4BB535B" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:GMap.NET.WindowsForms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_8959F6059840D2EED306A258C4BB535B" - { - "Name" = "8:GMap.NET.WindowsForms.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:GMap.NET.WindowsForms.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A36491C2E084BBC2D9CB35A2E30A3A86" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6B0AA5AACC5751C10AE8FF6933F0938C" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:Syncfusion.PdfViewer.Windows, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A36491C2E084BBC2D9CB35A2E30A3A86" + "_6B0AA5AACC5751C10AE8FF6933F0938C" { "Name" = "8:Syncfusion.PdfViewer.Windows.dll" "Attributes" = "3:512" @@ -445,20 +481,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E2134F16CD8C975272DF7EB26BA09020" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_754FD60E24B3F404402A8AFB95AF0FD0" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Syncfusion.Pdf.Base, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Syncfusion.Compression.Base, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" "ScatterAssemblies" { - "_E2134F16CD8C975272DF7EB26BA09020" + "_754FD60E24B3F404402A8AFB95AF0FD0" { - "Name" = "8:Syncfusion.Pdf.Base.dll" + "Name" = "8:Syncfusion.Compression.Base.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Syncfusion.Pdf.Base.dll" + "SourcePath" = "8:Syncfusion.Compression.Base.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" @@ -476,45 +512,14 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E3A1CB7C126E96889D733CA72744D00D" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:GMap.NET.Core, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_E3A1CB7C126E96889D733CA72744D00D" - { - "Name" = "8:GMap.NET.Core.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:GMap.NET.Core.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FD506AE2787A39200FA3CA8E8BFC8A53" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_88BA7D22227A4C1FD6976D0407DA89B2" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:MySql.Data, Version=6.5.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" "ScatterAssemblies" { - "_FD506AE2787A39200FA3CA8E8BFC8A53" + "_88BA7D22227A4C1FD6976D0407DA89B2" { "Name" = "8:MySql.Data.dll" "Attributes" = "3:512" @@ -538,20 +543,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FE368536F3EA18C760584D712F360826" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CA144385826D77ECA7AB24D7B09F056E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MonthCalendar, Version=1.0.1.140, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:GMap.NET.WindowsForms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL" "ScatterAssemblies" { - "_FE368536F3EA18C760584D712F360826" + "_CA144385826D77ECA7AB24D7B09F056E" { - "Name" = "8:MonthCalendar.dll" + "Name" = "8:GMap.NET.WindowsForms.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:MonthCalendar.dll" + "SourcePath" = "8:GMap.NET.WindowsForms.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" @@ -625,15 +630,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Mip1.1" - "ProductCode" = "8:{7DC7BD81-ADD7-46B9-9A3E-8054F7C087A7}" - "PackageCode" = "8:{3F3BA5C9-9D9F-4414-862A-653D520A33D4}" + "ProductCode" = "8:{CEA7D3C2-1155-4451-8864-74556EC36D03}" + "PackageCode" = "8:{1F79D53A-9B5A-4A70-8994-9C39FD5AB51C}" "UpgradeCode" = "8:{96C5136E-DF0B-48C4-9031-F8CA75E3E3E6}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.13" + "ProductVersion" = "8:1.1.14" "Manufacturer" = "8:Kompozitum" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/MipInstaller/Release/MipInstaller.msi b/MipInstaller/Release/MipInstaller.msi index a91d0cc..b8ed75a 100644 Binary files a/MipInstaller/Release/MipInstaller.msi and b/MipInstaller/Release/MipInstaller.msi differ