Index: trunk/SQL/StoredProcedures/PROC_WYLICZ_I_ZAPISZ_PROWIZJE.txt =================================================================== --- trunk/SQL/StoredProcedures/PROC_WYLICZ_I_ZAPISZ_PROWIZJE.txt (revision 674) +++ trunk/SQL/StoredProcedures/PROC_WYLICZ_I_ZAPISZ_PROWIZJE.txt (revision 676) @@ -6,76 +6,44 @@ ALTER PROCEDURE [dbo].[PROC_WYLICZ_I_ZAPISZ_PROWIZJE] - @ROK INTEGER = 2003, - @MS INTEGER = 2, - @idAgencji integer = 2 + @ROK INT = 2003, + @MS INT = 2, + @idAgencji INT = 2 AS -- wyczysc wszystko dla danej agencji DELETE FROM Prowizje -WHERE Rok =@Rok -AND Ms=@Ms +WHERE Rok = @Rok +AND Ms = @Ms AND Agencja = (SELECT symbol FROM Agencje where Id_Agencji = @idAgencji) --- + INSERT INTO Prowizje -SELECT a2.symbol,b_agent, B_ROK, b_ms, numer_faktury, NETTO, NrKorygowanejFaktury, -CASE Z.ZP - WHEN 1 THEN Z.procentProwizji - ELSE ROUND(P.PR_PROWIZJI,2) +SELECT +W.Agencja, +W.Symbol, +YEAR(W.dataWplaty) AS Rok, +Month(W.dataWplaty) AS Ms, +W.NR_FK, +W.Netto, +NULL AS nrFakturyKorygowanej, +procentProwizji = +CASE +WHEN Z.Zp = 1 THEN CAST(Z.procentProwizji AS decimal(9,2)) +ELSE COALESCE(CAST(P.Pr_Prowizji AS decimal(9,2)), 0) END, -Z.ZP, -CASE Z.ZP - WHEN 1 THEN ROUND(Z.procentProwizji * Netto, 2) - ELSE ROUND(ROUND(P.PR_PROWIZJI, 2) * Netto, 2) -END AS kwotaProwizji, -id_faktury -FROM dbo.VIEW_POMOCNICZY_BUDZET VPB -LEFT JOIN dbo.[PLAN] P ON VPB.b_rok = P.rok AND VPB.b_ms = P.ms AND P.symbol = VPB.b_agent -LEFT JOIN zamowienia Z ON Z.idZamowienia = VPB.idZamowienia -LEFT JOIN agenci A1 ON A1.symbol = VPB.B_agent -LEFT JOIN agencje A2 ON A2.id_agencji = A1.id_agencji -WHERE B_ROK = @ROK -AND B_MS = @MS -AND A1.id_agencji = @idAgencji - --- aktualizuj prowizje dla faktur z poprzednich miesiecy -DECLARE @Prowizje TABLE -( -idProwizji INT, -procentProwizji float, -kwotaProwizji money, -ZP bit -) - -INSERT INTO @Prowizje - SELECT - Pr.idProwizji, - procentProwizji = - CASE - WHEN Z.ZP=1 THEN ROUND(Z.procentProwizji, 2) - ELSE ROUND(PL.Pr_Prowizji, 2) - END, - kwotaProwizji = - CASE - WHEN Z.ZP=1 THEN ROUND(Pr.Netto * Z.procentProwizji, 2) - ELSE ROUND(Pr.Netto * PL.Pr_Prowizji, 2) - END, - Z.ZP - FROM WplywyByTytul W - INNER JOIN Prowizje Pr ON Pr.idFaktury = W.ID_FAKTURY - INNER JOIN Agencje A ON A.Symbol = W.Agencja - INNER JOIN Faktury F ON F.ID_FAKTURY = W.ID_FAKTURY - INNER JOIN Zamowienia Z ON Z.idZamowienia = F.idZamowienia - LEFT OUTER JOIN [PLAN] Pl ON Pl.Symbol = W.Symbol AND Pl.Rok=YEAR(W.dataWplaty) AND Pl.MS=MONTH(W.dataWplaty) - WHERE YEAR(W.dataWplaty)=@ROK and MONTH(W.dataWplaty)=@MS - AND A.id_Agencji=@idAgencji - AND PR.ms<>@MS - -UPDATE P -SET -P.procentProwizji=P1.procentProwizji, -P.kwotaProwizji=P1.kwotaProwizji, -P.ZP=P1.ZP -FROM Prowizje P INNER JOIN @Prowizje P1 ON P.idProwizji=P1.idProwizji +Z.Zp, +W.ID_FAKTURY +FROM WplywyByTytul AS W +INNER JOIN Faktury AS F ON W.ID_FAKTURY = F.Id_Faktury +INNER JOIN Zamowienia AS Z ON Z.idZamowienia = F.idZamowienia +LEFT OUTER JOIN [Plan] AS P ON P.Rok=@rok AND P.Ms=@ms AND P.Symbol=W.Symbol +WHERE (YEAR(W.dataWplaty) = @rok) +AND (MONTH(W.dataWplaty) = @ms) +--TODO: dodac pole typ faktury, ktory bedzie jednoznacznie okreslal jakie faktury nas interesuja... +AND F.Numer_Roz<>'POZ' AND F.Numer_Roz<>'KAT' +AND W.roznica_nowa<=60 +AND F.Id_Sprzedawcy=@idAgencji +AND F.Korekta<>1 +ORDER BY Pr_Prowizji Index: trunk/BazaReklam/OrderDetails.cs =================================================================== --- trunk/BazaReklam/OrderDetails.cs (revision 602) +++ trunk/BazaReklam/OrderDetails.cs (revision 676) @@ -101,5 +101,5 @@ pROMOCJETableAdapter.Fill(sLOWNIKDataSet.PROMOCJE); - if (User.Instance().St_kierownik || User.Instance().St_produkcja) + if (User.Instance().IsKierownik || User.Instance().IsProdukcja) { lISTA_TYPOW_REKLAMYTableAdapter.Fill(sLOWNIKDataSet.LISTA_TYPOW_REKLAMY); @@ -123,5 +123,5 @@ private void OrderDetails_Load(object sender, EventArgs e) { - wyroznienie_exportedCheckBox.Enabled = User.Instance().St_produkcja; + wyroznienie_exportedCheckBox.Enabled = User.Instance().IsProdukcja; } @@ -323,5 +323,5 @@ sprawdzBledy(); - if (!User.Instance().St_kierownik && reklama.IsPROMOCJANull()) + if (!User.Instance().IsKierownik && reklama.IsPROMOCJANull()) { if (Convert.ToDouble(reklama.RABAT) > maksymalnyRabat) @@ -352,5 +352,5 @@ string typ = Convert.ToString(reklama.TYP); - if (((typ == "BEZP£ATNA") || (typ == "BARTER") || (typ == "REKLAMACJA")) && !User.Instance().St_produkcja) + if (((typ == "BEZP£ATNA") || (typ == "BARTER") || (typ == "REKLAMACJA")) && !User.Instance().IsProdukcja) { MessageBox.Show("Zamówienie musi byæ zatwierdzone do druku przez kierownika"); @@ -492,5 +492,5 @@ zablokujGroupBoxa(groupBox1); - if (!(User.Instance().St_produkcja | User.Instance().St_kierownik)) + if (!(User.Instance().IsProdukcja | User.Instance().IsKierownik)) { zablokujGroupBoxa(groupBox2); @@ -520,5 +520,5 @@ private string nrRek(string symAgenta, string tagAgenta) { - if (User.Instance().St_handlowiec) + if (User.Instance().IsHandlowiec) { string nr = DbUtils.numerNowejReklamy(symAgenta, tagAgenta).ToString(); @@ -859,5 +859,5 @@ } - if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec) + if (User.Instance().IsHandlowiec) { row["symbol akwizytora"] = User.Instance().Symbol_agenta; @@ -1048,9 +1048,9 @@ //Uprawnienia - kier_notatkaTextBox.ReadOnly = !User.Instance().St_kierownik; - kier_zatwierdzilCheckBox.Enabled = User.Instance().St_kierownik; - zablokuj_prowizjeCheckBox.Enabled = User.Instance().St_kierownik; - - if (!User.Instance().St_kierownik) + kier_notatkaTextBox.ReadOnly = !User.Instance().IsKierownik; + kier_zatwierdzilCheckBox.Enabled = User.Instance().IsKierownik; + zablokuj_prowizjeCheckBox.Enabled = User.Instance().IsKierownik; + + if (!User.Instance().IsKierownik) { cENA_JEDNTextBox.ReadOnly = zatwiedzonoDoDruku; @@ -1616,5 +1616,5 @@ { //ta opcja tylko dostepna dla produkcji - if (!User.Instance().St_produkcja) return; + if (!User.Instance().IsProdukcja) return; DataGridViewRow clickedRow = ukazaloSieDataGridView.Rows[e.RowIndex]; Index: trunk/BazaReklam/StartForm.cs =================================================================== --- trunk/BazaReklam/StartForm.cs (revision 597) +++ trunk/BazaReklam/StartForm.cs (revision 676) @@ -32,9 +32,9 @@ kontaktTypTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { wynikAgencji(); } - else if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec) + else if (User.Instance().IsHandlowiec) { wynikAgenta(); @@ -84,5 +84,5 @@ SqlDataReader reader; - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { command.CommandText = "select Symbol from dbo.AGENCI where aktywny=1 and ID_AGENCJI=@param order by Symbol"; @@ -432,9 +432,9 @@ // MessageBox.Show("ddd"); - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { agencjaToolStripComboBox.Text = User.Instance().SymbolAgencji; } - else if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec) + else if (User.Instance().IsHandlowiec) { agentToolStripComboBox.Text = User.Instance().Login; @@ -452,5 +452,5 @@ { - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { shedulerTableAdapter.FillByAgencjaWgDaty(rEKLAMADataSet.sheduler, User.Instance().IdAgencji); @@ -463,9 +463,9 @@ if (pierwszaAktywacja) return; - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { wynikAgencji(); } - else if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec) + else if (User.Instance().IsHandlowiec) { wynikAgenta(); Index: trunk/BazaReklam/ZamowieniaForm.cs =================================================================== --- trunk/BazaReklam/ZamowieniaForm.cs (revision 673) +++ trunk/BazaReklam/ZamowieniaForm.cs (revision 676) @@ -96,6 +96,6 @@ private void ZamowieniaForm_Load(object sender, EventArgs e) { - usunFaktureButton.Enabled = User.Instance().St_kierownik; - dtpZmianaDaty.Enabled = User.Instance().St_kierownik; + usunFaktureButton.Enabled = User.Instance().IsKierownik; + dtpZmianaDaty.Enabled = User.Instance().IsKierownik; dtpZmianaDaty.Value = DateTime.Today; dtpZmianaDaty.MaxDate = DateTime.Today; @@ -648,5 +648,5 @@ naglowekFaktury.DATA_WYSTAWIENIA = DateTime.Today; - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { if (dtpZmianaDaty.Value != DateTime.Today) Index: trunk/BazaReklam/ProvisionForm.resx =================================================================== --- trunk/BazaReklam/ProvisionForm.resx (revision 675) +++ trunk/BazaReklam/ProvisionForm.resx (revision 676) @@ -219,28 +219,28 @@ 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 @@ -315,34 +315,34 @@ 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 gg== @@ -351,29 +351,29 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABYxJREFUSEuVVXtM - U1ccLpubGFnmBo5FSJZt0cnQmEU3BlmmfxBHeCg6mCI61G0ZD3WgKKjIQ+URxfGoEZTAQJ6CIK9CXSkU - GKRDkCHCKk+BttDSWoqAIJNvv3PXbCYqjpt8uae993zf9/udc79jxHvxZTTPM8zz7PmPcnNzt58/H3Mo - Ojo6NPLs6QtnwsNTz56JKIg6E/Vr7IVYaQKfL0tMTGyl2RaExQsWSEtLq5aPaDCkfgC5bhLKiTkop4Gh - GaDnEdBF40h+ytzq1asDiPw9wisLEklISIhUaPUY/wtQE5lyEhh4SMRjQMcDoF0HiNoH4bB58y9EbEcw - XpBARETE1oZbbdA9/od8aALoHwe69YCMRO6SQDv9PnzQp5GIdxJMFyTg4uJifr249PEoCShIgKFZ9QTl - XTNI+2MS5xr0OFE9hq1xvz2yOlp4fVVQqd/5iFM2F+Pivty3b99yEltEmG9j8BZRm1pG54DbGiBQNI1g - 0UNE1DyEf6UePwnGcKh8DAcIP5Zo4ZihxJ6kBrQ0SJCdnT0ZEhISZ2pquoJEXntuZY2NjfYZGRldN6tq - UHmzCuUSKS7WDeOgQIekpmmcILHDFSRQ9gDeJPB9sRa2SYO4Wt8LlWIQtbW1OHLkiIDIVz2zy1paWlxq - ampm2trankxMTECrGcWwQg6N4j7KWu7DNVuJCw1TCKjQwbdUix9ujMLrugq7C1T4OEaGPtkd3Lt3D2Vl - 5XB1dY0jgQ8MLePxqC2LhULh0OzsLMbHx6HVajE6OoqBgQHIZDIMdP+J5CoZdl4bQahYT+412F+kxp6C - EXjmj2ADvx8Xy9tQlH0ZYmExgoODtcbGxv9tgszMzG86OzsxNTUFnU4HjUaDkZERDA8Po6OjA62trei6 - 0wL3tE4cv6kjgVHsJfeeJOiep4RThhxb+HfRlPotZsu3Iz2rAGvXrk2kCtZwVSQnJ6cy13q9niNXq9Uc - +dDQEHp7eyGVSnHrdylEtVLYXRpAoFCL3eR8B5G7ZSuwldq35nQbpJVZmC7bjypJIzZt2lRB5M6EN3lX - rly5xfrO2qJSqThyuVzOtYiBFh/19fVoaayDR/JteBersYvc77imxNc5SmxMGcQnEU1okIghqq5HjaQW - Hh4e7UTuTXiXl5WVpRwbG+PaolQqOfLBwUH09/ejr68PTU1NEIvFqBFXoUxYjQ+je/HFZTnWxfdj+aku - fE7klSIxhBUCEBckEgn8/PxURH6Si5SkpCQdc89ao1AoONeMnLWnu7sbzc3NqKys5CASVuDqDRFC0mtx - LrcWZeUCZKZewonjQXB0dIS9vT0CAwPh7OwsJfJwwvu8oKCg0NjYWOTn56Onp4ergDnv6urith5tXZSU - lKC0tBQV5JI5TUu5jNCTx+G6dQtsbGywcuVKWFtbw8HBgbmHiYlJOpEfIKzg+fv72+fk5EAgECAmJgZU - EUfKRNg2ZeOioiJOgM/nw93dHba2tqBUhZWVFVtQeHl5cc59fHz6169ff83IyOhnIt9IWMozNzdf6u3t - fZTOgfuMiCEsLAxRUVGoq6vjqigsLGRxwD4ijpi5poXEsWPH4OvrO+Pm5lZjYWHBUjaZEEZw5RbYEOks - 182XLFmyxcnJKZmE1Hl5eaADCNQ+UMYgICCAK52IWBwgMjKSEQ+QUD7NS6P5zPFBwmbCR4S3//2SacAu - loRvEayXLVvmuW3btnQS0lM2sWrmGOLj49n4saenp8TS0jKd2pBiWMhddP+UYEkwIbxq4HzmxqKWJaEZ - YZ2Zmdl3JJQfHh6up3XqsbOzKzC4ZVlziPCVwS17nx2h80b102rsxddZ2wgbCHsNTtm+Zm4/M7h9w1D5 - iwy/9H8mxJy9Q2DpyM7hBbt9qYqhdCb2v1vwNOnfEbzWBKne0K0AAAAASUVORK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABY1JREFUSEuVVXtM + U1ccLpubGFnmBo5FSJZt0cnQmEU3BlmmfxBHeAg6mCI61G0ZD3WgKKjIQ+URxfEyghgYyFMQ5E1dKS0w + SIcgIMJqeQm0BUprKQKCTL79zl2zmahs3OTLPe295/u+3++c+x0D3ssvgwWeYYFnL36Um5u748KF6MNR + UVEhEefOXDwbFpZ67mx4QeTZyF9jLsZI4hMTpQkJCa0024ywdNECaWlpNfIRNYZUDyHXTkE5OQ/lDDA0 + C/Q8BmQ0PpeQMr927Vp/In+P8MqiROLj4yMUGh0m/gRURKacAgYeEfE40PkQ6NACgo5B2G3d+gsR2xAM + FyUQHh7u3HC7Hdonf5MPTQL9E0C3DpCSyD0S6KDfRw55NxLxLoLxogScnJxMbxSXPhkjAQUJMDSPPkW5 + bBZpbVM436DDyZpxOMf+9tjiWOGNNYGlvhfCT1tdio39cv/+/StJbAlhoY3BW0JtahmbB+6ogQDBDIIE + jxAuegS/Kh1+qhjH4fJxHCT8WKKBfYYSe5Ma0NIgRnZ29lRwcHCssbHxKhJ57YWVNTY22mZkZMhuVYtQ + dasa5WIJLtUN41CFFklNMzhJYkcqSaDsIbxI4PtiDayTBnGtvhejikHU1tbi6NGjFUS+5rld1tLS4iQS + iWbb2tqeTk5OQqMew7BCDrXiAcpaHsAlW4mLDdPwr9TCp1SDH26OwfPGKPYUjOLjaCn6pHdx//59lJWV + w8XFJZYEPtC3jMejtizl8/lDc3NzmJiYgEajwdjYGAYGBiCVSjHQ/QeSq6XYdX0EIUIduVfjQJEKewtG + 4JE/gk2J/bhU3o6i7CsQ8osRFBSkMTQ0/HcTZGZmftPV1YXp6WlotVqo1WqMjIxgeHgYnZ2daG1thexu + C9zSunDilpYExrCP3HuQoFueEg4ZcmxLvIem1G8xV74D6VkFWL9+fQJVsI6rIjk5OZW51ul0HLlKpeLI + h4aG0NvbC4lEgtu/SyColcDm8gAC+BrsIec7idw1WwFnat+6M+2QVGVhpuwAqsWN2LJlSyWROxLe5KWk + pNxmfWdtGR0d5cjlcjnXIgZafNTX16OlsQ7uyXfgVazCbnK/87oSX+cosfnqID4Jb0KDWAhBTT1E4lq4 + u7t3ELkX4V1eVlaWcnx8nGuLUqnkyAcHB9Hf34++vj40NTVBKBRCJKxGGb8GH0b14osrcmyI68fK0zJ8 + TuRVAiH4lRUgLojFYvj6+o4S+SkuUpKSkrTMPWuNQqHgXDNy1p7u7m40NzejqqqKg4BfiWs3BQhOr8X5 + 3FqUlVcgM/UyTp4IhL29PWxtbREQEABHR0cJkYcR3ucFBgaGxMTEID8/Hz09PVwFzLlMJuO2Xnt7O0pK + SlBaWopKcsmcpl29gpBTJ+DivA1WVlZYvXo1LC0tYWdnx9zDyMgoncgPElbx/Pz8bHNyclBRUYHo6GhQ + RRwpE2HblI2Lioo4gcTERLi5ucHa2hqUqrCwsGALCk9PT865t7d3/8aNG68bGBj8TOSbCct5pqamy728 + vI7ROfCAETGEhoYiMjISdXV1XBWFhYUsDthHxBEz17SQOH78OHx8fGZdXV1FZmZmLGWTCaEEF26B9ZHO + ct102bJl2xwcHJJJSJWXlwc6gEDtA2UM/P39udKJiMUBIiIiGPEACeXTvDSazxwfImwlfER4+58vmQbs + Ykn4FsFyxYoVHtu3b08nIR1lE6tmniEuLo6Nn3h4eIjNzc3TqQ1X9Qu5m+6fEswJRoRX9ZzP3VjUsiQ0 + IWwwMTH5joTyw8LCdLROPTY2NgV6tyxrDhO+0rtl77MjdMGoflaNvfg6axthE2Gf3inb18ztZ3q3b+gr + f5nh//yfCTFn7xBYOrJzeNFu/1NFXzoT+98teJb0L+cv1f7gs1NUAAAAAElFTkSuQmCC Index: trunk/BazaReklam/AdminForm.resx =================================================================== --- trunk/BazaReklam/AdminForm.resx (revision 65) +++ trunk/BazaReklam/AdminForm.resx (revision 676) @@ -236,21 +236,24 @@ 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 + + + + 17, 17 + 376, 17 Index: trunk/BazaReklam/MDIBazaReklam.cs =================================================================== --- trunk/BazaReklam/MDIBazaReklam.cs (revision 673) +++ trunk/BazaReklam/MDIBazaReklam.cs (revision 676) @@ -39,5 +39,5 @@ - if (User.Instance().St_handlowiec || User.Instance().St_kierownik || User.Instance().St_sekretarka || User.Instance().St_subhandlowiec || User.Instance().St_produkcja) + if (User.Instance().IsHandlowiec || User.Instance().IsKierownik || User.Instance().IsSekretarka || User.Instance().IsProdukcja) { zamowieniaToolStripButton.Enabled = true; @@ -47,5 +47,5 @@ } - if (User.Instance().St_dtp || User.Instance().St_handlowiec || User.Instance().St_kierownik || User.Instance().St_sekretarka || User.Instance().St_subhandlowiec || User.Instance().St_produkcja) + if (User.Instance().IsDtp || User.Instance().IsHandlowiec || User.Instance().IsKierownik || User.Instance().IsSekretarka || User.Instance().IsProdukcja) { raportyToolStripButton.Enabled = true; @@ -53,10 +53,10 @@ } - if (User.Instance().St_admin || User.Instance().St_handlowiec || User.Instance().St_kierownik || User.Instance().St_sekretarka || User.Instance().St_subhandlowiec) + if (User.Instance().IsAdmin || User.Instance().IsHandlowiec || User.Instance().IsKierownik || User.Instance().IsSekretarka) { prowizjeToolStripButton.Enabled = true; } - if (User.Instance().St_admin) + if (User.Instance().IsAdmin) { adminToolStripButton.Visible = true; @@ -66,5 +66,5 @@ - if (User.Instance().St_handlowiec || User.Instance().St_kierownik || User.Instance().St_sekretarka || User.Instance().St_subhandlowiec || User.Instance().St_produkcja) + if (User.Instance().IsHandlowiec || User.Instance().IsKierownik || User.Instance().IsSekretarka || User.Instance().IsProdukcja) { startToolStripButton.Enabled = true; @@ -353,5 +353,5 @@ private void BindUserAgency() { - cbUserAgency.Visible = User.Instance().St_kierownik && User.Instance().UserAgencyList.Count > 1; + cbUserAgency.Visible = User.Instance().IsKierownik && User.Instance().UserAgencyList.Count > 1; if (!cbUserAgency.Visible || cbUserAgency.ComboBox == null) return; Index: trunk/BazaReklam/FacturesFormNew.cs =================================================================== --- trunk/BazaReklam/FacturesFormNew.cs (revision 632) +++ trunk/BazaReklam/FacturesFormNew.cs (revision 676) @@ -57,5 +57,5 @@ ((CheckBox)((ToolStripControlHost)wyszukajToolStrip.Items["zalegleCheckBox"]).Control).CheckState = CheckState.Indeterminate; - PoznanKatowicetoolStripButton.Enabled = User.Instance().St_produkcja && User.Instance().St_kierownik; + PoznanKatowicetoolStripButton.Enabled = User.Instance().IsProdukcja && User.Instance().IsKierownik; } @@ -269,9 +269,9 @@ private void FacturesForm_Shown(object sender, EventArgs e) { - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { agencjaToolStripComboBox.Text = User.Instance().SymbolAgencji; } - else if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec) + else if (User.Instance().IsHandlowiec) { kodRozliczeniowyToolStripTextBox.Text = User.Instance().Kod_agenta; Index: trunk/BazaReklam/OrdersForm.cs =================================================================== --- trunk/BazaReklam/OrdersForm.cs (revision 607) +++ trunk/BazaReklam/OrdersForm.cs (revision 676) @@ -981,5 +981,5 @@ TreeNode node; - if (User.Instance().St_handlowiec) + if (User.Instance().IsHandlowiec) { node = new TreeNode("Moje zamówienia"); @@ -1013,5 +1013,5 @@ - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { node = new TreeNode("Analiza ceny modu³u"); @@ -1179,9 +1179,9 @@ private void OrdersForm_Shown(object sender, EventArgs e) { - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { agencjaToolStripComboBox.Text = User.Instance().SymbolAgencji; } - else if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec) + else if (User.Instance().IsHandlowiec) { agentToolStripComboBox.Text = User.Instance().Login; Index: trunk/BazaReklam/ZestawienieZamowienForm.cs =================================================================== --- trunk/BazaReklam/ZestawienieZamowienForm.cs (revision 602) +++ trunk/BazaReklam/ZestawienieZamowienForm.cs (revision 676) @@ -191,9 +191,9 @@ rokToolStripTextBox.Text = DateTime.Today.Year.ToString(); - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { agencjaToolStripComboBox.Text = User.Instance().SymbolAgencji; } - else if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec) + else if (User.Instance().IsHandlowiec) { kodRozliczeniowyToolStripTextBox.Text = User.Instance().Kod_agenta; Index: trunk/BazaReklam/FactureViewer.cs =================================================================== --- trunk/BazaReklam/FactureViewer.cs (revision 648) +++ trunk/BazaReklam/FactureViewer.cs (revision 676) @@ -75,5 +75,5 @@ //Produkcja ma domyœlnie bez podpisu - if (User.Instance().St_produkcja) + if (User.Instance().IsProdukcja) { podpisCheckBox.CheckState = CheckState.Unchecked; @@ -171,5 +171,5 @@ //Produkcja ma domyœlnie bez podpisu - if (User.Instance().St_produkcja) + if (User.Instance().IsProdukcja) { podpisCheckBox.CheckState = CheckState.Unchecked; @@ -234,6 +234,6 @@ powodKorektyComboBox.Enabled = true; - opisTextBox.ReadOnly = !User.Instance().St_kierownik; - opisTextBox.BackColor = User.Instance().St_kierownik ? Color.White : Color.WhiteSmoke; + opisTextBox.ReadOnly = !User.Instance().IsKierownik; + opisTextBox.BackColor = User.Instance().IsKierownik ? Color.White : Color.WhiteSmoke; reportViewer1.LocalReport.ReportEmbeddedResource = "Baza_Reklam.Raporty.fakturaKorekta.rdlc"; @@ -287,5 +287,5 @@ //Produkcja ma domyœlnie bez podpisu - if (User.Instance().St_produkcja) + if (User.Instance().IsProdukcja) { podpisCheckBox.CheckState = CheckState.Unchecked; @@ -303,5 +303,5 @@ reportViewer1.RefreshReport(); - nUMERTextBox.Enabled = User.Instance().St_kierownik; + nUMERTextBox.Enabled = User.Instance().IsKierownik; } Index: trunk/BazaReklam/ProjectForm.cs =================================================================== --- trunk/BazaReklam/ProjectForm.cs (revision 651) +++ trunk/BazaReklam/ProjectForm.cs (revision 676) @@ -166,20 +166,20 @@ path_to_materialTextBox.ReadOnly = false; - usunButton.Enabled = (!string.IsNullOrEmpty(User.Instance().Symbol_agenta) && User.Instance().Symbol_agenta.ToLower() == projekt.AGENT.ToLower()) || User.Instance().St_produkcja || User.Instance().St_dtp; + usunButton.Enabled = (!string.IsNullOrEmpty(User.Instance().Symbol_agenta) && User.Instance().Symbol_agenta.ToLower() == projekt.AGENT.ToLower()) || User.Instance().IsProdukcja || User.Instance().IsDtp; } else { - dodajButton.Enabled = false || User.Instance().St_produkcja || User.Instance().St_dtp; - tYP_PROJEKTUComboBox.Enabled = false || User.Instance().St_produkcja || User.Instance().St_dtp; - zAMAWIAM_NADateTimePicker.Enabled = false || User.Instance().St_produkcja || User.Instance().St_dtp; - pRIORYTETComboBox.Enabled = false || User.Instance().St_produkcja || User.Instance().St_dtp; - - lokalizacjaTextBox.ReadOnly = true && !User.Instance().St_produkcja; - oPISTextBox.ReadOnly = true && !User.Instance().St_produkcja; - uwagiTextBox.ReadOnly = true && !User.Instance().St_produkcja; - path_to_materialTextBox.ReadOnly = true && !User.Instance().St_produkcja; - dataEmisjiTextBox.ReadOnly = true && !User.Instance().St_produkcja; - - usunButton.Enabled = User.Instance().St_kierownik; + dodajButton.Enabled = false || User.Instance().IsProdukcja || User.Instance().IsDtp; + tYP_PROJEKTUComboBox.Enabled = false || User.Instance().IsProdukcja || User.Instance().IsDtp; + zAMAWIAM_NADateTimePicker.Enabled = false || User.Instance().IsProdukcja || User.Instance().IsDtp; + pRIORYTETComboBox.Enabled = false || User.Instance().IsProdukcja || User.Instance().IsDtp; + + lokalizacjaTextBox.ReadOnly = true && !User.Instance().IsProdukcja; + oPISTextBox.ReadOnly = true && !User.Instance().IsProdukcja; + uwagiTextBox.ReadOnly = true && !User.Instance().IsProdukcja; + path_to_materialTextBox.ReadOnly = true && !User.Instance().IsProdukcja; + dataEmisjiTextBox.ReadOnly = true && !User.Instance().IsProdukcja; + + usunButton.Enabled = User.Instance().IsKierownik; } Index: trunk/BazaReklam/ProvisionForm.Designer.cs =================================================================== --- trunk/BazaReklam/ProvisionForm.Designer.cs (revision 675) +++ trunk/BazaReklam/ProvisionForm.Designer.cs (revision 676) @@ -31,5 +31,4 @@ this.components = new System.ComponentModel.Container(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProvisionForm)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -44,4 +43,5 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProvisionForm)); this.aGENCIBindingSource = new System.Windows.Forms.BindingSource(this.components); this.sLOWNIKDataSet = new Baza_Reklam.SLOWNIKDataSet(); @@ -56,4 +56,25 @@ this.BDsumaTextBox = new System.Windows.Forms.TextBox(); this.prowizjeDataGridView = new System.Windows.Forms.DataGridView(); + this.sYMBOLDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewComboBoxColumn(); + this.rOKDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.mSDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bUDZETDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.sPOTKANIADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.kONTAKTYDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.nKLIENCIDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.kLIENCIDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.rEKLAMYDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.oCENADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.OCENAComboCoxColumn = new System.Windows.Forms.DataGridViewComboBoxColumn(); + this.PR_PROWIZJI = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wBUDZETDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wSPOTKANIADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wTELDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wEMAILDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wLISTDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wFAXDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wNKLIENCIDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wKLIENCIDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wREKLAMYDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); @@ -86,25 +107,4 @@ this.agencjeTableAdapter1 = new Baza_Reklam.SLOWNIKDataSetTableAdapters.AGENCJETableAdapter(); this.ukrytyLabel = new System.Windows.Forms.Label(); - this.sYMBOLDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewComboBoxColumn(); - this.rOKDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.mSDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bUDZETDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.sPOTKANIADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.kONTAKTYDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.nKLIENCIDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.kLIENCIDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.rEKLAMYDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.oCENADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.OCENAComboCoxColumn = new System.Windows.Forms.DataGridViewComboBoxColumn(); - this.PR_PROWIZJI = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.wBUDZETDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.wSPOTKANIADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.wTELDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.wEMAILDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.wLISTDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.wFAXDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.wNKLIENCIDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.wKLIENCIDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.wREKLAMYDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.aGENCIBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.sLOWNIKDataSet)).BeginInit(); @@ -248,4 +248,209 @@ this.prowizjeDataGridView.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.prowizjeDataGridView_DataError); // + // sYMBOLDataGridViewTextBoxColumn + // + this.sYMBOLDataGridViewTextBoxColumn.DataPropertyName = "SYMBOL"; + this.sYMBOLDataGridViewTextBoxColumn.DataSource = this.aGENCIBindingSource; + this.sYMBOLDataGridViewTextBoxColumn.DisplayMember = "Symbol"; + this.sYMBOLDataGridViewTextBoxColumn.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; + this.sYMBOLDataGridViewTextBoxColumn.HeaderText = "Agent"; + this.sYMBOLDataGridViewTextBoxColumn.Name = "sYMBOLDataGridViewTextBoxColumn"; + this.sYMBOLDataGridViewTextBoxColumn.ReadOnly = true; + this.sYMBOLDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.sYMBOLDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.sYMBOLDataGridViewTextBoxColumn.ValueMember = "Symbol"; + // + // rOKDataGridViewTextBoxColumn + // + this.rOKDataGridViewTextBoxColumn.DataPropertyName = "ROK"; + this.rOKDataGridViewTextBoxColumn.HeaderText = "Rok"; + this.rOKDataGridViewTextBoxColumn.Name = "rOKDataGridViewTextBoxColumn"; + this.rOKDataGridViewTextBoxColumn.ReadOnly = true; + this.rOKDataGridViewTextBoxColumn.Width = 43; + // + // mSDataGridViewTextBoxColumn + // + this.mSDataGridViewTextBoxColumn.DataPropertyName = "MS"; + this.mSDataGridViewTextBoxColumn.HeaderText = "Mies."; + this.mSDataGridViewTextBoxColumn.Name = "mSDataGridViewTextBoxColumn"; + this.mSDataGridViewTextBoxColumn.ReadOnly = true; + this.mSDataGridViewTextBoxColumn.Width = 43; + // + // bUDZETDataGridViewTextBoxColumn + // + this.bUDZETDataGridViewTextBoxColumn.DataPropertyName = "BUDZET"; + dataGridViewCellStyle1.Format = "N0"; + dataGridViewCellStyle1.NullValue = null; + this.bUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; + this.bUDZETDataGridViewTextBoxColumn.HeaderText = "Plan"; + this.bUDZETDataGridViewTextBoxColumn.Name = "bUDZETDataGridViewTextBoxColumn"; + this.bUDZETDataGridViewTextBoxColumn.ReadOnly = true; + this.bUDZETDataGridViewTextBoxColumn.Width = 60; + // + // sPOTKANIADataGridViewTextBoxColumn + // + this.sPOTKANIADataGridViewTextBoxColumn.DataPropertyName = "SPOTKANIA"; + this.sPOTKANIADataGridViewTextBoxColumn.HeaderText = "Spotk."; + this.sPOTKANIADataGridViewTextBoxColumn.Name = "sPOTKANIADataGridViewTextBoxColumn"; + this.sPOTKANIADataGridViewTextBoxColumn.ReadOnly = true; + this.sPOTKANIADataGridViewTextBoxColumn.Width = 44; + // + // kONTAKTYDataGridViewTextBoxColumn + // + this.kONTAKTYDataGridViewTextBoxColumn.DataPropertyName = "KONTAKTY"; + this.kONTAKTYDataGridViewTextBoxColumn.HeaderText = "Kontakt"; + this.kONTAKTYDataGridViewTextBoxColumn.Name = "kONTAKTYDataGridViewTextBoxColumn"; + this.kONTAKTYDataGridViewTextBoxColumn.ReadOnly = true; + this.kONTAKTYDataGridViewTextBoxColumn.Width = 43; + // + // nKLIENCIDataGridViewTextBoxColumn + // + this.nKLIENCIDataGridViewTextBoxColumn.DataPropertyName = "N_KLIENCI"; + this.nKLIENCIDataGridViewTextBoxColumn.HeaderText = "N. Klien."; + this.nKLIENCIDataGridViewTextBoxColumn.Name = "nKLIENCIDataGridViewTextBoxColumn"; + this.nKLIENCIDataGridViewTextBoxColumn.ReadOnly = true; + this.nKLIENCIDataGridViewTextBoxColumn.Width = 43; + // + // kLIENCIDataGridViewTextBoxColumn + // + this.kLIENCIDataGridViewTextBoxColumn.DataPropertyName = "KLIENCI"; + this.kLIENCIDataGridViewTextBoxColumn.HeaderText = "Klien."; + this.kLIENCIDataGridViewTextBoxColumn.Name = "kLIENCIDataGridViewTextBoxColumn"; + this.kLIENCIDataGridViewTextBoxColumn.ReadOnly = true; + this.kLIENCIDataGridViewTextBoxColumn.Width = 43; + // + // rEKLAMYDataGridViewTextBoxColumn + // + this.rEKLAMYDataGridViewTextBoxColumn.DataPropertyName = "REKLAMY"; + this.rEKLAMYDataGridViewTextBoxColumn.HeaderText = "Rekl."; + this.rEKLAMYDataGridViewTextBoxColumn.Name = "rEKLAMYDataGridViewTextBoxColumn"; + this.rEKLAMYDataGridViewTextBoxColumn.ReadOnly = true; + this.rEKLAMYDataGridViewTextBoxColumn.Width = 43; + // + // oCENADataGridViewTextBoxColumn + // + this.oCENADataGridViewTextBoxColumn.DataPropertyName = "OCENA"; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.oCENADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; + this.oCENADataGridViewTextBoxColumn.HeaderText = "Ocena"; + this.oCENADataGridViewTextBoxColumn.Name = "oCENADataGridViewTextBoxColumn"; + this.oCENADataGridViewTextBoxColumn.ReadOnly = true; + this.oCENADataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.oCENADataGridViewTextBoxColumn.Width = 60; + // + // OCENAComboCoxColumn + // + this.OCENAComboCoxColumn.DataPropertyName = "OCENA"; + this.OCENAComboCoxColumn.HeaderText = "Ocena"; + this.OCENAComboCoxColumn.Name = "OCENAComboCoxColumn"; + this.OCENAComboCoxColumn.ReadOnly = true; + this.OCENAComboCoxColumn.Visible = false; + this.OCENAComboCoxColumn.Width = 60; + // + // PR_PROWIZJI + // + this.PR_PROWIZJI.DataPropertyName = "PR_PROWIZJI"; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle3.Format = "P"; + dataGridViewCellStyle3.NullValue = null; + this.PR_PROWIZJI.DefaultCellStyle = dataGridViewCellStyle3; + this.PR_PROWIZJI.HeaderText = "Prowizja"; + this.PR_PROWIZJI.Name = "PR_PROWIZJI"; + this.PR_PROWIZJI.ReadOnly = true; + this.PR_PROWIZJI.Width = 50; + // + // wBUDZETDataGridViewTextBoxColumn + // + this.wBUDZETDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.wBUDZETDataGridViewTextBoxColumn.DataPropertyName = "W_BUDZET"; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.Format = "N0"; + this.wBUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; + this.wBUDZETDataGridViewTextBoxColumn.HeaderText = "Sprzeda¿"; + this.wBUDZETDataGridViewTextBoxColumn.Name = "wBUDZETDataGridViewTextBoxColumn"; + this.wBUDZETDataGridViewTextBoxColumn.ReadOnly = true; + this.wBUDZETDataGridViewTextBoxColumn.Width = 60; + // + // wSPOTKANIADataGridViewTextBoxColumn + // + this.wSPOTKANIADataGridViewTextBoxColumn.DataPropertyName = "W_SPOTKANIA"; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wSPOTKANIADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5; + this.wSPOTKANIADataGridViewTextBoxColumn.HeaderText = "Spotk."; + this.wSPOTKANIADataGridViewTextBoxColumn.Name = "wSPOTKANIADataGridViewTextBoxColumn"; + this.wSPOTKANIADataGridViewTextBoxColumn.ReadOnly = true; + this.wSPOTKANIADataGridViewTextBoxColumn.Width = 43; + // + // wTELDataGridViewTextBoxColumn + // + this.wTELDataGridViewTextBoxColumn.DataPropertyName = "W_TEL"; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wTELDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6; + this.wTELDataGridViewTextBoxColumn.HeaderText = "Tel."; + this.wTELDataGridViewTextBoxColumn.Name = "wTELDataGridViewTextBoxColumn"; + this.wTELDataGridViewTextBoxColumn.ReadOnly = true; + this.wTELDataGridViewTextBoxColumn.Width = 43; + // + // wEMAILDataGridViewTextBoxColumn + // + this.wEMAILDataGridViewTextBoxColumn.DataPropertyName = "W_EMAIL"; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wEMAILDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7; + this.wEMAILDataGridViewTextBoxColumn.HeaderText = "Email"; + this.wEMAILDataGridViewTextBoxColumn.Name = "wEMAILDataGridViewTextBoxColumn"; + this.wEMAILDataGridViewTextBoxColumn.ReadOnly = true; + this.wEMAILDataGridViewTextBoxColumn.Width = 43; + // + // wLISTDataGridViewTextBoxColumn + // + this.wLISTDataGridViewTextBoxColumn.DataPropertyName = "W_LIST"; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wLISTDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; + this.wLISTDataGridViewTextBoxColumn.HeaderText = "List"; + this.wLISTDataGridViewTextBoxColumn.Name = "wLISTDataGridViewTextBoxColumn"; + this.wLISTDataGridViewTextBoxColumn.ReadOnly = true; + this.wLISTDataGridViewTextBoxColumn.Width = 44; + // + // wFAXDataGridViewTextBoxColumn + // + this.wFAXDataGridViewTextBoxColumn.DataPropertyName = "W_FAX"; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wFAXDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9; + this.wFAXDataGridViewTextBoxColumn.HeaderText = "Fax"; + this.wFAXDataGridViewTextBoxColumn.Name = "wFAXDataGridViewTextBoxColumn"; + this.wFAXDataGridViewTextBoxColumn.ReadOnly = true; + this.wFAXDataGridViewTextBoxColumn.Width = 43; + // + // wNKLIENCIDataGridViewTextBoxColumn + // + this.wNKLIENCIDataGridViewTextBoxColumn.DataPropertyName = "W_N_KLIENCI"; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wNKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle10; + this.wNKLIENCIDataGridViewTextBoxColumn.HeaderText = "N. Klien."; + this.wNKLIENCIDataGridViewTextBoxColumn.Name = "wNKLIENCIDataGridViewTextBoxColumn"; + this.wNKLIENCIDataGridViewTextBoxColumn.ReadOnly = true; + this.wNKLIENCIDataGridViewTextBoxColumn.Width = 43; + // + // wKLIENCIDataGridViewTextBoxColumn + // + this.wKLIENCIDataGridViewTextBoxColumn.DataPropertyName = "W_KLIENCI"; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle11; + this.wKLIENCIDataGridViewTextBoxColumn.HeaderText = "Klien."; + this.wKLIENCIDataGridViewTextBoxColumn.Name = "wKLIENCIDataGridViewTextBoxColumn"; + this.wKLIENCIDataGridViewTextBoxColumn.ReadOnly = true; + this.wKLIENCIDataGridViewTextBoxColumn.Width = 43; + // + // wREKLAMYDataGridViewTextBoxColumn + // + this.wREKLAMYDataGridViewTextBoxColumn.DataPropertyName = "W_REKLAMY"; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wREKLAMYDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle12; + this.wREKLAMYDataGridViewTextBoxColumn.HeaderText = "Rekl"; + this.wREKLAMYDataGridViewTextBoxColumn.Name = "wREKLAMYDataGridViewTextBoxColumn"; + this.wREKLAMYDataGridViewTextBoxColumn.ReadOnly = true; + this.wREKLAMYDataGridViewTextBoxColumn.Width = 43; + // // bindingNavigator1 // @@ -516,209 +721,4 @@ this.ukrytyLabel.Text = "ukrytyLabel"; this.ukrytyLabel.Visible = false; - // - // sYMBOLDataGridViewTextBoxColumn - // - this.sYMBOLDataGridViewTextBoxColumn.DataPropertyName = "SYMBOL"; - this.sYMBOLDataGridViewTextBoxColumn.DataSource = this.aGENCIBindingSource; - this.sYMBOLDataGridViewTextBoxColumn.DisplayMember = "Symbol"; - this.sYMBOLDataGridViewTextBoxColumn.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; - this.sYMBOLDataGridViewTextBoxColumn.HeaderText = "Agent"; - this.sYMBOLDataGridViewTextBoxColumn.Name = "sYMBOLDataGridViewTextBoxColumn"; - this.sYMBOLDataGridViewTextBoxColumn.ReadOnly = true; - this.sYMBOLDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.sYMBOLDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.sYMBOLDataGridViewTextBoxColumn.ValueMember = "Symbol"; - // - // rOKDataGridViewTextBoxColumn - // - this.rOKDataGridViewTextBoxColumn.DataPropertyName = "ROK"; - this.rOKDataGridViewTextBoxColumn.HeaderText = "Rok"; - this.rOKDataGridViewTextBoxColumn.Name = "rOKDataGridViewTextBoxColumn"; - this.rOKDataGridViewTextBoxColumn.ReadOnly = true; - this.rOKDataGridViewTextBoxColumn.Width = 43; - // - // mSDataGridViewTextBoxColumn - // - this.mSDataGridViewTextBoxColumn.DataPropertyName = "MS"; - this.mSDataGridViewTextBoxColumn.HeaderText = "Mies."; - this.mSDataGridViewTextBoxColumn.Name = "mSDataGridViewTextBoxColumn"; - this.mSDataGridViewTextBoxColumn.ReadOnly = true; - this.mSDataGridViewTextBoxColumn.Width = 43; - // - // bUDZETDataGridViewTextBoxColumn - // - this.bUDZETDataGridViewTextBoxColumn.DataPropertyName = "BUDZET"; - dataGridViewCellStyle1.Format = "N0"; - dataGridViewCellStyle1.NullValue = null; - this.bUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; - this.bUDZETDataGridViewTextBoxColumn.HeaderText = "Plan"; - this.bUDZETDataGridViewTextBoxColumn.Name = "bUDZETDataGridViewTextBoxColumn"; - this.bUDZETDataGridViewTextBoxColumn.ReadOnly = true; - this.bUDZETDataGridViewTextBoxColumn.Width = 60; - // - // sPOTKANIADataGridViewTextBoxColumn - // - this.sPOTKANIADataGridViewTextBoxColumn.DataPropertyName = "SPOTKANIA"; - this.sPOTKANIADataGridViewTextBoxColumn.HeaderText = "Spotk."; - this.sPOTKANIADataGridViewTextBoxColumn.Name = "sPOTKANIADataGridViewTextBoxColumn"; - this.sPOTKANIADataGridViewTextBoxColumn.ReadOnly = true; - this.sPOTKANIADataGridViewTextBoxColumn.Width = 44; - // - // kONTAKTYDataGridViewTextBoxColumn - // - this.kONTAKTYDataGridViewTextBoxColumn.DataPropertyName = "KONTAKTY"; - this.kONTAKTYDataGridViewTextBoxColumn.HeaderText = "Kontakt"; - this.kONTAKTYDataGridViewTextBoxColumn.Name = "kONTAKTYDataGridViewTextBoxColumn"; - this.kONTAKTYDataGridViewTextBoxColumn.ReadOnly = true; - this.kONTAKTYDataGridViewTextBoxColumn.Width = 43; - // - // nKLIENCIDataGridViewTextBoxColumn - // - this.nKLIENCIDataGridViewTextBoxColumn.DataPropertyName = "N_KLIENCI"; - this.nKLIENCIDataGridViewTextBoxColumn.HeaderText = "N. Klien."; - this.nKLIENCIDataGridViewTextBoxColumn.Name = "nKLIENCIDataGridViewTextBoxColumn"; - this.nKLIENCIDataGridViewTextBoxColumn.ReadOnly = true; - this.nKLIENCIDataGridViewTextBoxColumn.Width = 43; - // - // kLIENCIDataGridViewTextBoxColumn - // - this.kLIENCIDataGridViewTextBoxColumn.DataPropertyName = "KLIENCI"; - this.kLIENCIDataGridViewTextBoxColumn.HeaderText = "Klien."; - this.kLIENCIDataGridViewTextBoxColumn.Name = "kLIENCIDataGridViewTextBoxColumn"; - this.kLIENCIDataGridViewTextBoxColumn.ReadOnly = true; - this.kLIENCIDataGridViewTextBoxColumn.Width = 43; - // - // rEKLAMYDataGridViewTextBoxColumn - // - this.rEKLAMYDataGridViewTextBoxColumn.DataPropertyName = "REKLAMY"; - this.rEKLAMYDataGridViewTextBoxColumn.HeaderText = "Rekl."; - this.rEKLAMYDataGridViewTextBoxColumn.Name = "rEKLAMYDataGridViewTextBoxColumn"; - this.rEKLAMYDataGridViewTextBoxColumn.ReadOnly = true; - this.rEKLAMYDataGridViewTextBoxColumn.Width = 43; - // - // oCENADataGridViewTextBoxColumn - // - this.oCENADataGridViewTextBoxColumn.DataPropertyName = "OCENA"; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.oCENADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; - this.oCENADataGridViewTextBoxColumn.HeaderText = "Ocena"; - this.oCENADataGridViewTextBoxColumn.Name = "oCENADataGridViewTextBoxColumn"; - this.oCENADataGridViewTextBoxColumn.ReadOnly = true; - this.oCENADataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.oCENADataGridViewTextBoxColumn.Width = 60; - // - // OCENAComboCoxColumn - // - this.OCENAComboCoxColumn.DataPropertyName = "OCENA"; - this.OCENAComboCoxColumn.HeaderText = "Ocena"; - this.OCENAComboCoxColumn.Name = "OCENAComboCoxColumn"; - this.OCENAComboCoxColumn.ReadOnly = true; - this.OCENAComboCoxColumn.Visible = false; - this.OCENAComboCoxColumn.Width = 60; - // - // PR_PROWIZJI - // - this.PR_PROWIZJI.DataPropertyName = "PR_PROWIZJI"; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle3.Format = "P"; - dataGridViewCellStyle3.NullValue = null; - this.PR_PROWIZJI.DefaultCellStyle = dataGridViewCellStyle3; - this.PR_PROWIZJI.HeaderText = "Prowizja"; - this.PR_PROWIZJI.Name = "PR_PROWIZJI"; - this.PR_PROWIZJI.ReadOnly = true; - this.PR_PROWIZJI.Width = 50; - // - // wBUDZETDataGridViewTextBoxColumn - // - this.wBUDZETDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.wBUDZETDataGridViewTextBoxColumn.DataPropertyName = "W_BUDZET"; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.Format = "N0"; - this.wBUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; - this.wBUDZETDataGridViewTextBoxColumn.HeaderText = "Sprzeda¿"; - this.wBUDZETDataGridViewTextBoxColumn.Name = "wBUDZETDataGridViewTextBoxColumn"; - this.wBUDZETDataGridViewTextBoxColumn.ReadOnly = true; - this.wBUDZETDataGridViewTextBoxColumn.Width = 60; - // - // wSPOTKANIADataGridViewTextBoxColumn - // - this.wSPOTKANIADataGridViewTextBoxColumn.DataPropertyName = "W_SPOTKANIA"; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wSPOTKANIADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5; - this.wSPOTKANIADataGridViewTextBoxColumn.HeaderText = "Spotk."; - this.wSPOTKANIADataGridViewTextBoxColumn.Name = "wSPOTKANIADataGridViewTextBoxColumn"; - this.wSPOTKANIADataGridViewTextBoxColumn.ReadOnly = true; - this.wSPOTKANIADataGridViewTextBoxColumn.Width = 43; - // - // wTELDataGridViewTextBoxColumn - // - this.wTELDataGridViewTextBoxColumn.DataPropertyName = "W_TEL"; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wTELDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6; - this.wTELDataGridViewTextBoxColumn.HeaderText = "Tel."; - this.wTELDataGridViewTextBoxColumn.Name = "wTELDataGridViewTextBoxColumn"; - this.wTELDataGridViewTextBoxColumn.ReadOnly = true; - this.wTELDataGridViewTextBoxColumn.Width = 43; - // - // wEMAILDataGridViewTextBoxColumn - // - this.wEMAILDataGridViewTextBoxColumn.DataPropertyName = "W_EMAIL"; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wEMAILDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7; - this.wEMAILDataGridViewTextBoxColumn.HeaderText = "Email"; - this.wEMAILDataGridViewTextBoxColumn.Name = "wEMAILDataGridViewTextBoxColumn"; - this.wEMAILDataGridViewTextBoxColumn.ReadOnly = true; - this.wEMAILDataGridViewTextBoxColumn.Width = 43; - // - // wLISTDataGridViewTextBoxColumn - // - this.wLISTDataGridViewTextBoxColumn.DataPropertyName = "W_LIST"; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wLISTDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; - this.wLISTDataGridViewTextBoxColumn.HeaderText = "List"; - this.wLISTDataGridViewTextBoxColumn.Name = "wLISTDataGridViewTextBoxColumn"; - this.wLISTDataGridViewTextBoxColumn.ReadOnly = true; - this.wLISTDataGridViewTextBoxColumn.Width = 44; - // - // wFAXDataGridViewTextBoxColumn - // - this.wFAXDataGridViewTextBoxColumn.DataPropertyName = "W_FAX"; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wFAXDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9; - this.wFAXDataGridViewTextBoxColumn.HeaderText = "Fax"; - this.wFAXDataGridViewTextBoxColumn.Name = "wFAXDataGridViewTextBoxColumn"; - this.wFAXDataGridViewTextBoxColumn.ReadOnly = true; - this.wFAXDataGridViewTextBoxColumn.Width = 43; - // - // wNKLIENCIDataGridViewTextBoxColumn - // - this.wNKLIENCIDataGridViewTextBoxColumn.DataPropertyName = "W_N_KLIENCI"; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wNKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle10; - this.wNKLIENCIDataGridViewTextBoxColumn.HeaderText = "N. Klien."; - this.wNKLIENCIDataGridViewTextBoxColumn.Name = "wNKLIENCIDataGridViewTextBoxColumn"; - this.wNKLIENCIDataGridViewTextBoxColumn.ReadOnly = true; - this.wNKLIENCIDataGridViewTextBoxColumn.Width = 43; - // - // wKLIENCIDataGridViewTextBoxColumn - // - this.wKLIENCIDataGridViewTextBoxColumn.DataPropertyName = "W_KLIENCI"; - dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle11; - this.wKLIENCIDataGridViewTextBoxColumn.HeaderText = "Klien."; - this.wKLIENCIDataGridViewTextBoxColumn.Name = "wKLIENCIDataGridViewTextBoxColumn"; - this.wKLIENCIDataGridViewTextBoxColumn.ReadOnly = true; - this.wKLIENCIDataGridViewTextBoxColumn.Width = 43; - // - // wREKLAMYDataGridViewTextBoxColumn - // - this.wREKLAMYDataGridViewTextBoxColumn.DataPropertyName = "W_REKLAMY"; - dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wREKLAMYDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle12; - this.wREKLAMYDataGridViewTextBoxColumn.HeaderText = "Rekl"; - this.wREKLAMYDataGridViewTextBoxColumn.Name = "wREKLAMYDataGridViewTextBoxColumn"; - this.wREKLAMYDataGridViewTextBoxColumn.ReadOnly = true; - this.wREKLAMYDataGridViewTextBoxColumn.Width = 43; // // ProvisionForm Index: trunk/BazaReklam/AdminForm.Designer.cs =================================================================== --- trunk/BazaReklam/AdminForm.Designer.cs (revision 65) +++ trunk/BazaReklam/AdminForm.Designer.cs (revision 676) @@ -101,5 +101,5 @@ // lOGINLabel.AutoSize = true; - lOGINLabel.Location = new System.Drawing.Point(46, 25); + lOGINLabel.Location = new System.Drawing.Point(56, 26); lOGINLabel.Name = "lOGINLabel"; lOGINLabel.Size = new System.Drawing.Size(36, 13); @@ -110,5 +110,5 @@ // imieLabel.AutoSize = true; - imieLabel.Location = new System.Drawing.Point(56, 82); + imieLabel.Location = new System.Drawing.Point(63, 79); imieLabel.Name = "imieLabel"; imieLabel.Size = new System.Drawing.Size(29, 13); @@ -119,5 +119,5 @@ // nazwiskoLabel.AutoSize = true; - nazwiskoLabel.Location = new System.Drawing.Point(34, 108); + nazwiskoLabel.Location = new System.Drawing.Point(36, 109); nazwiskoLabel.Name = "nazwiskoLabel"; nazwiskoLabel.Size = new System.Drawing.Size(56, 13); @@ -128,5 +128,5 @@ // pASSWORDLabel.AutoSize = true; - pASSWORDLabel.Location = new System.Drawing.Point(46, 52); + pASSWORDLabel.Location = new System.Drawing.Point(53, 53); pASSWORDLabel.Name = "pASSWORDLabel"; pASSWORDLabel.Size = new System.Drawing.Size(39, 13); @@ -137,9 +137,9 @@ // st_sekretarkaLabel.AutoSize = true; - st_sekretarkaLabel.Location = new System.Drawing.Point(30, 33); + st_sekretarkaLabel.Location = new System.Drawing.Point(30, 34); st_sekretarkaLabel.Name = "st_sekretarkaLabel"; - st_sekretarkaLabel.Size = new System.Drawing.Size(60, 13); + st_sekretarkaLabel.Size = new System.Drawing.Size(62, 13); st_sekretarkaLabel.TabIndex = 9; - st_sekretarkaLabel.Text = "sekretarka:"; + st_sekretarkaLabel.Text = "Sekretarka:"; // // st_handlowiecLabel @@ -148,61 +148,61 @@ st_handlowiecLabel.Location = new System.Drawing.Point(26, 63); st_handlowiecLabel.Name = "st_handlowiecLabel"; - st_handlowiecLabel.Size = new System.Drawing.Size(64, 13); + st_handlowiecLabel.Size = new System.Drawing.Size(66, 13); st_handlowiecLabel.TabIndex = 11; - st_handlowiecLabel.Text = "handlowiec:"; + st_handlowiecLabel.Text = "Handlowiec:"; // // st_sub_handlowiecLabel // st_sub_handlowiecLabel.AutoSize = true; - st_sub_handlowiecLabel.Location = new System.Drawing.Point(9, 91); + st_sub_handlowiecLabel.Location = new System.Drawing.Point(25, 92); st_sub_handlowiecLabel.Name = "st_sub_handlowiecLabel"; - st_sub_handlowiecLabel.Size = new System.Drawing.Size(81, 13); + st_sub_handlowiecLabel.Size = new System.Drawing.Size(67, 13); st_sub_handlowiecLabel.TabIndex = 13; - st_sub_handlowiecLabel.Text = "subhandlowiec:"; + st_sub_handlowiecLabel.Text = "Ksiêgowoœæ:"; // // st_kierownikLabel // st_kierownikLabel.AutoSize = true; - st_kierownikLabel.Location = new System.Drawing.Point(30, 121); + st_kierownikLabel.Location = new System.Drawing.Point(36, 121); st_kierownikLabel.Name = "st_kierownikLabel"; - st_kierownikLabel.Size = new System.Drawing.Size(55, 13); + st_kierownikLabel.Size = new System.Drawing.Size(56, 13); st_kierownikLabel.TabIndex = 15; - st_kierownikLabel.Text = "kierownik:"; + st_kierownikLabel.Text = "Kierownik:"; // // st_dtpLabel // st_dtpLabel.AutoSize = true; - st_dtpLabel.Location = new System.Drawing.Point(181, 33); + st_dtpLabel.Location = new System.Drawing.Point(181, 34); st_dtpLabel.Name = "st_dtpLabel"; - st_dtpLabel.Size = new System.Drawing.Size(28, 13); + st_dtpLabel.Size = new System.Drawing.Size(30, 13); st_dtpLabel.TabIndex = 17; - st_dtpLabel.Text = " dtp:"; + st_dtpLabel.Text = " Dtp:"; // // st_korektaLabel // st_korektaLabel.AutoSize = true; - st_korektaLabel.Location = new System.Drawing.Point(163, 58); + st_korektaLabel.Location = new System.Drawing.Point(164, 63); st_korektaLabel.Name = "st_korektaLabel"; - st_korektaLabel.Size = new System.Drawing.Size(46, 13); + st_korektaLabel.Size = new System.Drawing.Size(47, 13); st_korektaLabel.TabIndex = 19; - st_korektaLabel.Text = "korekta:"; + st_korektaLabel.Text = "Korekta:"; // // st_produkcjaLabel // st_produkcjaLabel.AutoSize = true; - st_produkcjaLabel.Location = new System.Drawing.Point(153, 91); + st_produkcjaLabel.Location = new System.Drawing.Point(153, 92); st_produkcjaLabel.Name = "st_produkcjaLabel"; - st_produkcjaLabel.Size = new System.Drawing.Size(57, 13); + st_produkcjaLabel.Size = new System.Drawing.Size(58, 13); st_produkcjaLabel.TabIndex = 21; - st_produkcjaLabel.Text = "produkcja:"; + st_produkcjaLabel.Text = "Produkcja:"; // // st_adminLabel // st_adminLabel.AutoSize = true; - st_adminLabel.Location = new System.Drawing.Point(171, 121); + st_adminLabel.Location = new System.Drawing.Point(172, 121); st_adminLabel.Name = "st_adminLabel"; - st_adminLabel.Size = new System.Drawing.Size(38, 13); + st_adminLabel.Size = new System.Drawing.Size(39, 13); st_adminLabel.TabIndex = 23; - st_adminLabel.Text = "admin:"; + st_adminLabel.Text = "Admin:"; // // tabControl1 @@ -285,5 +285,5 @@ // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(35, 22); + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(36, 22); this.bindingNavigatorCountItem.Text = "of {0}"; this.bindingNavigatorCountItem.ToolTipText = "Total number of items"; @@ -404,5 +404,5 @@ // this.st_adminCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.uZYTKOWNICYBindingSource, "st_admin", true)); - this.st_adminCheckBox.Location = new System.Drawing.Point(215, 116); + this.st_adminCheckBox.Location = new System.Drawing.Point(215, 115); this.st_adminCheckBox.Name = "st_adminCheckBox"; this.st_adminCheckBox.Size = new System.Drawing.Size(21, 24); @@ -412,5 +412,5 @@ // this.st_handlowiecCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.uZYTKOWNICYBindingSource, "st_handlowiec", true)); - this.st_handlowiecCheckBox.Location = new System.Drawing.Point(96, 58); + this.st_handlowiecCheckBox.Location = new System.Drawing.Point(96, 57); this.st_handlowiecCheckBox.Name = "st_handlowiecCheckBox"; this.st_handlowiecCheckBox.Size = new System.Drawing.Size(20, 24); @@ -436,5 +436,5 @@ // this.st_kierownikCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.uZYTKOWNICYBindingSource, "st_kierownik", true)); - this.st_kierownikCheckBox.Location = new System.Drawing.Point(96, 116); + this.st_kierownikCheckBox.Location = new System.Drawing.Point(96, 115); this.st_kierownikCheckBox.Name = "st_kierownikCheckBox"; this.st_kierownikCheckBox.Size = new System.Drawing.Size(20, 24); @@ -444,5 +444,5 @@ // this.st_korektaCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.uZYTKOWNICYBindingSource, "st_korekta", true)); - this.st_korektaCheckBox.Location = new System.Drawing.Point(215, 58); + this.st_korektaCheckBox.Location = new System.Drawing.Point(215, 57); this.st_korektaCheckBox.Name = "st_korektaCheckBox"; this.st_korektaCheckBox.Size = new System.Drawing.Size(21, 24); @@ -477,7 +477,7 @@ // this.lOGINTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.uZYTKOWNICYBindingSource, "LOGIN", true)); - this.lOGINTextBox.Location = new System.Drawing.Point(124, 22); + this.lOGINTextBox.Location = new System.Drawing.Point(96, 22); this.lOGINTextBox.Name = "lOGINTextBox"; - this.lOGINTextBox.Size = new System.Drawing.Size(100, 20); + this.lOGINTextBox.Size = new System.Drawing.Size(144, 20); this.lOGINTextBox.TabIndex = 2; this.lOGINTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.lOGINTextBox_Validating); @@ -486,7 +486,7 @@ // this.pASSWORDTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.uZYTKOWNICYBindingSource, "PASSWORD", true)); - this.pASSWORDTextBox.Location = new System.Drawing.Point(124, 49); + this.pASSWORDTextBox.Location = new System.Drawing.Point(96, 49); this.pASSWORDTextBox.Name = "pASSWORDTextBox"; - this.pASSWORDTextBox.Size = new System.Drawing.Size(100, 20); + this.pASSWORDTextBox.Size = new System.Drawing.Size(144, 20); this.pASSWORDTextBox.TabIndex = 8; // @@ -494,7 +494,7 @@ // this.nazwiskoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.uZYTKOWNICYBindingSource, "Nazwisko", true)); - this.nazwiskoTextBox.Location = new System.Drawing.Point(124, 105); + this.nazwiskoTextBox.Location = new System.Drawing.Point(96, 105); this.nazwiskoTextBox.Name = "nazwiskoTextBox"; - this.nazwiskoTextBox.Size = new System.Drawing.Size(100, 20); + this.nazwiskoTextBox.Size = new System.Drawing.Size(144, 20); this.nazwiskoTextBox.TabIndex = 6; // @@ -502,7 +502,7 @@ // this.imieTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.uZYTKOWNICYBindingSource, "Imie", true)); - this.imieTextBox.Location = new System.Drawing.Point(124, 75); + this.imieTextBox.Location = new System.Drawing.Point(96, 75); this.imieTextBox.Name = "imieTextBox"; - this.imieTextBox.Size = new System.Drawing.Size(100, 20); + this.imieTextBox.Size = new System.Drawing.Size(144, 20); this.imieTextBox.TabIndex = 4; // Index: trunk/BazaReklam/ProvisionForm.cs =================================================================== --- trunk/BazaReklam/ProvisionForm.cs (revision 675) +++ trunk/BazaReklam/ProvisionForm.cs (revision 676) @@ -73,6 +73,6 @@ OCENAComboCoxColumn.ValueMember = "value"; - dodajPlanToolStripButton.Enabled = User.Instance().St_kierownik; - usunToolStripButton.Enabled = User.Instance().St_kierownik; + dodajPlanToolStripButton.Enabled = User.Instance().IsKierownik; + usunToolStripButton.Enabled = User.Instance().IsKierownik; } @@ -88,5 +88,5 @@ ((ComboBox)agencjaToolStripComboBox.Control).SelectedValue = User.Instance().IdAgencji; - if (!User.Instance().St_kierownik) + if (!User.Instance().IsKierownik) { agencjaToolStripComboBox.Enabled = false; @@ -322,5 +322,5 @@ private void Uprawnienia() { - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { Index: trunk/BazaReklam/AddZamowienieForm.cs =================================================================== --- trunk/BazaReklam/AddZamowienieForm.cs (revision 602) +++ trunk/BazaReklam/AddZamowienieForm.cs (revision 676) @@ -55,5 +55,5 @@ numerZamowieniaLabel1.Text = k.kodKlienta + "/" + row.rokZamowienia + "/" + row.kodAgenta + "/" + row.nrZamowienia; - kierownikGroupBox.Enabled = User.Instance().St_kierownik; + kierownikGroupBox.Enabled = User.Instance().IsKierownik; czasPlatnosciListBox.DisplayMember = "DisplayValue"; @@ -96,5 +96,5 @@ private void SetCzasPlatnosci(int czasPlatnosci) { - txtCzasPlatnosci.Visible = User.Instance().St_kierownik; + txtCzasPlatnosci.Visible = User.Instance().IsKierownik; lblCzasPlatnosci.Visible = txtCzasPlatnosci.Visible; Index: trunk/BazaReklam/Facturer.cs =================================================================== --- trunk/BazaReklam/Facturer.cs (revision 621) +++ trunk/BazaReklam/Facturer.cs (revision 676) @@ -65,5 +65,5 @@ nUMERTextBox.Text = read[0]; - groupBox2.Enabled = true & User.Instance().St_admin; + groupBox2.Enabled = true & User.Instance().IsAdmin; } @@ -668,5 +668,5 @@ private void Facturer_Shown(object sender, EventArgs e) { - if (!User.Instance().St_kierownik) + if (!User.Instance().IsKierownik) { foreach (Control c in Controls) Index: trunk/BazaReklam/ReportsForm.cs =================================================================== --- trunk/BazaReklam/ReportsForm.cs (revision 654) +++ trunk/BazaReklam/ReportsForm.cs (revision 676) @@ -102,5 +102,5 @@ stareRaportyTreeView.Nodes["Pozosta³e"].Nodes.Add(node); - if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec | User.Instance().St_kierownik | User.Instance().St_sekretarka) + if (User.Instance().IsHandlowiec | User.Instance().IsKierownik | User.Instance().IsSekretarka) { node = new TreeNode(); @@ -160,5 +160,5 @@ } - if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec | User.Instance().St_kierownik) + if (User.Instance().IsHandlowiec | User.Instance().IsKierownik) { node = new TreeNode(); @@ -178,5 +178,5 @@ } - if (User.Instance().St_kierownik) { + if (User.Instance().IsKierownik) { node = new TreeNode(); @@ -365,11 +365,11 @@ { case "s": - return User.Instance().St_kierownik | User.Instance().St_handlowiec | User.Instance().St_subhandlowiec | User.Instance().St_sekretarka; + return User.Instance().IsKierownik | User.Instance().IsHandlowiec | User.Instance().IsSekretarka; case "h": - return User.Instance().St_kierownik | User.Instance().St_handlowiec | User.Instance().St_subhandlowiec; + return User.Instance().IsKierownik | User.Instance().IsHandlowiec; case "k": - return User.Instance().St_kierownik; + return User.Instance().IsKierownik; case "a": - return User.Instance().St_admin; + return User.Instance().IsAdmin; default: return false; @@ -449,7 +449,7 @@ ) { - if (!User.Instance().St_kierownik) + if (!User.Instance().IsKierownik) { - if (User.Instance().St_sekretarka) + if (User.Instance().IsSekretarka) { List paramList = new List(); @@ -457,5 +457,5 @@ reportViewer1.ServerReport.SetParameters(paramList); } - else if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec) + else if (User.Instance().IsHandlowiec) { List paramList = new List(); @@ -477,5 +477,5 @@ reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/OcenaAgenta") { - if (!User.Instance().St_kierownik) + if (!User.Instance().IsKierownik) { List paramList = new List(); @@ -487,5 +487,5 @@ if (reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/WynikAgenta") { - if (!User.Instance().St_kierownik) + if (!User.Instance().IsKierownik) { List paramList = new List(); Index: trunk/BazaReklam/Classes/User.cs =================================================================== --- trunk/BazaReklam/Classes/User.cs (revision 591) +++ trunk/BazaReklam/Classes/User.cs (revision 676) @@ -28,5 +28,5 @@ private string skype; private string smtpServer; - private bool st_admin; + private bool _isAdmin; private bool st_dtp; private bool st_handlowiec; @@ -97,5 +97,5 @@ } - public bool St_sekretarka + public bool IsSekretarka { get { return st_sekretarka; } @@ -103,5 +103,5 @@ } - public bool St_handlowiec + public bool IsHandlowiec { get { return st_handlowiec; } @@ -109,5 +109,5 @@ } - public bool St_subhandlowiec + public bool IsKsiegowosc { get { return st_subhandlowiec; } @@ -115,5 +115,5 @@ } - public bool St_kierownik + public bool IsKierownik { get { return st_kierownik; } @@ -121,5 +121,5 @@ } - public bool St_dtp + public bool IsDtp { get { return st_dtp; } @@ -127,5 +127,5 @@ } - public bool St_korekta + public bool IsKorekta { get { return st_korekta; } @@ -133,5 +133,5 @@ } - public bool St_produkcja + public bool IsProdukcja { get { return st_produkcja; } @@ -139,8 +139,8 @@ } - public bool St_admin - { - get { return st_admin; } - set { st_admin = value; } + public bool IsAdmin + { + get { return _isAdmin; } + set { _isAdmin = value; } } @@ -149,10 +149,4 @@ get { return stanowisko; } set { stanowisko = value; } - } - - public string NrGG - { - get { return nrGG; } - set { nrGG = value; } } Index: trunk/BazaReklam/Logowanie.cs =================================================================== --- trunk/BazaReklam/Logowanie.cs (revision 626) +++ trunk/BazaReklam/Logowanie.cs (revision 676) @@ -108,12 +108,12 @@ User.Instance().Imie = reader.GetValue(2).ToString(); User.Instance().Nazwisko = reader.GetValue(3).ToString(); - User.Instance().St_sekretarka = (bool) reader.GetValue(5); - User.Instance().St_handlowiec = (bool) reader.GetValue(6); - User.Instance().St_subhandlowiec = (bool) reader.GetValue(7); - User.Instance().St_kierownik = (bool) reader.GetValue(8); - User.Instance().St_dtp = (bool) reader.GetValue(9); - User.Instance().St_korekta = (bool) reader.GetValue(10); - User.Instance().St_produkcja = (bool) reader.GetValue(11); - User.Instance().St_admin = (bool) reader.GetValue(12); + User.Instance().IsSekretarka = (bool) reader.GetValue(5); + User.Instance().IsHandlowiec = (bool) reader.GetValue(6); + User.Instance().IsKsiegowosc = (bool) reader.GetValue(7); + User.Instance().IsKierownik = (bool) reader.GetValue(8); + User.Instance().IsDtp = (bool) reader.GetValue(9); + User.Instance().IsKorekta = (bool) reader.GetValue(10); + User.Instance().IsProdukcja = (bool) reader.GetValue(11); + User.Instance().IsAdmin = (bool) reader.GetValue(12); if (!reader.IsDBNull(13)) { @@ -136,6 +136,5 @@ //jezeli handlowiec to sciaga dane agenta - if (User.Instance().St_handlowiec | User.Instance().St_kierownik | User.Instance().St_subhandlowiec | - User.Instance().St_sekretarka) + if (User.Instance().IsHandlowiec | User.Instance().IsKierownik | User.Instance().IsSekretarka) { reader.Close(); Index: trunk/BazaReklam/FacturesForm.cs =================================================================== --- trunk/BazaReklam/FacturesForm.cs (revision 602) +++ trunk/BazaReklam/FacturesForm.cs (revision 676) @@ -331,9 +331,9 @@ private void FacturesForm_Shown(object sender, EventArgs e) { - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { agencjaToolStripComboBox.Text = User.Instance().SymbolAgencji; } - else if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec) + else if (User.Instance().IsHandlowiec) { kodRozliczeniowyToolStripTextBox.Text = User.Instance().Kod_agenta; Index: trunk/BazaReklam/KorektyForm.cs =================================================================== --- trunk/BazaReklam/KorektyForm.cs (revision 630) +++ trunk/BazaReklam/KorektyForm.cs (revision 676) @@ -458,9 +458,9 @@ private void FacturesForm_Shown(object sender, EventArgs e) { - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { agencjaToolStripComboBox.Text = User.Instance().SymbolAgencji; } - else if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec) + else if (User.Instance().IsHandlowiec) { kodRozliczeniowyToolStripTextBox.Text = User.Instance().Kod_agenta; Index: trunk/BazaReklam/ProductionForm.cs =================================================================== --- trunk/BazaReklam/ProductionForm.cs (revision 659) +++ trunk/BazaReklam/ProductionForm.cs (revision 676) @@ -668,25 +668,21 @@ private void uprawnienia() { - usunToolStripButton.Enabled = User.Instance().St_kierownik | User.Instance().St_produkcja; - - zamowienieToolStripButton.Visible = User.Instance().St_produkcja | User.Instance().St_handlowiec | - User.Instance().St_subhandlowiec | User.Instance().St_kierownik; - klientToolStripButton.Visible = User.Instance().St_produkcja | User.Instance().St_handlowiec | - User.Instance().St_subhandlowiec | User.Instance().St_kierownik; - - zwrotToolStripButton.Enabled = User.Instance().St_produkcja | User.Instance().St_korekta | - User.Instance().St_dtp; - doDTPToolStripButton.Enabled = User.Instance().St_produkcja || User.Instance().St_dtp; - proToolStripButton.Enabled = User.Instance().St_dtp; - doKorektyToolStripButton.Enabled = User.Instance().St_dtp; - doDTP2ToolStripButton.Enabled = User.Instance().St_korekta; - doKorekty2ToolStripButton.Enabled = User.Instance().St_dtp; - doAgentaToolStripButton.Enabled = User.Instance().St_korekta | User.Instance().St_dtp; - akceptToolStripButton.Enabled = User.Instance().St_handlowiec | User.Instance().St_subhandlowiec | - User.Instance().St_kierownik | User.Instance().St_produkcja; - nieakceptToolStripButton.Enabled = User.Instance().St_handlowiec | User.Instance().St_subhandlowiec | - User.Instance().St_kierownik; - - if (!(User.Instance().St_produkcja | User.Instance().St_kierownik | User.Instance().St_dtp)) + usunToolStripButton.Enabled = User.Instance().IsKierownik | User.Instance().IsProdukcja; + + zamowienieToolStripButton.Visible = User.Instance().IsProdukcja | User.Instance().IsHandlowiec | User.Instance().IsKierownik; + klientToolStripButton.Visible = User.Instance().IsProdukcja | User.Instance().IsHandlowiec | User.Instance().IsKierownik; + + zwrotToolStripButton.Enabled = User.Instance().IsProdukcja | User.Instance().IsKorekta | + User.Instance().IsDtp; + doDTPToolStripButton.Enabled = User.Instance().IsProdukcja || User.Instance().IsDtp; + proToolStripButton.Enabled = User.Instance().IsDtp; + doKorektyToolStripButton.Enabled = User.Instance().IsDtp; + doDTP2ToolStripButton.Enabled = User.Instance().IsKorekta; + doKorekty2ToolStripButton.Enabled = User.Instance().IsDtp; + doAgentaToolStripButton.Enabled = User.Instance().IsKorekta | User.Instance().IsDtp; + akceptToolStripButton.Enabled = User.Instance().IsHandlowiec | User.Instance().IsKierownik | User.Instance().IsProdukcja; + nieakceptToolStripButton.Enabled = User.Instance().IsHandlowiec | User.Instance().IsKierownik; + + if (!(User.Instance().IsProdukcja | User.Instance().IsKierownik | User.Instance().IsDtp)) { tabControl1.TabPages.Remove(spisTabPage); @@ -694,5 +690,5 @@ } - zapiszStronyButton.Enabled = User.Instance().St_produkcja | User.Instance().St_kierownik; + zapiszStronyButton.Enabled = User.Instance().IsProdukcja | User.Instance().IsKierownik; } @@ -787,5 +783,5 @@ doAgentaToolStripButton.Enabled = false; - if ((User.Instance().St_handlowiec) && (!User.Instance().St_kierownik)) + if ((User.Instance().IsHandlowiec) && (!User.Instance().IsKierownik)) { //handlowiec moze akceptowac tylko swoje projekty @@ -810,9 +806,9 @@ //produkcja ma miec zawsze aktywny ten button - if (User.Instance().St_produkcja) + if (User.Instance().IsProdukcja) akceptToolStripButton.Enabled = true; else { - if ((User.Instance().St_handlowiec) && (!User.Instance().St_kierownik)) + if ((User.Instance().IsHandlowiec) && (!User.Instance().IsKierownik)) { //handlowiec moze akceptowac tylko swoje projekty @@ -837,5 +833,5 @@ doAgentaToolStripButton.Enabled = false; - if ((User.Instance().St_handlowiec) && (!User.Instance().St_kierownik)) + if ((User.Instance().IsHandlowiec) && (!User.Instance().IsKierownik)) { //handlowiec moze akceptowac tylko swoje projekty @@ -1043,5 +1039,5 @@ "select * from dbo.PRODUKCJA where STAN!='ZAAKCEPTOWANE' AND STAN!='NIEZAAKCEPTOWANE' AND STAN!='ZWROT Z PRODUKCJI'"; - if (User.Instance().St_produkcja) + if (User.Instance().IsProdukcja) { str = @@ -1050,5 +1046,5 @@ } - if (User.Instance().St_kierownik) + if (User.Instance().IsKierownik) { str = "select dbo.PRODUKCJA.* from dbo.PRODUKCJA left join dbo.AGENCI " + @@ -1060,5 +1056,5 @@ } - if (User.Instance().St_handlowiec | User.Instance().St_subhandlowiec) + if (User.Instance().IsHandlowiec) { str = @@ -1068,5 +1064,5 @@ } - if (User.Instance().St_dtp) + if (User.Instance().IsDtp) { str = "select * from dbo.PRODUKCJA where STAN='DO DTP' OR STAN='W DTP' OR STAN='PO KOREKCIE' OR STAN='ZAMAWIAM'"; @@ -1074,5 +1070,5 @@ } - if (User.Instance().St_korekta) + if (User.Instance().IsKorekta) { str = "select * from dbo.PRODUKCJA where STAN='DO KOREKTY' OR STAN='W 2 KOREKCIE' "; Index: trunk/BazaReklam/InfoForm.cs =================================================================== --- trunk/BazaReklam/InfoForm.cs (revision 602) +++ trunk/BazaReklam/InfoForm.cs (revision 676) @@ -479,5 +479,5 @@ { - if (!User.Instance().St_kierownik) + if (!User.Instance().IsKierownik) { infoTabControl.TabPages.Remove(grzbietyTabPage); @@ -487,5 +487,5 @@ } - if (!(User.Instance().St_kierownik | User.Instance().St_handlowiec | User.Instance().St_subhandlowiec | User.Instance().St_sekretarka)) + if (!(User.Instance().IsKierownik | User.Instance().IsHandlowiec | User.Instance().IsSekretarka)) { infoTabControl.TabPages.Remove(kursyWalutTabPage); @@ -496,40 +496,40 @@ - dodajAgencjeButton.Enabled = User.Instance().St_kierownik; - edytujAgencjeButton.Enabled = User.Instance().St_kierownik; - dodajAgentaButton.Enabled = User.Instance().St_kierownik; - edytujAgentaButton.Enabled = User.Instance().St_kierownik; - dodajKontoButton.Enabled = User.Instance().St_kierownik; - edytujKontoButton.Enabled = User.Instance().St_kierownik; - - nrWydanDataGridView.AllowUserToAddRows = User.Instance().St_kierownik; - modulyDataGridView.AllowUserToAddRows = User.Instance().St_kierownik; - - bindingNavigatorAddNewItem2.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - bindingNavigatorAddNewItem3.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - bindingNavigatorAddNewItem5.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - bindingNavigatorAddNewItem6.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - bindingNavigatorAddNewItem7.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - bindingNavigatorAddNewItem8.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - bindingNavigatorAddNewItem9.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - bindingNavigatorAddNewItem10.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - - zapiszGrzbietyToolStripButton.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - zapiszNrWydToolStripButton.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - zapiszTytultoolStripButton.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - zapiszPromocjeToolStripButton.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - modulySaveToolStripButton.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - zapiszPlanProwToolStripButton.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - zapiszBudzetToolStripButton.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - zapiszKosztyBiuraToolStripButton.Visible = User.Instance().St_kierownik | User.Instance().St_admin; - - bindingNavigatorDeleteItem2.Visible = User.Instance().St_admin; - bindingNavigatorDeleteItem3.Visible = User.Instance().St_admin; - bindingNavigatorDeleteItem5.Visible = User.Instance().St_admin; - bindingNavigatorDeleteItem6.Visible = User.Instance().St_admin; - bindingNavigatorDeleteItem7.Visible = User.Instance().St_admin; - bindingNavigatorDeleteItem8.Visible = User.Instance().St_admin; - bindingNavigatorDeleteItem9.Visible = User.Instance().St_admin; - bindingNavigatorDeleteItem10.Visible = User.Instance().St_admin; + dodajAgencjeButton.Enabled = User.Instance().IsKierownik; + edytujAgencjeButton.Enabled = User.Instance().IsKierownik; + dodajAgentaButton.Enabled = User.Instance().IsKierownik; + edytujAgentaButton.Enabled = User.Instance().IsKierownik; + dodajKontoButton.Enabled = User.Instance().IsKierownik; + edytujKontoButton.Enabled = User.Instance().IsKierownik; + + nrWydanDataGridView.AllowUserToAddRows = User.Instance().IsKierownik; + modulyDataGridView.AllowUserToAddRows = User.Instance().IsKierownik; + + bindingNavigatorAddNewItem2.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + bindingNavigatorAddNewItem3.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + bindingNavigatorAddNewItem5.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + bindingNavigatorAddNewItem6.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + bindingNavigatorAddNewItem7.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + bindingNavigatorAddNewItem8.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + bindingNavigatorAddNewItem9.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + bindingNavigatorAddNewItem10.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + + zapiszGrzbietyToolStripButton.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + zapiszNrWydToolStripButton.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + zapiszTytultoolStripButton.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + zapiszPromocjeToolStripButton.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + modulySaveToolStripButton.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + zapiszPlanProwToolStripButton.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + zapiszBudzetToolStripButton.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + zapiszKosztyBiuraToolStripButton.Visible = User.Instance().IsKierownik | User.Instance().IsAdmin; + + bindingNavigatorDeleteItem2.Visible = User.Instance().IsAdmin; + bindingNavigatorDeleteItem3.Visible = User.Instance().IsAdmin; + bindingNavigatorDeleteItem5.Visible = User.Instance().IsAdmin; + bindingNavigatorDeleteItem6.Visible = User.Instance().IsAdmin; + bindingNavigatorDeleteItem7.Visible = User.Instance().IsAdmin; + bindingNavigatorDeleteItem8.Visible = User.Instance().IsAdmin; + bindingNavigatorDeleteItem9.Visible = User.Instance().IsAdmin; + bindingNavigatorDeleteItem10.Visible = User.Instance().IsAdmin; } @@ -629,5 +629,5 @@ staryAgentComboBox.DataSource = aGENCITableAdapter.GetDataByNieaktywniIDAgencji(idAgencji); - groupBox1.Enabled = User.Instance().St_kierownik & (idAgencji == User.Instance().IdAgencji); + groupBox1.Enabled = User.Instance().IsKierownik & (idAgencji == User.Instance().IdAgencji); } } Index: trunk/BazaReklam/ClientsForm.cs =================================================================== --- trunk/BazaReklam/ClientsForm.cs (revision 669) +++ trunk/BazaReklam/ClientsForm.cs (revision 676) @@ -1658,5 +1658,5 @@ treeView1.Nodes.Add(node); - if (User.Instance().St_handlowiec) + if (User.Instance().IsHandlowiec) { node = new TreeNode("Moi klienci"); @@ -1709,13 +1709,13 @@ { //usuwanie faktury - usunFakture.Enabled = User.Instance().St_kierownik; + usunFakture.Enabled = User.Instance().IsKierownik; usunFakture.Visible = false; //dodawanie klasyfikacji - klTextBox.Visible = User.Instance().St_kierownik; - dodajKlButton.Visible = User.Instance().St_kierownik; - usunKlButton.Visible = User.Instance().St_kierownik; - - dodajLogoToolStripButton.Enabled = User.Instance().St_kierownik | User.Instance().St_produkcja; + klTextBox.Visible = User.Instance().IsKierownik; + dodajKlButton.Visible = User.Instance().IsKierownik; + usunKlButton.Visible = User.Instance().IsKierownik; + + dodajLogoToolStripButton.Enabled = User.Instance().IsKierownik | User.Instance().IsProdukcja; }