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

update 20241210

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-10 20:36:02 +01:00
parent 8ade484063
commit 2c42687a40
191 changed files with 71919 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,6 +60,7 @@
this.GrpBewilligung = new System.Windows.Forms.GroupBox();
this.chkBewilliigungZwingend = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.chkboxInOffice = new System.Windows.Forms.CheckBox();
this.chkinterop = new System.Windows.Forms.CheckBox();
this.chkbearbeitungdirekt = new System.Windows.Forms.CheckBox();
this.cbbearbeitungzwingend = new System.Windows.Forms.CheckBox();
@@ -69,7 +70,6 @@
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();
@@ -77,6 +77,8 @@
this.cbbezeichnungmutierbar = new System.Windows.Forms.CheckBox();
this.cbVertrag = new System.Windows.Forms.CheckBox();
this.Grp1 = new System.Windows.Forms.GroupBox();
this.label17 = new System.Windows.Forms.Label();
this.cbboxarchiv = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxFachverantwortung = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxOwner = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxofficevorlage = new Syncfusion.WinForms.ListView.SfComboBox();
@@ -142,8 +144,6 @@
this.label16 = new System.Windows.Forms.Label();
this.rbNr = new System.Windows.Forms.RadioButton();
this.label15 = new System.Windows.Forms.Label();
this.cbboxarchiv = new Syncfusion.WinForms.ListView.SfComboBox();
this.label17 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
this.tabControlAdv1.SuspendLayout();
this.tabPageAdv1.SuspendLayout();
@@ -156,6 +156,7 @@
((System.ComponentModel.ISupportInitialize)(this.TreeDokumentArt)).BeginInit();
this.GroupBox2.SuspendLayout();
this.Grp1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxarchiv)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxFachverantwortung)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxOwner)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxofficevorlage)).BeginInit();
@@ -172,7 +173,6 @@
this.groupBox7.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxarchiv)).BeginInit();
this.SuspendLayout();
//
// tabControlAdv1
@@ -284,7 +284,6 @@
//
// GrpUnterschrifte
//
this.GrpUnterschrifte.Controls.Add(this.cbUnterschriftpruefung);
this.GrpUnterschrifte.Controls.Add(this.lblStandard);
this.GrpUnterschrifte.Controls.Add(this.lbUnterschriftStandard);
this.GrpUnterschrifte.Controls.Add(this.cbUnterschriftrechts);
@@ -301,7 +300,7 @@
// cbUnterschriftpruefung
//
this.cbUnterschriftpruefung.AutoSize = true;
this.cbUnterschriftpruefung.Location = new System.Drawing.Point(15, 105);
this.cbUnterschriftpruefung.Location = new System.Drawing.Point(15, 19);
this.cbUnterschriftpruefung.Name = "cbUnterschriftpruefung";
this.cbUnterschriftpruefung.Size = new System.Drawing.Size(176, 17);
this.cbUnterschriftpruefung.TabIndex = 1;
@@ -363,6 +362,7 @@
//
// GrpBewilligung
//
this.GrpBewilligung.Controls.Add(this.cbUnterschriftpruefung);
this.GrpBewilligung.Controls.Add(this.chkBewilliigungZwingend);
this.GrpBewilligung.Location = new System.Drawing.Point(15, 471);
this.GrpBewilligung.Name = "GrpBewilligung";
@@ -374,12 +374,13 @@
// chkBewilliigungZwingend
//
this.chkBewilliigungZwingend.AutoSize = true;
this.chkBewilliigungZwingend.Location = new System.Drawing.Point(19, 20);
this.chkBewilliigungZwingend.Location = new System.Drawing.Point(277, 19);
this.chkBewilliigungZwingend.Name = "chkBewilliigungZwingend";
this.chkBewilliigungZwingend.Size = new System.Drawing.Size(179, 17);
this.chkBewilliigungZwingend.TabIndex = 0;
this.chkBewilliigungZwingend.Text = "Bewilligung Dokument zwingend";
this.chkBewilliigungZwingend.UseVisualStyleBackColor = true;
this.chkBewilliigungZwingend.Visible = false;
//
// groupBox4
//
@@ -397,9 +398,17 @@
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Dokument-Produktion";
//
// chkboxInOffice
//
this.chkboxInOffice.Location = new System.Drawing.Point(11, 78);
this.chkboxInOffice.Name = "chkboxInOffice";
this.chkboxInOffice.Size = new System.Drawing.Size(187, 24);
this.chkboxInOffice.TabIndex = 26;
this.chkboxInOffice.Text = "Erstellung mit Office";
//
// chkinterop
//
this.chkinterop.Location = new System.Drawing.Point(259, 59);
this.chkinterop.Location = new System.Drawing.Point(11, 59);
this.chkinterop.Name = "chkinterop";
this.chkinterop.Size = new System.Drawing.Size(127, 24);
this.chkinterop.TabIndex = 11;
@@ -407,7 +416,7 @@
//
// chkbearbeitungdirekt
//
this.chkbearbeitungdirekt.Location = new System.Drawing.Point(259, 40);
this.chkbearbeitungdirekt.Location = new System.Drawing.Point(11, 40);
this.chkbearbeitungdirekt.Name = "chkbearbeitungdirekt";
this.chkbearbeitungdirekt.Size = new System.Drawing.Size(127, 24);
this.chkbearbeitungdirekt.TabIndex = 10;
@@ -415,7 +424,7 @@
//
// cbbearbeitungzwingend
//
this.cbbearbeitungzwingend.Location = new System.Drawing.Point(259, 19);
this.cbbearbeitungzwingend.Location = new System.Drawing.Point(11, 19);
this.cbbearbeitungzwingend.Name = "cbbearbeitungzwingend";
this.cbbearbeitungzwingend.Size = new System.Drawing.Size(221, 24);
this.cbbearbeitungzwingend.TabIndex = 9;
@@ -424,7 +433,7 @@
//
// cbPDFDirekteArchivierung
//
this.cbPDFDirekteArchivierung.Location = new System.Drawing.Point(16, 59);
this.cbPDFDirekteArchivierung.Location = new System.Drawing.Point(392, 69);
this.cbPDFDirekteArchivierung.Name = "cbPDFDirekteArchivierung";
this.cbPDFDirekteArchivierung.Size = new System.Drawing.Size(280, 24);
this.cbPDFDirekteArchivierung.TabIndex = 8;
@@ -433,19 +442,21 @@
//
// cbPDFDokument
//
this.cbPDFDokument.Location = new System.Drawing.Point(16, 40);
this.cbPDFDokument.Location = new System.Drawing.Point(392, 50);
this.cbPDFDokument.Name = "cbPDFDokument";
this.cbPDFDokument.Size = new System.Drawing.Size(280, 24);
this.cbPDFDokument.TabIndex = 6;
this.cbPDFDokument.Text = "Generierng als PDF";
this.cbPDFDokument.Visible = false;
//
// cbOfficeDokument
//
this.cbOfficeDokument.Location = new System.Drawing.Point(16, 19);
this.cbOfficeDokument.Location = new System.Drawing.Point(392, 29);
this.cbOfficeDokument.Name = "cbOfficeDokument";
this.cbOfficeDokument.Size = new System.Drawing.Size(240, 24);
this.cbOfficeDokument.TabIndex = 4;
this.cbOfficeDokument.Text = "Office-Dokument";
this.cbOfficeDokument.Visible = false;
//
// groupBox3
//
@@ -620,14 +631,6 @@
this.GroupBox2.TabStop = false;
this.GroupBox2.Text = "Diverses";
//
// chkboxInOffice
//
this.chkboxInOffice.Location = new System.Drawing.Point(259, 78);
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);
@@ -705,6 +708,26 @@
this.Grp1.TabStop = false;
this.Grp1.Text = "Vorlage";
//
// label17
//
this.label17.Location = new System.Drawing.Point(16, 172);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(100, 16);
this.label17.TabIndex = 30;
this.label17.Text = "Physisches Archiv";
//
// cbboxarchiv
//
this.cbboxarchiv.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxarchiv.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxarchiv.Location = new System.Drawing.Point(120, 168);
this.cbboxarchiv.Name = "cbboxarchiv";
this.cbboxarchiv.Size = new System.Drawing.Size(336, 25);
this.cbboxarchiv.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxarchiv.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxarchiv.TabIndex = 29;
this.cbboxarchiv.TabStop = false;
//
// cbboxFachverantwortung
//
this.cbboxFachverantwortung.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
@@ -1418,26 +1441,6 @@
this.label15.TabIndex = 7;
this.label15.Text = "Sort";
//
// cbboxarchiv
//
this.cbboxarchiv.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxarchiv.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxarchiv.Location = new System.Drawing.Point(120, 168);
this.cbboxarchiv.Name = "cbboxarchiv";
this.cbboxarchiv.Size = new System.Drawing.Size(336, 25);
this.cbboxarchiv.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxarchiv.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxarchiv.TabIndex = 29;
this.cbboxarchiv.TabStop = false;
//
// label17
//
this.label17.Location = new System.Drawing.Point(16, 172);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(100, 16);
this.label17.TabIndex = 30;
this.label17.Text = "Physisches Archiv";
//
// Dokumenttyp
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1469,6 +1472,7 @@
this.GroupBox2.PerformLayout();
this.Grp1.ResumeLayout(false);
this.Grp1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxarchiv)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxFachverantwortung)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxOwner)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxofficevorlage)).EndInit();
@@ -1488,7 +1492,6 @@
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxarchiv)).EndInit();
this.ResumeLayout(false);
}

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

@@ -149,24 +149,31 @@ namespace OnDoc.UIControls.Administrator
this.cbUnterschriftpruefung.Checked = Convert.ToBoolean(r["Unterschrift_Pruefung"]) == true;
this.lbUnterschriftStandard.SelectedIndex = Convert.ToInt32(r["unterschrift_standard"]);
this.cbboxarchiv.SelectedValue = Convert.ToInt32(r["physisches_archiv"]);
switch (Convert.ToInt32(r["genresultat_type"]))
{
case 1:
cbOfficeDokument.Checked = true;
break;
case 2:
cbPDFDokument.Checked = true;
break;
case 3:
cbPDFDirekteArchivierung.Checked = true;
break;
case 4:
cbbearbeitungzwingend.Checked = true;
break;
default:
cbOfficeDokument.Checked = true;
break;
}
//this.cbbearbeitungzwingend.Checked = Convert.ToBoolean(r["bearbeitungzwingend"]) == true;
//switch (Convert.ToInt32(r["genresultat_type"]))
//{
// case 1:
// cbOfficeDokument.Checked = true;
// break;
// case 2:
// cbPDFDokument.Checked = true;
// break;
// case 3:
// cbPDFDirekteArchivierung.Checked = true;
// break;
// case 4:
// cbbearbeitungzwingend.Checked = true;
// break;
// default:
// cbOfficeDokument.Checked = true;
// break;
//}
try { chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true; } catch { chkbearbeitungdirekt.Checked = false; }
try { chkinterop.Checked = Convert.ToBoolean(r["interop"]) == true; }catch { chkinterop.Checked = false; }
try { chkboxInOffice.Checked = Convert.ToBoolean(r["erstellungInOffice"]) == true; } catch { chkboxInOffice.Checked = false; };
try { cbbearbeitungzwingend.Checked = Convert.ToBoolean(r["bearbeitung_zwingend"]) == true; } catch { cbbearbeitungzwingend.Checked = false; }
r["physisches_archiv"] = cbboxarchiv.SelectedValue;
this.cbversandstrasse_moeglich.Checked = r["versandstrasse_moeglich"].ToString() == "True";
this.cbebanking_moeglich.Checked = r["ebanking_moeglich"].ToString() == "True";
@@ -175,23 +182,23 @@ namespace OnDoc.UIControls.Administrator
this.listBox1.DataSource = db.dsdaten.Tables[0];
this.listBox1.DisplayMember = "Bezeichnung";
this.listBox1.ValueMember = "vorlagenfeldregelnr";
try
{
chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true;
}
catch { chkbearbeitungdirekt.Checked = false; }
try
{
chkinterop.Checked = Convert.ToBoolean(r["interop"]) == true;
}
catch { chkinterop.Checked = false; }
//try
//{
// chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true;
//}
//catch { chkbearbeitungdirekt.Checked = false; }
//try
//{
// chkinterop.Checked = Convert.ToBoolean(r["interop"]) == true;
//}
//catch { chkinterop.Checked = false; }
try
{
chkboxInOffice.Checked = Convert.ToBoolean(r["erstellunginoffice"]) == true;
}
catch
{ chkboxInOffice.Checked = false; }
//try
//{
// chkboxInOffice.Checked = Convert.ToBoolean(r["erstellunginoffice"]) == true;
//}
//catch
//{ chkboxInOffice.Checked = false; }
Update_Vorlagenfelder();
}
@@ -340,11 +347,11 @@ namespace OnDoc.UIControls.Administrator
r["BearbeitungDirket"] = chkbearbeitungdirekt.Checked == true;
r["interop"] = chkinterop.Checked == true;
r["erstellungInOffice"] = chkboxInOffice.Checked == true;
r["[physisches_archiv]"]=cbboxarchiv.SelectedValue;
if (cbOfficeDokument.Checked) { r["genresultat_type"] = 1; }
if (cbPDFDokument.Checked) { r["genresultat_type"] = 2; }
if (cbPDFDirekteArchivierung.Checked) { r["genresultat_type"] = 3; }
if (cbbearbeitungzwingend.Checked) { r["genresultat_type"] = 4; }
r["physisches_archiv"]=cbboxarchiv.SelectedValue;
//if (cbOfficeDokument.Checked) { r["genresultat_type"] = 1; }
//if (cbPDFDokument.Checked) { r["genresultat_type"] = 2; }
//if (cbPDFDirekteArchivierung.Checked) { r["genresultat_type"] = 3; }
r["bearbeitung_zwingend"] = this.cbbearbeitungzwingend.Checked == true;

4
Client/UIControls/Administrator/edk_viewer.cs
View File

@@ -59,7 +59,7 @@ namespace OnDoc.UIControls.Administrator
}
else
{
sql = "select top "+numericUpDown1.ToString()+" rowid, tgnummer, insert_timestamp, dbo.binarytobase64(xmldata) from edk_data ";
sql = "select top "+numericUpDown1.Value.ToString()+" rowid, tgnummer, insert_timestamp, dbo.binarytobase64(xmldata) from edk_data ";
sql = sql + " where insert_timestamp >= '" + datum + "' ";
if (mitarbeiternr > 0)
@@ -69,7 +69,7 @@ namespace OnDoc.UIControls.Administrator
sql = sql + " where tgnummer='" + db.dsdaten.Tables[0].Rows[0][0].ToString() + "'";
}
}
sql = sql + "order by rowid desc";
sql = sql + " order by rowid desc";
}
db.Get_Tabledata(sql, false, true);