Zbiór zmian 998
- Data:
- 2010-01-06 12:31:33 (16 years ago)
- Lokalizacja:
- trunk
- Pliki:
-
- 7 zmodyfikowane
-
BazaReklam/Baza Reklam.csproj (zmodyfikowane) (1 diff)
-
BazaReklam/ClientsForm.cs (zmodyfikowane) (25 diffs)
-
BazaReklam/OrderDetails.cs (zmodyfikowane) (11 diffs)
-
BazaReklam/OrdersForm.cs (zmodyfikowane) (3 diffs)
-
BazaReklam/Properties/AssemblyInfo.cs (zmodyfikowane) (1 diff)
-
BazaReklam/ZestawienieZamowienForm.cs (zmodyfikowane) (2 diffs)
-
BazaReklamSetup/BazaReklamSetup.vdproj (zmodyfikowane) (10 diffs)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
trunk/BazaReklam/Baza Reklam.csproj
r996 r998 36 36 <ProductName>Baza Reklam</ProductName> 37 37 <PublisherName>AACT</PublisherName> 38 <CreateWebPageOnPublish>true</CreateWebPageOnPublish> 38 39 <WebPage>index.htm</WebPage> 39 40 <OpenBrowserOnPublish>false</OpenBrowserOnPublish> 40 41 <ApplicationRevision>0</ApplicationRevision> 41 <ApplicationVersion>1.2. 9.0</ApplicationVersion>42 <ApplicationVersion>1.2.10.0</ApplicationVersion> 42 43 <UseApplicationTrust>false</UseApplicationTrust> 43 44 <BootstrapperEnabled>false</BootstrapperEnabled> -
trunk/BazaReklam/ClientsForm.cs
r900 r998 291 291 if (rEKLAMABindingSource.Current == null) return; 292 292 293 DataRowView row = (DataRowView)rEKLAMABindingSource.Current; 294 int idRek = Int32.Parse(row["reklamaId"].ToString()); 295 int custId = Int32.Parse(row["customerId"].ToString()); 296 297 OrderDetails.getOrderDetails().PokazSzczegolyZamowienia(idRek); 298 if (OrderDetails.getOrderDetails().ShowDialog() == DialogResult.OK) 299 { 300 rEKLAMADataSet.REKLAMA.Clear(); 301 rEKLAMATableAdapter.FillByCustomerId(rEKLAMADataSet.REKLAMA, custId); 302 } 303 } 304 305 private void nowaButton_Click(object sender, EventArgs e) 306 { 307 if (kLIENCIBindingSource.Current == null) return; 308 293 309 try 294 310 { 295 311 Cursor = Cursors.WaitCursor; 296 DataRowView row = (DataRowView) rEKLAMABindingSource.Current; 297 int idRek = Int32.Parse(row["reklamaId"].ToString()); 298 int custId = Int32.Parse(row["customerId"].ToString()); 299 300 OrderDetails.getOrderDetails().PokazSzczegolyZamowienia(idRek); 301 302 if (OrderDetails.getOrderDetails().ShowDialog() == DialogResult.OK) 303 { 304 rEKLAMADataSet.REKLAMA.Clear(); 305 rEKLAMATableAdapter.FillByCustomerId(rEKLAMADataSet.REKLAMA, custId); 306 } 307 } 308 finally 309 { 310 Cursor = Cursors.Default; 311 } 312 } 313 314 private void nowaButton_Click(object sender, EventArgs e) 315 { 316 if (kLIENCIBindingSource.Current == null) return; 317 318 try 319 { 320 Cursor = Cursors.WaitCursor; 321 322 DataRowView row = (DataRowView) kLIENCIBindingSource.Current; 323 REKLAMADataSet.KLIENCIRow klient = (REKLAMADataSet.KLIENCIRow) row.Row; 312 313 DataRowView row = (DataRowView)kLIENCIBindingSource.Current; 314 REKLAMADataSet.KLIENCIRow klient = (REKLAMADataSet.KLIENCIRow)row.Row; 324 315 325 316 if (klient.IskodKlientaNull()) … … 392 383 finally 393 384 { 394 if (cmd.Connection !=null)385 if (cmd.Connection != null) 395 386 { 396 387 cmd.Connection.Close(); … … 411 402 Cursor = Cursors.WaitCursor; 412 403 413 DataRowView row = (DataRowView) rEKLAMABindingSource.Current;404 DataRowView row = (DataRowView)rEKLAMABindingSource.Current; 414 405 int idRek = Int32.Parse(row["reklamaId"].ToString()); 415 406 int custId = Int32.Parse(row["customerId"].ToString()); … … 432 423 { 433 424 if (kLIENCIBindingSource.Current == null) return; 434 425 435 426 const string caption = "Klient - usuwanie klienta"; 436 427 … … 439 430 MessageBoxButtons.YesNo, 440 431 MessageBoxIcon.Question); 441 432 442 433 if (dialogResult != DialogResult.Yes) return; 443 434 444 435 445 DataRowView row = (DataRowView) kLIENCIBindingSource.Current;436 DataRowView row = (DataRowView)kLIENCIBindingSource.Current; 446 437 int custId = Int32.Parse(row["CustomerId"].ToString()); 447 438 … … 451 442 { 452 443 453 dialogResult = MessageBox.Show("Istniej¹ dane (reklamy, osoby do kontaktu lub klasyfikacja klienta) zwi¹zane z klientem! Usun¹æ klienta?", 444 dialogResult = MessageBox.Show("Istniej¹ dane (reklamy, osoby do kontaktu lub klasyfikacja klienta) zwi¹zane z klientem! Usun¹æ klienta?", 454 445 caption, 455 446 MessageBoxButtons.YesNo, 456 447 MessageBoxIcon.Question); 457 448 458 449 if (dialogResult == DialogResult.Yes) 459 450 { … … 678 669 679 670 rEKLAMADataSet.KLIENCI.Clear(); 680 671 681 672 command.CommandText = "sp_GetClientsWithNoContact"; 682 673 command.CommandType = CommandType.StoredProcedure; … … 796 787 797 788 sqlDataAdapter.Fill(rEKLAMADataSet.KLIENCI); 798 789 799 790 clientsDataGridView.Refresh(); 800 791 … … 809 800 { 810 801 if (rEKLAMABindingSource.Current == null) return; 811 812 DataRowView row = (DataRowView) rEKLAMABindingSource.Current;802 803 DataRowView row = (DataRowView)rEKLAMABindingSource.Current; 813 804 int idReklamy = Convert.ToInt32(row["reklamaId"]); 814 805 Facturer f = new Facturer(idReklamy); … … 817 808 { 818 809 rEKLAMADataSet.REKLAMA.Clear(); 819 DataRowView r = (DataRowView) kLIENCIBindingSource.Current;810 DataRowView r = (DataRowView)kLIENCIBindingSource.Current; 820 811 int customerId = Int32.Parse(r["CustomerId"].ToString()); 821 812 rEKLAMATableAdapter.FillByCustomerId(rEKLAMADataSet.REKLAMA, customerId); … … 829 820 if (rEKLAMABindingSource.Current == null) return; 830 821 831 DataRowView row = (DataRowView) rEKLAMABindingSource.Current;832 REKLAMADataSet.REKLAMARow reklama = (REKLAMADataSet.REKLAMARow) row.Row;822 DataRowView row = (DataRowView)rEKLAMABindingSource.Current; 823 REKLAMADataSet.REKLAMARow reklama = (REKLAMADataSet.REKLAMARow)row.Row; 833 824 834 825 if (AdHelper.IsOgloszenie(reklama)) … … 840 831 { 841 832 ProjectForm pf = new ProjectForm(reklama.ReklamaID); 842 pf.ShowDialog();843 }833 pf.ShowDialog(); 834 } 844 835 } 845 836 … … 984 975 if (zestawienieFakturBindingSource.Current == null) return; 985 976 986 DataRowView row = (DataRowView) zestawienieFakturBindingSource.Current;977 DataRowView row = (DataRowView)zestawienieFakturBindingSource.Current; 987 978 988 979 //nie ma faktury … … 1096 1087 DataRowView r = datatable.AddNew(); 1097 1088 kONTAKTYBindingSource.MoveLast(); 1098 1089 1099 1090 1100 1091 … … 1105 1096 AddUpdateKontakt(r, custId); 1106 1097 1107 1098 1108 1099 1109 1100 kONTAKTYBindingSource.EndEdit(); … … 1119 1110 { 1120 1111 if (kONTAKTYBindingSource.Current == null) return; 1121 1112 1122 1113 if (MessageBox.Show("Czy na pewno chcesz usun¹æ rekord?", "", MessageBoxButtons.YesNo) == DialogResult.Yes) 1123 1114 { … … 1132 1123 if (rEKLAMABindingSource.Current == null) return; 1133 1124 1134 DataRowView row = (DataRowView) rEKLAMABindingSource.Current;1125 DataRowView row = (DataRowView)rEKLAMABindingSource.Current; 1135 1126 int idReklamy = Convert.ToInt32(row["reklamaId"]); 1136 1127 int custId = Convert.ToInt32(row["customerId"]); … … 1147 1138 if (rEKLAMABindingSource.Current == null) return; 1148 1139 1149 DataRowView row = (DataRowView) rEKLAMABindingSource.Current;1150 REKLAMADataSet.REKLAMARow reklama = (REKLAMADataSet.REKLAMARow) row.Row;1140 DataRowView row = (DataRowView)rEKLAMABindingSource.Current; 1141 REKLAMADataSet.REKLAMARow reklama = (REKLAMADataSet.REKLAMARow)row.Row; 1151 1142 1152 1143 if (reklama.IsID_FAKTURYNull()) … … 1186 1177 { 1187 1178 if (kLIENCIBindingSource.Current == null) return; 1188 1179 1189 1180 MessageBox.Show("Dane zapisano", "Klient"); 1190 1181 } … … 1269 1260 1270 1261 1271 if (((REKLAMADataSet.KLIENCIRow)row.Row).IsCountryNull()) 1262 if (((REKLAMADataSet.KLIENCIRow)row.Row).IsCountryNull()) 1272 1263 countryComboBox.SelectedIndex = -1; 1273 1264 … … 1278 1269 private void kryteriumWyszukiwania_KeyPress(object sender, KeyPressEventArgs e) 1279 1270 { 1280 if (e.KeyChar == 13) 1271 if (e.KeyChar == 13) 1281 1272 szukajToolStripButton.PerformClick(); 1282 1273 } … … 2264 2255 ExcelHelper excelHelper = new ExcelHelper(); 2265 2256 excelHelper.Export(clientsDataGridView); 2266 2257 2267 2258 Cursor = Cursors.Default; 2268 2259 } … … 2321 2312 { 2322 2313 if (kLIENCIBindingSource.Current == null) return; 2323 2314 2324 2315 try 2325 2316 { … … 2329 2320 2330 2321 ZamowieniaForm zam = new ZamowieniaForm(klient); 2331 zam.ShowDialog(); 2322 zam.ShowDialog(); 2332 2323 } 2333 2324 finally … … 2490 2481 } 2491 2482 2492 // if (idSubscription > 0 && gridSubscriptions.DataSource2483 // if (idSubscription > 0 && gridSubscriptions.DataSource 2493 2484 List<Subscription> subscriptions = (List<Subscription>)gridSubscriptions.DataSource; 2494 2485 2495 DataRowView row = (DataRowView) kLIENCIBindingSource.Current;2496 REKLAMADataSet.KLIENCIRow klient = (REKLAMADataSet.KLIENCIRow) row.Row;2486 DataRowView row = (DataRowView)kLIENCIBindingSource.Current; 2487 REKLAMADataSet.KLIENCIRow klient = (REKLAMADataSet.KLIENCIRow)row.Row; 2497 2488 2498 2489 SubscriptionForm subscriptionForm = new SubscriptionForm(klient.CustomerID, subscript); -
trunk/BazaReklam/OrderDetails.cs
r936 r998 306 306 Cursor = Cursors.WaitCursor; 307 307 308 SaveChanges(); 309 308 if (!SaveChanges()) 309 { 310 Cursor = Cursors.Default; 311 return; 312 } 313 314 Cursor = Cursors.Default; 310 315 MessageBox.Show("Zmiany zapisane"); 311 Cursor = Cursors.Default;312 316 } 313 317 … … 322 326 Cursor = Cursors.WaitCursor; 323 327 324 SaveChanges(); 325 328 if (!SaveChanges()) 329 { 330 Cursor = Cursors.Default; 331 return; 332 } 333 334 Cursor = Cursors.Default; 326 335 MessageBox.Show("Zmiany zapisane"); 327 Cursor = Cursors.Default;328 336 Close(); 329 337 } 330 338 331 private void SaveChanges() 332 { 339 private bool SaveChanges() 340 { 341 if (SelectedModule == null) 342 { 343 MessageBox.Show("Baza reklam", "Wybierz modu³ reklamy!", MessageBoxButtons.OK, MessageBoxIcon.Warning); 344 return false; 345 } 346 347 if (SelectedTitle == null) 348 { 349 MessageBox.Show("Baza reklam", "Wybierz tytu³!", MessageBoxButtons.OK, MessageBoxIcon.Warning); 350 return false; 351 } 352 353 if (SelectedSection == null) 354 { 355 MessageBox.Show("Baza reklam", "Wybierz sekcjê!", MessageBoxButtons.OK, MessageBoxIcon.Warning); 356 return false; 357 } 358 333 359 Reklama.MOD_TYP = SelectedModule.Name; 334 360 Reklama.TYTU£ = SelectedTitle.ShortName; … … 377 403 MessageBox.Show("Zosta³a zmieniona opcja wyró¿nienia. Zamówienie nale¿y ponownie przeliczyæ"); 378 404 Cursor = Cursors.Default; 379 return ;405 return false; 380 406 } 381 407 … … 400 426 401 427 ukazeSieDataGridView.Sort(ukazeSieDataGridView.Columns[0], ListSortDirection.Ascending); 428 429 return true; 402 430 } 403 431 … … 406 434 foreach (REKLAMADataSet.UKAZE_SIE_W_NRRow emisja in emisje.Rows) 407 435 { 408 if (emisja.IsidFakturyNull()) return true; 436 if (emisja.IsidFakturyNull()) 437 return true; 409 438 } 410 439 … … 531 560 } 532 561 533 if (r.ReadOnly && r.DefaultCellStyle.BackColor == Color.MintCream) continue; 562 if (r.ReadOnly && r.DefaultCellStyle.BackColor == Color.MintCream) 563 continue; 534 564 535 565 foreach (DataGridViewRow s in ukazaloSieDataGridView.Rows) … … 739 769 rEKLAMABindingSource.EndEdit(); 740 770 } 771 #if DEBUG 772 else 773 { 774 MessageBox.Show("Przelicz()\n.Co jest null!"); 775 } 776 #endif 741 777 742 778 } … … 906 942 rEKLAMA_STRONATableAdapter.FillByReklamaId(rEKLAMADataSet.REKLAMA_STRONA, reklamaId); 907 943 uKAZE_SIE_W_NRTableAdapter.FillByReklamaId(rEKLAMADataSet.UKAZE_SIE_W_NR, reklamaId); 908 909 910 944 911 945 //Set ComboBox selected item … … 1492 1526 rEKLAMABindingSource.EndEdit(); 1493 1527 PrzeliczCaleZamowienie(); 1494 1495 1528 } 1496 1529 … … 1740 1773 if (SelectedModule == null) return; 1741 1774 1742 1743 1775 txtTotalModuleAmount.Text = 1744 1776 ReCaluculateModuleAmount(txtHorizontal.Text, txtVertical.Text).ToString(); … … 1831 1863 Debug.WriteLine(string.Format("Event: {0}", "txtVertical_Validating")); 1832 1864 1833 if ( (SelectedNavigationColumn != null) && (SelectedTitle != null))1865 if (SelectedNavigationColumn != null && SelectedTitle != null) 1834 1866 { 1835 1867 NavigationColumnRepository navigationColumnRepository = -
trunk/BazaReklam/OrdersForm.cs
r996 r998 976 976 private void reklamaDataGridView_CellDoubleClick(object sender, DataGridViewCellEventArgs e) 977 977 { 978 if (reklamyZestawienieBindingSource.Current != null) 979 { 980 DataRowView row = (DataRowView)reklamyZestawienieBindingSource.Current; 981 int idRek = Int32.Parse(row["reklamaId"].ToString()); 982 983 984 OrderDetails.getOrderDetails().PokazSzczegolyZamowienia(idRek); 985 DialogResult result = OrderDetails.getOrderDetails().ShowDialog(); 986 987 if (result == DialogResult.OK) 988 { 989 rEKLAMADataSet.ReklamyZestawienie.Clear(); 990 sqlDataAdapter.Fill(rEKLAMADataSet.ReklamyZestawienie); 991 } 992 } 993 978 EditReklama(); 994 979 } 995 980 … … 1191 1176 private void zamToolStripButton_Click(object sender, EventArgs e) 1192 1177 { 1178 EditReklama(); 1179 } 1180 1181 private void EditReklama() 1182 { 1193 1183 if (reklamyZestawienieBindingSource.Current != null) 1194 1184 { … … 1197 1187 1198 1188 OrderDetails.getOrderDetails().PokazSzczegolyZamowienia(idRek); 1199 OrderDetails.getOrderDetails().ShowDialog(); 1189 if (OrderDetails.getOrderDetails().ShowDialog() == DialogResult.OK) 1190 { 1191 rEKLAMADataSet.ReklamyZestawienie.Clear(); 1192 sqlDataAdapter.Fill(rEKLAMADataSet.ReklamyZestawienie); 1193 } 1200 1194 } 1201 1195 } -
trunk/BazaReklam/Properties/AssemblyInfo.cs
r996 r998 30 30 // 31 31 [assembly: AssemblyVersion("1.0.0.0")] 32 [assembly: AssemblyFileVersion("1.2. 9")]32 [assembly: AssemblyFileVersion("1.2.10")] -
trunk/BazaReklam/ZestawienieZamowienForm.cs
r791 r998 226 226 private void zamToolStripButton_Click(object sender, EventArgs e) 227 227 { 228 229 228 if (reklamyZestawienieBindingSource.Current != null) 230 229 { … … 239 238 } 240 239 } 241 242 240 } 243 241 -
trunk/BazaReklamSetup/BazaReklamSetup.vdproj
r981 r998 82 82 "Entry" 83 83 { 84 "MsmKey" = "8:_61EDB5BB1F4F4436A7DDA1B9B3025B3D" 85 "OwnerKey" = "8:_UNDEFINED" 86 "MsmSig" = "8:_UNDEFINED" 87 } 88 "Entry" 89 { 84 90 "MsmKey" = "8:_65508AB999A44FC7909AAE84E5BD5F45" 85 91 "OwnerKey" = "8:_UNDEFINED" … … 95 101 { 96 102 "MsmKey" = "8:_78F7FF4DBAE741BDB144A21AB75A662F" 97 "OwnerKey" = "8:_UNDEFINED"98 "MsmSig" = "8:_UNDEFINED"99 }100 "Entry"101 {102 "MsmKey" = "8:_90355BBD5BDA4A8FB195EB7C7A954ADA"103 103 "OwnerKey" = "8:_UNDEFINED" 104 104 "MsmSig" = "8:_UNDEFINED" … … 410 410 "IsolateTo" = "8:" 411 411 } 412 "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61EDB5BB1F4F4436A7DDA1B9B3025B3D" 413 { 414 "SourcePath" = "8:..\\BazaReklam\\Resources\\br.ico" 415 "TargetName" = "8:br.ico" 416 "Tag" = "8:" 417 "Folder" = "8:_A71B9F4A6F7A4846B9A8121692FB34D3" 418 "Condition" = "8:" 419 "Transitive" = "11:FALSE" 420 "Vital" = "11:TRUE" 421 "ReadOnly" = "11:FALSE" 422 "Hidden" = "11:FALSE" 423 "System" = "11:FALSE" 424 "Permanent" = "11:FALSE" 425 "SharedLegacy" = "11:FALSE" 426 "PackageAs" = "3:1" 427 "Register" = "3:1" 428 "Exclude" = "11:FALSE" 429 "IsDependency" = "11:FALSE" 430 "IsolateTo" = "8:" 431 } 412 432 "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6C6DB793A8DA3CF4F3943CD8BBC6D521" 413 433 { … … 441 461 "IsolateTo" = "8:" 442 462 } 443 "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_90355BBD5BDA4A8FB195EB7C7A954ADA"444 {445 "SourcePath" = "8:..\\BazaReklam\\cab.ico"446 "TargetName" = "8:cab.ico"447 "Tag" = "8:"448 "Folder" = "8:_A71B9F4A6F7A4846B9A8121692FB34D3"449 "Condition" = "8:"450 "Transitive" = "11:FALSE"451 "Vital" = "11:TRUE"452 "ReadOnly" = "11:FALSE"453 "Hidden" = "11:FALSE"454 "System" = "11:FALSE"455 "Permanent" = "11:FALSE"456 "SharedLegacy" = "11:FALSE"457 "PackageAs" = "3:1"458 "Register" = "3:1"459 "Exclude" = "11:FALSE"460 "IsDependency" = "11:FALSE"461 "IsolateTo" = "8:"462 }463 463 "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CC2D346B584D9209A0B0C23E19E16393" 464 464 { … … 573 573 { 574 574 "LangId" = "3:0" 575 "RequiresElevation" = "11:FALSE" 575 576 } 576 577 "Product" … … 578 579 "Name" = "8:Microsoft Visual Studio" 579 580 "ProductName" = "8:Baza Reklam" 580 "ProductCode" = "8:{ 0553529D-70F2-40D5-9ED7-0DAB681B62BB}"581 "PackageCode" = "8:{ F7CFD8B8-FE02-4E5C-9665-28F5691FBC7C}"581 "ProductCode" = "8:{4B16CA46-93C5-463C-B503-24C98C651B53}" 582 "PackageCode" = "8:{68299E18-89FE-42F3-8661-61DCD67F0F45}" 582 583 "UpgradeCode" = "8:{4E2DBBA4-3139-4790-8DDB-7AADFC963A7D}" 583 584 "RestartWWWService" = "11:FALSE" … … 585 586 "DetectNewerInstalledVersion" = "11:TRUE" 586 587 "InstallAllUsers" = "11:TRUE" 587 "ProductVersion" = "8:1.2. 8"588 "ProductVersion" = "8:1.2.10" 588 589 "Manufacturer" = "8:AACT" 589 590 "ARPHELPTELEPHONE" = "8:" … … 709 710 "Folder" = "8:_3EC045D247324FEAAAFA23650D200DFD" 710 711 "WorkingFolder" = "8:_A71B9F4A6F7A4846B9A8121692FB34D3" 711 "Icon" = "8:_ 90355BBD5BDA4A8FB195EB7C7A954ADA"712 "Icon" = "8:_61EDB5BB1F4F4436A7DDA1B9B3025B3D" 712 713 "Feature" = "8:" 713 714 } … … 723 724 "Folder" = "8:_9BF0E65BEA7A4F3680D59A772BB53D46" 724 725 "WorkingFolder" = "8:_A71B9F4A6F7A4846B9A8121692FB34D3" 725 "Icon" = "8:_ 90355BBD5BDA4A8FB195EB7C7A954ADA"726 "Icon" = "8:_61EDB5BB1F4F4436A7DDA1B9B3025B3D" 726 727 "Feature" = "8:" 727 728 } … … 1182 1183 } 1183 1184 } 1184 "VJSharpPlugin"1185 {1186 }1187 1185 } 1188 1186 }
