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

update 20241217

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-17 20:48:07 +01:00
parent 8f74cec1ab
commit 7e891afc23
108 changed files with 686 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Client/Client.csproj
View File

@@ -52,8 +52,7 @@
<StartupObject>OnDoc.Program</StartupObject>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>
</ApplicationIcon>
<ApplicationIcon>OnDoc6_Transparent.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup />
<ItemGroup>

6
Client/Diverses/SplashScreen.Designer.cs generated
View File

@@ -52,9 +52,9 @@
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(164, 304);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(122, 26);
this.label1.Size = new System.Drawing.Size(134, 26);
this.label1.TabIndex = 1;
this.label1.Text = "Version 0.8";
this.label1.Text = "Version 0.85";
//
// label2
//
@@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(203, 26);
this.label2.TabIndex = 2;
this.label2.Text = "13. Dezember 2024";
this.label2.Text = "15. Dezember 2024";
//
// SplashScreen
//

78
Client/Diverses/valueselector.Designer.cs generated
View File

@@ -30,7 +30,14 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(valueselector));
this.GridData = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.sfCalendar1 = new Syncfusion.WinForms.Input.SfCalendar();
this.panel1 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.button1 = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.GridData)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// GridData
@@ -50,11 +57,74 @@
this.GridData.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.GridData_CellClick);
this.GridData.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.GridData_CellDoubleClick);
//
// sfCalendar1
//
this.sfCalendar1.FirstDayOfWeek = System.DayOfWeek.Monday;
this.sfCalendar1.Location = new System.Drawing.Point(3, 3);
this.sfCalendar1.MinimumSize = new System.Drawing.Size(196, 196);
this.sfCalendar1.Name = "sfCalendar1";
this.sfCalendar1.ShowWeekNumbers = true;
this.sfCalendar1.Size = new System.Drawing.Size(357, 342);
this.sfCalendar1.TabIndex = 2;
this.sfCalendar1.Text = "sfCalendar1";
this.sfCalendar1.Click += new System.EventHandler(this.sfCalendar1_Click);
this.sfCalendar1.DoubleClick += new System.EventHandler(this.sfCalendar1_DoubleClick);
//
// panel1
//
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.panel2);
this.panel1.Controls.Add(this.sfCalendar1);
this.panel1.Location = new System.Drawing.Point(5, 5);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(363, 425);
this.panel1.TabIndex = 3;
//
// panel2
//
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel2.Location = new System.Drawing.Point(79, 351);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(32, 16);
this.panel2.TabIndex = 3;
this.panel2.Click += new System.EventHandler(this.panel2_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(118, 353);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(36, 13);
this.label1.TabIndex = 4;
this.label1.Text = "Heute";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(160, 353);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(35, 13);
this.label2.TabIndex = 5;
this.label2.Text = "label2";
//
// button1
//
this.button1.Location = new System.Drawing.Point(136, 390);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(86, 23);
this.button1.TabIndex = 6;
this.button1.Text = "übernehmen";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// valueselector
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(373, 450);
this.Controls.Add(this.panel1);
this.Controls.Add(this.GridData);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "valueselector";
@@ -63,6 +133,8 @@
this.Text = "Werte-Auwahl";
this.Load += new System.EventHandler(this.valueselector_Load);
((System.ComponentModel.ISupportInitialize)(this.GridData)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
}
@@ -70,5 +142,11 @@
#endregion
private Syncfusion.WinForms.DataGrid.SfDataGrid GridData;
private Syncfusion.WinForms.Input.SfCalendar sfCalendar1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button button1;
}
}

40
Client/Diverses/valueselector.cs
View File

@@ -18,15 +18,29 @@ namespace OnDoc.Diverses
public string partnernr { get; set; } = "";
public string datenherkunft { get; set; } = "";
public string selected_value { get; set; }
public string selected_value { get; set; }
public DateTime selected_datetime { get; set; } = DateTime.Now;
public valueselector()
{
InitializeComponent();
this.panel1.Visible = false;
this.GridData.Visible = true;
}
public valueselector(Boolean Showcalendar)
{
InitializeComponent();
this.panel1.Visible = true;
this.GridData.Visible = false;
label2.Text = DateTime.Now.ToString("dd.MM.yyyy");
}
private void valueselector_Load(object sender, EventArgs e)
{
this.SetDesktopLocation(Cursor.Position.X, Cursor.Position.Y);
this.sfCalendar1.SelectedDate = DateTime.Now;
}
public void load_data()
@@ -68,5 +82,29 @@ namespace OnDoc.Diverses
DialogResult = DialogResult.OK;
this.Close();
}
private void sfCalendar1_Click(object sender, EventArgs e)
{
this.selected_datetime = (DateTime)sfCalendar1.SelectedDate;
}
private void sfCalendar1_DoubleClick(object sender, EventArgs e)
{
sfCalendar1_Click(sender, e);
DialogResult = DialogResult.OK;
this.Close();
}
private void panel2_Click(object sender, EventArgs e)
{
sfCalendar1.SelectedDate = DateTime.Now;
sfCalendar1_DoubleClick(sender, e);
}
private void button1_Click(object sender, EventArgs e)
{
sfCalendar1_DoubleClick(sender, e);
}
}
}

17
Client/DocMgmt/DokTypSelect.Designer.cs generated
View File

@@ -65,6 +65,7 @@ namespace OnDoc.DocMgmt
this.neuerUnterordnerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.umbenennenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ordnerLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.detailsAnzeigenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.tsbtnNewRoot = new System.Windows.Forms.ToolStripButton();
@@ -202,6 +203,7 @@ namespace OnDoc.DocMgmt
//
// ribbonPanel5
//
this.ribbonPanel5.ButtonMoreVisible = false;
this.ribbonPanel5.Items.Add(this.RibbonButtonVorlagen);
this.ribbonPanel5.Name = "ribbonPanel5";
this.ribbonPanel5.Text = "Vorlagen";
@@ -318,7 +320,7 @@ namespace OnDoc.DocMgmt
this.zuFavoritenHinzufügenToolStripMenuItem,
this.detailsAnzeigenToolStripMenuItem});
this.contextMenuStripVorlagen.Name = "contextMenuStrip1";
this.contextMenuStripVorlagen.Size = new System.Drawing.Size(204, 92);
this.contextMenuStripVorlagen.Size = new System.Drawing.Size(204, 70);
this.contextMenuStripVorlagen.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
//
// ctxmenuerstellen
@@ -411,9 +413,10 @@ namespace OnDoc.DocMgmt
this.neuerOrdnerAufObesterEbeneToolStripMenuItem,
this.neuerUnterordnerToolStripMenuItem,
this.umbenennenToolStripMenuItem,
this.ordnerLöschenToolStripMenuItem});
this.ordnerLöschenToolStripMenuItem,
this.detailsAnzeigenToolStripMenuItem1});
this.contextMenuStripFavoriten.Name = "contextMenuStrip1";
this.contextMenuStripFavoriten.Size = new System.Drawing.Size(309, 92);
this.contextMenuStripFavoriten.Size = new System.Drawing.Size(309, 114);
//
// neuerOrdnerAufObesterEbeneToolStripMenuItem
//
@@ -443,6 +446,13 @@ namespace OnDoc.DocMgmt
this.ordnerLöschenToolStripMenuItem.Text = "Vorlage / Ordner mit Unterlementen löschen";
this.ordnerLöschenToolStripMenuItem.Click += new System.EventHandler(this.ordnerLöschenToolStripMenuItem_Click);
//
// detailsAnzeigenToolStripMenuItem1
//
this.detailsAnzeigenToolStripMenuItem1.Name = "detailsAnzeigenToolStripMenuItem1";
this.detailsAnzeigenToolStripMenuItem1.Size = new System.Drawing.Size(308, 22);
this.detailsAnzeigenToolStripMenuItem1.Text = "Details anzeigen";
this.detailsAnzeigenToolStripMenuItem1.Click += new System.EventHandler(this.detailsAnzeigenToolStripMenuItem1_Click);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.treeViewAdv2);
@@ -693,5 +703,6 @@ namespace OnDoc.DocMgmt
private System.Windows.Forms.ToolStripComboBox toolstripCombobox_Fachverantwortung;
private System.Windows.Forms.ToolStripButton toolStripButton4;
private System.Windows.Forms.ToolStripMenuItem detailsAnzeigenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem detailsAnzeigenToolStripMenuItem1;
}
}

35
Client/DocMgmt/DokTypSelect.cs
View File

@@ -83,10 +83,20 @@ namespace OnDoc.DocMgmt
}
if (this.favoriten) { Load_Favoriten(""); }
if (this.favoriten) {
RibbonButtonFavoriten.Checked = true;
RibbonButtonVorlagen.Checked = false;
RibbonButtonFavoriten_Click(sender, e);
treeViewAdv1.Visible = false;
//Load_Favoriten("");
}
else { load_standard(""); }
toolstriptextboxsearch.Focus();
RibbonButtonVorlagen.Checked = true;
RibbonButtonFavoriten.Checked = false;
treeViewAdv2.Visible = false;
favoriten = false;
treeViewAdv2_VisibleChanged(sender, e);
}
TreeNodeAdv[] nodestoexpand = new TreeNodeAdv[50];
@@ -418,6 +428,7 @@ namespace OnDoc.DocMgmt
try
{
dokumenttypnr = Convert.ToInt32(treeViewAdv1.SelectedNode.Tag);
if (dokumenttypnr < 0) { return; }
DialogResult = DialogResult.OK;
}
catch { }
@@ -429,6 +440,7 @@ namespace OnDoc.DocMgmt
{
System.Data.DataRow row = treeViewAdv1.SelectedNode.TagObject as System.Data.DataRow;
dokumenttypnr = Convert.ToInt32(row["id"]);
if (dokumenttypnr < 0) { return; }
DialogResult = DialogResult.OK;
}
catch { }
@@ -457,8 +469,10 @@ namespace OnDoc.DocMgmt
private void treeViewAdv2_VisibleChanged(object sender, EventArgs e)
{
toolStrip1.Visible = treeViewAdv2.Visible;
if (treeViewAdv2.Visible == false)
{
this.Width = treeViewAdv1.Width + 10;
}
else
@@ -522,6 +536,15 @@ namespace OnDoc.DocMgmt
}
}
public void New_Favoriten()
{
RibbonButtonVorlagen.Checked = false;
this.favoriten= true;
RibbonButtonVorlagen_Click(null, null);
RibbonButtonFavoriten_Click(null, null);
}
private void treeViewAdv1_VisibleChanged(object sender, EventArgs e)
{
treevisibility();
@@ -855,5 +878,13 @@ namespace OnDoc.DocMgmt
DokTypDetails dd = new DokTypDetails(dokumenttypnr);
dd.ShowDialog();
}
private void detailsAnzeigenToolStripMenuItem1_Click(object sender, EventArgs e)
{
System.Data.DataRow row = treeViewAdv2.SelectedNode.TagObject as System.Data.DataRow;
dokumenttypnr = Convert.ToInt32(row[6]);
DokTypDetails dd = new DokTypDetails(dokumenttypnr);
dd.ShowDialog();
}
}
}

2
Client/DocMgmt/DokTypSelect.resx
View File

@@ -284,7 +284,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAi
DAAAAk1TRnQBSQFMAgEBBgEAAbABAAGwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBBgEAAcABAAHAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

30
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -36,6 +36,7 @@ namespace OnDoc.DocMgmt
public bool interop { get; set; } = false;
public bool runmacros { get; set; } = false;
public string dokumentid = "";
public string filename { get; set; } = "";
public Dokumenterstellung()
{
@@ -107,6 +108,7 @@ namespace OnDoc.DocMgmt
}
public void Dokument_Erstellen()
{
this.filename = "";
if (ucAllgemeineDokumentParam1.check_fields()==false) {
MessageBox.Show(ucAllgemeineDokumentParam1.check_error,"Feldwerte",MessageBoxButtons.OK,MessageBoxIcon.Error);
return; };
@@ -143,7 +145,22 @@ namespace OnDoc.DocMgmt
interop = ucAllgemeineDokumentParam1.interop;
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten || ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
//Erstellung Office
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
{
string filename = AppParams.tempdir + dokumentid + "_Erstellt_." + dok.extension;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename);
db = null;
filename = AppParams.tempdir + dokumentid +"." + dok.extension;
this.filename = filename;
DocFunction = 6;
this.Close();
return;
}
//Bearbeiten
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
@@ -203,6 +220,17 @@ namespace OnDoc.DocMgmt
}
if (ucAllgemeineDokumentParam1.docgendata.versandstrasse_moeglich == false) { ribbonButtonVersandstrasse.Enabled = false; }
docPreview1.Show_Doc(dokumentid);
DB dB = new DB(AppParams.connectionstring);
dB.Get_Tabledata("Select * from dokument where dokumentid='"+dokumentid+"'",false,true);
if (Convert.ToBoolean(dB.dsdaten.Tables[0].Rows[0]["ToApprove"])==true && Convert.ToBoolean(dB.dsdaten.Tables[0].Rows[0]["approved"]) == false)
{
ribbonButtonArchiv.Enabled = false;
}
if (Convert.ToBoolean(dB.dsdaten.Tables[0].Rows[0]["bearbeitung_zwingend"]) == true)
{
ribbonButtonArchiv.Enabled = false;
}
dB = null;
docPreview1.Hide_Editbuttons();
}
}

114
Client/DocMgmt/Serienbrief.Designer.cs generated
View File

@@ -82,6 +82,11 @@
this.partnerLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.erneutGenerierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.ctxmenutree = new System.Windows.Forms.ContextMenuStrip(this.components);
this.partnerlistePrüfenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentgenerierungZurücksetzenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.druckstapelAufbereitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.archivierenUndAbschliessenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.GridEmpfänger = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.ribbon1 = new System.Windows.Forms.Ribbon();
this.ribbonTab1 = new System.Windows.Forms.RibbonTab();
@@ -115,14 +120,9 @@
this.panel1 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.panelLoad = new System.Windows.Forms.Panel();
this.label4 = new System.Windows.Forms.Label();
this.ctxmenutree = new System.Windows.Forms.ContextMenuStrip(this.components);
this.partnerlistePrüfenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentgenerierungZurücksetzenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.druckstapelAufbereitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.archivierenUndAbschliessenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.GrpDokumentInhalt.SuspendLayout();
this.groupBox1.SuspendLayout();
this.grpDruckstapel.SuspendLayout();
@@ -143,6 +143,7 @@
((System.ComponentModel.ISupportInitialize)(this.sfDataGridEmpfaenger)).BeginInit();
this.ctxmenuEmpfaenger.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit();
this.ctxmenutree.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.GridEmpfänger)).BeginInit();
this.pnlLoad.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.sfdatagridsbload)).BeginInit();
@@ -152,7 +153,6 @@
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.panelLoad.SuspendLayout();
this.ctxmenutree.SuspendLayout();
this.SuspendLayout();
//
// GrpDokumentInhalt
@@ -773,6 +773,45 @@
this.treeViewAdv1.ToolTipControl.Visible = true;
this.treeViewAdv1.AfterSelect += new System.EventHandler(this.treeViewAdv1_AfterSelect);
//
// ctxmenutree
//
this.ctxmenutree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.partnerlistePrüfenToolStripMenuItem,
this.dokumentgenerierungZurücksetzenToolStripMenuItem,
this.druckstapelAufbereitenToolStripMenuItem,
this.archivierenUndAbschliessenToolStripMenuItem});
this.ctxmenutree.Name = "ctxmenutree";
this.ctxmenutree.Size = new System.Drawing.Size(266, 92);
this.ctxmenutree.Opening += new System.ComponentModel.CancelEventHandler(this.ctxmenutree_Opening);
//
// partnerlistePrüfenToolStripMenuItem
//
this.partnerlistePrüfenToolStripMenuItem.Name = "partnerlistePrüfenToolStripMenuItem";
this.partnerlistePrüfenToolStripMenuItem.Size = new System.Drawing.Size(265, 22);
this.partnerlistePrüfenToolStripMenuItem.Text = "Partnerliste prüfen";
this.partnerlistePrüfenToolStripMenuItem.Click += new System.EventHandler(this.partnerlistePrüfenToolStripMenuItem_Click);
//
// dokumentgenerierungZurücksetzenToolStripMenuItem
//
this.dokumentgenerierungZurücksetzenToolStripMenuItem.Name = "dokumentgenerierungZurücksetzenToolStripMenuItem";
this.dokumentgenerierungZurücksetzenToolStripMenuItem.Size = new System.Drawing.Size(265, 22);
this.dokumentgenerierungZurücksetzenToolStripMenuItem.Text = "Dokumentgenerierung zurücksetzen";
this.dokumentgenerierungZurücksetzenToolStripMenuItem.Click += new System.EventHandler(this.dokumentgenerierungZurücksetzenToolStripMenuItem_Click);
//
// druckstapelAufbereitenToolStripMenuItem
//
this.druckstapelAufbereitenToolStripMenuItem.Name = "druckstapelAufbereitenToolStripMenuItem";
this.druckstapelAufbereitenToolStripMenuItem.Size = new System.Drawing.Size(265, 22);
this.druckstapelAufbereitenToolStripMenuItem.Text = "Druckstapel aufbereiten";
this.druckstapelAufbereitenToolStripMenuItem.Click += new System.EventHandler(this.druckstapelAufbereitenToolStripMenuItem_Click);
//
// archivierenUndAbschliessenToolStripMenuItem
//
this.archivierenUndAbschliessenToolStripMenuItem.Name = "archivierenUndAbschliessenToolStripMenuItem";
this.archivierenUndAbschliessenToolStripMenuItem.Size = new System.Drawing.Size(265, 22);
this.archivierenUndAbschliessenToolStripMenuItem.Text = "Archivieren und abschliessen";
this.archivierenUndAbschliessenToolStripMenuItem.Click += new System.EventHandler(this.archivierenUndAbschliessenToolStripMenuItem_Click);
//
// GridEmpfänger
//
this.GridEmpfänger.AccessibleName = "Table";
@@ -1105,11 +1144,20 @@
this.splitContainer1.SplitterDistance = 900;
this.splitContainer1.TabIndex = 5;
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(725, 598);
this.docPreview1.TabIndex = 4;
this.docPreview1.ZoomPercentage = 0;
//
// panelLoad
//
this.panelLoad.BackColor = System.Drawing.Color.Silver;
this.panelLoad.Controls.Add(this.label4);
this.panelLoad.Location = new System.Drawing.Point(466, 87);
this.panelLoad.Location = new System.Drawing.Point(463, 97);
this.panelLoad.Name = "panelLoad";
this.panelLoad.Size = new System.Drawing.Size(578, 100);
this.panelLoad.TabIndex = 6;
@@ -1125,54 +1173,6 @@
this.label4.TabIndex = 0;
this.label4.Text = "Serienbrief wird initialisiert - bitte einen Moment warten....";
//
// ctxmenutree
//
this.ctxmenutree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.partnerlistePrüfenToolStripMenuItem,
this.dokumentgenerierungZurücksetzenToolStripMenuItem,
this.druckstapelAufbereitenToolStripMenuItem,
this.archivierenUndAbschliessenToolStripMenuItem});
this.ctxmenutree.Name = "ctxmenutree";
this.ctxmenutree.Size = new System.Drawing.Size(266, 114);
this.ctxmenutree.Opening += new System.ComponentModel.CancelEventHandler(this.ctxmenutree_Opening);
//
// partnerlistePrüfenToolStripMenuItem
//
this.partnerlistePrüfenToolStripMenuItem.Name = "partnerlistePrüfenToolStripMenuItem";
this.partnerlistePrüfenToolStripMenuItem.Size = new System.Drawing.Size(265, 22);
this.partnerlistePrüfenToolStripMenuItem.Text = "Partnerliste prüfen";
this.partnerlistePrüfenToolStripMenuItem.Click += new System.EventHandler(this.partnerlistePrüfenToolStripMenuItem_Click);
//
// dokumentgenerierungZurücksetzenToolStripMenuItem
//
this.dokumentgenerierungZurücksetzenToolStripMenuItem.Name = "dokumentgenerierungZurücksetzenToolStripMenuItem";
this.dokumentgenerierungZurücksetzenToolStripMenuItem.Size = new System.Drawing.Size(265, 22);
this.dokumentgenerierungZurücksetzenToolStripMenuItem.Text = "Dokumentgenerierung zurücksetzen";
this.dokumentgenerierungZurücksetzenToolStripMenuItem.Click += new System.EventHandler(this.dokumentgenerierungZurücksetzenToolStripMenuItem_Click);
//
// druckstapelAufbereitenToolStripMenuItem
//
this.druckstapelAufbereitenToolStripMenuItem.Name = "druckstapelAufbereitenToolStripMenuItem";
this.druckstapelAufbereitenToolStripMenuItem.Size = new System.Drawing.Size(265, 22);
this.druckstapelAufbereitenToolStripMenuItem.Text = "Druckstapel aufbereiten";
this.druckstapelAufbereitenToolStripMenuItem.Click += new System.EventHandler(this.druckstapelAufbereitenToolStripMenuItem_Click);
//
// archivierenUndAbschliessenToolStripMenuItem
//
this.archivierenUndAbschliessenToolStripMenuItem.Name = "archivierenUndAbschliessenToolStripMenuItem";
this.archivierenUndAbschliessenToolStripMenuItem.Size = new System.Drawing.Size(265, 22);
this.archivierenUndAbschliessenToolStripMenuItem.Text = "Archivieren und abschliessen";
this.archivierenUndAbschliessenToolStripMenuItem.Click += new System.EventHandler(this.archivierenUndAbschliessenToolStripMenuItem_Click);
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(725, 598);
this.docPreview1.TabIndex = 4;
this.docPreview1.ZoomPercentage = 0;
//
// Serienbrief
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1215,6 +1215,7 @@
((System.ComponentModel.ISupportInitialize)(this.sfDataGridEmpfaenger)).EndInit();
this.ctxmenuEmpfaenger.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).EndInit();
this.ctxmenutree.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.GridEmpfänger)).EndInit();
this.pnlLoad.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.sfdatagridsbload)).EndInit();
@@ -1226,7 +1227,6 @@
this.splitContainer1.ResumeLayout(false);
this.panelLoad.ResumeLayout(false);
this.panelLoad.PerformLayout();
this.ctxmenutree.ResumeLayout(false);
this.ResumeLayout(false);
}

19
Client/DocMgmt/Serienbrief.cs
View File

@@ -187,6 +187,17 @@ namespace OnDoc.UIControls
docPreview1.Visible = false;
treeViewAdv1.Enabled = true;
}
if (type == 7){
this.ribbonPanel3.Enabled = enabled;
this.ribbonPanel5.Enabled= enabled;
this.ribbonPanel6.Enabled=enabled;
this.ribbonPanel7.Enabled = enabled;
this.ribbonPanel8.Enabled = enabled;
this.ribbonPanel9.Enabled = enabled;
this.ribbonButtonDelete.Enabled=enabled;
erneutGenerierenToolStripMenuItem.Enabled=enabled;
}
}
private void Refresh_Lists()
{
@@ -584,7 +595,7 @@ namespace OnDoc.UIControls
db.Get_Tabledata("Select beschreibung from physischesarchiv where physischesarchivnr = " + db.dsdaten.Tables[0].Rows[0][3].ToString(), false, true);
sb.barcode_zusatz = db.dsdaten.Tables[0].Rows[0][0].ToString();
if (sb.barcode_zusatz != "") { sb.barcode_zusatz = " / " + sb.barcode_zusatz; }
if (sb.barcode_zusatz != "") { sb.barcode_zusatz = " " + sb.barcode_zusatz; }
}
}
@@ -669,6 +680,10 @@ namespace OnDoc.UIControls
{
enable_disable_functions(3, false);
}
if (inbearbeitung==0 && generiert==0 && fehlerhaft==0 && abgeschlossen > 0)
{
enable_disable_functions(7, false);
}
}
catch { }
@@ -800,6 +815,7 @@ namespace OnDoc.UIControls
update_screen();
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
enable_disable_functions(6, false);
if (sb.status == 1) { enable_disable_functions(7, false); }
db = null;
}
private void update_screen()
@@ -1812,6 +1828,7 @@ namespace OnDoc.UIControls
}
}
}
sb.status = 1;
sb.dsempfaenger.AcceptChanges();
update_serienbriefdaten(false);
update_zahlen();

7
Client/Klassen/clsProcessWatch.cs
View File

@@ -22,8 +22,9 @@ namespace OnDoc.Klassen
public static void AddToList(string dokumentid, string filename, string application)
{
FilestoCheck.Add(new FileToCheck(dokumentid, filename, application));
if (watchtimer.Enabled == false) { watchtimer.Enabled = true; }
watchtimer.Elapsed += WatchProcesses;
if (watchtimer.Enabled == false) { watchtimer.Enabled = true; }
}
public static void RemoveFromList(string dokumentid)
@@ -52,6 +53,7 @@ namespace OnDoc.Klassen
found= false;
foreach (FileToCheck fc in FilestoCheck)
{
Logging.Logging.Debug("FileChek "+fc.filename+" / " + DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), "OnDoc.Processwatch", fc.dokumentid);
if (fc.application == "Word") { word = true; }
if (fc.application == "Excel") { excel = true; }
if (fc.application == "PDF") { pdf = true; }
@@ -61,7 +63,7 @@ namespace OnDoc.Klassen
Process[] localByName = Process.GetProcessesByName("WINWORD");
foreach (Process p in localByName)
{
if (p.MainWindowTitle.IndexOf(fc.dokumentid) > 0) { found = true; }
if (p.MainWindowTitle.IndexOf(fc.dokumentid) > -1) { found = true; }
}
}
if (excel)
@@ -74,6 +76,7 @@ namespace OnDoc.Klassen
}
if (!found)
{
Logging.Logging.Debug("Not Found "+fc.filename+" / "+ DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), "OnDoc.Processwatch", fc.dokumentid);
if (Check_Modified(fc) == true)
{
Save_File(fc.dokumentid, fc.filename);

1
Client/Start.Designer.cs generated
View File

@@ -140,6 +140,7 @@
this.menuStrip1.Size = new System.Drawing.Size(1683, 24);
this.menuStrip1.TabIndex = 5;
this.menuStrip1.Text = "menuStrip1";
this.menuStrip1.Visible = false;
//
// dateiToolStripMenuItem
//

8
Client/UIControls/DocPreview.cs
View File

@@ -21,6 +21,7 @@ namespace OnDoc.UIControls
{
public partial class DocPreview : UserControl
{
string PrintDokID = "";
public int ZoomPercentage { get; set; }
public DocPreview()
{
@@ -51,6 +52,7 @@ namespace OnDoc.UIControls
}
public void Show_Doc(string dokumentid)
{
PrintDokID= dokumentid;
clsdok dok = new clsdok("", "", "");
if (dokumentid.Length > 25) { dok.dokument = dokumentid; } else { dok = GetDoc(true, dokumentid); }
var stream = new MemoryStream(Convert.FromBase64String(dok.dokument));
@@ -70,8 +72,9 @@ namespace OnDoc.UIControls
}
}
public void show_base64(string image)
public void show_base64(string image,string Logtext)
{
PrintDokID = "Vorschau Vorlage: " + Logtext; ;
var stream = new MemoryStream(Convert.FromBase64String(image));
if (stream.Length > 0)
{
@@ -98,6 +101,7 @@ namespace OnDoc.UIControls
var stream = new MemoryStream(Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString()));
if (stream.Length > 0)
{
PrintDokID = "Serienbrief: Nr:" + Serienbriefnr.ToString() + " / " + dokumentid.ToString();
this.pdfViewerControl1.Load(stream);
this.pdfViewerControl1.Visible = true;
pdfViewerControl1.ZoomMode = ZoomMode.FitWidth;
@@ -283,11 +287,13 @@ namespace OnDoc.UIControls
private void toolStripButton1_Click(object sender, EventArgs e)
{
pdfViewerControl1.Print(true);
Logging.DocLog.Info("Preview gedruckt", "OnDoc", PrintDokID,"","");
}
public void printpdf()
{
pdfViewerControl1.Print(true);
Logging.DocLog.Info("Preview gedruckt", "OnDoc", PrintDokID, "", "");
}
}
}

53
Client/UIControls/DokList.Designer.cs generated
View File

@@ -38,16 +38,17 @@ namespace OnDoc.UICintrols
this.dokumentBearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.archivierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.druckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.barcodeDemoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.vertragPDFDEMOToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.zellenwertInZwischenablageKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.druckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pDFGenerierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentAnVersandstrasseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.wordInterOPEditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.historyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.tsrbvorschau = new System.Windows.Forms.ToolStripComboBox();
@@ -182,6 +183,7 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.FilterChanged += new Syncfusion.WinForms.DataGrid.Events.FilterChangedEventHandler(this.sfDataGrid1_FilterChanged);
this.sfDataGrid1.DataSourceChanged += new Syncfusion.WinForms.DataGrid.Events.DataSourceChangedEventHandler(this.sfDataGrid1_DataSourceChanged);
this.sfDataGrid1.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellClick);
this.sfDataGrid1.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellDoubleClick);
this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent);
//
// ctxMenuDokList
@@ -191,18 +193,19 @@ namespace OnDoc.UICintrols
this.dokumentBearbeitenToolStripMenuItem,
this.dokumentLöschenToolStripMenuItem,
this.archivierenToolStripMenuItem,
this.druckenToolStripMenuItem,
this.dokumentKopierenToolStripMenuItem,
this.toolStripMenuItem1,
this.barcodeDemoToolStripMenuItem,
this.vertragPDFDEMOToolStripMenuItem,
this.zellenwertInZwischenablageKopierenToolStripMenuItem,
this.druckenToolStripMenuItem,
this.pDFGenerierenToolStripMenuItem,
this.dokumentAnVersandstrasseToolStripMenuItem,
this.wordInterOPEditToolStripMenuItem,
this.attributeAnzeigenVersteckenToolStripMenuItem,
this.historyToolStripMenuItem,
this.dokumentKopierenToolStripMenuItem});
this.historyToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 312);
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 318);
//
// dokumentAnzeigenToolStripMenuItem
//
@@ -236,6 +239,27 @@ namespace OnDoc.UICintrols
this.archivierenToolStripMenuItem.Text = "Archivieren";
this.archivierenToolStripMenuItem.Click += new System.EventHandler(this.archivierenToolStripMenuItem_Click);
//
// druckenToolStripMenuItem
//
this.druckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Printer_16x16_32;
this.druckenToolStripMenuItem.Name = "druckenToolStripMenuItem";
this.druckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.druckenToolStripMenuItem.Text = "Drucken";
this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click);
//
// dokumentKopierenToolStripMenuItem
//
this.dokumentKopierenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Copy_16x16_32;
this.dokumentKopierenToolStripMenuItem.Name = "dokumentKopierenToolStripMenuItem";
this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentKopierenToolStripMenuItem.Text = "Dokument kopieren";
this.dokumentKopierenToolStripMenuItem.Click += new System.EventHandler(this.dokumentKopierenToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(276, 6);
//
// barcodeDemoToolStripMenuItem
//
this.barcodeDemoToolStripMenuItem.Name = "barcodeDemoToolStripMenuItem";
@@ -259,13 +283,6 @@ namespace OnDoc.UICintrols
this.zellenwertInZwischenablageKopierenToolStripMenuItem.Text = "Zellenwert in Zwischenablage kopieren";
this.zellenwertInZwischenablageKopierenToolStripMenuItem.Click += new System.EventHandler(this.zellenwertInZwischenablageKopierenToolStripMenuItem_Click);
//
// druckenToolStripMenuItem
//
this.druckenToolStripMenuItem.Name = "druckenToolStripMenuItem";
this.druckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.druckenToolStripMenuItem.Text = "Drucken";
this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click);
//
// pDFGenerierenToolStripMenuItem
//
this.pDFGenerierenToolStripMenuItem.Name = "pDFGenerierenToolStripMenuItem";
@@ -304,13 +321,6 @@ namespace OnDoc.UICintrols
this.historyToolStripMenuItem.Text = "History";
this.historyToolStripMenuItem.Click += new System.EventHandler(this.historyToolStripMenuItem_Click);
//
// dokumentKopierenToolStripMenuItem
//
this.dokumentKopierenToolStripMenuItem.Name = "dokumentKopierenToolStripMenuItem";
this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentKopierenToolStripMenuItem.Text = "Dokument kopieren";
this.dokumentKopierenToolStripMenuItem.Click += new System.EventHandler(this.dokumentKopierenToolStripMenuItem_Click);
//
// toolStrip1
//
this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -428,6 +438,7 @@ namespace OnDoc.UICintrols
this.lblTitel.TabIndex = 2;
this.lblTitel.Text = "Pendente Dokumente";
this.lblTitel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblTitel.Visible = false;
//
// ribbonPanel2
//
@@ -1053,6 +1064,7 @@ namespace OnDoc.UICintrols
//
// RibbonPanelDiverses
//
this.RibbonPanelDiverses.ButtonMoreVisible = false;
this.RibbonPanelDiverses.Items.Add(this.ribbonButtonBCK);
this.RibbonPanelDiverses.Name = "RibbonPanelDiverses";
this.RibbonPanelDiverses.Text = "Diverse Funktionen";
@@ -1368,5 +1380,6 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonPanel ribbonPanelZuweisung;
private System.Windows.Forms.ToolStripMenuItem historyToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dokumentKopierenToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
}
}

57
Client/UIControls/DokList.cs
View File

@@ -662,7 +662,9 @@ namespace OnDoc.UICintrols
if (dokumenttypnr == 0)
{
DokTypSelect DokTypSelect = new DokTypSelect(Favoriten);
//;
DokTypSelect.vorlagentype = 1;
DokTypSelect.ShowDialog(this);
if (DokTypSelect.DialogResult == DialogResult.OK)
{
@@ -685,6 +687,8 @@ namespace OnDoc.UICintrols
else
{
frmnewdok.ShowDialog();
refresh_dokumente();
}
switch (frmnewdok.DocFunction)
{
@@ -713,6 +717,17 @@ namespace OnDoc.UICintrols
break;
case 5:
break;
case 6:
selected_dokumentid = frmnewdok.dokumentid;
selected_partnernr = frmnewdok.partnernr.ToString(); ;
interop = frmnewdok.interop;
runmacros = frmnewdok.runmacros;
string filename = frmnewdok.filename;
DB db = new DB(AppParams.connectionstring);
db.Dok_in_Bearbeietung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
db = null;
clsProcessWatch.AddToList(selected_dokumentid, filename, "Word");
break;
default:
break;
}
@@ -1200,6 +1215,7 @@ namespace OnDoc.UICintrols
else
{
this.lblToApprove.Text = db.dsdaten.Tables[0].Rows[0][0].ToString();
lblToApprove.Visible = true;
}
db = null;
}
@@ -1635,6 +1651,10 @@ namespace OnDoc.UICintrols
RibbonButtonArchivToOnBase.Enabled = false;
dokumentBearbeitenToolStripMenuItem.Enabled = false;
dokumentLöschenToolStripMenuItem.Enabled = false;
druckenToolStripMenuItem.Enabled = false;
dokumentKopierenToolStripMenuItem.Enabled = false;
attributeAnzeigenVersteckenToolStripMenuItem.Enabled = false;
historyToolStripMenuItem.Enabled = false;
archivierenToolStripMenuItem.Enabled = false;
zellenwertInZwischenablageKopierenToolStripMenuItem.Enabled = false;
selected_dokumentid = "";
@@ -1652,6 +1672,10 @@ namespace OnDoc.UICintrols
dokumentLöschenToolStripMenuItem.Enabled = true;
archivierenToolStripMenuItem.Enabled = true;
zellenwertInZwischenablageKopierenToolStripMenuItem.Enabled = true;
druckenToolStripMenuItem.Enabled = true;
dokumentKopierenToolStripMenuItem.Enabled = true;
attributeAnzeigenVersteckenToolStripMenuItem.Enabled = true;
historyToolStripMenuItem.Enabled = true;
this.sfDataGrid1.SelectedItem = this.sfDataGrid1.View.Records[0];
sfDataGrid1.SelectedIndex = 0;
@@ -1771,16 +1795,41 @@ namespace OnDoc.UICintrols
private void historyToolStripMenuItem_Click(object sender, EventArgs e)
{
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return; }
DokHistory dh = new DokHistory(selected_dokumentid);
dh.ShowDialog();
}
private void dokumentKopierenToolStripMenuItem_Click(object sender, EventArgs e)
{
DB db = new DB(AppParams.connectionstring);
db.copydoc(selected_dokumentid);
db = null;
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return; }
if (MessageBox.Show("Gewähltes Dokument kopieren?", "Dokument kopieren", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
DB db = new DB(AppParams.connectionstring);
string newdocid = db.copydoc(selected_dokumentid, AppParams.CurrentMitarbieter);
db = null;
if (newdocid == "")
{
MessageBox.Show("Das Dokument ID:'" + selected_dokumentid + "' konnte nicht kopiert werden.", "Dokument kopieren", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
else
{
MessageBox.Show("Das Dokument wurde erfolgreich kopiert. Neue Dokument.ID:'" + newdocid + "'.", "Dokument kopieren", MessageBoxButtons.OK, MessageBoxIcon.Information);
Logging.DocLog.Info("Dokumentkopie von '" + selected_dokumentid + "' erstellt", "OnDoc.DocList'", newdocid, "", "Dokumentkopie erstellt");
refresh_dokumente();
}
}
}
private void sfDataGrid1_CellDoubleClick(object sender, CellClickEventArgs e)
{
sfDataGrid1_CellClick(sender, e);
dokumentBearbeitenToolStripMenuItem_Click(sender, e);
}
}

50
Client/UIControls/DokTypDetail.cs
View File

@@ -45,37 +45,51 @@ namespace OnDoc.UIControls
DataRow dr = details.NewRow();
dr[0] = dc.ColumnName.ToString().Replace("_", "");
dr[1] = dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString();
if (dc.ColumnName.ToString().Replace("_", "") == "Vertrag")
try
{
if (dB.dsdaten.Tables[0].Columns[0].DataType == typeof(Boolean)) {
if (Convert.ToBoolean(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName]) == false)
{
dr[1] = "Nein";
}
else
{ dr[1] = "Ja"; }
}
else
{
}
}
details.Rows.Add(dr);
catch { }
details.Rows.Add(dr);
}
else
{
DocGet dg = new DocGet(AppParams.connectionstring);
clsdok dok = new clsdok(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString(), dB.dsdaten.Tables[0].Rows[0]["Applikation"].ToString(), "");
string PDF = "";
switch (dB.dsdaten.Tables[0].Rows[0]["Applikation"].ToString().ToUpper())
if (dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString() != "")
{
case "WORD":
PDF = dg.Convert_Word_To_PDF(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString());
break;
case "EXCEL":
PDF = dg.Convert_Excel_To_PDF(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString());
break;
case "PDF":
PDF = dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString();
break;
default:
break;
DocGet dg = new DocGet(AppParams.connectionstring);
clsdok dok = new clsdok(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString(), dB.dsdaten.Tables[0].Rows[0]["Applikation"].ToString(), "");
string PDF = "";
switch (dB.dsdaten.Tables[0].Rows[0]["Applikation"].ToString().ToUpper())
{
case "WORD":
PDF = dg.Convert_Word_To_PDF(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString());
break;
case "EXCEL":
PDF = dg.Convert_Excel_To_PDF(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString());
break;
case "PDF":
PDF = dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString();
break;
default:
break;
}
docPreview1.show_base64(PDF, "Dokumenttyp: " + dokumenttypnr.ToString());
dg = null;
dok = null;
}
docPreview1.show_base64(PDF);
}
}
sfDataGrid1.DataSource = details;

33
Client/UIControls/Partnersuche.cs
View File

@@ -32,6 +32,8 @@ namespace OnDoc.UIControls
public bool personendokument { get; set; } = false;
public bool check_bp_person { get; set; } = false;
public int dokumenttypnr { get; set; } = 0;
public Partnersuche()
{
InitializeComponent();
@@ -47,6 +49,18 @@ namespace OnDoc.UIControls
clsPartner.set_connectionstring(AppParams.connectionstring);
this.trefferlistedata.TableControl.DoubleClick += TableControl_DoubleClick;
}
public Partnersuche(bool personendokument, bool check_bp_person, int dokumenttypnr=0)
{
InitializeComponent();
this.personendokument = personendokument;
this.check_bp_person = check_bp_person;
clsPartner.set_connectionstring(AppParams.connectionstring);
this.trefferlistedata.TableControl.DoubleClick += TableControl_DoubleClick;
this.dokumenttypnr = dokumenttypnr;
}
private void Form1_Load(object sender, EventArgs e)
{
this.SetDesktopLocation(Cursor.Position.X, Cursor.Position.Y);
@@ -223,6 +237,23 @@ namespace OnDoc.UIControls
catch { return false; }
finally { db=null; }
}
if (partnersaldiert)
{
DB db = new DB(AppParams.connectionstring);
try
{
db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr=" + dokumenttypnr.ToString(),false,true);
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["vertrag"]) == true)
{
MessageBox.Show("Das Dokument " + db.dsdaten.Tables[0].Rows[0]["Bezeichnung"].ToString() + " kann nicht für einen saldierten Partner erstellt werden.","Dokument erstellen", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
}
catch { return false; }
finally { db = null; }
}
return true;
@@ -257,7 +288,7 @@ namespace OnDoc.UIControls
{
try
{
get_details();
if (!get_details()) { return; };
//partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00"));
//partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00");
//partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert"));

13
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -504,7 +504,7 @@ namespace OnDoc.UIControls
private void show_partnerdialog()
{
Partnersuche ps = new Partnersuche(personendokument,true);
Partnersuche ps = new Partnersuche(personendokument,true,dokumenttypnr);
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
@@ -539,10 +539,11 @@ namespace OnDoc.UIControls
switch (feldtyp.ToUpper())
{
case "DATUMSHORT":
case "DATUMMEDIUM":
case "DATUMLONG":
break;
frmCalendar f = new frmCalendar();
valueselector f = new valueselector(true);
f.ShowDialog();
string res = "";
if (f.DialogResult == DialogResult.OK)
@@ -550,15 +551,15 @@ namespace OnDoc.UIControls
if (feldtyp.ToUpper() == "DATUMSHORT")
{
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.sfCalendar1.SelectedDate), Helper.ConvertHelper.DateTimeFormat.datumshort);
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.selected_datetime), Helper.ConvertHelper.DateTimeFormat.datumshort);
}
if (feldtyp.ToUpper() == "DATUMMEDIUM")
{
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.sfCalendar1.SelectedDate), Helper.ConvertHelper.DateTimeFormat.datummedium);
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.selected_datetime), Helper.ConvertHelper.DateTimeFormat.datummedium);
}
if (feldtyp.ToUpper() == "DATUMLONG")
{
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.sfCalendar1.SelectedDate), Helper.ConvertHelper.DateTimeFormat.datummedium);
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.selected_datetime), Helper.ConvertHelper.DateTimeFormat.datummedium);
}
}
f.Dispose();

BIN
Client/bin/Debug/DOCGEN.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/DOCGEN.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/Database.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/Database.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/Helper.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/Helper.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocClient.zip
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocOffice.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocOffice.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/obj/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.