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

update 20241113

Browse Source
This commit is contained in:
Stefan Hutter
2024-11-13 17:55:15 +01:00
parent 09bcee5a2a
commit 1682465067
117 changed files with 346 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,6 @@
this.ctxmenuEmpfaenger = new System.Windows.Forms.ContextMenuStrip(this.components);
this.partnerHinzufügenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.partnerLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ausListeLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.erneutGenerierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.GridEmpfänger = new Syncfusion.WinForms.DataGrid.SfDataGrid();
@@ -599,37 +598,29 @@
this.ctxmenuEmpfaenger.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.partnerHinzufügenToolStripMenuItem,
this.partnerLöschenToolStripMenuItem,
this.ausListeLöschenToolStripMenuItem,
this.erneutGenerierenToolStripMenuItem});
this.ctxmenuEmpfaenger.Name = "ctxmenuEmpfaenger";
this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(176, 92);
this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(211, 92);
//
// partnerHinzufügenToolStripMenuItem
//
this.partnerHinzufügenToolStripMenuItem.Name = "partnerHinzufügenToolStripMenuItem";
this.partnerHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
this.partnerHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
this.partnerHinzufügenToolStripMenuItem.Text = "Partner hinzufügen";
this.partnerHinzufügenToolStripMenuItem.Click += new System.EventHandler(this.partnerHinzufügenToolStripMenuItem_Click);
//
// partnerLöschenToolStripMenuItem
//
this.partnerLöschenToolStripMenuItem.Name = "partnerLöschenToolStripMenuItem";
this.partnerLöschenToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
this.partnerLöschenToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
this.partnerLöschenToolStripMenuItem.Text = "Partner löschen";
this.partnerLöschenToolStripMenuItem.Click += new System.EventHandler(this.partnerLöschenToolStripMenuItem_Click);
//
// ausListeLöschenToolStripMenuItem
//
this.ausListeLöschenToolStripMenuItem.Name = "ausListeLöschenToolStripMenuItem";
this.ausListeLöschenToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
this.ausListeLöschenToolStripMenuItem.Text = "Aus Liste löschen";
this.ausListeLöschenToolStripMenuItem.Click += new System.EventHandler(this.ausListeLöschenToolStripMenuItem_Click);
//
// erneutGenerierenToolStripMenuItem
//
this.erneutGenerierenToolStripMenuItem.Name = "erneutGenerierenToolStripMenuItem";
this.erneutGenerierenToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
this.erneutGenerierenToolStripMenuItem.Text = "Erneut generieren";
this.erneutGenerierenToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
this.erneutGenerierenToolStripMenuItem.Text = "Generierung zurücksetzen";
this.erneutGenerierenToolStripMenuItem.Click += new System.EventHandler(this.erneutGenerierenToolStripMenuItem_Click);
//
// treeViewAdv1
@@ -964,7 +955,7 @@
this.pnlLoad.Controls.Add(this.btnsbloadcancel);
this.pnlLoad.Controls.Add(this.btnsbloadok);
this.pnlLoad.Controls.Add(this.panel1);
this.pnlLoad.Location = new System.Drawing.Point(216, 51);
this.pnlLoad.Location = new System.Drawing.Point(1024, 72);
this.pnlLoad.Name = "pnlLoad";
this.pnlLoad.Size = new System.Drawing.Size(493, 634);
this.pnlLoad.TabIndex = 4;
@@ -1177,7 +1168,6 @@
private System.Windows.Forms.Button button2;
private System.Windows.Forms.RibbonPanel ribbonPanel9;
private System.Windows.Forms.RibbonButton RibbonButtonArchivierenUndAbschlessen;
private System.Windows.Forms.ToolStripMenuItem ausListeLöschenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem erneutGenerierenToolStripMenuItem;
}
}

147
Client/DocMgmt/Serienbrief.cs
View File

@@ -10,6 +10,7 @@ using System.Runtime.CompilerServices;
using System.Runtime.Remoting.Messaging;
using System.Text;
using System.Threading.Tasks;
using System.Web.Caching;
using System.Windows.Forms;
using System.Xml.Linq;
using Database;
@@ -118,7 +119,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;
@@ -186,7 +187,7 @@ namespace OnDoc.UIControls
}
dB = null;
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
finish_progress();
//sfDataGridEmpfaenger.DataSource = importdata;
}
@@ -198,7 +199,8 @@ namespace OnDoc.UIControls
sfDataGridEmpfaenger.DataSource = dt;
update_zahlen();
}
private void refresh_spalten() {
private void refresh_spalten()
{
//sfDataGridEmpfaenger.Columns["STATUS"].Visible = false;
//sfDataGridEmpfaenger.Columns["FEHLERCODE"].Visible = false;
//sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = false;
@@ -210,7 +212,7 @@ namespace OnDoc.UIControls
//sfDataGridEmpfaenger.Columns["AKTIV"].Visible = false;
sfDataGridEmpfaenger.Columns["Zustelladresse"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede1"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede2"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede2"].Visible = false;
sfDataGridEmpfaenger.Columns["Anrede"].Width = 0;
sfDataGridEmpfaenger.Columns["Name"].Visible = false;
sfDataGridEmpfaenger.Columns["Vorname"].Visible = false;
@@ -218,7 +220,7 @@ namespace OnDoc.UIControls
sfDataGridEmpfaenger.Columns["PLZ"].Visible = false;
sfDataGridEmpfaenger.Columns["Ort"].Visible = false;
}
private void init_empfaenger(int serienbriefnr)
{
@@ -349,10 +351,10 @@ namespace OnDoc.UIControls
DB db = new DB(AppParams.connectionstring);
if (newsb)
{
db.Get_Tabledata("Select bezeichnung,office_vorlagenr from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true);
db.Get_Tabledata("Select bezeichnung,office_vorlagenr, isnull(vertrag,0) as vertrag 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]);
}
}
@@ -371,7 +373,7 @@ namespace OnDoc.UIControls
try { sb.unterschriftrechts = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue.ToString()); } catch { sb.unterschriftrechts = 0; }
try { sb.team = Convert.ToInt32(cbboxteam.SelectedValue.ToString()); } catch { sb.team = 0; }
sb.archivdatum = Convert.ToDateTime(DateDokumentDatum.Value);
sb.dokumentdatum= Convert.ToDateTime(DateDokumentDatum.Value);
sb.dokumentdatum = Convert.ToDateTime(DateDokumentDatum.Value);
DB db = new DB(AppParams.connectionstring);
sb.serienbriefnr = db.Save_Serienbrief(sb, AppParams.tempdir);
db.save_sb_vorlage_to_db(sb.filename, "", sb.serienbriefnr);
@@ -383,6 +385,7 @@ namespace OnDoc.UIControls
{
try
{
int inbearbeitung = 0;
int fehlerhaft = 0;
int generiert = 0;
@@ -410,16 +413,30 @@ namespace OnDoc.UIControls
RibbonButtonArchivierenUndAbschlessen.Enabled = false;
ribbonButtonDruckstapel.Enabled = false;
if (inbearbeitung > 0) { RibbonButtonGenerateSB.Enabled = true; }
if (fehlerhaft == 0 && inbearbeitung == 0 && generiert > 0) {
if (fehlerhaft == 0 && inbearbeitung == 0 && generiert > 0)
{
RibbonButtonArchivierenUndAbschlessen.Enabled = true;
ribbonButtonDruckstapel.Enabled = true;
}
enable_disable(true);
if (generiert > 0 || abgeschlossen > 0)
{
enable_disable(false);
}
}
catch { }
}
private void enable_disable(bool enabled)
{
groupBox5.Enabled = enabled;
groupBox6.Enabled = enabled;
groupBox7.Enabled = enabled;
groupBox8.Enabled = enabled;
ribbonButton1.Enabled = enabled;
}
private void Set_Functions(int type)
{
@@ -429,23 +446,23 @@ namespace OnDoc.UIControls
ctxmenuEmpfaenger.Enabled = true;
partnerHinzufügenToolStripMenuItem.Visible = true;
partnerLöschenToolStripMenuItem.Visible = true;
ausListeLöschenToolStripMenuItem.Visible = false;
erneutGenerierenToolStripMenuItem.Visible = false;
docPreview1.Visible = false;
}
if (type == 3 || type==4)
if (type == 3 || type == 4)
{
partnerHinzufügenToolStripMenuItem.Visible = false;
partnerLöschenToolStripMenuItem.Visible = false;
sfDataGridEmpfaenger.AllowEditing = false;
ausListeLöschenToolStripMenuItem.Visible = true;
erneutGenerierenToolStripMenuItem.Visible = true;
docPreview1.clear_viewer();
docPreview1.Visible = true;
//ctxmenuEmpfaenger.Enabled = false;
}
}
@@ -453,42 +470,42 @@ namespace OnDoc.UIControls
{
update_grid();
}
private void update_grid()
{
string nodetext = treeViewAdv1.SelectedNode.Text;
DataView dv = new DataView(sb.dsempfaenger.Tables[0]);
private void update_grid()
{
string nodetext = treeViewAdv1.SelectedNode.Text;
DataView dv = new DataView(sb.dsempfaenger.Tables[0]);
switch (nodetext.Substring(0, 5))
{
case "In Be":
dv.RowFilter = "Status = 0";
sfDataGridEmpfaenger.DataSource = null;
sfDataGridEmpfaenger.DataSource = dv;
switch (nodetext.Substring(0, 5))
{
case "In Be":
dv.RowFilter = "Status = 0";
sfDataGridEmpfaenger.DataSource = null;
sfDataGridEmpfaenger.DataSource = dv;
refresh_spalten();
Set_Functions(1);
break;
case "Fehle":
dv.RowFilter = "Status=-1";
sfDataGridEmpfaenger.DataSource = null;
sfDataGridEmpfaenger.DataSource = dv;
Set_Functions(1);
break;
case "Fehle":
dv.RowFilter = "Status=-1";
sfDataGridEmpfaenger.DataSource = null;
sfDataGridEmpfaenger.DataSource = dv;
refresh_spalten();
Set_Functions(2);
break;
case "Gener":
dv.RowFilter = "Status = 1";
sfDataGridEmpfaenger.DataSource = null;
sfDataGridEmpfaenger.DataSource = dv;
break;
case "Gener":
dv.RowFilter = "Status = 1";
sfDataGridEmpfaenger.DataSource = null;
sfDataGridEmpfaenger.DataSource = dv;
refresh_spalten(); Set_Functions(3);
break;
case "Abges":
dv.RowFilter = "Status = 2";
sfDataGridEmpfaenger.DataSource = null;
sfDataGridEmpfaenger.DataSource = dv;
break;
case "Abges":
dv.RowFilter = "Status = 2";
sfDataGridEmpfaenger.DataSource = null;
sfDataGridEmpfaenger.DataSource = dv;
refresh_spalten();
Set_Functions(4);
break;
}
break;
}
}
private void ribbonbuttonsave_Click(object sender, EventArgs e)
@@ -937,7 +954,8 @@ namespace OnDoc.UIControls
{
Insert_Value(vorlagendaten.Rows[i][i1].ToString(), vorlagendaten.Columns[i1].ColumnName);
}
} catch { }
}
catch { }
try
{
if (vorlagendaten.Columns[i1].ColumnName.ToString().Substring(0, 5) == "I_09_")
@@ -957,24 +975,32 @@ namespace OnDoc.UIControls
// IntWert = RenCol(IntWert)
Insert_Value(vorlagendaten.Rows[i][IntWert].ToString(), Intbookmark);
}
} catch { }
}
catch { }
}
string pdfdoc = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb));
Helper.FileHelper fh = new FileHelper();
DB db = new DB(AppParams.connectionstring);
string filename = "SB_" + sb.serienbriefnr.ToString() + vorlagendaten.Rows[i]["intEintragnr"].ToString() + ".pdf";
System.Data.DataRow dr = sb.dsempfaenger.Tables[0].Select("intEintragnr = '" + vorlagendaten.Rows[i]["IntEintragnr"].ToString() + "'").FirstOrDefault();
string dokumentid = "";
if (dr != null)
{
dokumentid = dr["dokumentid"].ToString();
}
if (dokumentid == "") { dokumentid = db.get_dbkey("Dokument"); }
string filename = dokumentid + ".pdf";
//string filename = "SB_" + sb.serienbriefnr.ToString() + vorlagendaten.Rows[i]["intEintragnr"].ToString() + ".pdf";
fh.SaveBase64ToFile(pdfdoc, AppParams.tempdir + filename);
db.save_serienbrief_datei(sb.serienbriefnr, Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]), AppParams.tempdir + filename);
db.save_serienbrief_datei(sb.serienbriefnr, Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]), AppParams.tempdir + filename, dokumentid);
System.IO.File.Delete(AppParams.tempdir + filename);
db = null;
System.Data.DataRow dr = sb.dsempfaenger.Tables[0].Select("intEintragnr = '" + vorlagendaten.Rows[i]["IntEintragnr"].ToString()+"'").FirstOrDefault();
if (dr != null)
{
dr["STATUS"] = "1";
dr["Dokumentid"] = dokumentid;
}
sb.DocValues.Clear();
}
@@ -1232,7 +1258,7 @@ namespace OnDoc.UIControls
private void merge()
{
DataView dv = new DataView(sb.dsempfaenger.Tables[0]);
dv.RowFilter = "Status = 1";
@@ -1251,7 +1277,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 serienbriefnr=" + sb.serienbriefnr.ToString() + " and inteintragnr=" + dr["IntEintragNr"].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)
{
@@ -1260,9 +1286,9 @@ namespace OnDoc.UIControls
if (i >= stapelgroesse)
{
save_stapel(stapel, ref streams);
i = 0;
streams = new Stream[dv.Count-(stapel*stapelgroesse)];
streams = new Stream[dv.Count - (stapel * stapelgroesse)];
stapel++;
}
}
@@ -1298,7 +1324,7 @@ namespace OnDoc.UIControls
fs.Close();
fs.Dispose();
TreeNodeAdv tn = new TreeNodeAdv();
tn.Text = "Druckstapel " + stapelnr.ToString()+" ("+streams.Length.ToString()+")";
tn.Text = "Druckstapel " + stapelnr.ToString() + " (" + streams.Length.ToString() + ")";
tn.Tag = stapelnr.ToString();
tn.TagObject = filename;
treeviewDruckstapel.Nodes.Add(tn);
@@ -1336,7 +1362,7 @@ namespace OnDoc.UIControls
private void RibbonButtonArchivierenUndAbschlessen_CanvasChanged(object sender, EventArgs e)
{
}
private void RibbonButtonArchivierenUndAbschlessen_Click(object sender, EventArgs e)
@@ -1429,7 +1455,7 @@ namespace OnDoc.UIControls
{
finish_progress();
}
}
private void ausListeLöschenToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1446,7 +1472,7 @@ namespace OnDoc.UIControls
System.Data.DataTable dt = sb.dsempfaenger.Tables[0];
var records = sfDataGridEmpfaenger.View.GetSelectedRecords();
if (records.Count < 1) { return; }
int[] inteintraege = new int[records.Count];
int i = 0;
@@ -1456,11 +1482,11 @@ namespace OnDoc.UIControls
string documentid = datarow["dokumentid"].ToString();
inteintraege[i] = Convert.ToInt32(datarow["inteintragnr"].ToString());
i = i + 1;
}
for (int i1 = 0; i1 < i; i1++)
for (int i1 = 0; i1 < i; i1++)
{
System.Data.DataRow dr = sb.dsempfaenger.Tables[0].Select("inteintragnr='" + inteintraege[i1].ToString()+"'").FirstOrDefault(); // finds all rows with id==2 and selects first or null if haven't found any
System.Data.DataRow dr = sb.dsempfaenger.Tables[0].Select("inteintragnr='" + inteintraege[i1].ToString() + "'").FirstOrDefault(); // finds all rows with id==2 and selects first or null if haven't found any
if (dr != null)
{
dr["status"] = "0"; //changes the Product_name
@@ -1469,5 +1495,6 @@ namespace OnDoc.UIControls
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
}
}
}