Index: /trunk/BazaReklam/Baza Reklam.csproj =================================================================== --- /trunk/BazaReklam/Baza Reklam.csproj (revision 614) +++ /trunk/BazaReklam/Baza Reklam.csproj (revision 626) @@ -11,4 +11,28 @@ Baza Reklam cab.ico + 056FE3A26AB338C7EF38953FC5E38316E34F40A8 + Baza Reklam_TemporaryKey.pfx + true + true + true + C:\temp\BazaReklam\Update\test\ + true + Web + true + Foreground + 7 + Days + false + false + true + http://www.infocity.pl/baza_reklam/update/test/ + http://www.infocity.pl/baza_reklam/instrukcja.htm + pl-PL + Baza Reklam + AACT + index.htm + false + 1.0.0.%2a + false @@ -658,4 +682,5 @@ + @@ -668,4 +693,40 @@ + + + + False + .NET Framework 2.0 + true + + + + + False + + + + + Include + Assembly + + + False + + + + + Include + Assembly + + + False + + + + + Include + Assembly + Index: /trunk/BazaReklam/FormBadVer.cs =================================================================== --- /trunk/BazaReklam/FormBadVer.cs (revision 610) +++ /trunk/BazaReklam/FormBadVer.cs (revision 626) @@ -1,4 +1,5 @@ using System; using System.ComponentModel; +using System.IO; using System.Windows.Forms; using System.Net; @@ -28,11 +29,11 @@ { button1.Enabled = false; - - string updater = Environment.CurrentDirectory + "\\BazaReklam.Updater.exe"; - if (System.IO.File.Exists(updater)) + string updater = Environment.CurrentDirectory + Path.DirectorySeparatorChar + "BazaReklam.Updater.exe"; + + if (File.Exists(updater)) StartUpdater(); else - webClient.DownloadFileAsync(new Uri(_updaterUrl), Environment.CurrentDirectory + "\\BazaReklam.Updater.exe"); + webClient.DownloadFileAsync(new Uri(_updaterUrl), Environment.CurrentDirectory + Path.DirectorySeparatorChar + "BazaReklam.Updater.exe"); } @@ -53,9 +54,22 @@ private void StartUpdater() { - string updater = Environment.CurrentDirectory + "\\BazaReklam.Updater.exe"; - Cursor = Cursors.Default; - button1.Cursor = Cursors.Default; - Close(); - Process.Start(updater, string.Format(" \"{0}\" {1}", "Baza Reklam", _zipUrl)); + string updater = Environment.CurrentDirectory + Path.DirectorySeparatorChar + "BazaReklam.Updater.exe"; + try + { + Cursor = Cursors.Default; + button1.Cursor = Cursors.Default; + + ProcessStartInfo processStartInfo = new ProcessStartInfo(updater); + processStartInfo.Arguments = string.Format(" \"{0}\" {1}", "Baza Reklam", _zipUrl); + + Close(); + + Process.Start(processStartInfo); + } + catch (Exception exception) + { + Logger.LogException(exception.Message, exception + "\n" + updater, "[aktualizacja]", DateTime.Now); + MessageBox.Show("B³¹d aktualizacji oprogramowania: " + exception.Message, "Aktualizacja oprogramowania", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } } Index: /trunk/BazaReklam/Classes/Logger.cs =================================================================== --- /trunk/BazaReklam/Classes/Logger.cs (revision 576) +++ /trunk/BazaReklam/Classes/Logger.cs (revision 626) @@ -9,4 +9,9 @@ public static void LogException(Exception exception, string userName, DateTime dateTime) { + LogException(exception.Message, exception.ToString(), userName, dateTime); + } + + public static void LogException(string errorMessage, string errorDetails, string userName, DateTime dateTime) + { SqlConnection conn = null; SqlCommand cmd = null; @@ -17,13 +22,13 @@ cmd = new SqlCommand("dbo.sp_LogException", conn); cmd.CommandType = CommandType.StoredProcedure; - cmd.Parameters.AddWithValue("@errorMessage", exception.Message); + cmd.Parameters.AddWithValue("@errorMessage", errorMessage); cmd.Parameters.AddWithValue("@userName", userName); cmd.Parameters.AddWithValue("@dateTime", dateTime); - cmd.Parameters.AddWithValue("@errorDetails", exception.ToString()); + cmd.Parameters.AddWithValue("@errorDetails", errorDetails); cmd.ExecuteNonQuery(); } catch (Exception ex) { - EmailSender.SendNotification(ex, exception, userName, dateTime); + EmailSender.SendNotification(ex, errorMessage, errorDetails, userName, dateTime); } finally Index: /trunk/BazaReklam/Classes/ConnString.cs =================================================================== --- /trunk/BazaReklam/Classes/ConnString.cs (revision 539) +++ /trunk/BazaReklam/Classes/ConnString.cs (revision 626) @@ -45,4 +45,22 @@ } } + + public static string GetDataSource() + { + SqlConnection sqlConnection = null; + try + { + sqlConnection = new SqlConnection(getConnString().Value); + return sqlConnection.DataSource; + } + catch + { + return string.Empty; + } + finally + { + if (sqlConnection != null) sqlConnection.Dispose(); + } + } } } Index: /trunk/BazaReklam/Classes/EmailSender.cs =================================================================== --- /trunk/BazaReklam/Classes/EmailSender.cs (revision 554) +++ /trunk/BazaReklam/Classes/EmailSender.cs (revision 626) @@ -8,5 +8,5 @@ public class EmailSender { - public static void SendNotification(Exception loggingException, Exception exception, string userName, DateTime dateTime) + public static void SendNotification(Exception loggingException, string exceptionMessage, string exceptionDetails, string userName, DateTime dateTime) { try @@ -20,6 +20,6 @@ sb.AppendLine("Data i czas: " + dateTime); sb.AppendLine("U¿ytkownik: " + userName); - sb.AppendLine("Exception.Message: " + exception.Message); - sb.AppendLine(exception.ToString()); + sb.AppendLine("Exception.Message: " + exceptionMessage); + sb.AppendLine(exceptionDetails); sb.AppendLine("***"); sb.AppendLine("Logging.Exception.Message: " + loggingException.Message); Index: /trunk/BazaReklam/Logowanie.cs =================================================================== --- /trunk/BazaReklam/Logowanie.cs (revision 617) +++ /trunk/BazaReklam/Logowanie.cs (revision 626) @@ -240,6 +240,6 @@ cmd = new SqlCommand("SELECT ver FROM dbo.app WHERE [name]='BazaReklam'"); cmd.Connection = - new SqlConnection( - "Data Source=sql.ct.com.pl;Initial Catalog=Applications;Persist Security Info=True;User=updater;Password=UpdateSolution;Application Name=BazaReklam_v" + Application.ProductVersion + ";"); + new SqlConnection("Data Source=" + ConnString.GetDataSource() + ";Initial Catalog=Applications;Persist Security Info=True;User=updater;Password=UpdateSolution;Application Name=BazaReklam_v" + Application.ProductVersion + ";"); + cmd.Connection.Open(); Index: /trunk/BazaReklam/Raporty/fakturaReversed2_1page.rdlc =================================================================== --- /trunk/BazaReklam/Raporty/fakturaReversed2_1page.rdlc (revision 539) +++ /trunk/BazaReklam/Raporty/fakturaReversed2_1page.rdlc (revision 626) @@ -1744,5 +1744,5 @@ true - =Code.Slownie(iif(Sum(Fields!S_VAT.Value, "FakturaDetails2")<>0,Sum(Fields!NETTO.Value, "FakturaDetails2")*1.22,Sum(Fields!BRUTTO.Value, "FakturaDetails2"))) + =Code.Slownie(iif(Sum(Fields!S_VAT.Value, "FakturaDetails2")<>0,Sum(Fields!NETTO.Value, "FakturaDetails2")*1.22,Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value), "FakturaDetails2"))) Index: /trunk/BazaReklam/Raporty/fakturaKorekta.rdlc =================================================================== --- /trunk/BazaReklam/Raporty/fakturaKorekta.rdlc (revision 539) +++ /trunk/BazaReklam/Raporty/fakturaKorekta.rdlc (revision 626) @@ -1787,5 +1787,5 @@ 4 true - =Abs(Sum(Fields!BRUTTO.Value, "FakturaDetails2") - Sum(Fields!BRUTTO.Value, "FakturaDetailsKorekty")) + =Abs(Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value), "FakturaDetails2") - Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value), "FakturaDetailsKorekty")) @@ -1914,5 +1914,5 @@ true - =Code.Slownie(Abs(Sum(Fields!BRUTTO.Value, "FakturaDetails2") - Sum(Fields!BRUTTO.Value, "FakturaDetailsKorekty"))) + =Code.Slownie(Abs(Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value), "FakturaDetails2") - Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value), "FakturaDetailsKorekty"))) @@ -3550,5 +3550,5 @@ true - =Sum(Fields!BRUTTO.Value) + =Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value)) @@ -4223,5 +4223,5 @@ 16 true - =Sum(Fields!BRUTTO.Value,"FakturaDetailsKorekty") + =Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value), "FakturaDetailsKorekty") @@ -4309,5 +4309,5 @@ 4 true - =iif(Sum(Fields!S_VAT.Value)<>0,Sum(Fields!NETTO.Value)*1.22,Sum(Fields!BRUTTO.Value)) + =iif(Sum(Fields!S_VAT.Value)<>0,Sum(Fields!NETTO.Value)*1.22,Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value))) @@ -4434,5 +4434,5 @@ true - =Code.Slownie(iif(Sum(Fields!S_VAT.Value)<>0,Sum(Fields!NETTO.Value)*1.22,Sum(Fields!BRUTTO.Value))) + =Code.Slownie(iif(Sum(Fields!S_VAT.Value)<>0,Sum(Fields!NETTO.Value)*1.22,Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value)))) @@ -4682,5 +4682,5 @@ true - =Sum(Fields!BRUTTO.Value) + =Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value)) @@ -5368,5 +5368,5 @@ 16 true - =Sum(Fields!BRUTTO.Value) + =Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value)) @@ -5458,5 +5458,5 @@ 4 true - =iif(Sum(Fields!S_VAT.Value)<>0,Sum(Fields!NETTO.Value)*1.22,Sum(Fields!BRUTTO.Value)) + =iif(Sum(Fields!S_VAT.Value)<>0,Sum(Fields!NETTO.Value)*1.22,Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value))) @@ -5588,5 +5588,5 @@ true - =Code.Slownie(iif(Sum(Fields!S_VAT.Value)<>0,Sum(Fields!NETTO.Value)*1.22,Sum(Fields!BRUTTO.Value))) + =Code.Slownie(iif(Sum(Fields!S_VAT.Value)<>0,Sum(Fields!NETTO.Value)*1.22,Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value)))) Index: /trunk/BazaReklam/Raporty/fakturaReversed2.rdlc =================================================================== --- /trunk/BazaReklam/Raporty/fakturaReversed2.rdlc (revision 539) +++ /trunk/BazaReklam/Raporty/fakturaReversed2.rdlc (revision 626) @@ -1705,5 +1705,5 @@ true - =Code.Slownie(iif(Sum(Fields!S_VAT.Value, "FakturaDetails2")<>0,Sum(Fields!NETTO.Value, "FakturaDetails2")*1.22,Sum(Fields!BRUTTO.Value, "FakturaDetails2"))) + =Code.Slownie(iif(Sum(Fields!S_VAT.Value, "FakturaDetails2")<>0,Sum(Fields!NETTO.Value, "FakturaDetails2")*1.22,Sum(Fields!NETTO.Value * (1 + Fields!S_VAT.Value), "FakturaDetails2"))) Index: /trunk/BazaReklam/Properties/AssemblyInfo.cs =================================================================== --- /trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 623) +++ /trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 626) @@ -30,3 +30,3 @@ // [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.1.8")] +[assembly: AssemblyFileVersion("1.1.10")] Index: /trunk/BazaReklamSetup/BazaReklamSetup.vdproj =================================================================== --- /trunk/BazaReklamSetup/BazaReklamSetup.vdproj (revision 623) +++ /trunk/BazaReklamSetup/BazaReklamSetup.vdproj (revision 626) @@ -725,6 +725,6 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Baza Reklam" - "ProductCode" = "8:{B9EB2B5B-CFFC-4B79-881F-6FA0E7D5043C}" - "PackageCode" = "8:{7AE251DC-6A55-48EE-96D8-760FD74317E4}" + "ProductCode" = "8:{FA4C0434-CC8C-4564-B722-58F3DC1E3E26}" + "PackageCode" = "8:{D7791233-87BA-4BB5-97AE-E785CEDE9FB5}" "UpgradeCode" = "8:{4E2DBBA4-3139-4790-8DDB-7AADFC963A7D}" "RestartWWWService" = "11:FALSE" @@ -732,5 +732,5 @@ "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:1.1.8" + "ProductVersion" = "8:1.1.10" "Manufacturer" = "8:AACT" "ARPHELPTELEPHONE" = "8:"

Baza reklam - Informacje o wersji

Wersja 1.1.10 (2009-04-30)