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

Update 20241118

Browse Source
This commit is contained in:
Stefan Hutter
2024-11-18 15:21:58 +01:00
parent 69de21ca51
commit 194a97416c
120 changed files with 635 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,6 +138,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();
((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
this.tabControlAdv1.SuspendLayout();
this.tabPageAdv1.SuspendLayout();
@@ -576,6 +577,7 @@
//
// GroupBox2
//
this.GroupBox2.Controls.Add(this.chkboxInOffice);
this.GroupBox2.Controls.Add(this.cbaktiv);
this.GroupBox2.Controls.Add(this.rbDokumenterstellungPerson);
this.GroupBox2.Controls.Add(this.rbDokumenterstellungBP);
@@ -1360,6 +1362,14 @@
this.label15.TabIndex = 7;
this.label15.Text = "Sort";
//
// 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";
//
// Dokumenttyp
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1514,5 +1524,6 @@
private Syncfusion.Windows.Forms.Tools.TreeViewAdv TreeDokumenttyp;
internal System.Windows.Forms.CheckBox chkbearbeitungdirekt;
internal System.Windows.Forms.CheckBox chkinterop;
internal System.Windows.Forms.CheckBox chkboxInOffice;
}
}

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

@@ -162,7 +162,12 @@ namespace OnDoc.UIControls.Administrator
}
catch { chkinterop.Checked = false; }
try
{
chkboxInOffice.Checked = Convert.ToBoolean(r["erstellunginoffice"]) == true;
}
catch
{ chkboxInOffice.Checked = false; }
Update_Vorlagenfelder();
}
@@ -251,6 +256,12 @@ namespace OnDoc.UIControls.Administrator
{
chkaktiv.Checked = false;
}
if (Convert.ToBoolean(dr["erstellunginoffice"]) == true)
{
chkboxInOffice.Checked = true;
}
else
{ chkboxInOffice.Checked= false; }
}
private void txtfeldname_TextChanged(object sender, EventArgs e)
@@ -304,7 +315,7 @@ namespace OnDoc.UIControls.Administrator
r["ebanking_moeglich"] = cbebanking_moeglich.Checked == true;
r["BearbeitungDirket"] = chkbearbeitungdirekt.Checked==true;
r["interop"] = chkinterop.Checked == true;
r["erstellungInOffice"] = chkboxInOffice.Checked == true;
if (cbOfficeDokument.Checked) { r["genresultat_type"] = 1; }
if (cbPDFDokument.Checked) { r["genresultat_type"] = 2; }
if (cbPDFDirekteArchivierung.Checked) { r["genresultat_type"] = 3; }

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

@@ -112,12 +112,12 @@ namespace OnDoc.UICintrols
this.RibbonButtonBerechtigungsgruppe = new System.Windows.Forms.RibbonButton();
this.RibbonPanelDiverses = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonBCK = new System.Windows.Forms.RibbonButton();
this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel();
this.ribbonbuttonlogin = new System.Windows.Forms.RibbonButton();
this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig();
this.lblToApprove = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel();
this.ribbonbuttonlogin = new System.Windows.Forms.RibbonButton();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -890,6 +890,20 @@ namespace OnDoc.UICintrols
this.ribbonButtonBCK.Text = "BCK";
this.ribbonButtonBCK.Click += new System.EventHandler(this.ribbonButton3_Click);
//
// ribbonPanel4
//
this.ribbonPanel4.Items.Add(this.ribbonbuttonlogin);
this.ribbonPanel4.Name = "ribbonPanel4";
this.ribbonPanel4.Text = "";
//
// ribbonbuttonlogin
//
this.ribbonbuttonlogin.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.Image")));
this.ribbonbuttonlogin.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.LargeImage")));
this.ribbonbuttonlogin.Name = "ribbonbuttonlogin";
this.ribbonbuttonlogin.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.SmallImage")));
this.ribbonbuttonlogin.Click += new System.EventHandler(this.ribbonbuttonlogin_Click);
//
// lblToApprove
//
this.lblToApprove.AutoSize = true;
@@ -914,20 +928,6 @@ namespace OnDoc.UICintrols
this.RibbonButtonCreateNewDoc.Text = "Dokument";
this.RibbonButtonCreateNewDoc.Click += new System.EventHandler(this.RibbonButtonCreateNewDoc_Click);
//
// ribbonPanel4
//
this.ribbonPanel4.Items.Add(this.ribbonbuttonlogin);
this.ribbonPanel4.Name = "ribbonPanel4";
this.ribbonPanel4.Text = "";
//
// ribbonbuttonlogin
//
this.ribbonbuttonlogin.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.Image")));
this.ribbonbuttonlogin.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.LargeImage")));
this.ribbonbuttonlogin.Name = "ribbonbuttonlogin";
this.ribbonbuttonlogin.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.SmallImage")));
this.ribbonbuttonlogin.Click += new System.EventHandler(this.ribbonbuttonlogin_Click);
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

15
Client/UIControls/DokList.resx
View File

@@ -469,23 +469,20 @@
</data>
<data name="ribbonbuttonlogin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonlogin.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonlogin.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAATSURBVDhPYxgFo2AUjAIwYGAAAAQQAAGnRHxjAAAAAElF
TkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

55
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -45,6 +45,16 @@ namespace OnDoc.UIControls
public string genertated_dokumentid { get; set; }
public bool ErstellungInOffice = false;
public int vorlagenr = 0;
public bool kopfzeile_generieren = false;
public string barcode_zusatz = "";
public int barcode_top = 0;
public int barcode_left = 0;
public int barcode_width = 0;
public int barcode_height = 0;
public int barcode_horizontal = 0;
public UCAllgemeineDokumentParam()
{
InitializeComponent();
@@ -105,6 +115,17 @@ namespace OnDoc.UIControls
this.cbfaksimile.Enabled = Convert.ToBoolean(dr["unterschrift_faksimile"]) == true;
this.cbfaksimile.Checked = false;
this.cbformularohneunterschrfit.Checked = false;
try {
if (Convert.ToBoolean(dr["ErstellungInOffice"]) == true){
this.ErstellungInOffice = true;
}
else
{
ErstellungInOffice = false;
}
}
catch { ErstellungInOffice=false; }
if (dr["Versandstrasse_moeglich"].ToString() == "") { docgendata.versandstrasse_moeglich = false; }
else
{
@@ -123,6 +144,28 @@ namespace OnDoc.UIControls
catch { interop = false; }
barcode = Convert.ToBoolean(dr["Vertrag"])== true;
try
{
if (dr["physichses_archiv"].ToString() == "1") { this.barcode_zusatz = " U"; }
if (dr["physichses_archiv"].ToString() == "2") { this.barcode_zusatz = " F"; }
}
catch { }
db.Get_Tabledata("Select office_vorlagenr,kopfzeile_generieren, bcpt,bcpl, bcw, bch, bchorizontal from office_vorlage where office_vorlagenr="+dr["office_vorlagenr"].ToString(),false,true);
this.vorlagenr = Convert.ToInt32(dr["office_vorlagenr"]);
this.kopfzeile_generieren = false;
this.barcode_left = Convert.ToInt32(dr["bcpl"]);
this.barcode_top = Convert.ToInt32(dr["bcpt"]);
this.barcode_width = Convert.ToInt32(dr["bcw"]);
this.barcode_height = Convert.ToInt32(dr["bch"]);
this.barcode_horizontal = Convert.ToInt32(dr["bchorizontal"]);
try
{
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][1]) == true) { this.kopfzeile_generieren = true; }
}
catch { }
}
else
{
@@ -173,7 +216,7 @@ namespace OnDoc.UIControls
gridDokwertlist.QueryImageCellStyle += gridDokwertlist_QueryImageCellStyle;
gridDokwertlist.Columns["userinterface"].FilterPredicates.Add(new Syncfusion.Data.FilterPredicate() { FilterType=Syncfusion.Data.FilterType.Equals,FilterValue=true });
db = null;
db = null;
Refresh_Team();
this.cbboxteam.SelectedIndex = 0;
}
@@ -365,6 +408,7 @@ namespace OnDoc.UIControls
docgendata.dokumentdatum = DateDokumentDatum.DateTimeText.ToString();
docgendata.bezeichnung = txtbezeichnung.Text;
docgendata.erstellungsart = Erstellungsart.DokumentPreview;
if (ErstellungInOffice == true) { docgendata.erstellungsart = Erstellungsart.ErstellungInOffice; }
if (rbDokumentbearbeiten.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentBearbeiten; }
if (rbEditlater.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; }
if (rbasPDF.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDF; }
@@ -392,6 +436,15 @@ namespace OnDoc.UIControls
if (docgendata.digitaleunterschrift == true) { dokdata.As_Faksimile = "True"; } else { dokdata.As_Faksimile = "False"; }
dokdata.dokumentwerte = docgendata.dokumentwerte;
dokdata.Barcode = barcode;
dokdata.VorlageNr = this.vorlagenr.ToString();
dokdata.Kopfzeile_generieren = this.kopfzeile_generieren;
dokdata.barcode_zusatz = barcode_zusatz;
dokdata.barcode_left = barcode_left;
dokdata.barcode_width = barcode_width;
dokdata.barcode_top = barcode_top;
dokdata.barcode_height = barcode_height;
dokdata.barcode_zusatz = barcode_zusatz;
}
private void sfButton1_Click(object sender, EventArgs e)