shu/OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update 20241229

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-29 23:03:57 +01:00
parent 4455cca85a
commit 2feaf6cc29
140 changed files with 12447 additions and 556552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Client/UIControls/Administrator/Dokumenttyp.Designer.cs generated
View File

@@ -100,6 +100,7 @@
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.tsbtnsave = new System.Windows.Forms.ToolStripButton();
this.grpVorlagenfeld = new System.Windows.Forms.GroupBox();
this.btnSaveVorlagenfeld = new System.Windows.Forms.Button();
this.chkaktiv = new System.Windows.Forms.CheckBox();
this.label14 = new System.Windows.Forms.Label();
this.lblFeldregel = new System.Windows.Forms.TextBox();
@@ -144,7 +145,6 @@
this.label16 = new System.Windows.Forms.Label();
this.rbNr = new System.Windows.Forms.RadioButton();
this.label15 = new System.Windows.Forms.Label();
this.btnSaveVorlagenfeld = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
this.tabControlAdv1.SuspendLayout();
this.tabPageAdv1.SuspendLayout();
@@ -178,7 +178,6 @@
//
// tabControlAdv1
//
this.tabControlAdv1.BeforeTouchSize = new System.Drawing.Size(1019, 760);
this.tabControlAdv1.Controls.Add(this.tabPageAdv1);
this.tabControlAdv1.Controls.Add(this.tabPageAdv2);
this.tabControlAdv1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -204,7 +203,6 @@
this.tabPageAdv1.Name = "tabPageAdv1";
this.tabPageAdv1.ShowCloseButton = true;
this.tabPageAdv1.Size = new System.Drawing.Size(1016, 733);
this.tabPageAdv1.TabIndex = 1;
this.tabPageAdv1.Text = "Allgemein";
this.tabPageAdv1.ThemesEnabled = false;
//
@@ -325,7 +323,7 @@
//
this.cbUnterschriftrechts.Location = new System.Drawing.Point(130, 28);
this.cbUnterschriftrechts.Name = "cbUnterschriftrechts";
this.cbUnterschriftrechts.Size = new System.Drawing.Size(114, 24);
this.cbUnterschriftrechts.Size = new System.Drawing.Size(150, 24);
this.cbUnterschriftrechts.TabIndex = 6;
this.cbUnterschriftrechts.Text = "Unterschrift rechts";
//
@@ -846,7 +844,6 @@
this.tabPageAdv2.Name = "tabPageAdv2";
this.tabPageAdv2.ShowCloseButton = true;
this.tabPageAdv2.Size = new System.Drawing.Size(1016, 733);
this.tabPageAdv2.TabIndex = 2;
this.tabPageAdv2.Text = "Voralgenfelder";
this.tabPageAdv2.ThemesEnabled = false;
//
@@ -986,6 +983,16 @@
this.grpVorlagenfeld.TabStop = false;
this.grpVorlagenfeld.Text = "Vorlagenfeld";
//
// btnSaveVorlagenfeld
//
this.btnSaveVorlagenfeld.Location = new System.Drawing.Point(21, 622);
this.btnSaveVorlagenfeld.Name = "btnSaveVorlagenfeld";
this.btnSaveVorlagenfeld.Size = new System.Drawing.Size(248, 23);
this.btnSaveVorlagenfeld.TabIndex = 36;
this.btnSaveVorlagenfeld.Text = "Speichern";
this.btnSaveVorlagenfeld.UseVisualStyleBackColor = true;
this.btnSaveVorlagenfeld.Click += new System.EventHandler(this.btnSaveVorlagenfeld_Click);
//
// chkaktiv
//
this.chkaktiv.AutoSize = true;
@@ -1446,16 +1453,6 @@
this.label15.TabIndex = 7;
this.label15.Text = "Sort";
//
// btnSaveVorlagenfeld
//
this.btnSaveVorlagenfeld.Location = new System.Drawing.Point(21, 622);
this.btnSaveVorlagenfeld.Name = "btnSaveVorlagenfeld";
this.btnSaveVorlagenfeld.Size = new System.Drawing.Size(248, 23);
this.btnSaveVorlagenfeld.TabIndex = 36;
this.btnSaveVorlagenfeld.Text = "Speichern";
this.btnSaveVorlagenfeld.UseVisualStyleBackColor = true;
this.btnSaveVorlagenfeld.Click += new System.EventHandler(this.btnSaveVorlagenfeld_Click);
//
// Dokumenttyp
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

6
Client/UIControls/DokList.cs
View File

@@ -405,7 +405,7 @@ namespace OnDoc.UICintrols
DB db = new DB(AppParams.connectionstring);
try
{
if (db.Dok_in_Bearbeietung(3, selected_dokumentid, AppParams.CurrentMitarbieter) == false)
if (db.Dok_in_Bearbeitung(3, selected_dokumentid, AppParams.CurrentMitarbieter) == false)
{
MessageBox.Show("Das Dokument wird aktuell bearbeitet.", "Dokumentbearbeitung", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
@@ -426,7 +426,7 @@ namespace OnDoc.UICintrols
Logging.DocLog.Info("Verantwortung für Bearbeitung übernommen", "Doklist", selected_dokumentid, selected_partnernr, "Verantwortung übernommen");
}
}
db.Dok_in_Bearbeietung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
db.Dok_in_Bearbeitung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
}
catch { }
@@ -783,7 +783,7 @@ namespace OnDoc.UICintrols
return;
}
db.Dok_in_Bearbeietung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
db.Dok_in_Bearbeitung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
db = null;
clsProcessWatch.AddToList(selected_dokumentid, filename, "Word");
break;

52
Client/UIControls/UCAllgemeineDokumentParam.Designer.cs generated
View File

@@ -28,8 +28,8 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.GrpPartner = new System.Windows.Forms.GroupBox();
this.button1 = new System.Windows.Forms.Button();
this.btneditadresse = new System.Windows.Forms.Button();
this.btnweitereadressen = new System.Windows.Forms.Button();
this.txtanrede = new System.Windows.Forms.TextBox();
@@ -76,6 +76,9 @@
this.cbboxpostzustellung = new Syncfusion.WinForms.ListView.SfComboBox();
this.lblPostzustellung = new System.Windows.Forms.Label();
this.btnErneutGenerierung = new System.Windows.Forms.Button();
this.lblAnrede = new System.Windows.Forms.Label();
this.DateTerminText = new System.Windows.Forms.TextBox();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.GrpPartner.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout();
@@ -99,7 +102,7 @@
//
// GrpPartner
//
this.GrpPartner.Controls.Add(this.button1);
this.GrpPartner.Controls.Add(this.lblAnrede);
this.GrpPartner.Controls.Add(this.btneditadresse);
this.GrpPartner.Controls.Add(this.btnweitereadressen);
this.GrpPartner.Controls.Add(this.txtanrede);
@@ -116,15 +119,6 @@
this.GrpPartner.TabStop = false;
this.GrpPartner.Text = "Partner";
//
// button1
//
this.button1.Location = new System.Drawing.Point(490, 226);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 8;
this.button1.Text = "button1";
this.button1.UseVisualStyleBackColor = true;
//
// btneditadresse
//
this.btneditadresse.Image = global::OnDoc.Properties.Resources.EditDoc_16x16_32;
@@ -149,11 +143,10 @@
//
// txtanrede
//
this.txtanrede.Location = new System.Drawing.Point(298, 156);
this.txtanrede.Location = new System.Drawing.Point(298, 169);
this.txtanrede.Name = "txtanrede";
this.txtanrede.Size = new System.Drawing.Size(200, 20);
this.txtanrede.TabIndex = 6;
this.txtanrede.Text = "txtanrede";
//
// groupBox5
//
@@ -547,6 +540,7 @@
//
// groupBox9
//
this.groupBox9.Controls.Add(this.DateTerminText);
this.groupBox9.Controls.Add(this.DateTermin);
this.groupBox9.Controls.Add(this.lblTermin);
this.groupBox9.Controls.Add(this.DateDokumentDatum);
@@ -563,11 +557,13 @@
//
// DateTermin
//
this.DateTermin.Location = new System.Drawing.Point(398, 42);
this.DateTermin.DateTimeIcon = null;
this.DateTermin.Location = new System.Drawing.Point(476, 42);
this.DateTermin.Name = "DateTermin";
this.DateTermin.Size = new System.Drawing.Size(107, 21);
this.DateTermin.Size = new System.Drawing.Size(29, 21);
this.DateTermin.TabIndex = 5;
this.DateTermin.ToolTipText = "";
this.DateTermin.ValueChanged += new Syncfusion.WinForms.Input.Events.DateTimeValueChangedEventHandler(this.DateTermin_ValueChanged);
//
// lblTermin
//
@@ -580,6 +576,7 @@
//
// DateDokumentDatum
//
this.DateDokumentDatum.DateTimeIcon = null;
this.DateDokumentDatum.Location = new System.Drawing.Point(151, 44);
this.DateDokumentDatum.Name = "DateDokumentDatum";
this.DateDokumentDatum.Size = new System.Drawing.Size(107, 21);
@@ -627,6 +624,27 @@
this.btnErneutGenerierung.Visible = false;
this.btnErneutGenerierung.Click += new System.EventHandler(this.btnErneutGenerierung_Click);
//
// lblAnrede
//
this.lblAnrede.AutoSize = true;
this.lblAnrede.Location = new System.Drawing.Point(298, 153);
this.lblAnrede.Name = "lblAnrede";
this.lblAnrede.Size = new System.Drawing.Size(151, 13);
this.lblAnrede.TabIndex = 8;
this.lblAnrede.Text = "Anrede (sofern nicht Standard)";
//
// DateTerminText
//
this.DateTerminText.Location = new System.Drawing.Point(406, 43);
this.DateTerminText.Name = "DateTerminText";
this.DateTerminText.Size = new System.Drawing.Size(69, 20);
this.DateTerminText.TabIndex = 6;
//
// contextMenuStrip1
//
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
//
// UCAllgemeineDokumentParam
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -723,7 +741,9 @@
private System.Windows.Forms.Button btnErneutGenerierung;
private System.Windows.Forms.Button btnweitereadressen;
private System.Windows.Forms.TextBox txtanrede;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button btneditadresse;
private System.Windows.Forms.Label lblAnrede;
private System.Windows.Forms.TextBox DateTerminText;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
}
}

23
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -165,17 +165,22 @@ namespace OnDoc.UIControls
{
this.lblTermin.Visible = true;
this.DateTermin.Visible = true;
this.DateTerminText.Visible = true;
this.DateTerminText.Text = "";
}
else
{
this.lblTermin.Visible = false;
this.DateTermin.Visible = false;
this.DateTerminText.Visible = false;
this.DateTermin.Value = new DateTime(1900, 01, 01);
}
db.Get_Tabledata("Select beschreibung from physischesarchiv where physischesarchivnr = " + dr["physisches_archiv"].ToString(), false, true);
barcode_zusatz = db.dsdaten.Tables[0].Rows[0][0].ToString();
if (barcode_zusatz != "") { barcode_zusatz = " / " + barcode_zusatz; }
if (barcode_zusatz != "") { barcode_zusatz = " " + barcode_zusatz; }
db.Get_Tabledata("Select office_vorlagenr,kopfzeile_generieren, bcpt,bcpl, bcw, bch, bchorizontal, barcodetype, datamatrixcontent from office_vorlage where office_vorlagenr="+dr["office_vorlagenr"].ToString(),false,true);
this.vorlagenr = Convert.ToInt32(dr["office_vorlagenr"]);
@@ -567,7 +572,14 @@ namespace OnDoc.UIControls
dokdata.barcode_textposition = AppParams.barcodetextposition;
dokdata.barcode_type = barcode_type;
dokdata.barcode_content = barcode_content;
dokdata.Termin = DateTermin.Value.ToString();
if (DateTerminText.Text == "")
{
dokdata.Termin = "01.01.1900";
}
else
{
dokdata.Termin = DateTermin.Value.ToString();
}
dokdata.Bezeichnung = txtbezeichnung.ToString();
dokdata.zustelladresse = docgendata.zustelladresse;
dokdata.anrede = docgendata.anrede;
@@ -586,7 +598,7 @@ namespace OnDoc.UIControls
if (ps.DialogResult == DialogResult.OK)
{
this.partnernr = ps.partnernr;
if (ps.bpperson_changed) { lblPartner.ForeColor = System.Drawing.Color.Red; } else { lblPartner.ForeColor = System.Drawing.Color.Black; }
if (ps.bpperson_changed) { lblPartner.ForeColor = System.Drawing.Color.Blue; } else { lblPartner.ForeColor = System.Drawing.Color.Black; }
update_partner();
}
}
@@ -798,5 +810,10 @@ namespace OnDoc.UIControls
}
catch { }
}
private void DateTermin_ValueChanged(object sender, Syncfusion.WinForms.Input.Events.DateTimeValueChangedEventArgs e)
{
this.DateTerminText.Text = DateTermin.Value.ToString().Substring(0,10);
}
}
}

3
Client/UIControls/UCAllgemeineDokumentParam.resx
View File

@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>