Index: trunk/BazaReklam/Baza Reklam.csproj
===================================================================
--- trunk/BazaReklam/Baza Reklam.csproj (revision 822)
+++ trunk/BazaReklam/Baza Reklam.csproj (revision 824)
@@ -33,5 +33,5 @@
index.htm
false
-
1.1.26.0
+
1.1.28.0
false
@@ -712,36 +712,36 @@
False
+ Exclude
- Exclude
Assembly
False
+ Include
- Include
Assembly
False
+ Include
- Include
Assembly
False
+ Include
- Include
Assembly
Index: trunk/BazaReklam/ProjectForm.cs
===================================================================
--- trunk/BazaReklam/ProjectForm.cs (revision 822)
+++ trunk/BazaReklam/ProjectForm.cs (revision 824)
@@ -1,3 +1,4 @@
using System;
+using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
@@ -16,20 +17,22 @@
{
- private int reklamaID;
- private int projektID;
- private bool pro;
-
- public ProjectForm(int rekId)
+ protected int ReklamaId;
+ protected int ProjektId;
+ private readonly bool _pro;
+
+ public ProjectForm(int reklamaId)
{
InitializeComponent();
- reklamaID = rekId;
- }
-
- public ProjectForm(int rekId, int proId)
+ ReklamaId = reklamaId;
+ InitReklama();
+ }
+
+ public ProjectForm(int reklamaId, int projektId)
{
InitializeComponent();
- reklamaID = rekId;
- projektID = proId;
- pro = true;
+ ReklamaId = reklamaId;
+ ProjektId = projektId;
+ _pro = true;
+ InitReklama();
}
@@ -62,4 +65,19 @@
+ private bool IsOgloszenie()
+ {
+ if (Reklama == null) return false;
+
+ return GetProjectType(Reklama.TYTU£, Reklama.MOD_TYP) == 2;
+ }
+
+ private void InitReklama()
+ {
+ pRODUKCJATableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
+ reklamaTableAdapter1.Connection.ConnectionString = ConnString.getConnString().Value;
+
+ reklamaTableAdapter1.FillByReklamaId(rEKLAMADataSet.REKLAMA, ReklamaId);
+ }
+
private void ProjectForm_Load(object sender, EventArgs e)
{
@@ -68,8 +86,10 @@
toolTip.SetToolTip(btnOpenFolder, "Otwórz folder z materia³ami");
- pRODUKCJATableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
- reklamaTableAdapter1.Connection.ConnectionString = ConnString.getConnString().Value;
-
- reklamaTableAdapter1.FillByReklamaId(rEKLAMADataSet.REKLAMA, reklamaID);
+ EnableControls(!IsOgloszenie());
+ if (IsOgloszenie())
+ {
+ tYP_PROJEKTUComboBox.Items.Clear();
+ tYP_PROJEKTUComboBox.Items.AddRange(new string[] { "Nowy", "W produkcji", "Gotowy" });
+ }
if (Reklama != null && Reklama.TYTU£.ToUpper() != "EXPO")
@@ -80,17 +100,16 @@
jezykComboBox.SelectedIndex = 0;
-
rEKLAMADataSet.PRODUKCJA.Clear();
- pRODUKCJATableAdapter.FillByReklamaId(rEKLAMADataSet.PRODUKCJA, reklamaID);
+ pRODUKCJATableAdapter.FillByReklamaId(rEKLAMADataSet.PRODUKCJA, ReklamaId);
pRODUKCJABindingSource.DataSource = rEKLAMADataSet;
if (pRODUKCJABindingSource.List.Count == 0)
{
- dodajNowyProjekt(reklamaID);
- }
-
- if (pro)
- {
- while (Convert.ToInt32(((DataRowView) pRODUKCJABindingSource.Current)["ID"]) != projektID)
+ DodajNowyProjekt(ReklamaId);
+ }
+
+ if (_pro)
+ {
+ while (Convert.ToInt32(((DataRowView) pRODUKCJABindingSource.Current)["ID"]) != ProjektId)
{
pRODUKCJABindingSource.MoveNext();
@@ -101,12 +120,29 @@
pRODUKCJABindingSource.MoveLast();
}
-
- }
-
- public void dodajNowyProjekt(int rekID)
- {
- // this.reklamaID = rekID;
+ }
+
+ private void EnableControls(bool enabled)
+ {
+
+ List
controls = new List();
+ controls.Add(szerTextBox);
+ controls.Add(wysTextBox);
+ controls.Add(lokalizacjaTextBox);
+ controls.Add(path_to_materialTextBox);
+ controls.Add(btnOpenFolder);
+
+ foreach (Control control in controls)
+ {
+ control.Enabled = enabled;
+ if (control is TextBox)
+ control.BackColor = enabled ? Color.White : Color.Gray;
+ }
+ }
+
+ public void DodajNowyProjekt(int reklamaId)
+ {
+ // this.ReklamaId = reklamaId;
- REKLAMADataSet.REKLAMARow row = rEKLAMADataSet.REKLAMA.FindByReklamaID(reklamaID);
+ REKLAMADataSet.REKLAMARow row = rEKLAMADataSet.REKLAMA.FindByReklamaID(ReklamaId);
DataView datatable = (DataView)pRODUKCJABindingSource.List;
@@ -118,10 +154,10 @@
row2["modu³"] = row["MOD_TYP"];
row2["Type"] = GetProjectType(row["TYTU£"].ToString(), row["MOD_TYP"].ToString());
- row2["reklamaId"] = reklamaID;
+ row2["reklamaId"] = ReklamaId;
row2["szer"] = row["SZER"];
row2["wys"] = row["WYS"];
row2["kolor"] = row["KOLOR"];
row2["lokalizacja"] = row["strona"];
- row2["dataemisji"] = piewrszaEmisja(reklamaID);
+ row2["dataemisji"] = piewrszaEmisja(ReklamaId);
row2["AGENT"] = User.Instance().Login;
row2["DATA_AGENT"] = DateTime.Now;
@@ -316,5 +352,5 @@
private void dodajNowyButton_Click(object sender, EventArgs e)
{
- dodajNowyProjekt(reklamaID);
+ DodajNowyProjekt(ReklamaId);
}
Index: trunk/BazaReklam/Classes/Repositories/Repository.cs
===================================================================
--- trunk/BazaReklam/Classes/Repositories/Repository.cs (revision 732)
+++ trunk/BazaReklam/Classes/Repositories/Repository.cs (revision 824)
@@ -16,10 +16,10 @@
}
- public void Save()
+ public virtual void Save(T entity)
{
throw new NotImplementedException();
}
- public void Delete()
+ public virtual void Delete(T entity)
{
throw new NotImplementedException();
Index: trunk/BazaReklam/Classes/Repositories/ProductionRepository.cs
===================================================================
--- trunk/BazaReklam/Classes/Repositories/ProductionRepository.cs (revision 822)
+++ trunk/BazaReklam/Classes/Repositories/ProductionRepository.cs (revision 824)
@@ -11,4 +11,14 @@
"SELECT TOP 100 P.*, R.[Id Reklamy] AS AdName, R.CustomerId FROM dbo.Produkcja P INNER JOIN dbo.Reklama R ON R.ReklamaId=P.ReklamaId WHERE P.[Type]=2 {0} ORDER BY P.Id DESC";
+ public override Production Find(int id)
+ {
+ string query = string.Format(_query, " AND P.Id=" + id);
+ List productions = GetProductionList(query);
+ if (productions.Count > 0)
+ return productions[0];
+
+ return null;
+ }
+
public override List FindAll()
{
@@ -16,7 +26,8 @@
}
- public List FindAllToDo()
+ public List FindAllToDo(string productionAgent)
{
- string query = string.Format(_query, " AND P.Typ_Projektu='NOWY'");
+ string query = string.Format(_query, " AND (P.Typ_Projektu='NOWY' OR (P.Typ_Projektu='W PRODUKCJI' AND P.Produkcja='{0}'))");
+ query = string.Format(query, productionAgent);
return GetProductionList(query);
@@ -43,4 +54,48 @@
return GetProductionList(query);
+ }
+
+ public override void Save(Production entity)
+ {
+ const string query = "UPDATE dbo.Produkcja SET Typ_Projektu=@status, DATA_PRODUKCJA=@dataProdukcja, DATA_AKCEPTACJI=@dataAkceptacji, DATA_KOREKTA=@returnDate, Produkcja=@productionAgent WHERE Id=@id;";
+
+ SqlConnection conn = null;
+ SqlCommand cmd = null;
+ try
+ {
+ conn = new SqlConnection(ConnString.getConnString().Value);
+ conn.Open();
+ cmd = new SqlCommand(query, conn);
+ cmd.Parameters.AddWithValue("@id", entity.Id);
+ cmd.Parameters.AddWithValue("@status", entity.Status);
+ cmd.Parameters.AddWithValue("@productionAgent", entity.ProductionAgent);
+
+ if (entity.ProductionDate != DateTime.MinValue)
+ cmd.Parameters.AddWithValue("@dataProdukcja", entity.ProductionDate);
+ else
+ cmd.Parameters.AddWithValue("@dataProdukcja", DBNull.Value);
+
+ if (entity.AcceptanceDate != DateTime.MinValue)
+ cmd.Parameters.AddWithValue("@dataAkceptacji", entity.AcceptanceDate);
+ else
+ cmd.Parameters.AddWithValue("@dataAkceptacji", DBNull.Value);
+
+ if (entity.ReturnDate != DateTime.MinValue)
+ cmd.Parameters.AddWithValue("@returnDate", entity.ReturnDate);
+ else
+ cmd.Parameters.AddWithValue("@returnDate", DBNull.Value);
+
+ cmd.ExecuteNonQuery();
+ }
+ finally
+ {
+
+ if (cmd != null) cmd.Dispose();
+ if (conn != null)
+ {
+ conn.Close();
+ conn.Dispose();
+ }
+ }
}
@@ -76,4 +131,6 @@
if (reader["DATA_AKCEPTACJI"] != DBNull.Value)
production.AcceptanceDate = Convert.ToDateTime(reader["DATA_AKCEPTACJI"]);
+ if (reader["DATA_KOREKTA"] != DBNull.Value)
+ production.ReturnDate = Convert.ToDateTime(reader["DATA_KOREKTA"]);
productionList.Add(production);
}
Index: trunk/BazaReklam/Classes/Repositories/IRepository.cs
===================================================================
--- trunk/BazaReklam/Classes/Repositories/IRepository.cs (revision 614)
+++ trunk/BazaReklam/Classes/Repositories/IRepository.cs (revision 824)
@@ -7,6 +7,6 @@
T Find(int id);
List FindAll();
- void Save();
- void Delete();
+ void Save(T entity);
+ void Delete(T entity);
}
}
Index: trunk/BazaReklam/Classes/Model/Production.cs
===================================================================
--- trunk/BazaReklam/Classes/Model/Production.cs (revision 822)
+++ trunk/BazaReklam/Classes/Model/Production.cs (revision 824)
@@ -1,5 +1,3 @@
using System;
-using System.Collections.Generic;
-using System.Text;
namespace Baza_Reklam.Classes.Model
@@ -18,4 +16,5 @@
private DateTime _productionDate;
private DateTime _acceptanceDate;
+ private DateTime _returnDate;
public int Id
@@ -84,4 +83,10 @@
set { _customerId = value; }
}
+
+ public DateTime ReturnDate
+ {
+ get { return _returnDate; }
+ set { _returnDate = value; }
+ }
}
}
Index: trunk/BazaReklam/ProductionForm.Designer.cs
===================================================================
--- trunk/BazaReklam/ProductionForm.Designer.cs (revision 822)
+++ trunk/BazaReklam/ProductionForm.Designer.cs (revision 824)
@@ -34,13 +34,13 @@
System.Windows.Forms.Label uwagiLabel;
System.Windows.Forms.Label pLIKLabel;
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductionForm));
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
this.tabs = new System.Windows.Forms.TabControl();
this.produkcjaTabPage = new System.Windows.Forms.TabPage();
@@ -209,4 +209,6 @@
this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel();
this.adNameTxt = new System.Windows.Forms.ToolStripTextBox();
+ this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel();
+ this.agentListCombo = new System.Windows.Forms.ToolStripComboBox();
this.productionSearchBtn = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
@@ -215,8 +217,11 @@
this.productionRefreshBtn = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
+ this.productionDetails = new System.Windows.Forms.ToolStripButton();
+ this.adDetailsBtn = new System.Windows.Forms.ToolStripButton();
this.clientDetailsBtn = new System.Windows.Forms.ToolStripButton();
- this.adDetailsBtn = new System.Windows.Forms.ToolStripButton();
- this.productionDetails = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
+ this.toProductionBtn = new System.Windows.Forms.ToolStripButton();
+ this.readyBtn = new System.Windows.Forms.ToolStripButton();
+ this.returnBtn = new System.Windows.Forms.ToolStripButton();
this.dgvOgloszenia = new System.Windows.Forms.DataGridView();
this.AdName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -225,8 +230,11 @@
this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Content = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.AcceptanceDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ProductionDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SellAgent = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ProductionAgent = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ProductionDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.AcceptanceDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ReturnDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.AdId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.CustomerId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.aGENCJEBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.aGENCIBindingSource = new System.Windows.Forms.BindingSource(this.components);
@@ -352,6 +360,6 @@
this.produkcjaDataGridView.AllowUserToAddRows = false;
this.produkcjaDataGridView.AllowUserToDeleteRows = false;
- dataGridViewCellStyle9.BackColor = System.Drawing.Color.MintCream;
- this.produkcjaDataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.MintCream;
+ this.produkcjaDataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.produkcjaDataGridView.AutoGenerateColumns = false;
this.produkcjaDataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
@@ -393,6 +401,6 @@
this.NAZWA_ZAMOWIENIA.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.NAZWA_ZAMOWIENIA.DataPropertyName = "NAZWA_ZAMOWIENIA";
- dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.NAZWA_ZAMOWIENIA.DefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.NAZWA_ZAMOWIENIA.DefaultCellStyle = dataGridViewCellStyle2;
this.NAZWA_ZAMOWIENIA.HeaderText = "Sym. zam.";
this.NAZWA_ZAMOWIENIA.Name = "NAZWA_ZAMOWIENIA";
@@ -418,8 +426,8 @@
this.zAMAWIAMNADataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.zAMAWIAMNADataGridViewTextBoxColumn.DataPropertyName = "ZAMAWIAM_NA";
- dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- dataGridViewCellStyle11.Format = "d";
- dataGridViewCellStyle11.NullValue = null;
- this.zAMAWIAMNADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ dataGridViewCellStyle3.Format = "d";
+ dataGridViewCellStyle3.NullValue = null;
+ this.zAMAWIAMNADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
this.zAMAWIAMNADataGridViewTextBoxColumn.HeaderText = "Na kiedy";
this.zAMAWIAMNADataGridViewTextBoxColumn.Name = "zAMAWIAMNADataGridViewTextBoxColumn";
@@ -452,6 +460,6 @@
//
this.dATAAGENTDataGridViewTextBoxColumn.DataPropertyName = "DATA_AGENT";
- dataGridViewCellStyle12.Format = "g";
- this.dATAAGENTDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle12;
+ dataGridViewCellStyle4.Format = "g";
+ this.dATAAGENTDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
this.dATAAGENTDataGridViewTextBoxColumn.FillWeight = 47.9073F;
this.dATAAGENTDataGridViewTextBoxColumn.HeaderText = "Data";
@@ -475,6 +483,6 @@
//
this.dATAPRODUKCJADataGridViewTextBoxColumn.DataPropertyName = "DATA_PRODUKCJA";
- dataGridViewCellStyle13.Format = "g";
- this.dATAPRODUKCJADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle13;
+ dataGridViewCellStyle5.Format = "g";
+ this.dATAPRODUKCJADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5;
this.dATAPRODUKCJADataGridViewTextBoxColumn.FillWeight = 47.9073F;
this.dATAPRODUKCJADataGridViewTextBoxColumn.HeaderText = "Data";
@@ -505,6 +513,6 @@
//
this.dATAAKCEPTACJIDataGridViewTextBoxColumn.DataPropertyName = "DATA_DTP_PO_KOR";
- dataGridViewCellStyle14.Format = "g";
- this.dATAAKCEPTACJIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle14;
+ dataGridViewCellStyle6.Format = "g";
+ this.dATAAKCEPTACJIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6;
this.dATAAKCEPTACJIDataGridViewTextBoxColumn.FillWeight = 47.9073F;
this.dATAAKCEPTACJIDataGridViewTextBoxColumn.HeaderText = "Data";
@@ -1054,12 +1062,12 @@
this.spisPlikowDataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.spisPlikowDataGridView.BackgroundColor = System.Drawing.Color.White;
- dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.spisPlikowDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
+ dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.spisPlikowDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
this.spisPlikowDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.spisPlikowDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1201,6 +1209,6 @@
//
this.strona_zlecenie.DataPropertyName = "strona_zlecenie";
- dataGridViewCellStyle16.BackColor = System.Drawing.Color.Azure;
- this.strona_zlecenie.DefaultCellStyle = dataGridViewCellStyle16;
+ dataGridViewCellStyle8.BackColor = System.Drawing.Color.Azure;
+ this.strona_zlecenie.DefaultCellStyle = dataGridViewCellStyle8;
this.strona_zlecenie.HeaderText = "Strona zapisana";
this.strona_zlecenie.Name = "strona_zlecenie";
@@ -1896,4 +1904,6 @@
this.toolStripLabel6,
this.adNameTxt,
+ this.toolStripLabel7,
+ this.agentListCombo,
this.productionSearchBtn,
this.toolStripSeparator10,
@@ -1902,8 +1912,11 @@
this.productionRefreshBtn,
this.toolStripSeparator12,
+ this.productionDetails,
+ this.adDetailsBtn,
this.clientDetailsBtn,
- this.adDetailsBtn,
- this.productionDetails,
- this.toolStripSeparator13});
+ this.toolStripSeparator13,
+ this.toProductionBtn,
+ this.readyBtn,
+ this.returnBtn});
this.toolStrip2.Location = new System.Drawing.Point(0, 0);
this.toolStrip2.Name = "toolStrip2";
@@ -1944,4 +1957,18 @@
this.adNameTxt.Size = new System.Drawing.Size(100, 25);
//
+ // toolStripLabel7
+ //
+ this.toolStripLabel7.Name = "toolStripLabel7";
+ this.toolStripLabel7.Size = new System.Drawing.Size(40, 22);
+ this.toolStripLabel7.Text = "Agent:";
+ this.toolStripLabel7.Visible = false;
+ //
+ // agentListCombo
+ //
+ this.agentListCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.agentListCombo.Name = "agentListCombo";
+ this.agentListCombo.Size = new System.Drawing.Size(121, 25);
+ this.agentListCombo.Visible = false;
+ //
// productionSearchBtn
//
@@ -1989,4 +2016,24 @@
this.toolStripSeparator12.Size = new System.Drawing.Size(6, 25);
//
+ // productionDetails
+ //
+ this.productionDetails.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.productionDetails.Image = ((System.Drawing.Image)(resources.GetObject("productionDetails.Image")));
+ this.productionDetails.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.productionDetails.Name = "productionDetails";
+ this.productionDetails.Size = new System.Drawing.Size(23, 22);
+ this.productionDetails.Text = "Projekt";
+ this.productionDetails.Click += new System.EventHandler(this.productionDetails_Click);
+ //
+ // adDetailsBtn
+ //
+ this.adDetailsBtn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.adDetailsBtn.Image = ((System.Drawing.Image)(resources.GetObject("adDetailsBtn.Image")));
+ this.adDetailsBtn.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.adDetailsBtn.Name = "adDetailsBtn";
+ this.adDetailsBtn.Size = new System.Drawing.Size(23, 22);
+ this.adDetailsBtn.Text = "Zamówienie";
+ this.adDetailsBtn.Click += new System.EventHandler(this.adDetailsBtn_Click);
+ //
// clientDetailsBtn
//
@@ -1999,28 +2046,38 @@
this.clientDetailsBtn.Click += new System.EventHandler(this.productionDetailsBtn_Click);
//
- // adDetailsBtn
- //
- this.adDetailsBtn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.adDetailsBtn.Image = ((System.Drawing.Image)(resources.GetObject("adDetailsBtn.Image")));
- this.adDetailsBtn.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.adDetailsBtn.Name = "adDetailsBtn";
- this.adDetailsBtn.Size = new System.Drawing.Size(23, 22);
- this.adDetailsBtn.Text = "Zamówienie";
- this.adDetailsBtn.Click += new System.EventHandler(this.adDetailsBtn_Click);
- //
- // productionDetails
- //
- this.productionDetails.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.productionDetails.Image = ((System.Drawing.Image)(resources.GetObject("productionDetails.Image")));
- this.productionDetails.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.productionDetails.Name = "productionDetails";
- this.productionDetails.Size = new System.Drawing.Size(23, 22);
- this.productionDetails.Text = "Projekt";
- this.productionDetails.Click += new System.EventHandler(this.productionDetails_Click);
- //
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(6, 25);
+ //
+ // toProductionBtn
+ //
+ this.toProductionBtn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toProductionBtn.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toProductionBtn.Name = "toProductionBtn";
+ this.toProductionBtn.Size = new System.Drawing.Size(109, 22);
+ this.toProductionBtn.Text = "Przejmij do produkcji";
+ this.toProductionBtn.Click += new System.EventHandler(this.toProduction_Click);
+ //
+ // readyBtn
+ //
+ this.readyBtn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.readyBtn.Image = ((System.Drawing.Image)(resources.GetObject("readyBtn.Image")));
+ this.readyBtn.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.readyBtn.Name = "readyBtn";
+ this.readyBtn.Size = new System.Drawing.Size(48, 22);
+ this.readyBtn.Text = "Gotowy";
+ this.readyBtn.Click += new System.EventHandler(this.readyBtn_Click);
+ //
+ // returnBtn
+ //
+ this.returnBtn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.returnBtn.Image = ((System.Drawing.Image)(resources.GetObject("returnBtn.Image")));
+ this.returnBtn.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.returnBtn.Name = "returnBtn";
+ this.returnBtn.Size = new System.Drawing.Size(39, 22);
+ this.returnBtn.Text = "Zwrot";
+ this.returnBtn.Visible = false;
+ this.returnBtn.Click += new System.EventHandler(this.returnBtn_Click);
//
// dgvOgloszenia
@@ -2033,8 +2090,11 @@
this.Id,
this.Content,
+ this.SellAgent,
+ this.ProductionAgent,
+ this.ProductionDate,
this.AcceptanceDate,
- this.ProductionDate,
- this.SellAgent,
- this.ProductionAgent});
+ this.ReturnDate,
+ this.AdId,
+ this.CustomerId});
this.dgvOgloszenia.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvOgloszenia.Location = new System.Drawing.Point(0, 0);
@@ -2042,4 +2102,5 @@
this.dgvOgloszenia.Size = new System.Drawing.Size(1000, 579);
this.dgvOgloszenia.TabIndex = 2;
+ this.dgvOgloszenia.SelectionChanged += new System.EventHandler(this.dgvOgloszenia_SelectionChanged);
//
// AdName
@@ -2074,4 +2135,22 @@
this.Content.Name = "Content";
//
+ // SellAgent
+ //
+ this.SellAgent.DataPropertyName = "SellAgent";
+ this.SellAgent.HeaderText = "Agent reklamy";
+ this.SellAgent.Name = "SellAgent";
+ //
+ // ProductionAgent
+ //
+ this.ProductionAgent.DataPropertyName = "ProductionAgent";
+ this.ProductionAgent.HeaderText = "Agent produkcji";
+ this.ProductionAgent.Name = "ProductionAgent";
+ //
+ // ProductionDate
+ //
+ this.ProductionDate.DataPropertyName = "ProductionDate";
+ this.ProductionDate.HeaderText = "Data produkcji";
+ this.ProductionDate.Name = "ProductionDate";
+ //
// AcceptanceDate
//
@@ -2080,21 +2159,24 @@
this.AcceptanceDate.Name = "AcceptanceDate";
//
- // ProductionDate
- //
- this.ProductionDate.DataPropertyName = "ProductionDate";
- this.ProductionDate.HeaderText = "Data produkcji";
- this.ProductionDate.Name = "ProductionDate";
- //
- // SellAgent
- //
- this.SellAgent.DataPropertyName = "SellAgent";
- this.SellAgent.HeaderText = "Agent reklamy";
- this.SellAgent.Name = "SellAgent";
- //
- // ProductionAgent
- //
- this.ProductionAgent.DataPropertyName = "ProductionAgent";
- this.ProductionAgent.HeaderText = "Agent produkcji";
- this.ProductionAgent.Name = "ProductionAgent";
+ // ReturnDate
+ //
+ this.ReturnDate.DataPropertyName = "ReturnDate";
+ this.ReturnDate.HeaderText = "Data zwrotu";
+ this.ReturnDate.Name = "ReturnDate";
+ this.ReturnDate.Visible = false;
+ //
+ // AdId
+ //
+ this.AdId.DataPropertyName = "AdId";
+ this.AdId.HeaderText = "AdId";
+ this.AdId.Name = "AdId";
+ this.AdId.Visible = false;
+ //
+ // CustomerId
+ //
+ this.CustomerId.DataPropertyName = "CustomerId";
+ this.CustomerId.HeaderText = "CustomerId";
+ this.CustomerId.Name = "CustomerId";
+ this.CustomerId.Visible = false;
//
// aGENCJEBindingSource
@@ -2414,4 +2496,9 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
private System.Windows.Forms.DataGridView dgvOgloszenia;
+ private System.Windows.Forms.ToolStripButton toProductionBtn;
+ private System.Windows.Forms.ToolStripButton readyBtn;
+ private System.Windows.Forms.ToolStripLabel toolStripLabel7;
+ private System.Windows.Forms.ToolStripComboBox agentListCombo;
+ private System.Windows.Forms.ToolStripButton returnBtn;
private System.Windows.Forms.DataGridViewTextBoxColumn AdName;
private System.Windows.Forms.DataGridViewTextBoxColumn Status;
@@ -2419,8 +2506,11 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Id;
private System.Windows.Forms.DataGridViewTextBoxColumn Content;
- private System.Windows.Forms.DataGridViewTextBoxColumn AcceptanceDate;
- private System.Windows.Forms.DataGridViewTextBoxColumn ProductionDate;
private System.Windows.Forms.DataGridViewTextBoxColumn SellAgent;
private System.Windows.Forms.DataGridViewTextBoxColumn ProductionAgent;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ProductionDate;
+ private System.Windows.Forms.DataGridViewTextBoxColumn AcceptanceDate;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ReturnDate;
+ private System.Windows.Forms.DataGridViewTextBoxColumn AdId;
+ private System.Windows.Forms.DataGridViewTextBoxColumn CustomerId;
}
}
Index: trunk/BazaReklam/app.config
===================================================================
--- trunk/BazaReklam/app.config (revision 822)
+++ trunk/BazaReklam/app.config (revision 824)
@@ -8,5 +8,5 @@
-
Index: trunk/BazaReklam/Properties/AssemblyInfo.cs
===================================================================
--- trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 820)
+++ trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 824)
@@ -30,3 +30,3 @@
//
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.1.26")]
+[assembly: AssemblyFileVersion("1.1.28")]
Index: trunk/BazaReklam/ProductionForm.cs
===================================================================
--- trunk/BazaReklam/ProductionForm.cs (revision 822)
+++ trunk/BazaReklam/ProductionForm.cs (revision 824)
@@ -18,4 +18,10 @@
public partial class ProductionForm : Form, IForm
{
+ private const string IN_PRODUCTION = "W PRODUKCJI";
+ private const string DONE = "GOTOWY";
+ private const string NEW = "NOWY";
+ private const string BACK_TO_AGENT = "ZWROT";
+
+
//Nr wydañ wg których generowane s¹ listy do klientów
private static ProductionForm productionForm;
@@ -33,4 +39,14 @@
private SqlDataAdapter sqlDataAdapter;
private string tyt;
+
+ protected Production CurrentProduction
+ {
+ get
+ {
+ if (dgvOgloszenia.CurrentRow == null) return null;
+
+ return (Production)dgvOgloszenia.CurrentRow.DataBoundItem;
+ }
+ }
private ProductionForm(Form parent)
@@ -1092,5 +1108,5 @@
if (User.Instance().IsDtp)
{
- str = "select * from dbo.PRODUKCJA where [Type]=1 AND STAN='DO DTP' OR STAN='W DTP' OR STAN='PO KOREKCIE' OR STAN='ZAMAWIAM'";
+ str = "SELECT * FROM dbo.PRODUKCJA WHERE ([Type]=1 AND STAN='DO DTP') OR ([Type]=1 AND STAN='W DTP') OR ([Type]=1 AND STAN='PO KOREKCIE') OR ([Type]=1 AND STAN='ZAMAWIAM')";
return str;
}
@@ -1369,5 +1385,5 @@
{
ProductionRepository repository = new ProductionRepository();
- dgvOgloszenia.DataSource = repository.FindAllToDo();
+ dgvOgloszenia.DataSource = repository.FindAllToDo(User.Instance().Login);
}
@@ -1387,4 +1403,10 @@
}
+ private static void UpdateOgloszenie(Production entity)
+ {
+ ProductionRepository repository = new ProductionRepository();
+ repository.Save(entity);
+ }
+
private void productionSearchBtn_Click(object sender, EventArgs e)
{
@@ -1396,4 +1418,5 @@
productionStatusCombo.SelectedIndex = -1;
adNameTxt.Text = string.Empty;
+ agentListCombo.SelectedIndex = -1;
}
@@ -1405,8 +1428,7 @@
private void productionDetailsBtn_Click(object sender, EventArgs e)
{
- if (dgvOgloszenia.CurrentRow == null) return;
-
- Production production = (Production)dgvOgloszenia.CurrentRow.DataBoundItem;
- ClientsForm.getClientsForm((MDIBazaReklam)MdiParent).pokazKlienta(production.CustomerId);
+ if (CurrentProduction == null) return;
+
+ ClientsForm.getClientsForm((MDIBazaReklam)MdiParent).pokazKlienta(CurrentProduction.CustomerId);
Hide();
ClientsForm.getClientsForm((MDIBazaReklam)MdiParent).Show();
@@ -1415,8 +1437,7 @@
private void productionDetails_Click(object sender, EventArgs e)
{
- if (dgvOgloszenia.CurrentRow == null) return;
-
- Production production = (Production)dgvOgloszenia.CurrentRow.DataBoundItem;
- ProjectForm projectForm = new ProjectForm(production.AdId, production.Id);
+ if (CurrentProduction == null) return;
+
+ ProjectForm projectForm = new ProjectForm(CurrentProduction.AdId, CurrentProduction.Id);
if (projectForm.ShowDialog() == DialogResult.OK)
{
@@ -1427,9 +1448,71 @@
private void adDetailsBtn_Click(object sender, EventArgs e)
{
- if (dgvOgloszenia.CurrentRow == null) return;
-
- Production production = (Production)dgvOgloszenia.CurrentRow.DataBoundItem;
- OrderDetails.getOrderDetails().PokazSzczegolyZamowienia(production.AdId);
+ if (CurrentProduction == null) return;
+
+ OrderDetails.getOrderDetails().PokazSzczegolyZamowienia(CurrentProduction.AdId);
OrderDetails.getOrderDetails().ShowDialog();
+ }
+
+ private void toProduction_Click(object sender, EventArgs e)
+ {
+ if (CurrentProduction == null) return;
+
+ ProductionRepository repository = new ProductionRepository();
+ Production production = repository.Find(CurrentProduction.Id);
+ if (production.ProductionDate != DateTime.MinValue)
+ {
+ MessageBox.Show("Og³oszenie ju¿ zosta³o przejête do produckji.\nProszê odwie¿yæ widok.",
+ "Baza Reklam - produkcja og³oszeñ");
+ return;
+ }
+
+ CurrentProduction.Status = IN_PRODUCTION;
+ CurrentProduction.ProductionDate = DateTime.Now;
+ CurrentProduction.ProductionAgent = User.Instance().Login;
+
+ UpdateOgloszenie(CurrentProduction);
+
+ SearchOgloszenia();
+ }
+
+ private void dgvOgloszenia_SelectionChanged(object sender, EventArgs e)
+ {
+ if (CurrentProduction == null) return;
+
+ toProductionBtn.Enabled = CurrentProduction.ProductionDate == DateTime.MinValue && User.Instance().IsProdukcja;
+
+ readyBtn.Enabled = CurrentProduction.ProductionDate != DateTime.MinValue
+ && CurrentProduction.AcceptanceDate == DateTime.MinValue
+ && User.Instance().IsProdukcja;
+
+ returnBtn.Enabled = CurrentProduction.ProductionDate != DateTime.MinValue
+ && CurrentProduction.AcceptanceDate == DateTime.MinValue
+ && CurrentProduction.ReturnDate == DateTime.MinValue
+ && User.Instance().IsProdukcja;
+ }
+
+ private void readyBtn_Click(object sender, EventArgs e)
+ {
+ if (CurrentProduction == null) return;
+
+ CurrentProduction.Status = DONE;
+ CurrentProduction.AcceptanceDate = DateTime.Now;
+
+ UpdateOgloszenie(CurrentProduction);
+
+ SearchOgloszenia();
+
+ }
+
+ private void returnBtn_Click(object sender, EventArgs e)
+ {
+ if (CurrentProduction == null) return;
+
+ CurrentProduction.Status = BACK_TO_AGENT;
+ CurrentProduction.ReturnDate = DateTime.Now;
+
+ UpdateOgloszenie(CurrentProduction);
+
+ SearchOgloszenia();
}
}