update 20241225
This commit is contained in:
1
Client/Diverses/NativVorlagen.Designer.cs
generated
1
Client/Diverses/NativVorlagen.Designer.cs
generated
@@ -51,6 +51,7 @@
|
||||
this.imageList1.Images.SetKeyName(2, "Powerpoint.png");
|
||||
this.imageList1.Images.SetKeyName(3, "Folder.png");
|
||||
this.imageList1.Images.SetKeyName(4, "Favoriten_24x24-32.png");
|
||||
this.imageList1.Images.SetKeyName(5, "PDF_Red.ico");
|
||||
//
|
||||
// treeView
|
||||
//
|
||||
|
||||
@@ -109,12 +109,13 @@ namespace OnDoc.Diverses
|
||||
|
||||
if (ext.Length > 2)
|
||||
{
|
||||
ext = ext.Substring(0, 2).ToUpper();
|
||||
ext = ext.Substring(0, 3).ToUpper();
|
||||
tnnew.ImageIndex = 4;
|
||||
tnnew.SelectedImageIndex = 4;
|
||||
if (ext == ".D") { tnnew.ImageIndex = 0; tnnew.SelectedImageIndex = 0; };
|
||||
if (ext == ".X") { tnnew.ImageIndex = 1; tnnew.SelectedImageIndex = 1; };
|
||||
if (ext == ".P") { tnnew.ImageIndex = 2; tnnew.SelectedImageIndex = 2; };
|
||||
if (ext == ".DO") { tnnew.ImageIndex = 0; tnnew.SelectedImageIndex = 0; };
|
||||
if (ext == ".XL") { tnnew.ImageIndex = 1; tnnew.SelectedImageIndex = 1; };
|
||||
if (ext == ".PP") { tnnew.ImageIndex = 2; tnnew.SelectedImageIndex = 2; };
|
||||
if (ext == ".PD") { tnnew.ImageIndex = 5; tnnew.SelectedImageIndex = 5; };
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -243,7 +244,7 @@ namespace OnDoc.Diverses
|
||||
string klassifizierung = "";
|
||||
try
|
||||
{
|
||||
for (int i = 1; i < TotalKlassifizierung+1; i++)
|
||||
for (int i = 1; i < TotalKlassifizierung + 1; i++)
|
||||
{
|
||||
RadioButton rb = this.Controls.Find("rb" + i.ToString(), true).FirstOrDefault() as RadioButton;
|
||||
if (rb != null)
|
||||
@@ -258,7 +259,7 @@ namespace OnDoc.Diverses
|
||||
catch { }
|
||||
try
|
||||
{
|
||||
|
||||
|
||||
string tempfilename = treeNode.Tag.ToString();
|
||||
Logging.Logging.Debug("Nativ-Vorlage: " + tempfilename, "OnDoc", "");
|
||||
if (tempfilename == "") { return; }
|
||||
@@ -266,13 +267,38 @@ namespace OnDoc.Diverses
|
||||
//string tempdir = AppParams.tempdir + "\nativdoks";
|
||||
|
||||
string ext = System.IO.Path.GetExtension(tempfilename);
|
||||
Logging.Logging.Debug("Native-Vorlage erstellen", "OnDoc", tempfilename);
|
||||
string tempfilename1 = "";
|
||||
tempfilename1 = System.IO.Path.GetFileName(tempfilename);
|
||||
tempfilename1 = AppParams.tempdir + "" + DateTime.Now.ToString("yyyyMMddhhmmss") + tempfilename1;
|
||||
ext = ext.Substring(0, 3).ToUpper();
|
||||
switch (ext)
|
||||
{
|
||||
case ".DO":
|
||||
System.Diagnostics.Process.Start("winword.exe", " /t" + tempfilename);
|
||||
break;
|
||||
case ".XL":
|
||||
System.Diagnostics.Process.Start("excel.exe", " /t " + tempfilename);
|
||||
break;
|
||||
case ".PP":
|
||||
System.Diagnostics.Process.Start("POWERPNT.EXE", " /N " + tempfilename);
|
||||
break;
|
||||
default:
|
||||
tempfilename1 = System.IO.Path.GetFileName(tempfilename);
|
||||
tempfilename1 = AppParams.tempdir + "" + DateTime.Now.ToString("yyyyMMddhhmmss") + tempfilename1;
|
||||
|
||||
System.IO.File.Copy(tempfilename, tempfilename1, true);
|
||||
Process.Start(tempfilename1);
|
||||
System.IO.File.Copy(tempfilename, tempfilename1, true);
|
||||
Process.Start(tempfilename1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
|
||||
// Logging.Logging.Debug("Native-Vorlage erstellen", "OnDoc", tempfilename);
|
||||
// string tempfilename1 = "";
|
||||
// tempfilename1 = System.IO.Path.GetFileName(tempfilename);
|
||||
// tempfilename1 = AppParams.tempdir + "" + DateTime.Now.ToString("yyyyMMddhhmmss") + tempfilename1;
|
||||
|
||||
// System.IO.File.Copy(tempfilename, tempfilename1, true);
|
||||
// Process.Start(tempfilename1);
|
||||
// if (ext.Length > 2)
|
||||
// {
|
||||
// ext = ext.Substring(0, 2).ToUpper();
|
||||
@@ -320,11 +346,11 @@ namespace OnDoc.Diverses
|
||||
// }
|
||||
|
||||
// }
|
||||
}
|
||||
catch (Exception e) {
|
||||
Logging.Logging.Debug("Start Nativ: " + e.Message, "OnDoc", "");
|
||||
}
|
||||
}
|
||||
// }
|
||||
// catch (Exception e) {
|
||||
// Logging.Logging.Debug("Start Nativ: " + e.Message, "OnDoc", "");
|
||||
// }
|
||||
//}
|
||||
|
||||
private void button1_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
@@ -124,8 +124,8 @@
|
||||
<value>
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB4
|
||||
DAAAAk1TRnQBSQFMAgEBBQEAAUgBAAFIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk
|
||||
DQAAAk1TRnQBSQFMAgEBBgEAAVABAAFQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
@@ -153,31 +153,36 @@
|
||||
AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
|
||||
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
|
||||
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
|
||||
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAAf8B8QjyBPEB/zEA
|
||||
AfMB9AcAAf8B1gH/AQAB9AHWAf8wAAHxAvQF8gHzAfID/wEAAfQB8jAAAfEB9AH/BfQB/wHyAQAB9AHx
|
||||
AgAB8jAAAfEC9AXzAfQB8gH0AfMBCQLzAfIwAAHxAfQB8wbxAd0B8QH0AfEC9AH/MAAB8QH0Cf8BAAEJ
|
||||
MwAB8QH0ARkHCQHzAQABCTMAAfEB9Aj/AgABCTMAAfEB9AHwAgkBGQYAAQkzAAHxAfQEAAH/BRkB8DMA
|
||||
AfEB9AQAAf8BCQHzAvQBGQHyMwAB8QH0BAAB/wEJAv8C8jQAAfEB9AQAAf8BCQH/AfIB8zUAAfQB8gH/
|
||||
AwAB/wEJAfAB8zcAAfIB1gQJAbwB8zsAAf8B8wHdAQkBtAHyCgAB/wHzAQgBuwFyAcIKAAH/AfQBGgEH
|
||||
AZMB8xYAAfIBGQG6AbMCsgEGArMB8gYAAfIBCAG7AXIDkAGLAXAB8gYAAfMBGgEHAY4FTAHzBgAB/wHD
|
||||
DJoBwwH/Ac4CrQOyAgYCswW0AbIBlgaQAYsBcAFyApgDkQGQA3UCbwRMAXUFdAF1AfQNegFZAfQCzgGt
|
||||
A7ICBgGzAdsECQHzAbQBlgaQAXEBiwFyAZgBGQGYAZEBmAGRBHUBbwRMAQcEGgH0AXQB9A16AVkBwwLO
|
||||
Aa0DsgIGAbMB2wQJAeIBtAGWAXEGkAGLAXIBmAEIApEBmAGRBHUBbwRMAQcEGgHzAXQB9A16AVkBwwLO
|
||||
AgkBsgHyAbMBBgGzAdsECQHzAbQClgGdAQgBlgH0AZYBkAGLAXIBmAEIAZgBkQGYAZEDdQHzAZMETAEH
|
||||
BBoB8wF0AfQNegFZAcMCzgIZAbMB/wEJAQYBsgHbBAkB8gG0A5YB8wEZAbsCkAGLAXIBmAEIAZgBkQG7
|
||||
AZEDdQHzAZMETAEHBBoB8wF0AfQNegFZAcMBzgGzAv8BCQH0ARkCBgHbBAkB8gG0ApYBcQG7Af8BlgKQ
|
||||
AXEBcgGYAQgCmAG7AZEDdQLzAQcDTAMHARsC9AF0AfQNegFZAcMBzgHbARkB3QH/AQkB9AGyAQYB2wG7
|
||||
AwkB8gG0ApYBcQEIAfQBnQOQAXIBmAEIBJgDdQHzAQcB9AF1BkwC9AF0AfQNegFZAcMBzgMJAf8BswEZ
|
||||
AbQBBgEJAbsDCQHzAbQClgGdAfMBmAHzA5ABcgGYAQgCmAG7AboDdQHzAQcB9AF1BEwCkwEaAf8BmgH0
|
||||
DXoBWQHDAbQDswG0AbICtAEGAdsCuwEJAQgB8wG0BJYBkAGYAXICkAFyAZgBCAGYAboBuwG6A3UBGgHz
|
||||
AQcBbwRMARoBkwEHAf8BmgH0DVkBOAH0AbMDzgKtArIBBgG7AgkCGQHzAbQDlgFxBZABcgGYAQgCugG7
|
||||
AboFdQJvAkwBkwFMARoBTAEHAf8BmgHDDjgB9gGzA84CrQKyAQYBuwEJAxkB8wG0A5YBcQWQAXIBmAEZ
|
||||
AZ0BugG7AboFdQJvAkwBvAH0AfMBGgL/AZoBwwY4AVkG9AH2AQABswG0As4CrQOyAbMFtAHOA5YCcQSQ
|
||||
AXICmAGdAroBlgF1AZMDdQJvAkwBkwUHAXUB9AY4Ab0IAAHyAQgBCQG0Ac4BrQOyAfIGAAHzAQgBuwGR
|
||||
AZYEkAHCBgAB8wEaAZkBkwF1A28BTAHzBgAB/wHDBJoBvQH/DAAB/wHzAd0BCQG0AfIKAAH/AfMBGQG7
|
||||
AZgB8woAAf8B9AEaAZkBkwHzFgABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEBFgAD/wIA
|
||||
AQEGAAE/AYgHAAEEBwABJhcAARcHAAEXBwABNwYAAQMB9wYAATwBBwYAATwBBwYAATwBDwYAATwBHwYA
|
||||
ARwBPwYAAYABfwYAAfABPwHwAT8B8AE/Av8BAAE/AQABPwEAAT9ZAAEBBwAB/wEAAT8BAAE/AQABPwEA
|
||||
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAAf8B8QjyBPEB/wMA
|
||||
Af8B7gn0AUwiAAHzAfQHAAH/AdYB/wEAAfQB1gH/AgAB9AoAAUwiAAHxAvQF8gHzAfID/wEAAfQB8gIA
|
||||
AfQCAAEaAQABGgEHAfMBGwIAAUwiAAHxAfQB/wX0Af8B8gEAAfQB8QIAAfICAAH0AgABGgHzARoBAAIH
|
||||
AgABTCIAAfEC9AXzAfQB8gH0AfMBCQLzAfICAAH0AgAB/wHzAf8B8wEAAfMCAAFMIgAB8QH0AfMG8QHd
|
||||
AfEB9AHxAvQB/wIAAfQCAAHxAf8GAAFMIgAB8QH0Cf8BAAEJBQAB9AIAAkwDAAF1ARoBAAFMIgAB8QH0
|
||||
ARkHCQHzAQABCQUAAfQDAAEaASYBTAEmAU0B8QEAAUwiAAHxAfQI/wIAAQkFAAH0BAABkwFMBAABTCIA
|
||||
AfEB9AHwAgkBGQYAAQkFAAH0BAACGwQAAUwiAAHxAfQEAAH/BRkB8AUAAfQEAAEmAZMEAAFMIgAB8QH0
|
||||
BAAB/wEJAfMC9AEZAfIFAAH0BAABdQHyBAABGiIAAfEB9AQAAf8BCQL/AvIGAAH0BwAB8QIrASYiAAHx
|
||||
AfQEAAH/AQkB/wHyAfMHAAH0BwABKwEAAUwjAAH0AfIB/wMAAf8BCQHwAfMIAAH0Af8GAAErAUwlAAHy
|
||||
AdYECQG8AfMKAAEWBisBTCkAAf8B8wHdAQkBtAHyCgAB/wHzAQgBuwFyAcIKAAH/AfQBGgEHAZMB8xYA
|
||||
AfIBGQG6AbMCsgEGArMB8gYAAfIBCAG7AXIDkAGLAXAB8gYAAfMBGgEHAY4FTAHzBgAB/wHDDJoBwwH/
|
||||
Ac4CrQOyAgYCswW0AbIBlgaQAYsBcAFyApgDkQGQA3UCbwRMAXUFdAF1AfQNegFZAfQCzgGtA7ICBgGz
|
||||
AdsECQHzAbQBlgaQAXEBiwFyAZgBGQGYAZEBmAGRBHUBbwRMAQcEGgH0AXQB9A16AVkBwwLOAa0DsgIG
|
||||
AbMB2wQJAeIBtAGWAXEGkAGLAXIBmAEIApEBmAGRBHUBbwRMAQcEGgHzAXQB9A16AVkBwwLOAgkBsgHy
|
||||
AbMBBgGzAdsECQHzAbQClgGdAQgBlgH0AZYBkAGLAXIBmAEIAZgBkQGYAZEDdQHzAZMETAEHBBoB8wF0
|
||||
AfQNegFZAcMCzgIZAbMB/wEJAQYBsgHbBAkB8gG0A5YB8wEZAbsCkAGLAXIBmAEIAZgBkQG7AZEDdQHz
|
||||
AZMETAEHBBoB8wF0AfQNegFZAcMBzgGzAv8BCQH0ARkCBgHbBAkB8gG0ApYBcQG7Af8BlgKQAXEBcgGY
|
||||
AQgCmAG7AZEDdQLzAQcDTAMHARsC9AF0AfQNegFZAcMBzgHbARkB3QH/AQkB9AGyAQYB2wG7AwkB8gG0
|
||||
ApYBcQEIAfQBnQOQAXIBmAEIBJgDdQHzAQcB9AF1BkwC9AF0AfQNegFZAcMBzgMJAf8BswEZAbQBBgEJ
|
||||
AbsDCQHzAbQClgGdAfMBmAHzA5ABcgGYAQgCmAG7AboDdQHzAQcB9AF1BEwCkwEaAf8BmgH0DXoBWQHD
|
||||
AbQDswG0AbICtAEGAdsCuwEJAQgB8wG0BJYBkAGYAXICkAFyAZgBCAGYAboBuwG6A3UBGgHzAQcBbwRM
|
||||
ARoBkwEHAf8BmgH0DVkBOAH0AbMDzgKtArIBBgG7AgkCGQHzAbQDlgFxBZABcgGYAQgCugG7AboFdQJv
|
||||
AkwBkwFMARoBTAEHAf8BmgHDDjgB9gGzA84CrQKyAQYBuwEJAxkB8wG0A5YBcQWQAXIBmAEZAZ0BugG7
|
||||
AboFdQJvAkwBvAH0AfMBGgL/AZoBwwY4AVkG9AH2AQABswG0As4CrQOyAbMFtAHOA5YCcQSQAXICmAGd
|
||||
AroBlgF1AZMDdQJvAkwBkwUHAXUB9AY4Ab0IAAHyAQgBCQG0Ac4BrQOyAfIGAAHzAQgBuwGRAZYEkAHC
|
||||
BgAB8wEaAZkBkwF1A28BTAHzBgAB/wHDBJoBvQH/DAAB/wHzAd0BCQG0AfIKAAH/AfMBGQG7AZgB8woA
|
||||
Af8B9AEaAZkBkwHzFgABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEBFgAD/wIAAQEBwAED
|
||||
BAABPwGIAd8B+wUAAQQB2gEbBQABJgHYAZsGAAHYAVsGAAHZAfsFAAEXAdkBywUAARcB3AELBQABNwHe
|
||||
AXsEAAEDAfcB3gF7BAABPAEHAd4BewQAATwBBwHeAXsEAAE8AQ8B3wHDBAABPAEfAd8B1wQAARwBPwLP
|
||||
BAABgAF/AeABHwQAAfABPwHwAT8B8AE/Av8BAAE/AQABPwEAAT9ZAAEBBwAB/wEAAT8BAAE/AQABPwEA
|
||||
Af8B8AE/AfABPwHwAT8C/ws=
|
||||
</value>
|
||||
</data>
|
||||
|
||||
@@ -141,7 +141,7 @@ namespace OnDoc.DocMgmt
|
||||
{
|
||||
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey);
|
||||
clsdok dok = new clsdok("", "", "");
|
||||
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice);
|
||||
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice,AppParams.OfficeSpleep1);
|
||||
|
||||
interop = ucAllgemeineDokumentParam1.interop;
|
||||
|
||||
|
||||
@@ -40,6 +40,9 @@ namespace OnDoc.Klassen
|
||||
public static string ZusatzFontSize { get; set; } = "";
|
||||
|
||||
public static string EDOKAPath { get; set; } = "";
|
||||
|
||||
public static int OfficeSpleep1 { get; set; } = 500;
|
||||
public static int OfficeSpleep2 { get; set; } = 1000;
|
||||
static AppParams()
|
||||
{
|
||||
|
||||
|
||||
@@ -207,10 +207,10 @@ namespace OnDoc
|
||||
|
||||
EDK_Data.Load_EDK_File(filename);
|
||||
dB.save_edk(filename, AppParams.CurrentMitarbieter);
|
||||
System.IO.File.Delete(filename);
|
||||
//System.IO.File.Delete(filename);
|
||||
if (EDK_Data.toexecute == true)
|
||||
{
|
||||
exec_edk();
|
||||
exec_edk(filename);
|
||||
}
|
||||
}
|
||||
private void URI_Call(string filename)
|
||||
@@ -265,7 +265,24 @@ namespace OnDoc
|
||||
|
||||
}
|
||||
|
||||
private void exec_edk()
|
||||
private bool edkb12_check(string filename)
|
||||
{
|
||||
DB dB = new DB(AppParams.connectionstring);
|
||||
string dokumenttypnr = EDK_Data.GetAVQ_Parameter("dokumenttypnr");
|
||||
int doktyp = Convert.ToInt32(dokumenttypnr);
|
||||
doktyp = doktyp - 900000000;
|
||||
dB.Get_Tabledata("Select count(*) from edk_data_doktype where dokumenttypnr=" + doktyp.ToString(),false,true);
|
||||
if (Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][0]) > 0)
|
||||
{
|
||||
dB.save_edkdata(filename,AppParams.currenttgnummer);
|
||||
dB = null;
|
||||
return true;
|
||||
}
|
||||
dB = null;
|
||||
return false;
|
||||
|
||||
}
|
||||
private void exec_edk(string filename)
|
||||
{
|
||||
EDK_Data.toexecute = false;
|
||||
if (EDK_Data.action == EDK_ActionType.DokumentErstellung)
|
||||
@@ -273,7 +290,20 @@ namespace OnDoc
|
||||
string partnernr = EDK_Data.GetAVQ_Parameter("Partnernr");
|
||||
string dokumenttypnr = EDK_Data.GetAVQ_Parameter("dokumenttypnr");
|
||||
string isdokumentpaket = EDK_Data.GetAVQ_Parameter("dokumentpaket");
|
||||
|
||||
string erstellungsart = EDK_Data.GetAVQ_Parameter("DirekteErstellung");
|
||||
string interaktion = "Yes";
|
||||
if (erstellungsart == "1") { interaktion = "No"; } else { interaktion = "Yes"; }
|
||||
if (erstellungsart == "2")
|
||||
{
|
||||
if (edkb12_check(filename))
|
||||
{
|
||||
System.IO.File.Delete(filename);
|
||||
MessageBox.Show("Das gewählte Dokument wird im Hintergrund erstellt.", "Dokumenterstellung", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
System.IO.File.Delete(filename);
|
||||
int doktyp = Convert.ToInt32(dokumenttypnr);
|
||||
doktyp = doktyp - 900000000;
|
||||
EDK_Data.toexecute = true;
|
||||
@@ -282,9 +312,10 @@ namespace OnDoc
|
||||
dokList1.createdocumentpaket(Convert.ToInt32(partnernr), doktyp);
|
||||
return;
|
||||
}
|
||||
//dokList1.createnewdoc(Convert.ToInt32(partnernr), doktyp, false, "Yes", "Yes");
|
||||
dokList1.createnewdoc(Convert.ToInt32(partnernr), doktyp, false, interaktion, "Yes");
|
||||
EDK_Data.toexecute = false;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -47,20 +47,20 @@ namespace OnDoc.UIControls.Administrator
|
||||
mitarbeiternr = Convert.ToInt32(cbboxzustaendigmitarbeiter.SelectedValue);
|
||||
} catch { mitarbeiternr = 0; }
|
||||
}
|
||||
string datum = dateTimePicker1.Value.ToString("yyyy-MM-dd");
|
||||
string datum = "Convert(Datetime,'"+dateTimePicker1.Value.ToString("yyyy-MM-dd 00:00:00")+"',102)";
|
||||
DB db = new DB(AppParams.connectionstring);
|
||||
string sql = "";
|
||||
if (rblog.Checked)
|
||||
{
|
||||
sql = "select top "+numericUpDown1.Value.ToString()+" rowid, mitarbeiternr, insert_timestamp,dbo.binarytobase64(xmldata) from edk_log";
|
||||
sql = sql + " where insert_timestamp >= '" + datum + "' ";
|
||||
sql = sql + " where insert_timestamp >= " + datum + " ";
|
||||
if (mitarbeiternr > 0) { sql = sql + " and mitarbeiternr=" + mitarbeiternr.ToString(); }
|
||||
sql = sql + " order by rowid desc";
|
||||
}
|
||||
else
|
||||
{
|
||||
sql = "select top "+numericUpDown1.Value.ToString()+" rowid, tgnummer, insert_timestamp, dbo.binarytobase64(xmldata) from edk_data ";
|
||||
sql = sql + " where insert_timestamp >= '" + datum + "' ";
|
||||
sql = sql + " where insert_timestamp >= " + datum + " ";
|
||||
|
||||
if (mitarbeiternr > 0)
|
||||
{
|
||||
|
||||
@@ -726,10 +726,12 @@ namespace OnDoc.UICintrols
|
||||
Dokumenterstellung frmnewdok = new Dokumenterstellung(partnernr, dokumenttypnr, profilnr);
|
||||
if (interaktion == "No")
|
||||
{
|
||||
frmnewdok.Visible = false;
|
||||
|
||||
frmnewdok.Show();
|
||||
frmnewdok.Visible = false;
|
||||
frmnewdok.Dokument_Erstellen();
|
||||
frmnewdok.Dispose();
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
@@ -771,7 +773,16 @@ namespace OnDoc.UICintrols
|
||||
interop = frmnewdok.interop;
|
||||
runmacros = frmnewdok.runmacros;
|
||||
string filename = frmnewdok.filename;
|
||||
|
||||
DB db = new DB(AppParams.connectionstring);
|
||||
db.clear_parameter();
|
||||
db.add_parameter("@dokumentid", selected_dokumentid);
|
||||
db.Get_Tabledata("ondoc_check_delete_einzeldokument", true, false);
|
||||
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) {
|
||||
db = null;
|
||||
return;
|
||||
}
|
||||
|
||||
db.Dok_in_Bearbeietung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
|
||||
db = null;
|
||||
clsProcessWatch.AddToList(selected_dokumentid, filename, "Word");
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user