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

update 20241204

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-04 21:29:04 +01:00
parent 9c0f9cd3b9
commit 9dccb8be8f
34 changed files with 256 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/DocMgmt/Serienbrief.cs
View File

@@ -390,7 +390,7 @@ namespace OnDoc.UIControls
sb.dsempfaenger = new DataSet();
sb.dsempfaenger.Tables.Clear();
sb.dsempfaenger.ReadXml(filename);
sb.dsempfaenger.Tables.Remove("Layout");
sb.dsempfaenger.AcceptChanges();
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
//System.IO.File.Delete(filename);

6
Client/Program.cs
View File

@@ -38,7 +38,8 @@ namespace OnDoc
if (args.Length > 0)
{
string debugstring;
if (args[0].ToString().ToUpper().Substring(args[0].ToString().Length - 4, 4) == ".EDK")
{
@@ -46,6 +47,7 @@ namespace OnDoc
string destfile = AppParams.tempdir + DateTime.Now.ToString("yyyyMMddHHmmss") + "_tmpfile.edk";
System.IO.File.Copy(args[0],destfile);
//EDK_Data.Load_EDK_File(args[0]);
}
else
@@ -81,7 +83,7 @@ namespace OnDoc
}
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
//Application.SetCompatibleTextRenderingDefault(false);
Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("Ngo9BigBOggjHTQxAR8/V1NCaF5cXmZCf1FpRmJGdld5fUVHYVZUTXxaS00DNHVRdkdnWXdecXRdQ2heUU13XUI=");
AppParams.init();
// // MyForm = new Start();

7
Client/Start.cs
View File

@@ -39,7 +39,7 @@ namespace OnDoc
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
InitLogging();
Logging.Logging.Debug("Start", "OnDoc-Client", "");
mitarbeiter = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
mitarbeiter = mitarbeiter.Substring(mitarbeiter.IndexOf("\\") + 1);
@@ -76,7 +76,7 @@ namespace OnDoc
}
else { System.Environment.Exit(1); }
}
Logging.Logging.Debug("Mitarbeiter", "OnDoc", AppParams.CurrentMitarbieter.ToString());
//partnerTree1.OnStrukturClicked += new PartnerTree.StrukturHandler(testhandler1);
//partnerTree1.Refresh(-1, AppParams.CurrentMitarbieter, Convert.ToInt32(rbcomboboxprofil.SelectedItem.Tag.ToString()));
@@ -183,6 +183,7 @@ namespace OnDoc
private void EDK_Call(string filename)
{
if (dokList1.profilnr == 0) return;
EDK_Data.Load_EDK_File(filename);
System.IO.File.Delete(filename);
if (EDK_Data.toexecute == true)
@@ -192,7 +193,7 @@ namespace OnDoc
}
private void URI_Call(string filename)
{
if (System.IO.File.Exists(filename))
{
using (StreamReader sr = new StreamReader(filename))

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

@@ -47,6 +47,7 @@
this.cbversandstrasse_moeglich = new System.Windows.Forms.CheckBox();
this.toolStrip2 = new System.Windows.Forms.ToolStrip();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.tsbtncopy = new System.Windows.Forms.ToolStripButton();
this.GrpUnterschrifte = new System.Windows.Forms.GroupBox();
this.cbUnterschriftpruefung = new System.Windows.Forms.CheckBox();
this.lblStandard = new System.Windows.Forms.Label();
@@ -67,6 +68,7 @@
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.TreeDokumentArt = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.GroupBox2 = new System.Windows.Forms.GroupBox();
this.chkboxInOffice = new System.Windows.Forms.CheckBox();
this.cbaktiv = new System.Windows.Forms.CheckBox();
this.rbDokumenterstellungPerson = new System.Windows.Forms.RadioButton();
this.rbDokumenterstellungBP = new System.Windows.Forms.RadioButton();
@@ -138,7 +140,7 @@
this.label16 = new System.Windows.Forms.Label();
this.rbNr = new System.Windows.Forms.RadioButton();
this.label15 = new System.Windows.Forms.Label();
this.chkboxInOffice = new System.Windows.Forms.CheckBox();
this.chkboxaktive = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
this.tabControlAdv1.SuspendLayout();
this.tabPageAdv1.SuspendLayout();
@@ -235,7 +237,8 @@
//
this.toolStrip2.AutoSize = false;
this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton1});
this.toolStripButton1,
this.tsbtncopy});
this.toolStrip2.Location = new System.Drawing.Point(0, 0);
this.toolStrip2.Name = "toolStrip2";
this.toolStrip2.Size = new System.Drawing.Size(1016, 42);
@@ -250,9 +253,19 @@
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(32, 32);
this.toolStripButton1.Text = "toolStripButton1";
this.toolStripButton1.Text = "Dokumenttyp speichern";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// tsbtncopy
//
this.tsbtncopy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.tsbtncopy.Image = global::OnDoc.Properties.Resources.Copy_16x16_32;
this.tsbtncopy.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtncopy.Name = "tsbtncopy";
this.tsbtncopy.Size = new System.Drawing.Size(23, 39);
this.tsbtncopy.Text = "Dokumenttyp kopieren";
this.tsbtncopy.Click += new System.EventHandler(this.tsbtncopy_Click);
//
// GrpUnterschrifte
//
this.GrpUnterschrifte.Controls.Add(this.cbUnterschriftpruefung);
@@ -591,6 +604,14 @@
this.GroupBox2.TabStop = false;
this.GroupBox2.Text = "Diverses";
//
// chkboxInOffice
//
this.chkboxInOffice.Location = new System.Drawing.Point(293, 71);
this.chkboxInOffice.Name = "chkboxInOffice";
this.chkboxInOffice.Size = new System.Drawing.Size(187, 24);
this.chkboxInOffice.TabIndex = 26;
this.chkboxInOffice.Text = "Erstellung mit Office";
//
// cbaktiv
//
this.cbaktiv.Location = new System.Drawing.Point(293, 53);
@@ -1265,7 +1286,7 @@
treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black;
this.TreeDokumenttyp.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
this.TreeDokumenttyp.BeforeTouchSize = new System.Drawing.Size(303, 670);
this.TreeDokumenttyp.BeforeTouchSize = new System.Drawing.Size(273, 670);
this.TreeDokumenttyp.Dock = System.Windows.Forms.DockStyle.Left;
//
//
@@ -1281,7 +1302,7 @@
this.TreeDokumenttyp.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.TreeDokumenttyp.Name = "TreeDokumenttyp";
this.TreeDokumenttyp.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.TreeDokumenttyp.Size = new System.Drawing.Size(303, 670);
this.TreeDokumenttyp.Size = new System.Drawing.Size(273, 670);
this.TreeDokumenttyp.SortWithChildNodes = true;
this.TreeDokumenttyp.TabIndex = 11;
this.TreeDokumenttyp.Text = "treeViewAdv1";
@@ -1301,6 +1322,7 @@
//
// panel1
//
this.panel1.Controls.Add(this.chkboxaktive);
this.panel1.Controls.Add(this.txtFilter);
this.panel1.Controls.Add(this.rbBezeichnung);
this.panel1.Controls.Add(this.label16);
@@ -1316,14 +1338,14 @@
//
this.txtFilter.Location = new System.Drawing.Point(69, 12);
this.txtFilter.Name = "txtFilter";
this.txtFilter.Size = new System.Drawing.Size(139, 20);
this.txtFilter.Size = new System.Drawing.Size(191, 20);
this.txtFilter.TabIndex = 6;
this.txtFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFilter_KeyDown);
//
// rbBezeichnung
//
this.rbBezeichnung.AutoSize = true;
this.rbBezeichnung.Location = new System.Drawing.Point(111, 40);
this.rbBezeichnung.Location = new System.Drawing.Point(111, 42);
this.rbBezeichnung.Name = "rbBezeichnung";
this.rbBezeichnung.Size = new System.Drawing.Size(87, 17);
this.rbBezeichnung.TabIndex = 9;
@@ -1344,7 +1366,7 @@
//
this.rbNr.AutoSize = true;
this.rbNr.Checked = true;
this.rbNr.Location = new System.Drawing.Point(69, 39);
this.rbNr.Location = new System.Drawing.Point(69, 42);
this.rbNr.Name = "rbNr";
this.rbNr.Size = new System.Drawing.Size(36, 17);
this.rbNr.TabIndex = 8;
@@ -1356,19 +1378,24 @@
// label15
//
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(12, 37);
this.label15.Location = new System.Drawing.Point(12, 44);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(26, 13);
this.label15.TabIndex = 7;
this.label15.Text = "Sort";
//
// chkboxInOffice
// chkboxaktive
//
this.chkboxInOffice.Location = new System.Drawing.Point(293, 71);
this.chkboxInOffice.Name = "chkboxInOffice";
this.chkboxInOffice.Size = new System.Drawing.Size(187, 24);
this.chkboxInOffice.TabIndex = 26;
this.chkboxInOffice.Text = "Erstellung mit Office";
this.chkboxaktive.AutoSize = true;
this.chkboxaktive.Checked = true;
this.chkboxaktive.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkboxaktive.Location = new System.Drawing.Point(205, 43);
this.chkboxaktive.Name = "chkboxaktive";
this.chkboxaktive.Size = new System.Drawing.Size(55, 17);
this.chkboxaktive.TabIndex = 10;
this.chkboxaktive.Text = "aktive";
this.chkboxaktive.UseVisualStyleBackColor = true;
this.chkboxaktive.CheckedChanged += new System.EventHandler(this.chkboxaktive_CheckedChanged);
//
// Dokumenttyp
//
@@ -1525,5 +1552,7 @@
internal System.Windows.Forms.CheckBox chkbearbeitungdirekt;
internal System.Windows.Forms.CheckBox chkinterop;
internal System.Windows.Forms.CheckBox chkboxInOffice;
private System.Windows.Forms.ToolStripButton tsbtncopy;
private System.Windows.Forms.CheckBox chkboxaktive;
}
}

108
Client/UIControls/Administrator/Dokumenttyp.cs
View File

@@ -16,6 +16,9 @@ using System.Windows.Forms.VisualStyles;
using OnDoc.Helper;
using Syncfusion.Windows.Forms.Tools;
using Syncfusion.WinForms.Controls;
using Syncfusion.Windows.Forms;
using System.Security.Cryptography;
using Windows.UI.WebUI;
namespace OnDoc.UIControls.Administrator
{
@@ -42,21 +45,36 @@ namespace OnDoc.UIControls.Administrator
System.Data.DataTable treedata = new System.Data.DataTable();
private void update_tree()
{
int count = txtFilter.Text.Trim().Count(f => f == ' ');
if (count > 0) { treedata.Rows.Clear(); }
TreeDokumenttyp.Nodes.Clear();
db.Get_Tabledata("Select dokumenttypnr as ID, Bezeichnung, Aktiv from dokumenttyp", false, true);
treedata = db.dsdaten.Tables[0].Copy();
string _sqlWhere = " Bezeichnung like '%" + txtFilter.Text + "%'";
string _sqlOrder = "Bezeichnung ";
string sql = "";
sql = "Select dokumenttypnr as ID, Bezeichnung, Aktiv from dokumenttyp";
if (txtFilter.Text.Trim().Length > 0)
{
sql = sql + " where bezeichnung like '%" + txtFilter.Text.Replace(" ", "%") + "%'";
}
else
{
sql = sql + " where dokumenttypnr > 0";
}
if (chkboxaktive.Checked) { sql = sql + " and aktiv=1"; }
if (rbNr.Checked)
{
_sqlOrder = "id ";
sql=sql+" order by id";
}
else _sqlOrder = "Bezeichnung";
else
{
sql = sql + " order by bezeichnung";
}
db.Get_Tabledata(sql, false, true);
treedata = db.dsdaten.Tables[0].Copy();
try
{
System.Data.DataTable _newDataTable = treedata.Select(_sqlWhere, _sqlOrder).CopyToDataTable();
foreach (DataRow r in _newDataTable.Rows)
foreach (DataRow r in treedata.Rows)
{
TreeNodeAdv nodeAdv = new TreeNodeAdv();
nodeAdv.Text = r["id"].ToString() + " " + r["Bezeichnung"].ToString();
@@ -78,8 +96,8 @@ namespace OnDoc.UIControls.Administrator
return;
}
private void Update_Details(int id) {
private void Update_Details(int id) {
db.Get_Tabledata("Select office_vorlagenr, bezeichnung from office_vorlage", false, true);
cbboxofficevorlage.DataSource = db.dsdaten.Tables[0];
cbboxofficevorlage.DisplayMember = "Bezeichnung";
@@ -171,7 +189,7 @@ namespace OnDoc.UIControls.Administrator
Update_Vorlagenfelder();
}
private void Update_Vorlagenfelder() {
private void Update_Vorlagenfelder() {
db.Get_Tabledata("Select * from View_Vorlagenfelder_Relaunch where doktypid=" + dokumenttypnr.ToString(), false, true);
this.sfDataGrid1.DataSource = db.dsdaten.Tables[0];
DataTable dt = db.dsdaten.Tables[0];
@@ -261,7 +279,7 @@ namespace OnDoc.UIControls.Administrator
chkboxInOffice.Checked = true;
}
else
{ chkboxInOffice.Checked= false; }
{ chkboxInOffice.Checked = false; }
}
private void txtfeldname_TextChanged(object sender, EventArgs e)
@@ -307,13 +325,13 @@ namespace OnDoc.UIControls.Administrator
r["Unterschrift_Faksimile"] = this.cbDigitaleUnterschrift.Checked;
r["Unterschrift_ohne"] = this.cbFormularOhneUnterschrift.Checked;
r["Unterschrift_Pruefung"] = this.cbUnterschriftpruefung.Checked;
r["unterschrift_standard"]=this.lbUnterschriftStandard.SelectedIndex;
r["unterschrift_standard"] = this.lbUnterschriftStandard.SelectedIndex;
r["aktiv"] = this.cbaktiv.Checked;
r["mutierer"] = AppParams.CurrentMitarbieter;
r["mutiert_am"]=DateTime.Now;
r["mutiert_am"] = DateTime.Now;
r["versandstrasse_moeglich"] = cbversandstrasse_moeglich.Checked == true;
r["ebanking_moeglich"] = cbebanking_moeglich.Checked == true;
r["BearbeitungDirket"] = chkbearbeitungdirekt.Checked==true;
r["BearbeitungDirket"] = chkbearbeitungdirekt.Checked == true;
r["interop"] = chkinterop.Checked == true;
r["erstellungInOffice"] = chkboxInOffice.Checked == true;
if (cbOfficeDokument.Checked) { r["genresultat_type"] = 1; }
@@ -321,8 +339,8 @@ namespace OnDoc.UIControls.Administrator
if (cbPDFDirekteArchivierung.Checked) { r["genresultat_type"] = 3; }
if (cbbearbeitungzwingend.Checked) { r["genresultat_type"] = 4; }
db.Update_Data();
db.daten.Tables.Clear();
@@ -335,11 +353,12 @@ namespace OnDoc.UIControls.Administrator
{
DataRow dr = db.daten.Tables[0].NewRow();
dr[0] = dokumenttypnr;
if (rbDokumenterstellungBP.Checked) {dr[1] = 1; } else { dr[1] = 2; }
if (rbDokumenterstellungBP.Checked) { dr[1] = 1; } else { dr[1] = 2; }
db.daten.Tables[0].Rows.Add(dr);
}
db.Update_Data();
ToastMessage.ShowToast("Speichern", "Dokumenttyp erfolgreich gespeichert");
update_tree();
}
private void listBox1_MouseDoubleClick(object sender, MouseEventArgs e)
@@ -363,11 +382,11 @@ namespace OnDoc.UIControls.Administrator
var obj = record.Data as DataRowView;
if (obj["id"].ToString() == newkey.ToString())
{ this.sfDataGrid1.SelectedItems.Add(obj);
var dataRow = (obj as DataRowView).Row;
var dataRow = (obj as DataRowView).Row;
Origin = (obj as DataRowView).Row;
Update_Vorlagenfeld(dataRow);}
Update_Vorlagenfeld(dataRow); }
}
}
@@ -378,7 +397,7 @@ namespace OnDoc.UIControls.Administrator
private void chkui_CheckedChanged(object sender, EventArgs e)
{
CheckBox tmpcheckbox = sender as CheckBox;
CheckBox tmpcheckbox = sender as CheckBox;
Origin[tmpcheckbox.Tag.ToString()] = tmpcheckbox.Checked;
var record = sfDataGrid1.View.Records.GetItemAt(sfDataGrid1.SelectedIndex);
@@ -396,8 +415,12 @@ namespace OnDoc.UIControls.Administrator
private void TreeDokumenttyp_AfterSelect(object sender, EventArgs e)
{
this.dokumenttypnr = Convert.ToInt32(TreeDokumenttyp.SelectedNode.Tag.ToString());
Update_Details(dokumenttypnr);
try
{
this.dokumenttypnr = Convert.ToInt32(TreeDokumenttyp.SelectedNode.Tag.ToString());
Update_Details(dokumenttypnr);
}
catch { }
}
private void txtFilter_KeyDown(object sender, KeyEventArgs e)
@@ -412,5 +435,42 @@ namespace OnDoc.UIControls.Administrator
{
update_tree();
}
private void tsbtncopy_Click(object sender, EventArgs e)
{
if (MessageBox.Show("Dokumenttyp kopieren?", "Kopieren", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
db.clear_parameter();
db.add_parameter("@id", dokumenttypnr.ToString());
db.add_parameter("@maid", AppParams.CurrentMitarbieter.ToString());
db.Get_Tabledata("sp_ondoc_copy_doktyp", true, false);
string newkey = db.dsdaten.Tables[0].Rows[0][0].ToString();
treedata.Rows.Clear();
update_tree();
//TreeDokumenttyp.SelectedNode= Search(TreeDokumenttyp.Nodes[0], db.dsdaten.Tables[0].Rows[0][0].ToString() );
List<TreeNodeAdv> nodes;
nodes = TreeDokumenttyp.SearchTree().Where(n => n.Text.Contains(newkey)).ToList();
if (nodes.Count > 0) { TreeDokumenttyp.SelectedNode = nodes[0]; }
}
}
private void chkboxaktive_CheckedChanged(object sender, EventArgs e)
{
update_tree();
}
}
public static class SOExtension
{
public static IEnumerable<TreeNodeAdv> SearchTree(this TreeViewAdv treeView)
{
return SearchTree(treeView.Nodes);
}
public static IEnumerable<TreeNodeAdv> SearchTree(this TreeNodeAdvCollection coll)
{
return coll.Cast<TreeNodeAdv>().Concat(coll.Cast<TreeNodeAdv>().SelectMany(x => SearchTree(x.Nodes)));
}
}
}

85
Client/UIControls/Administrator/OfficeVorlage.Designer.cs generated
View File

@@ -28,14 +28,18 @@
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OfficeVorlage));
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings1 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings1 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings1 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OfficeVorlage));
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripSplitButton1 = new System.Windows.Forms.ToolStripSplitButton();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.toolStripTextBox1 = new System.Windows.Forms.ToolStripTextBox();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.label20 = new System.Windows.Forms.Label();
@@ -109,10 +113,6 @@
this.txtNrProduktion = new System.Windows.Forms.TextBox();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
this.toolStripSplitButton1 = new System.Windows.Forms.ToolStripSplitButton();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.toolStripTextBox1 = new System.Windows.Forms.ToolStripTextBox();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStrip1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox7.SuspendLayout();
@@ -162,6 +162,39 @@
this.toolStripButton1.Text = "toolStripButton1";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// toolStripSplitButton1
//
this.toolStripSplitButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripSplitButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripSplitButton1.Image")));
this.toolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripSplitButton1.Name = "toolStripSplitButton1";
this.toolStripSplitButton1.Size = new System.Drawing.Size(48, 36);
this.toolStripSplitButton1.Text = "toolStripSplitButton1";
this.toolStripSplitButton1.Visible = false;
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(101, 36);
this.toolStripLabel1.Text = "Suche in Vorlagen";
//
// toolStripTextBox1
//
this.toolStripTextBox1.Font = new System.Drawing.Font("Segoe UI", 9F);
this.toolStripTextBox1.Name = "toolStripTextBox1";
this.toolStripTextBox1.Size = new System.Drawing.Size(100, 39);
//
// toolStripButton2
//
this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(36, 36);
this.toolStripButton2.Text = "toolStripButton2";
this.toolStripButton2.Visible = false;
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.groupBox7);
@@ -186,7 +219,7 @@
this.groupBox7.Controls.Add(this.label17);
this.groupBox7.Location = new System.Drawing.Point(313, 296);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(534, 256);
this.groupBox7.Size = new System.Drawing.Size(534, 53);
this.groupBox7.TabIndex = 14;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "PDF-Generierung";
@@ -309,7 +342,7 @@
this.groupBox4.Controls.Add(this.txtBcLeft);
this.groupBox4.Controls.Add(this.label3);
this.groupBox4.Controls.Add(this.txtBcTop);
this.groupBox4.Location = new System.Drawing.Point(312, 558);
this.groupBox4.Location = new System.Drawing.Point(313, 355);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(535, 380);
this.groupBox4.TabIndex = 13;
@@ -343,6 +376,7 @@
this.txtBCFontSize.Name = "txtBCFontSize";
this.txtBCFontSize.Size = new System.Drawing.Size(51, 20);
this.txtBCFontSize.TabIndex = 22;
this.txtBCFontSize.Visible = false;
//
// txtBCFont
//
@@ -350,6 +384,7 @@
this.txtBCFont.Name = "txtBCFont";
this.txtBCFont.Size = new System.Drawing.Size(74, 20);
this.txtBCFont.TabIndex = 21;
this.txtBCFont.Visible = false;
//
// label14
//
@@ -359,6 +394,7 @@
this.label14.Size = new System.Drawing.Size(75, 13);
this.label14.TabIndex = 20;
this.label14.Text = "Schrift/Grösse";
this.label14.Visible = false;
//
// txtBCFormat
//
@@ -366,6 +402,7 @@
this.txtBCFormat.Name = "txtBCFormat";
this.txtBCFormat.Size = new System.Drawing.Size(41, 20);
this.txtBCFormat.TabIndex = 19;
this.txtBCFormat.Visible = false;
//
// label13
//
@@ -392,6 +429,7 @@
this.label12.Size = new System.Drawing.Size(39, 13);
this.label12.TabIndex = 16;
this.label12.Text = "Format";
this.label12.Visible = false;
//
// label11
//
@@ -410,6 +448,7 @@
this.label10.Size = new System.Drawing.Size(72, 13);
this.label10.TabIndex = 14;
this.label10.Text = "Trennzeichen";
this.label10.Visible = false;
//
// txtBCTrennzeichen
//
@@ -417,6 +456,7 @@
this.txtBCTrennzeichen.Name = "txtBCTrennzeichen";
this.txtBCTrennzeichen.Size = new System.Drawing.Size(60, 20);
this.txtBCTrennzeichen.TabIndex = 13;
this.txtBCTrennzeichen.Visible = false;
//
// txtBCInhalt
//
@@ -941,37 +981,6 @@
//
this.openFileDialog1.FileName = "openFileDialog1";
//
// toolStripSplitButton1
//
this.toolStripSplitButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripSplitButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripSplitButton1.Image")));
this.toolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripSplitButton1.Name = "toolStripSplitButton1";
this.toolStripSplitButton1.Size = new System.Drawing.Size(48, 36);
this.toolStripSplitButton1.Text = "toolStripSplitButton1";
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(101, 36);
this.toolStripLabel1.Text = "Suche in Vorlagen";
//
// toolStripTextBox1
//
this.toolStripTextBox1.Font = new System.Drawing.Font("Segoe UI", 9F);
this.toolStripTextBox1.Name = "toolStripTextBox1";
this.toolStripTextBox1.Size = new System.Drawing.Size(100, 39);
//
// toolStripButton2
//
this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(36, 36);
this.toolStripButton2.Text = "toolStripButton2";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// OfficeVorlage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

22
Client/UIControls/Administrator/OfficeVorlage.cs
View File

@@ -274,6 +274,28 @@ namespace OnDoc.UIControls.Administrator
private void toolStripButton1_Click(object sender, EventArgs e)
{
Database.DB db = new Database.DB(AppParams.connectionstring);
db.Get_Tabledata_for_Update("Select * from office_vorlage where office_vorlagenr = " + TreeOfficeVorlagen.SelectedNode.Tag.ToString(),false,true);
DataRow r = db.daten.Tables[0].Rows[0];
r["bezeichnung"] = txtBezeichnung.Text;
r["beschreibung"] = txtBeschreibung.Text;
r["Version"] = txtVersion.Text;
r["prefix_dokumentname"] = txtPräfix.Text;
r["kopfzeile_generieren"] = chkKopfzeile.Checked;
r["bcpt"] = txtBcTop.Text;
r["bcpl"] = txtBcLeft.Text;
r["bcw"] = txtBcWidth.Text;
r["bch"] = txtBcHeigth.Text;
r["bchorizontal"] = chkbchorizontal.Checked;
r["barcodetype"] = cbboxBarcodeType.SelectedIndex;
r["datamatrixdelimiter"] = txtBCTrennzeichen.Text;
//r["datamatrixformat"] = txtBCFormat.Text;
//r["Datamatrixfont"] = txtBCFont.Text;
//r["DataMatrixFontSize"] = txtBCFontSize.Text;
r["datamatrixcontent"] = txtBCInhalt.Text;
r["datamatrixbeschriftung"] = txtBCAnzeige.Text;
db.Update_Data();
}

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

@@ -138,6 +138,7 @@ namespace OnDoc.UICintrols
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
this.ribbonButtonVorlagenfeldregel = new System.Windows.Forms.RibbonButton();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -807,6 +808,7 @@ namespace OnDoc.UICintrols
this.ribbonButton4.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonButton4.Name = "ribbonButton4";
this.ribbonButton4.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton4.SmallImage")));
this.ribbonButton4.Visible = false;
this.ribbonButton4.Click += new System.EventHandler(this.ribbonButton4_Click_1);
//
// ribbonPanelVorschau
@@ -869,7 +871,7 @@ namespace OnDoc.UICintrols
this.RibbonButtonAttributeEinAusblenden.LargeImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonAttributeEinAusblenden.LargeImage")));
this.RibbonButtonAttributeEinAusblenden.Name = "RibbonButtonAttributeEinAusblenden";
this.RibbonButtonAttributeEinAusblenden.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonAttributeEinAusblenden.SmallImage")));
this.RibbonButtonAttributeEinAusblenden.Text = "Einblenden_/_Ausblenden";
this.RibbonButtonAttributeEinAusblenden.Text = "Ein-/Ausblenden";
this.RibbonButtonAttributeEinAusblenden.Click += new System.EventHandler(this.RibbonButtonAttributeEinAusblenden_Click);
//
// ribbonTabDokpaket_Serienbrief
@@ -1002,8 +1004,9 @@ namespace OnDoc.UICintrols
this.ribbonPanel1.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Right;
this.ribbonPanel1.Items.Add(this.RibbonButtonDokumenttyp);
this.ribbonPanel1.Items.Add(this.RibbonButtonVorlagen);
this.ribbonPanel1.Items.Add(this.ribbonButtonVorlagenfeldregel);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = "ribbonPanel1";
this.ribbonPanel1.Text = "";
//
// RibbonButtonDokumenttyp
//
@@ -1111,6 +1114,15 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// ribbonButtonVorlagenfeldregel
//
this.ribbonButtonVorlagenfeldregel.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButtonVorlagenfeldregel.Image")));
this.ribbonButtonVorlagenfeldregel.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonVorlagenfeldregel.LargeImage")));
this.ribbonButtonVorlagenfeldregel.Name = "ribbonButtonVorlagenfeldregel";
this.ribbonButtonVorlagenfeldregel.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonVorlagenfeldregel.SmallImage")));
this.ribbonButtonVorlagenfeldregel.Text = "Vorlagenfeldregel";
this.ribbonButtonVorlagenfeldregel.Click += new System.EventHandler(this.ribbonButtonVorlagenfeldregel_Click);
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1246,5 +1258,6 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.ToolStripMenuItem attributeAnzeigenVersteckenToolStripMenuItem;
private System.Windows.Forms.RibbonPanel ribbonPanelAttribute;
private System.Windows.Forms.RibbonButton RibbonButtonAttributeEinAusblenden;
private System.Windows.Forms.RibbonButton ribbonButtonVorlagenfeldregel;
}
}

18
Client/UIControls/DokList.cs
View File

@@ -546,7 +546,7 @@ namespace OnDoc.UICintrols
}
public void createnewdoc(int partnernr, int dokumenttypnr, bool Favoriten = false, string interaktion = "Yes", string showdoc = "Yes")
{
if (dokumenttypnr == 0)
{
DokTypSelect DokTypSelect = new DokTypSelect(Favoriten);
@@ -559,7 +559,7 @@ namespace OnDoc.UICintrols
else { return; }
}
int selectedIndex = RibbonCBProfil.SelectedIndex;
profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
Dokumenterstellung frmnewdok = new Dokumenterstellung(partnernr, dokumenttypnr, profilnr);
if (interaktion == "No")
@@ -880,7 +880,7 @@ namespace OnDoc.UICintrols
string URL = AppParams.RESTURI + "api/ArchiveDocFromDatabase?dokumentid=" + documentid;
HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest;
webRequest.Method = WebRequestMethods.Http.Post;
webRequest.Method = WebRequestMethods.Http.Get;
webRequest.Headers["Authorization"] = "Bearer " + AppParams.apikey;
try
{
@@ -1200,9 +1200,9 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.Deserialize(ms);
}
sfDataGrid1.ShowToolTip = true;
sfDataGrid1.ToolTipOption.AutoPopDelay = 500;
sfDataGrid1.ToolTipOption.InitialDelay = 500;
//sfDataGrid1.ShowToolTip = true;
//sfDataGrid1.ToolTipOption.AutoPopDelay = 500;
//sfDataGrid1.ToolTipOption.InitialDelay = 500;
System.Windows.Forms.Application.DoEvents();
}
@@ -1398,6 +1398,12 @@ namespace OnDoc.UICintrols
tt.Text = "Hallo Du";
e.ToolTipInfo.Items.Add(tt);
}
private void ribbonButtonVorlagenfeldregel_Click(object sender, EventArgs e)
{
TableEditor tb = new TableEditor("Vorlagenfeldregel");
tb.Show();
}
}
}

21
Client/UIControls/DokList.resx
View File

@@ -447,6 +447,27 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="ribbonButtonVorlagenfeldregel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
</value>
</data>
<data name="ribbonButtonVorlagenfeldregel.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
</value>
</data>
<data name="ribbonButtonVorlagenfeldregel.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAATSURBVDhPYxgFo2AUjAIwYGAAAAQQAAGnRHxjAAAAAElF
TkSuQmCC
</value>
</data>
<data name="ribbonButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

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 Normal file
View File

Binary file not shown.

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

Binary file not shown.

BIN
Client/bin/OnDocClient.zip
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.UICintrols.DokList.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.