update 20240812

This commit is contained in:
Stefan Hutter
2024-08-12 16:35:06 +02:00
parent 43c44e0aad
commit fc8811829d
7922 changed files with 205978 additions and 91947 deletions

View File

@@ -33,6 +33,7 @@
this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton();
this.btnDokumenterstellen = new Syncfusion.WinForms.Controls.SfButton();
this.PnlPreview = new System.Windows.Forms.Panel();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.GrpFnkt = new System.Windows.Forms.GroupBox();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
@@ -46,7 +47,6 @@
this.lbledit = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.ucAllgemeineDokumentParam1 = new OnDoc.UIControls.UCAllgemeineDokumentParam();
this.PnlPreview.SuspendLayout();
this.GrpFnkt.SuspendLayout();
@@ -82,6 +82,14 @@
this.PnlPreview.TabIndex = 19;
this.PnlPreview.Visible = false;
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 123);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(668, 292);
this.docPreview1.TabIndex = 1;
//
// GrpFnkt
//
this.GrpFnkt.BackColor = System.Drawing.Color.SeaShell;
@@ -125,7 +133,7 @@
//
// button5
//
this.button5.Image = ((System.Drawing.Image)(resources.GetObject("button5.Image")));
this.button5.Image = global::OnDoc.Properties.Resources.Versandstrasse_48x48_32;
this.button5.Location = new System.Drawing.Point(338, 15);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(75, 81);
@@ -223,14 +231,6 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 123);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(668, 292);
this.docPreview1.TabIndex = 1;
//
// ucAllgemeineDokumentParam1
//
this.ucAllgemeineDokumentParam1.checkpartner = true;

View File

@@ -118,68 +118,6 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="button5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
DQ0zS3vVPkEAAAAASUVORK5CYII=
</value>
</data>
<data name="button4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAADSdJREFUaEPV

View File

@@ -60,6 +60,7 @@
this.lblBezeichnung = new System.Windows.Forms.Label();
this.txtbezeichnung = new System.Windows.Forms.TextBox();
this.GrpEmpfaenger = new System.Windows.Forms.GroupBox();
this.sfDataGridEmpfaenger = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.GridEmpfänger = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.ribbon1 = new System.Windows.Forms.Ribbon();
@@ -74,7 +75,6 @@
this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonEditWord = new System.Windows.Forms.RibbonButton();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.sfDataGridEmpfaenger = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.GrpDokumentInhalt.SuspendLayout();
this.groupBox8.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxteam)).BeginInit();
@@ -87,9 +87,9 @@
((System.ComponentModel.ISupportInitialize)(this.cbboxverantwortlich)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxpostzustellung)).BeginInit();
this.GrpEmpfaenger.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.sfDataGridEmpfaenger)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.GridEmpfänger)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.sfDataGridEmpfaenger)).BeginInit();
this.SuspendLayout();
//
// GrpDokumentInhalt
@@ -377,6 +377,16 @@
this.GrpEmpfaenger.TabStop = false;
this.GrpEmpfaenger.Text = "Empfänger";
//
// sfDataGridEmpfaenger
//
this.sfDataGridEmpfaenger.AccessibleName = "Table";
this.sfDataGridEmpfaenger.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfDataGridEmpfaenger.Location = new System.Drawing.Point(233, 16);
this.sfDataGridEmpfaenger.Name = "sfDataGridEmpfaenger";
this.sfDataGridEmpfaenger.Size = new System.Drawing.Size(870, 579);
this.sfDataGridEmpfaenger.TabIndex = 4;
this.sfDataGridEmpfaenger.Text = "sfDataGrid1";
//
// treeViewAdv1
//
treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1;
@@ -538,6 +548,7 @@
this.RibbonButtonNew.Name = "RibbonButtonNew";
this.RibbonButtonNew.SmallImage = global::OnDoc.Properties.Resources.NewSerienbrief_16x16_32;
this.RibbonButtonNew.Text = "Neu";
this.RibbonButtonNew.Click += new System.EventHandler(this.RibbonButtonNew_Click);
//
// RibbonButtonOpen
//
@@ -586,16 +597,6 @@
//
this.openFileDialog1.FileName = "openFileDialog1";
//
// sfDataGridEmpfaenger
//
this.sfDataGridEmpfaenger.AccessibleName = "Table";
this.sfDataGridEmpfaenger.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfDataGridEmpfaenger.Location = new System.Drawing.Point(233, 16);
this.sfDataGridEmpfaenger.Name = "sfDataGridEmpfaenger";
this.sfDataGridEmpfaenger.Size = new System.Drawing.Size(870, 579);
this.sfDataGridEmpfaenger.TabIndex = 4;
this.sfDataGridEmpfaenger.Text = "sfDataGrid1";
//
// Serienbrief
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -626,9 +627,9 @@
((System.ComponentModel.ISupportInitialize)(this.cbboxverantwortlich)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxpostzustellung)).EndInit();
this.GrpEmpfaenger.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.sfDataGridEmpfaenger)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.GridEmpfänger)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.sfDataGridEmpfaenger)).EndInit();
this.ResumeLayout(false);
}

View File

@@ -8,7 +8,9 @@ using System.Runtime.Remoting.Messaging;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Database;
using OnDoc.Klassen;
using OnDoc.UIControls.Administrator;
using Syncfusion.Windows.Forms.Tools;
using Syncfusion.WinForms.Controls;
using Syncfusion.WinForms.DataGrid;
@@ -18,6 +20,8 @@ namespace OnDoc.UIControls
{
public partial class Serienbrief : SfForm
{
private int dokumenttypnr = 0;
private int profilnr = 0;
public Serienbrief()
{
InitializeComponent();
@@ -25,11 +29,58 @@ namespace OnDoc.UIControls
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
}
private void Serienbrief_Load(object sender, EventArgs e)
public Serienbrief(int profilnr)
{
InitializeComponent();
this.Style.TitleBar.BackColor = Theaming.Titelbar();
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
this.profilnr = profilnr;
}
private void Serienbrief_Load(object sender, EventArgs e)
{
Refresh_Lists();
Refresh_Team();
}
private void Refresh_Lists()
{DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select nreintrag, bezeichnung from Postzustellung where aktiv=1 order by bezeichnung", false, true);
cbboxpostzustellung.DataSource = db.dsdaten.Tables[0];
cbboxpostzustellung.ValueMember = "nreintrag";
cbboxpostzustellung.DisplayMember = "bezeichnung";
db.clear_parameter();
db.Get_Tabledata("SP_Dokumentbearbeitung_Mitarbeiter", true, false);
cbboxzustaendigmitarbeiter.DataSource = db.dsdaten.Tables[0];
cbboxzustaendigmitarbeiter.DisplayMember = "name";
cbboxzustaendigmitarbeiter.ValueMember = "mitarbeiternr";
cbboxzustaendigmitarbeiter.SelectedValue = AppParams.CurrentMitarbieter;
cbboxunterschriftlinks.DataSource = db.dsdaten.Tables[0];
cbboxunterschriftlinks.DisplayMember = "name";
cbboxunterschriftlinks.ValueMember = "mitarbeiternr";
cbboxunterschriftrechts.DataSource = db.dsdaten.Tables[0];
cbboxunterschriftrechts.DisplayMember = "name";
cbboxunterschriftrechts.ValueMember = "mitarbeiternr";
cbboxverantwortlich.DataSource = db.dsdaten.Tables[0];
cbboxverantwortlich.DisplayMember = "name";
cbboxverantwortlich.ValueMember = "mitarbeiternr";
cbboxverantwortlich.SelectedValue = AppParams.CurrentMitarbieter;}
private void Refresh_Team()
{
DB dbteam = new DB(AppParams.connectionstring);
dbteam.clear_parameter();
dbteam.add_parameter("@profilnr", profilnr.ToString());
dbteam.add_parameter("@mitarbeiternr", cbboxzustaendigmitarbeiter.SelectedValue.ToString());
dbteam.Get_Tabledata("sp_dokumentbearbeitung_team", true, false);
cbboxteam.DataSource = null;
cbboxteam.DataSource = dbteam.dsdaten.Tables[0];
cbboxteam.ValueMember = "teamnr";
cbboxteam.DisplayMember = "bezeichnung";
}
private void RibbonButtonExit_Click(object sender, EventArgs e)
{
this.Close();
@@ -70,7 +121,19 @@ namespace OnDoc.UIControls
importdata.Columns.Clear();
return;
}
sfDataGridEmpfaenger.DataSource = importdata;
}
}
private void RibbonButtonNew_Click(object sender, EventArgs e)
{
OnDoc.DocMgmt.DokTypSelect DokTypSelect = new OnDoc.DocMgmt.DokTypSelect();
DokTypSelect.ShowDialog(this);
if (DokTypSelect.DialogResult == DialogResult.OK)
{
dokumenttypnr = DokTypSelect.dokumenttypnr;
}
else { return; }
}
}
}