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

92
Client/DocMgmt/Dokumenterstellung.Designer.cs generated
View File

@@ -29,11 +29,10 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Dokumenterstellung));
Model.clsdocgendata clsdocgendata2 = new Model.clsdocgendata();
Model.clsdocgendata clsdocgendata1 = new Model.clsdocgendata();
this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton();
this.btnDokumenterstellen = new Syncfusion.WinForms.Controls.SfButton();
this.PnlPreview = new System.Windows.Forms.Panel();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.GrpFnkt = new System.Windows.Forms.GroupBox();
this.btnOfficePrint = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
@@ -48,6 +47,8 @@
this.lbledit = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.label7 = new System.Windows.Forms.Label();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.ucAllgemeineDokumentParam1 = new OnDoc.UIControls.UCAllgemeineDokumentParam();
this.PnlPreview.SuspendLayout();
this.GrpFnkt.SuspendLayout();
@@ -83,18 +84,10 @@
this.PnlPreview.TabIndex = 19;
this.PnlPreview.Visible = false;
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 123);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(668, 292);
this.docPreview1.TabIndex = 1;
this.docPreview1.ZoomPercentage = 0;
//
// GrpFnkt
//
this.GrpFnkt.BackColor = System.Drawing.Color.SeaShell;
this.GrpFnkt.Controls.Add(this.label7);
this.GrpFnkt.Controls.Add(this.btnOfficePrint);
this.GrpFnkt.Controls.Add(this.label6);
this.GrpFnkt.Controls.Add(this.label5);
@@ -120,7 +113,7 @@
// btnOfficePrint
//
this.btnOfficePrint.Image = global::OnDoc.Properties.Resources.Printer_48x48_32;
this.btnOfficePrint.Location = new System.Drawing.Point(419, 19);
this.btnOfficePrint.Location = new System.Drawing.Point(289, 17);
this.btnOfficePrint.Name = "btnOfficePrint";
this.btnOfficePrint.Size = new System.Drawing.Size(74, 79);
this.btnOfficePrint.TabIndex = 12;
@@ -131,7 +124,7 @@
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(334, 99);
this.label6.Location = new System.Drawing.Point(515, 101);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(79, 13);
this.label6.TabIndex = 11;
@@ -141,7 +134,7 @@
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(345, 86);
this.label5.Location = new System.Drawing.Point(525, 88);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 13);
this.label5.TabIndex = 10;
@@ -151,7 +144,7 @@
// ribbonButtonVersandstrasse
//
this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Versandstrasse_48x48_32;
this.ribbonButtonVersandstrasse.Location = new System.Drawing.Point(338, 15);
this.ribbonButtonVersandstrasse.Location = new System.Drawing.Point(519, 17);
this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse";
this.ribbonButtonVersandstrasse.Size = new System.Drawing.Size(75, 81);
this.ribbonButtonVersandstrasse.TabIndex = 9;
@@ -163,7 +156,7 @@
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(264, 84);
this.label4.Location = new System.Drawing.Point(376, 91);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(60, 13);
this.label4.TabIndex = 8;
@@ -172,7 +165,7 @@
// ribbonButtonArchiv
//
this.ribbonButtonArchiv.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButtonArchiv.Image")));
this.ribbonButtonArchiv.Location = new System.Drawing.Point(257, 16);
this.ribbonButtonArchiv.Location = new System.Drawing.Point(369, 20);
this.ribbonButtonArchiv.Name = "ribbonButtonArchiv";
this.ribbonButtonArchiv.Size = new System.Drawing.Size(75, 81);
this.ribbonButtonArchiv.TabIndex = 7;
@@ -249,6 +242,24 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(303, 86);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(48, 13);
this.label7.TabIndex = 13;
this.label7.Text = "Drucken";
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 123);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(668, 292);
this.docPreview1.TabIndex = 1;
this.docPreview1.ZoomPercentage = 0;
//
// ucAllgemeineDokumentParam1
//
this.ucAllgemeineDokumentParam1.ausDokumentpaket = false;
@@ -256,29 +267,29 @@
this.ucAllgemeineDokumentParam1.bpperson_error_type = 0;
this.ucAllgemeineDokumentParam1.check_error = "";
this.ucAllgemeineDokumentParam1.checkpartner = true;
clsdocgendata2.bezeichnung = null;
clsdocgendata2.digitaleunterschrift = false;
clsdocgendata2.dokumentdatum = null;
clsdocgendata2.dokumenttypnr = null;
clsdocgendata2.dokumentwerte = null;
clsdocgendata2.ersteller = null;
clsdocgendata2.erstelling_in_office = false;
clsdocgendata2.erstellungsart = Model.Erstellungsart.DokumentBearbeiten;
clsdocgendata2.frormularOhneUnterschrift = false;
clsdocgendata2.inhaberadresse = null;
clsdocgendata2.logo = "";
clsdocgendata2.partnernr = null;
clsdocgendata2.postzustellung = null;
clsdocgendata2.status = null;
clsdocgendata2.team = null;
clsdocgendata2.unterschriftLinks = null;
clsdocgendata2.unterschriftRehts = null;
clsdocgendata2.verantwortlich = null;
clsdocgendata2.versandstrasse_moeglich = false;
clsdocgendata2.zustaendigkube = null;
clsdocgendata2.zustaendigmitarbeiter = null;
clsdocgendata2.zustelladresse = null;
this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata2;
clsdocgendata1.bezeichnung = null;
clsdocgendata1.digitaleunterschrift = false;
clsdocgendata1.dokumentdatum = null;
clsdocgendata1.dokumenttypnr = null;
clsdocgendata1.dokumentwerte = null;
clsdocgendata1.ersteller = null;
clsdocgendata1.erstelling_in_office = false;
clsdocgendata1.erstellungsart = Model.Erstellungsart.DokumentBearbeiten;
clsdocgendata1.frormularOhneUnterschrift = false;
clsdocgendata1.inhaberadresse = null;
clsdocgendata1.logo = "";
clsdocgendata1.partnernr = null;
clsdocgendata1.postzustellung = null;
clsdocgendata1.status = null;
clsdocgendata1.team = null;
clsdocgendata1.unterschriftLinks = null;
clsdocgendata1.unterschriftRehts = null;
clsdocgendata1.verantwortlich = null;
clsdocgendata1.versandstrasse_moeglich = false;
clsdocgendata1.zustaendigkube = null;
clsdocgendata1.zustaendigmitarbeiter = null;
clsdocgendata1.zustelladresse = null;
this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata1;
this.ucAllgemeineDokumentParam1.dokumenttypnr = 0;
this.ucAllgemeineDokumentParam1.genertated_dokumentid = null;
this.ucAllgemeineDokumentParam1.interop = false;
@@ -336,5 +347,6 @@
private System.Windows.Forms.Label lbledit;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button btnOfficePrint;
private System.Windows.Forms.Label label7;
}
}

26
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -253,15 +253,31 @@ namespace OnDoc.DocMgmt
private void btnOfficePrint_Click(object sender, EventArgs e)
{
clsdok dok = new clsdok("", "", "");
OfficePrinter.OnDocOffice op = new OfficePrinter.OnDocOffice();
DocGet gd = new DocGet(AppParams.connectionstring);
{
dok = gd.GetDoc(dokumentid);
}
Helper.FileHelper fh = new Helper.FileHelper();
string Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
fh.SaveBase64ToFile(dok.dokument, Filename );
op.PrintInWord(Filename, AppParams.wordprintmacro);
if (dok.doktype == "D")
{
OfficePrinter.OnDocOffice op = new OfficePrinter.OnDocOffice();
Helper.FileHelper fh = new Helper.FileHelper();
string Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
fh.SaveBase64ToFile(dok.dokument, Filename);
op.PrintInWord(Filename, AppParams.wordprintmacro);
op = null;
}
if (dok.doktype == "P")
{
docPreview1.printpdf();
}
if (dok.doktype == "X")
{
Helper.FileHelper fh = new Helper.FileHelper();
string Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
fh.SaveBase64ToFile(dok.dokument, Filename);
System.Diagnostics.Process.Start("winword.exe", "/w " + Filename);
}
}
}
}

185
Client/DocMgmt/Serienbrief.cs
View File

@@ -40,6 +40,7 @@ using Windows.Perception.Spatial;
using static Model.OnBaseDocUpload;
using static BroadcastListener.Classes.Factory;
using Microsoft.Office.Interop.Excel;
using Microsoft.SqlServer.Server;
namespace OnDoc.UIControls
@@ -94,7 +95,7 @@ namespace OnDoc.UIControls
{
if (message == "BtnSBVorschau")
{
if (sender.SenderName=="Serienbriefbearbeitung")
if (sender.SenderName == "Serienbriefbearbeitung")
{
string[] details = sender.Function.Split(' ');
foreach (System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
@@ -102,7 +103,7 @@ namespace OnDoc.UIControls
if (dr[0].ToString() == details[0].ToString())
{
IsPreview = true;
PreviewFiename = sender.Details.ToString()+".tmp";
PreviewFiename = sender.Details.ToString() + ".tmp";
ribbonbuttonsave_Click(sender, null);
Generate(Convert.ToInt32(dr["intEintragnr"]));
System.IO.File.Delete(PreviewFiename);
@@ -112,7 +113,7 @@ namespace OnDoc.UIControls
}
}
}
if (message== "BtnSBVorschauSave")
if (message == "BtnSBVorschauSave")
{
ribbonbuttonsave_Click(sender, null);
}
@@ -130,7 +131,7 @@ namespace OnDoc.UIControls
ribbonbuttonsave.Enabled = false;
ribbonButtonDelete.Enabled = false;
RibbonButtonExcelImport.Enabled = false;
ribbonbuttonaddpartner.Enabled= false;
ribbonbuttonaddpartner.Enabled = false;
ribbonButtonPartnerPruefen.Enabled = false;
ribbonButtonVorlageBearbeiten.Enabled = false;
ribbonbuttonaddpartner.Enabled = false;
@@ -233,6 +234,7 @@ namespace OnDoc.UIControls
private void RibbonButtonExcelImport_Click(object sender, EventArgs e)
{
System.Data.DataTable importdata = new System.Data.DataTable();
openFileDialog1.Filter = "Excel-Dateien files (*.xlsx)|*.xlsx|CSV-Dateien (*.csv)|*.csv|Alle Dateien (*.*)|*.*";
openFileDialog1.FilterIndex = 0;
@@ -262,7 +264,7 @@ namespace OnDoc.UIControls
MessageBox.Show("Die ausgewählten Daten können nicht verwendet werden.", "Import", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (importdata.Columns[0].Caption.ToUpper() != "PARTNERNR")
if (importdata.Columns[0].Caption != "Partnernr")
{
MessageBox.Show("Die importierten Daten enthalten keine Spalte 'Partnernr'. Der Vorgang wird abgebrochen.", "Import", MessageBoxButtons.OK, MessageBoxIcon.Error);
importdata.Rows.Clear();
@@ -270,6 +272,14 @@ namespace OnDoc.UIControls
return;
}
DB dB = new DB(AppParams.connectionstring);
if (sb.dsempfaenger.Tables[0].Rows.Count == 1)
{
if (sb.dsempfaenger.Tables[0].Rows[0]["Partnernr"].ToString().Trim() == "")
{
sb.dsempfaenger.Tables[0].Rows[0].Delete();
sb.dsempfaenger.AcceptChanges();
}
}
//sb.dsempfaenger.Tables[0].Rows.Clear();
bool found = false;
foreach (System.Data.DataColumn dc in importdata.Columns)
@@ -288,11 +298,11 @@ namespace OnDoc.UIControls
}
catch { }
}
}
importdata.AcceptChanges();
found=false;
found = false;
foreach (System.Data.DataColumn dc in sb.dsempfaenger.Tables[0].Columns)
{
if (dc.ColumnName.ToUpper() == "INTEINTRAGNR") { found = true; }
@@ -312,7 +322,14 @@ namespace OnDoc.UIControls
r1[col.ColumnName] = dr[col.ColumnName];
}
catch { r1[col.ColumnName] = ""; }
catch
{
try
{
r1["$$" + col.ColumnName + "$$"] = dr[col.ColumnName];
}
catch { r1[col.ColumnName] = ""; }
}
}
r1["STATUS"] = 0;
@@ -325,11 +342,19 @@ namespace OnDoc.UIControls
//}
//catch { }
dB.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + r1[0].ToString(), false, true);
if (dB.dsdaten.Tables[0].Rows.Count < 1) r1["Fehlercode"] = 1; else r1["fehlercode"] = 0;
r1[1] = dB.dsdaten.Tables[0].Rows[0][0].ToString();
sb.dsempfaenger.Tables[0].Rows.Add(r1);
try
{
if (dB.dsdaten.Tables[0].Rows.Count > 0)
{
if (dB.dsdaten.Tables[0].Rows.Count < 1) r1["Fehlercode"] = 1; else r1["fehlercode"] = 0;
r1[1] = dB.dsdaten.Tables[0].Rows[0][0].ToString();
sb.dsempfaenger.Tables[0].Rows.Add(r1);
}
}
catch { }
}
dB = null;
Partnerliste_Pruefen();
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
finish_progress();
@@ -349,39 +374,44 @@ namespace OnDoc.UIControls
{
// sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = false;
}
catch {
catch
{
sb.dsempfaenger.Tables[0].Columns.Add("IntEintragnr");
}
sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = true;
sfDataGridEmpfaenger.Columns["STATUS"].Visible = false;
sfDataGridEmpfaenger.Columns["FEHLERCODE"].Visible = false;
sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = true;
sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
sfDataGridEmpfaenger.Columns["ERSTELLER"].Visible = false;
sfDataGridEmpfaenger.Columns["DRUCKJOBID"].Visible = false;
sfDataGridEmpfaenger.Columns["AKTIV"].Visible = false;
sfDataGridEmpfaenger.Columns["Zustelladresse"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede1"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede2"].Visible = false;
sfDataGridEmpfaenger.Columns["Anrede"].Width = 0;
sfDataGridEmpfaenger.Columns["Name"].Visible = false;
sfDataGridEmpfaenger.Columns["Vorname"].Visible = false;
sfDataGridEmpfaenger.Columns["Strasse"].Visible = false;
sfDataGridEmpfaenger.Columns["PLZ"].Visible = false;
sfDataGridEmpfaenger.Columns["Ort"].Visible = false;
sfDataGridEmpfaenger.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
try
{
sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = true;
//sfDataGridEmpfaenger.Columns["STATUS"].Visible = false;
sfDataGridEmpfaenger.Columns["FEHLERCODE"].Visible = false;
sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = true;
sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
sfDataGridEmpfaenger.Columns["ERSTELLER"].Visible = false;
sfDataGridEmpfaenger.Columns["DRUCKJOBID"].Visible = false;
sfDataGridEmpfaenger.Columns["AKTIV"].Visible = false;
sfDataGridEmpfaenger.Columns["Zustelladresse"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede1"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede2"].Visible = false;
sfDataGridEmpfaenger.Columns["Anrede"].Width = 0;
sfDataGridEmpfaenger.Columns["Name"].Visible = false;
sfDataGridEmpfaenger.Columns["Vorname"].Visible = false;
sfDataGridEmpfaenger.Columns["Strasse"].Visible = false;
sfDataGridEmpfaenger.Columns["PLZ"].Visible = false;
sfDataGridEmpfaenger.Columns["Ort"].Visible = false;
sfDataGridEmpfaenger.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
}
catch { }
}
private void init_empfaenger(int serienbriefnr)
{
Database.DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select dbo.BinaryToBase64(xmldata) as Data from edex_sb_empfaenger where serienbriefnr=" + serienbriefnr.ToString(), false, true);
Base64Helper bh = new Base64Helper();
bh.Base64 = db.dsdaten.Tables[0].Rows[0][0].ToString();
string xml = bh.DecodeBase64();
string filename = AppParams.tempdir + @"\"+sb.serienbriefnr.ToString()+".xml";
string filename = AppParams.tempdir + @"\" + sb.serienbriefnr.ToString() + ".xml";
System.IO.File.WriteAllText(filename, xml);
//dsempfaenger.Tables.Clear();
//dsempfaenger.ReadXml(filename);
@@ -411,7 +441,7 @@ namespace OnDoc.UIControls
this.sb = new serienbrief();
sb.dokumenttypnr = DokTypSelect.dokumenttypnr;
update_serienbrief_details(true, sb.dokumenttypnr, 0);
init_empfaenger(0);
init_empfaenger(-1);
vorlagenfelder(sb.dokumenttypnr);
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
update_screen();
@@ -433,7 +463,7 @@ namespace OnDoc.UIControls
panelLoad.Visible = false;
Logging.Logging.Debug(ex.Message, "OnDoc", "SB Error");
}
}
else
{
@@ -444,7 +474,7 @@ namespace OnDoc.UIControls
private void vorlage_auslesen_und_speichern()
{
DOCGEN.DocGet dg = new DOCGEN.DocGet(AppParams.connectionstring);
string filedata = dg.get_word_vorlage(sb.officevorlagenr);
@@ -455,7 +485,7 @@ namespace OnDoc.UIControls
dB.Get_ApplicationType_from_Vorlage(sb.officevorlagenr);
string Apptype = "";
Apptype = dB.dsdaten.Tables[0].Rows[0][1].ToString();
string filename = AppParams.tempdir+sb.serienbriefnr.ToString() + "." + Apptype;
string filename = AppParams.tempdir + sb.serienbriefnr.ToString() + "." + Apptype;
fh.SaveBase64ToFile(filedata, filename);
sb.filename = filename;
}
@@ -481,7 +511,7 @@ namespace OnDoc.UIControls
//dB.Save_To_DB("", "", filedata, sb.serienbriefnr);
//sb.filename = dB.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir);
//// sb.filename = dB.save_sb_vorlage_to_db(filename, Apptype, sb.serienbriefnr);
private void vorlagenfelder(int dokumenttypnr)
{
DB db = new DB(AppParams.connectionstring);
@@ -549,9 +579,9 @@ namespace OnDoc.UIControls
db.Get_Tabledata("Select bezeichnung,office_vorlagenr, isnull(vertrag,0) as vertrag, isnull(physisches_archiv,0) as archiv from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true);
sb.bezeichnung = db.dsdaten.Tables[0].Rows[0][0].ToString();
sb.officevorlagenr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]);
sb.vertrag= Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]);
db.Get_Tabledata("Select beschreibung from physischesarchiv where phyischesarchivnr = " + db.dsdaten.Tables[0].Rows[0][3].ToString(),false,true);
sb.vertrag = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]);
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; }
}
@@ -580,7 +610,8 @@ namespace OnDoc.UIControls
{
sb.faksimile_unterschrfit = "False";
}
} catch { sb.faksimile_unterschrfit = "False"; }
}
catch { sb.faksimile_unterschrfit = "False"; }
try { sb.team = Convert.ToInt32(cbboxteam.SelectedValue.ToString()); } catch { sb.team = 0; }
sb.archivdatum = Convert.ToDateTime(DateDokumentDatum.Value);
sb.dokumentdatum = Convert.ToDateTime(DateDokumentDatum.Value);
@@ -594,8 +625,6 @@ namespace OnDoc.UIControls
else { db.save_sb_vorlage_to_db(PreviewFiename, "", sb.serienbriefnr); }
}
private void update_zahlen()
{
try
@@ -605,7 +634,9 @@ namespace OnDoc.UIControls
int fehlerhaft = 0;
int generiert = 0;
int abgeschlossen = 0;
sb.dsempfaenger.AcceptChanges();
DataView dv = new DataView(sb.dsempfaenger.Tables[0]);
dv.RowFilter = "Status = 0";
treeViewAdv1.Nodes[0].Text = "In Bearbeitung (" + dv.Count.ToString() + ")";
@@ -624,14 +655,14 @@ namespace OnDoc.UIControls
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0];
update_grid();
enable_disable_functions(2,false);
enable_disable_functions(2, false);
if (inbearbeitung > 0) { RibbonButtonGenerateSB.Enabled = true; }
if (fehlerhaft == 0 && inbearbeitung == 0 && generiert > 0)
{
RibbonButtonArchivierenUndAbschlessen.Enabled = true;
ribbonButtonDruckstapel.Enabled = true;
}
enable_disable_functions(3, true);
if (generiert > 0 || abgeschlossen > 0)
{
@@ -642,7 +673,7 @@ namespace OnDoc.UIControls
catch { }
}
private void treeViewAdv1_AfterSelect(object sender, EventArgs e)
{
update_grid();
@@ -673,7 +704,7 @@ namespace OnDoc.UIControls
sfDataGridEmpfaenger.DataSource = dv;
refresh_spalten();
enable_disable_functions(4, false);
break;
case "Gener":
dv.RowFilter = "Status = 1";
@@ -717,7 +748,7 @@ namespace OnDoc.UIControls
System.Windows.Forms.Application.DoEvents();
}
@@ -726,7 +757,8 @@ namespace OnDoc.UIControls
{
open_sb(selectedsbnr);
}
private void open_sb(int serienbriefnr) {
private void open_sb(int serienbriefnr)
{
DB db = new DB(AppParams.connectionstring);
sb = new serienbrief();
sb.dsempfaenger = new DataSet();
@@ -741,7 +773,7 @@ namespace OnDoc.UIControls
sb.barcode_type = db.dsdaten.Tables[0].Rows[0]["barcodetype"].ToString();
sb.barcode_content = db.dsdaten.Tables[0].Rows[0]["datamatrixcontent"].ToString();
string sql = "";
@@ -758,9 +790,9 @@ namespace OnDoc.UIControls
}
sb.barcode_font = AppParams.barcodefont;
sb.barcode_fontsize = AppParams.barcodefontsize;
sb.barcode_textposition=AppParams.barcodetextposition;
sb.barcode_textposition = AppParams.barcodetextposition;
sb.barcode_zusatz = "";
sb.filename = db.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir);
pnlLoad.Visible = false;
@@ -779,9 +811,9 @@ namespace OnDoc.UIControls
DateDokumentDatum.Value = sb.archivdatum;
switch (sb.ppfaktura)
{
case 0:rbppohne.Checked = true;break;
case 1: rbppa.Checked = true;break;
case 2:rbbpb.Checked = true;break;
case 0: rbppohne.Checked = true; break;
case 1: rbppa.Checked = true; break;
case 2: rbbpb.Checked = true; break;
}
if (sb.zustaendig == -1)
{
@@ -814,7 +846,7 @@ namespace OnDoc.UIControls
var dataRow = (e.DataRow.RowData as DataRowView).Row;
selectedsbnr = Convert.ToInt32(dataRow["serienbriefnr"].ToString());
}
catch { }
catch { }
}
@@ -958,9 +990,9 @@ namespace OnDoc.UIControls
.Where(gr => gr.Count() > 1)
.Select(g => g.Key);
string check_duplicates = "";
foreach(var dup in duplicates)
foreach (var dup in duplicates)
{
if (check_duplicates!="") { check_duplicates = check_duplicates + ", "; }
if (check_duplicates != "") { check_duplicates = check_duplicates + ", "; }
check_duplicates = check_duplicates + dup.ToString();
}
if (check_duplicates != "")
@@ -974,8 +1006,10 @@ namespace OnDoc.UIControls
if (sb.dsempfaenger.Tables[0].Columns.Count > 20) { check_zwingende_felder(); }
finish_progress();
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
if (msg != "") { MessageBox.Show(msg, "Serienbrief", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
if (msg != "")
{
MessageBox.Show(msg, "Serienbrief", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
return true;
}
@@ -1024,9 +1058,9 @@ namespace OnDoc.UIControls
System.Data.DataTable vorlagendaten = new System.Data.DataTable();
private void RibbonButtonGenerateSB_Click(object sender, EventArgs e)
{
ribbonbuttonsave_Click(sender, e);
if (!Partnerliste_Pruefen()){ return; }
if (!Partnerliste_Pruefen()) { return; }
Generate();
}
private void Generate(int vorschauid = 0)
@@ -1044,9 +1078,12 @@ namespace OnDoc.UIControls
{
Helper.FileHelper fh = new FileHelper();
sb.VorlageBase64 = fh.Base64FromFile(PreviewFiename);
} else {
string fn = dB.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir);
sb.VorlageBase64 = dB.dsdaten.Tables[0].Rows[0][0].ToString(); }
}
else
{
string fn = dB.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir);
sb.VorlageBase64 = dB.dsdaten.Tables[0].Rows[0][0].ToString();
}
sb.DocValues = new List<clsDocValue>();
@@ -1405,7 +1442,7 @@ namespace OnDoc.UIControls
}
clsDocValue dv = new clsDocValue();
dv.TMBeginn = beginntextmarke; ;
dv.TMEnd = endetextmarke;
dv.Value = feldwert;
@@ -1601,7 +1638,7 @@ namespace OnDoc.UIControls
{
add_progress();
System.Data.DataRow dr = rowView.Row;
db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString()+"'", false, true);
db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString() + "'", false, true);
var stream = new MemoryStream(Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString()));
if (stream.Length > 0)
{
@@ -1726,7 +1763,7 @@ namespace OnDoc.UIControls
onbasedoc.attributes = new List<Model.OnBaseDocUpload.attribute>();
foreach (System.Data.DataRow rw in db.dsdaten.Tables[1].Rows)
{
OnBaseDocUpload.attribute p = new OnBaseDocUpload.attribute(rw["fieldname"].ToString(), rw["fieldvalue"].ToString());
onbasedoc.attributes.Add(p);
@@ -1827,8 +1864,8 @@ namespace OnDoc.UIControls
dB.Exec_SQL("Update edex_sb_serienbrief set aktiv=0, mutiert_am=getdate(),mutierer=" + AppParams.CurrentMitarbieter.ToString() + " where serienbriefnr=" + sb.serienbriefnr.ToString());
dB = null;
enable_disable_functions(1,false);
enable_disable_functions(1, false);
}
@@ -1844,8 +1881,8 @@ namespace OnDoc.UIControls
if (ribbonButtonPartnerPruefen.Enabled) partnerlistePrüfenToolStripMenuItem.Visible = true;
if (RibbonButtonArchivierenUndAbschlessen.Enabled) archivierenUndAbschliessenToolStripMenuItem.Visible = true;
if (ribbonButtonDruckstapel.Enabled) druckstapelAufbereitenToolStripMenuItem.Visible = true;
if (treeViewAdv1.SelectedNode.Text.Substring(0,4)=="Gene") (dokumentgenerierungZurücksetzenToolStripMenuItem.Visible)=true;
if (treeViewAdv1.SelectedNode.Text.Substring(0, 4) == "Gene") (dokumentgenerierungZurücksetzenToolStripMenuItem.Visible) = true;
}
private void partnerlistePrüfenToolStripMenuItem_Click(object sender, EventArgs e)

12
Client/DocMgmt/frmToApproval.cs
View File

@@ -95,7 +95,17 @@ namespace OnDoc.DocMgmt
DataRow dr = dB.daten.Tables[0].NewRow();
dr["dokumentid"] = this.dokumentid;
dr["mitarbeiter_bewilligung"] = cbboxunterschriftlinks.SelectedValue.ToString();
dr["bewilligt"] = false;
if (Convert.ToInt32(cbboxunterschriftlinks.SelectedValue) == AppParams.CurrentMitarbieter)
{
dr["bewilligt"] = true;
dr["bewilligt_am"] = DateTime.Now;
}
else
{
dr["bewilligt"] = false;
}
dr["abgelehnt"] = false;
dr["bewilligungstyp"] = 1;
dr["erstellt_am"] = DateTime.Now;