updage 20241230

This commit is contained in:
Stefan Hutter
2024-12-30 17:54:25 +01:00
parent 2feaf6cc29
commit 238ef660aa
49 changed files with 212 additions and 84 deletions

View File

@@ -263,7 +263,15 @@ namespace OnDoc.UIControls
ExcelNet.ExcelReader reader = new ExcelNet.ExcelReader();
string selected_sheetname = "";
var sheets = new List<string>();
sheets = reader.Get_ExcelSheets(openFileDialog1.FileName);
try
{
sheets = reader.Get_ExcelSheets(openFileDialog1.FileName);
}
catch {
MessageBox.Show("Auf die gewählte Excel-Datei kann aktuell nicht zugegriffen werden. Evtl. ist diese noch geöffnet.", "Excel-Import", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (sheets.Count > 1)
{
DocMgmt.Serienbrief_Sheetselect sheetselect = new DocMgmt.Serienbrief_Sheetselect(sheets);
@@ -1022,6 +1030,7 @@ namespace OnDoc.UIControls
string check_duplicates = "";
foreach (var dup in duplicates)
{
set_grid_color(dup.ToString());
if (check_duplicates != "") { check_duplicates = check_duplicates + ", "; }
check_duplicates = check_duplicates + dup.ToString();
}
@@ -1045,6 +1054,11 @@ namespace OnDoc.UIControls
return true;
}
private void set_grid_color(string partner)
{
}
private void check_zwingende_felder()
{
@@ -1661,7 +1675,7 @@ namespace OnDoc.UIControls
PdfDocument finalDoc = new PdfDocument();
DB db = new DB(AppParams.connectionstring);
int stapelgroesse = 100;
int stapelgroesse = 200;
int stapel = 1;
int i = 0;
int anzahl_stapel = (dv.Count / 100) + 1;
@@ -1681,10 +1695,14 @@ namespace OnDoc.UIControls
if (i >= stapelgroesse)
{
save_stapel(stapel, ref streams);
i = 0;
streams = new Stream[dv.Count - (stapel * stapelgroesse)];
stapel++;
if (dv.Count-(stapel * stapelgroesse) >= stapelgroesse) { streams = new Stream[stapelgroesse]; } else
{
streams = new Stream[dv.Count - (stapel * stapelgroesse)];
}
//streams = new Stream[dv.Count - (stapel * stapelgroesse)];
stapel++;
}
}
}
@@ -1725,9 +1743,13 @@ namespace OnDoc.UIControls
treeviewDruckstapel.Nodes.Add(tn);
for (int i = 0; i < streams.Length; i++)
{
streams[i].Close();
streams[i].Dispose();
streams[i] = null;
}
streams = null;
finalDoc = null;
}
catch { }
}