update 20250126
This commit is contained in:
Stefan Hutter
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.
@@ -3161,3 +3161,91 @@ Parametername: encoder
|
||||
2025-01-24 14:12:42.7725|DEBUG|OnDoc|
|
||||
2025-01-24 14:12:42.7987|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
|
||||
2025-01-24 14:12:42.8007|INFO|OnDoc|Unterschrift-Bezug: TG9665
|
||||
2025-01-25 12:46:26.6233|DEBUG|OnDoc|
|
||||
2025-01-25 12:46:26.6703|DEBUG|OnDoc|
|
||||
2025-01-25 12:46:26.7003|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
|
||||
2025-01-25 12:46:26.7003|INFO|OnDoc|Unterschrift-Bezug: 1234
|
||||
2025-01-25 12:46:26.7993|DEBUG|OnDoc|
|
||||
2025-01-25 12:46:26.8093|DEBUG|OnDoc|
|
||||
2025-01-25 12:46:26.8343|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
|
||||
2025-01-25 12:46:26.8343|INFO|OnDoc|Unterschrift-Bezug: TG9665
|
||||
2025-01-25 12:49:25.2473|DEBUG|OnDoc|
|
||||
2025-01-25 12:49:25.2473|DEBUG|OnDoc|
|
||||
2025-01-25 12:49:25.2793|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
|
||||
2025-01-25 12:49:25.2793|INFO|OnDoc|Unterschrift-Bezug: 1234
|
||||
2025-01-25 12:49:25.3245|DEBUG|OnDoc|
|
||||
2025-01-25 12:49:25.3245|DEBUG|OnDoc|
|
||||
2025-01-25 12:49:25.3505|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
|
||||
2025-01-25 12:49:25.3531|INFO|OnDoc|Unterschrift-Bezug: TG9665
|
||||
2025-01-25 12:49:39.1964|DEBUG|OnDoc|
|
||||
2025-01-25 12:49:39.2063|DEBUG|OnDoc|
|
||||
2025-01-25 12:49:39.2324|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
|
||||
2025-01-25 12:49:39.2324|INFO|OnDoc|Unterschrift-Bezug: 1234
|
||||
2025-01-25 12:49:39.2704|DEBUG|OnDoc|
|
||||
2025-01-25 12:49:39.2704|DEBUG|OnDoc|
|
||||
2025-01-25 12:49:39.2979|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
|
||||
2025-01-25 12:49:39.2979|INFO|OnDoc|Unterschrift-Bezug: TG9665
|
||||
2025-01-25 12:49:59.0833|DEBUG|OnDoc|
|
||||
2025-01-25 12:49:59.0934|DEBUG|OnDoc|
|
||||
2025-01-25 12:49:59.1164|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
|
||||
2025-01-25 12:49:59.1194|INFO|OnDoc|Unterschrift-Bezug: 1234
|
||||
2025-01-25 12:49:59.1544|DEBUG|OnDoc|
|
||||
2025-01-25 12:49:59.1544|DEBUG|OnDoc|
|
||||
2025-01-25 12:49:59.1804|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9656
|
||||
2025-01-25 12:49:59.1834|INFO|OnDoc|Unterschrift-Bezug: TG9656
|
||||
2025-01-25 12:50:17.9642|DEBUG|OnDoc|
|
||||
2025-01-25 12:50:17.9642|DEBUG|OnDoc|
|
||||
2025-01-25 12:50:17.9972|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
|
||||
2025-01-25 12:50:17.9972|INFO|OnDoc|Unterschrift-Bezug: 1234
|
||||
2025-01-25 12:50:18.0352|DEBUG|OnDoc|
|
||||
2025-01-25 12:50:18.0352|DEBUG|OnDoc|
|
||||
2025-01-25 12:50:18.0612|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
|
||||
2025-01-25 12:50:18.0612|INFO|OnDoc|Unterschrift-Bezug: TG9665
|
||||
2025-01-25 12:55:10.7766|DEBUG|OnDoc|
|
||||
2025-01-25 12:55:10.8086|DEBUG|OnDoc|
|
||||
2025-01-25 12:55:10.8346|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
|
||||
2025-01-25 12:55:10.8346|INFO|OnDoc|Unterschrift-Bezug: 1234
|
||||
2025-01-25 12:55:10.9167|DEBUG|OnDoc|
|
||||
2025-01-25 12:55:10.9167|DEBUG|OnDoc|
|
||||
2025-01-25 12:55:10.9487|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
|
||||
2025-01-25 12:55:10.9487|INFO|OnDoc|Unterschrift-Bezug: TG9665
|
||||
2025-01-25 12:55:23.2607|DEBUG|OnDoc|
|
||||
2025-01-25 12:55:23.2607|DEBUG|OnDoc|
|
||||
2025-01-25 12:55:23.2937|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
|
||||
2025-01-25 12:55:23.2937|INFO|OnDoc|Unterschrift-Bezug: 1234
|
||||
2025-01-25 12:55:23.3318|DEBUG|OnDoc|
|
||||
2025-01-25 12:55:23.3318|DEBUG|OnDoc|
|
||||
2025-01-25 12:55:23.3558|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
|
||||
2025-01-25 12:55:23.3558|INFO|OnDoc|Unterschrift-Bezug: TG9665
|
||||
2025-01-25 12:55:42.0176|DEBUG|OnDoc|
|
||||
2025-01-25 12:55:42.0276|DEBUG|OnDoc|
|
||||
2025-01-25 12:55:42.0567|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
|
||||
2025-01-25 12:55:42.0567|INFO|OnDoc|Unterschrift-Bezug: 1234
|
||||
2025-01-25 12:55:42.0996|DEBUG|OnDoc|
|
||||
2025-01-25 12:55:42.0996|DEBUG|OnDoc|
|
||||
2025-01-25 12:55:42.1263|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
|
||||
2025-01-25 12:55:42.1263|INFO|OnDoc|Unterschrift-Bezug: TG9665
|
||||
2025-01-26 08:58:00.2714|DEBUG|OnDoc|
|
||||
2025-01-26 08:58:00.3055|DEBUG|OnDoc|
|
||||
2025-01-26 08:58:00.3302|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
|
||||
2025-01-26 08:58:00.3302|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
|
||||
2025-01-26 08:58:00.4053|DEBUG|OnDoc|
|
||||
2025-01-26 08:58:00.4153|DEBUG|OnDoc|
|
||||
2025-01-26 08:58:00.5190|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG4116
|
||||
2025-01-26 08:58:00.5280|INFO|OnDoc|Unterschrift-Bezug: TG4116
|
||||
2025-01-26 08:58:35.3267|DEBUG|OnDoc|
|
||||
2025-01-26 08:58:35.3267|DEBUG|OnDoc|
|
||||
2025-01-26 08:58:35.3521|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
|
||||
2025-01-26 08:58:35.3531|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
|
||||
2025-01-26 08:58:35.3903|DEBUG|OnDoc|
|
||||
2025-01-26 08:58:35.3903|DEBUG|OnDoc|
|
||||
2025-01-26 08:58:35.4163|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG4116
|
||||
2025-01-26 08:58:35.4163|INFO|OnDoc|Unterschrift-Bezug: TG4116
|
||||
2025-01-26 11:04:42.5815|DEBUG|OnDoc|
|
||||
2025-01-26 11:04:42.6126|DEBUG|OnDoc|
|
||||
2025-01-26 11:04:42.6376|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
|
||||
2025-01-26 11:04:42.6376|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
|
||||
2025-01-26 11:04:42.7251|DEBUG|OnDoc|
|
||||
2025-01-26 11:04:42.7351|DEBUG|OnDoc|
|
||||
2025-01-26 11:04:42.7621|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG4116
|
||||
2025-01-26 11:04:42.7621|INFO|OnDoc|Unterschrift-Bezug: TG4116
|
||||
|
||||
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.
@@ -822,6 +822,7 @@
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="UIControls\Administrator\AdminDokTypGenerierung.resx">
|
||||
<DependentUpon>AdminDokTypGenerierung.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="UIControls\Administrator\Dokumenttyp.resx">
|
||||
<DependentUpon>Dokumenttyp.cs</DependentUpon>
|
||||
|
||||
7
Client/DocMgmt/Dokumenterstellung.Designer.cs
generated
7
Client/DocMgmt/Dokumenterstellung.Designer.cs
generated
@@ -68,9 +68,9 @@
|
||||
// btnDokumenterstellen
|
||||
//
|
||||
this.btnDokumenterstellen.Font = new System.Drawing.Font("Segoe UI Semibold", 9F);
|
||||
this.btnDokumenterstellen.Location = new System.Drawing.Point(915, 638);
|
||||
this.btnDokumenterstellen.Location = new System.Drawing.Point(905, 638);
|
||||
this.btnDokumenterstellen.Name = "btnDokumenterstellen";
|
||||
this.btnDokumenterstellen.Size = new System.Drawing.Size(124, 28);
|
||||
this.btnDokumenterstellen.Size = new System.Drawing.Size(134, 28);
|
||||
this.btnDokumenterstellen.TabIndex = 17;
|
||||
this.btnDokumenterstellen.Text = "Dokument erstellen";
|
||||
this.btnDokumenterstellen.Click += new System.EventHandler(this.sfButton2_Click);
|
||||
@@ -265,6 +265,8 @@
|
||||
//
|
||||
this.ucAllgemeineDokumentParam1.ausDokumentpaket = false;
|
||||
this.ucAllgemeineDokumentParam1.barcode = false;
|
||||
this.ucAllgemeineDokumentParam1.bedingt_retournierbar = false;
|
||||
this.ucAllgemeineDokumentParam1.bpdokument = false;
|
||||
this.ucAllgemeineDokumentParam1.bpperson_error_type = 0;
|
||||
this.ucAllgemeineDokumentParam1.check_error = "";
|
||||
this.ucAllgemeineDokumentParam1.checkpartner = true;
|
||||
@@ -292,6 +294,7 @@
|
||||
clsdocgendata1.zustaendigmitarbeiter = null;
|
||||
clsdocgendata1.zustelladresse = null;
|
||||
this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata1;
|
||||
this.ucAllgemeineDokumentParam1.dokumentid = "";
|
||||
this.ucAllgemeineDokumentParam1.dokumenttypnr = 0;
|
||||
this.ucAllgemeineDokumentParam1.genertated_dokumentid = null;
|
||||
this.ucAllgemeineDokumentParam1.interop = false;
|
||||
|
||||
@@ -80,6 +80,8 @@ namespace OnDoc.DocMgmt
|
||||
Closing += Form_Closing;
|
||||
this.dokumentid=dokumentid;
|
||||
this.editdoc = true;
|
||||
btnDokumenterstellen.Text = "Dokument bearbeiten";
|
||||
|
||||
}
|
||||
|
||||
private void Form_Closing(object sender, CancelEventArgs e)
|
||||
|
||||
@@ -462,6 +462,7 @@ namespace OnDoc.UICintrols
|
||||
var datarow = record as DataRowView;
|
||||
string documentid = datarow["dokumentid"].ToString();
|
||||
dokument_bearbeiten(documentid, false);
|
||||
|
||||
}
|
||||
}
|
||||
public void dokument_bearbeiten(string dokid, bool newdok = false)
|
||||
@@ -511,16 +512,55 @@ namespace OnDoc.UICintrols
|
||||
else
|
||||
{
|
||||
Dokumenterstellung dokbearbeitung = new Dokumenterstellung(selected_dokumentid);
|
||||
if (dokbearbeitung.ShowDialog() == DialogResult.Abort)
|
||||
dokbearbeitung.ShowDialog();
|
||||
DB db1 = new DB(AppParams.connectionstring);
|
||||
switch (dokbearbeitung.DocFunction)
|
||||
{
|
||||
DB db1 = new DB(AppParams.connectionstring);
|
||||
db1.Dok_in_Bearbeitung(2, selected_dokumentid, AppParams.CurrentMitarbeiter);
|
||||
db1 = null;
|
||||
case 0:
|
||||
db1.Dok_in_Bearbeitung(2, selected_dokumentid, AppParams.CurrentMitarbeiter);
|
||||
db1 = null;
|
||||
break;
|
||||
case 1:
|
||||
Cursor = Cursors.WaitCursor;
|
||||
System.Windows.Forms.Application.DoEvents();
|
||||
selected_dokumentid = dokbearbeitung.dokumentid;
|
||||
selected_partnernr = dokbearbeitung.partnernr.ToString(); ;
|
||||
interop = dokbearbeitung.interop;
|
||||
runmacros = dokbearbeitung.runmacros;
|
||||
dok = GetDoc(false);
|
||||
OpenDoc(dok, true, interop, false);
|
||||
Cursor = Cursors.Default;
|
||||
System.Windows.Forms.Application.DoEvents();
|
||||
break;
|
||||
case 6:
|
||||
//DB db1 = new DB(AppParams.connectionstring);
|
||||
selected_dokumentid = dokbearbeitung.dokumentid;
|
||||
selected_partnernr = dokbearbeitung.partnernr.ToString(); ;
|
||||
interop = dokbearbeitung.interop;
|
||||
//runmacros = dokbearbeitung.runmacros;
|
||||
string filename = dokbearbeitung.filename;
|
||||
|
||||
|
||||
Logging.Logging.Debug("Doklist Docfunction=6", "Doklist", "");
|
||||
//db1.Dok_in_Bearbeitung(1, selected_dokumentid, AppParams.CurrentMitarbeiter);
|
||||
//db1 = null;
|
||||
clsProcessWatch.AddToList(selected_dokumentid, filename, "Word");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
OpenDoc(dok, true, interop, runmacros);
|
||||
};
|
||||
db1 = null;
|
||||
|
||||
//if (dokbearbeitung.ShowDialog() == DialogResult.Abort)
|
||||
//{
|
||||
// DB db1 = new DB(AppParams.connectionstring);
|
||||
// db1.Dok_in_Bearbeitung(2, selected_dokumentid, AppParams.CurrentMitarbeiter);
|
||||
// db1 = null;
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// OpenDoc(dok, true, interop, runmacros);
|
||||
//};
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -670,7 +670,11 @@ namespace OnDoc.UIControls
|
||||
if (docgendata.digitaleunterschrift == true) { dokdata.As_Faksimile = "True"; } else { dokdata.As_Faksimile = "False"; }
|
||||
if (docgendata.frormularOhneUnterschrift==true) { dokdata.Form_ohne_Unterschrift = "True" ; } else { dokdata.Form_ohne_Unterschrift = "False"; }
|
||||
|
||||
|
||||
dokdata.Zustaendig_Kube = "0";
|
||||
if (this.rbzustaendigkube.Checked)
|
||||
{
|
||||
dokdata.Zustaendig_Kube = "1";
|
||||
};
|
||||
dokdata.dokumentwerte = docgendata.dokumentwerte;
|
||||
dokdata.Barcode = barcode;
|
||||
dokdata.VorlageNr = this.vorlagenr.ToString();
|
||||
@@ -1024,7 +1028,7 @@ namespace OnDoc.UIControls
|
||||
{
|
||||
rbzustaendigkube.Checked = true;
|
||||
rbzustaendigmitarbeiter.Checked = false;
|
||||
cbboxzustaendigkube.SelectedValue = Convert.ToInt32(dr["zustaendig_kube"]);
|
||||
cbboxzustaendigkube.SelectedValue = Convert.ToInt32(dr["zustaendiger"]);
|
||||
} else
|
||||
{
|
||||
rbzustaendigmitarbeiter.Checked = true;
|
||||
|
||||
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.
Binary file not shown.
@@ -104,7 +104,7 @@ namespace DOCGEN.Generator
|
||||
OnDocOffice.clsWordEdit oo = new OnDocOffice.clsWordEdit("", "","",resturi,apikey);
|
||||
Logging.Logging.Debug("Generate_Word_in_Office", "Start", dokumentid);
|
||||
|
||||
dok.dokument = oo.Generate_Word_in_Office(ref docdata, ref dok, dt.Rows[0][0].ToString(), connectionstring, tempdir, dokumentid, Apptype,Extension,OfficeSleep,Office_Fill_DocIO, vbfilemanagement);
|
||||
dok.dokument = oo.Generate_Word_in_Office(ref docdata, ref dok, dt.Rows[0][0].ToString(), connectionstring, tempdir, dokumentid, Apptype,Extension,OfficeSleep,Office_Fill_DocIO, vbfilemanagement,editdoc);
|
||||
Logging.Logging.Debug("Generate_Word_in_Office", "Ende", dokumentid);
|
||||
oo = null;
|
||||
}
|
||||
|
||||
@@ -194,7 +194,7 @@ namespace DOCGEN.Klassen
|
||||
|
||||
}
|
||||
}
|
||||
public string Generate_Word(string base64, clsDocData docdata, string img_UL = "", string img_UR = "", string img_faktura = "")
|
||||
public string Generate_Word(string base64, clsDocData docdata, string img_UL = "", string img_UR = "", string img_faktura = "", bool serienbrief=false)
|
||||
{
|
||||
string formattype = "";
|
||||
MemoryStream ms = new MemoryStream(Helper.EncodeExtensions.DecodeBase642ByteArray(base64));
|
||||
@@ -288,6 +288,10 @@ namespace DOCGEN.Klassen
|
||||
|
||||
foreach (clsDocValue dv in docdata.DocValues)
|
||||
{
|
||||
if (dv.TMBeginn.ToString().Contains("VornameName"))
|
||||
{
|
||||
int a = 1;
|
||||
}
|
||||
//if (dv.TMBeginn.ToString().Contains("TGEDKCursor")) { //break; }
|
||||
//if (dv.FieldName.ToString().Contains("TGEDKCursor")) { //break; }
|
||||
if (docdata.Form_ohne_Unterschrift == "True")
|
||||
@@ -316,7 +320,7 @@ namespace DOCGEN.Klassen
|
||||
{
|
||||
BookmarksNavigator bookmarkNavigator = new BookmarksNavigator(document);
|
||||
// if ((dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99" || dv.TMBeginn.ToString() == "TGEDKVornameNameRechtsB99") && docdata.As_Faksimile == "True")
|
||||
if ((dv.TMBeginn.ToString().Contains("VornameNameLinks") || dv.TMBeginn.ToString().Contains("VornameNameRechts")) && docdata.As_Faksimile == "True")
|
||||
if ((dv.TMBeginn.ToString().Contains("VornameNameLinks") || dv.TMBeginn.ToString().Contains("VornameNameRechts")) && docdata.As_Faksimile == "True" && serienbrief==true)
|
||||
{
|
||||
string funktionlinks = "";
|
||||
string funktionrechts = "";
|
||||
@@ -391,7 +395,7 @@ namespace DOCGEN.Klassen
|
||||
else
|
||||
{
|
||||
//if (docdata.As_Faksimile=="True" && (dv.TMBeginn.ToString() == "TGEDKFunktionLinksB99" || dv.TMBeginn.ToString() == "TGEDKFunktionRechtsB99"))
|
||||
if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString().Contains("FunktionLinks") || dv.TMBeginn.ToString().Contains("FunktionRechts")))
|
||||
if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString().Contains("FunktionLinks") || dv.TMBeginn.ToString().Contains("FunktionRechts")) && serienbrief == true)
|
||||
{
|
||||
|
||||
}
|
||||
@@ -415,8 +419,12 @@ namespace DOCGEN.Klassen
|
||||
{
|
||||
if (!dv.TMBeginn.ToString().Contains("TGEDKCursor"))
|
||||
{
|
||||
if (dv.TMBeginn.ToString().Contains("VornameName"))
|
||||
{
|
||||
int a = 1;
|
||||
}
|
||||
bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
|
||||
bookmarkNavigator.InsertText(dv.Value.ToString());
|
||||
//bookmarkNavigator.InsertText(dv.Value.ToString());
|
||||
bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
|
||||
}
|
||||
}
|
||||
@@ -426,9 +434,13 @@ namespace DOCGEN.Klassen
|
||||
{
|
||||
if (!dv.TMBeginn.ToString().Contains("TGEDKCursor"))
|
||||
{
|
||||
if (dv.TMBeginn.ToString().Contains("VornameName"))
|
||||
{
|
||||
int a = 1;
|
||||
}
|
||||
|
||||
bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
|
||||
bookmarkNavigator.InsertText(dv.Value.ToString());
|
||||
//bookmarkNavigator.InsertText(dv.Value.ToString());
|
||||
bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
|
||||
}
|
||||
}
|
||||
@@ -479,7 +491,7 @@ namespace DOCGEN.Klassen
|
||||
}
|
||||
|
||||
}
|
||||
if (docdata.As_Faksimile == "True")
|
||||
if (docdata.As_Faksimile == "True" && serienbrief==true)
|
||||
{
|
||||
|
||||
TextSelection[] textSelections = document.FindAll("Thurgauer Kantonalbank", false, true);
|
||||
|
||||
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.
@@ -111,7 +111,7 @@ namespace DOCGEN
|
||||
dd.barcode_content = sb.barcode_content;
|
||||
dd.barcode_text = sb.barcode_text;
|
||||
|
||||
dok.dokument = sfword.Generate_Word(vorlage,dd, sb.img_unterschriftlinks,sb.img_unterschrfitrechts,sb.img_faktura);
|
||||
dok.dokument = sfword.Generate_Word(vorlage,dd, sb.img_unterschriftlinks,sb.img_unterschrfitrechts,sb.img_faktura,true);
|
||||
db = null;
|
||||
dok.doktype = "D";
|
||||
|
||||
|
||||
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.
@@ -293,7 +293,7 @@ namespace Database
|
||||
|
||||
Get_Tabledata(sql, false, true);
|
||||
|
||||
if (!useoffice) { return dsdaten.Tables[0]; }
|
||||
if (!useoffice || editdoc) { return dsdaten.Tables[0]; }
|
||||
else
|
||||
{
|
||||
VBFileManagement.VBFileManagement vm = new VBFileManagement.VBFileManagement();
|
||||
@@ -427,8 +427,8 @@ namespace Database
|
||||
dok.sZustelladresse = "";
|
||||
dok.sAnredezustelladresse = "";
|
||||
dok.iZustaendiger = Convert.ToInt32(DocData.Zustaendig);
|
||||
dok.bZustaendig_kube = DocData.Zustaendig_Kube == "1";
|
||||
//dok.iPostzustellung = 0;
|
||||
dok.bZustaendig_kube = false;
|
||||
dok.iMa_ausgangsarchivierung = 0;
|
||||
dok.iMa_eingangsarchivierung = 0;
|
||||
dok.sBemerkung = "";
|
||||
|
||||
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.
@@ -24,6 +24,8 @@ namespace Model
|
||||
public string Verantwortlich { get; set; }
|
||||
public string Zustaendig { get; set; }
|
||||
|
||||
public string Zustaendig_Kube { get; set; }
|
||||
|
||||
|
||||
|
||||
public string Team { get; set; }
|
||||
|
||||
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.
@@ -314,7 +314,7 @@ namespace OnDocOffice
|
||||
|
||||
if (runmacros == true)
|
||||
{
|
||||
Logging.Logging.Debug("Makros auslesen", "Edit_Document",dokumentid);
|
||||
Logging.Logging.Debug("Makros auslesen", "Edit_Document", dokumentid);
|
||||
Database.DB db = new Database.DB(connectstring);
|
||||
db.Get_Tabledata("Select * from ondoc_macros where dokumentid='" + dokumentid + "' order by reihenfolge", false, true);
|
||||
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
|
||||
@@ -324,9 +324,11 @@ namespace OnDocOffice
|
||||
Logging.Logging.Debug("Makro ", "Edit_Document", dr[0].ToString());
|
||||
word.Run(dr[0].ToString());
|
||||
}
|
||||
catch (Exception e) {
|
||||
catch (Exception e)
|
||||
{
|
||||
Logging.Logging.Debug("MakroError ", "Edit_Document", e.Message);
|
||||
string a = e.Message; }
|
||||
string a = e.Message;
|
||||
}
|
||||
}
|
||||
}
|
||||
//clsProcessWatch.AddToList(dokumentid, filename, "Word");
|
||||
@@ -452,7 +454,7 @@ namespace OnDocOffice
|
||||
|
||||
return Convert.ToBase64String(imageArray);
|
||||
}
|
||||
public string Generate_Word_in_Office(ref clsDocData docdata, ref clsdok dok, string vorlage, string connectionstring, string tempdir, string dokumentid, string apptype, string extension, int OfficeSleep, int bookmarks_docio, bool vbfilemanagment)
|
||||
public string Generate_Word_in_Office(ref clsDocData docdata, ref clsdok dok, string vorlage, string connectionstring, string tempdir, string dokumentid, string apptype, string extension, int OfficeSleep, int bookmarks_docio, bool vbfilemanagment, bool editdoc)
|
||||
{
|
||||
connectstring = connectionstring;
|
||||
DialogGenerate dialogGenerate = new DialogGenerate(docdata.Bezeichnung.ToString());
|
||||
@@ -623,25 +625,43 @@ namespace OnDocOffice
|
||||
cursortm = "";
|
||||
foreach (clsDocValue dv in docdata.DocValues)
|
||||
{
|
||||
if (dv.TMBeginn.ToString().Contains("Tagesdatum"))
|
||||
dv.used = 0;
|
||||
if (dv.TMBeginn.Contains("CompanyBBEB99")) { dv.used = 1; };
|
||||
if (dv.TMBeginn.Contains("EDKCursor"))
|
||||
{
|
||||
int a = 1;
|
||||
dv.used = 1;
|
||||
cursortm = dv.TMBeginn;
|
||||
}
|
||||
if (dv.FieldName.Contains("TGEDKCursor"))
|
||||
{
|
||||
dv.used = 1;
|
||||
cursorfeld = dv.FieldName;
|
||||
}
|
||||
|
||||
|
||||
if (dv.FieldName.ToString() != "") { dv.used = 1; };
|
||||
|
||||
}
|
||||
|
||||
foreach (Microsoft.Office.Interop.Word.Bookmark bm in worddoc.Bookmarks)
|
||||
{
|
||||
clsDocValue dv = docdata.DocValues.Find(x => x.TMBeginn == bm.Name);
|
||||
if (dv != null) { dv.used = 1; }
|
||||
}
|
||||
foreach (clsDocValue dv in docdata.DocValues)
|
||||
{
|
||||
if (dv.used == 0) { continue; }
|
||||
try
|
||||
{
|
||||
if (dv.TMBeginn.ToString().Contains("TGEDKCursor"))
|
||||
{
|
||||
//if (dv.TMBeginn.ToString() == "TGEDKCursor" || dv.TMBeginn.ToString() == "TGEDKCursorB" ||
|
||||
// dv.FieldName.ToString() == "TGEDKCursor" || dv.FieldName.ToString() == "TGEDKCursorB") {
|
||||
cursorpositionieren = true;
|
||||
cursortm = dv.TMBeginn.ToString();
|
||||
//break;
|
||||
}
|
||||
if (dv.FieldName.ToString().Contains("TGEDKCursor"))
|
||||
{
|
||||
cursorpositionieren = true;
|
||||
cursorfeld = dv.FieldName.ToString();
|
||||
//break;
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
@@ -653,31 +673,29 @@ namespace OnDocOffice
|
||||
{
|
||||
if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() == "" && !dv.TMBeginn.ToString().Contains("TGEDKCurosr"))
|
||||
{
|
||||
if (dv.TMBeginn.Contains("Zustel"))
|
||||
{
|
||||
int a = 1;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
Logging.Logging.Debug(dv.TMBeginn.ToString(), "Select", dokumentid);
|
||||
worddoc.Bookmarks[dv.TMBeginn.ToString()].Select();
|
||||
//Logging.Logging.Debug(dv.TMBeginn.ToString(), "Select-End", dokumentid);
|
||||
pos = worddoc.Bookmarks[dv.TMBeginn.ToString()].Start;
|
||||
word.Selection.Text = dv.Value.ToString();
|
||||
//Logging.Logging.Debug(dv.TMBeginn.ToString(), "Text-End", dokumentid);
|
||||
pos2 = word.Selection.End;
|
||||
|
||||
//pos = worddoc.Bookmarks[dv.TMBeginn.ToString()].Start;
|
||||
//pos2 = word.Selection.End;
|
||||
// Logging.Logging.Debug(dv.TMBeginn.ToString(), "Selection-End", dokumentid);
|
||||
|
||||
//------------------------------
|
||||
if (dv.TMBeginn.ToString().Substring(0, 19) == "XTGEDKDirektTelefonB" ||
|
||||
dv.TMBeginn.ToString().Substring(0, 23) == "XTGEDKVornameNameBetreue" ||
|
||||
dv.TMBeginn.ToString().Substring(0, 19) == "XTGEDKDirektTelefonZ")
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (dv.TMBeginn.Contains("TGEDKDirektTelefonB") || dv.TMBeginn.Contains("TGEDKVornameNameBetreue") || dv.TMBeginn.Contains("TGEDKDirektTelefonZ"))
|
||||
{
|
||||
pos = worddoc.Bookmarks[dv.TMBeginn.ToString()].Start;
|
||||
pos2 = word.Selection.End;
|
||||
word.Selection.MoveLeft(Unit: Microsoft.Office.Interop.Word.WdUnits.wdCharacter, Count: 1);
|
||||
word.Selection.TypeText(Text: "");
|
||||
word.Selection.SetRange(Start: pos + 1, End: pos2 + 1);
|
||||
|
||||
if (editdoc) word.Selection.TypeText(Text: " ");
|
||||
word.Selection.SetRange(pos + 1, pos2 + 1);
|
||||
var withBlock = worddoc.Bookmarks;
|
||||
withBlock.Add(Range: word.Selection.Range, Name: dv.TMBeginn.ToString());
|
||||
withBlock.DefaultSorting = Microsoft.Office.Interop.Word.WdBookmarkSortBy.wdSortByName;
|
||||
@@ -685,15 +703,11 @@ namespace OnDocOffice
|
||||
}
|
||||
else
|
||||
{
|
||||
if (dv.TMBeginn.ToString().Substring(0, 22) == "XTGEDKDirektTelefonDokZ" ||
|
||||
dv.TMBeginn.ToString().Substring(0, 20) == "XTGEDKVornameNameDokZ")
|
||||
if (dv.TMBeginn.Contains("TGEDKDirektTelefonDokZ") || dv.TMBeginn.Contains("TGEDKVornameNameDokZ"))
|
||||
{
|
||||
pos = worddoc.Bookmarks[dv.TMBeginn.ToString()].Start;
|
||||
pos2 = word.Selection.End;
|
||||
|
||||
word.Selection.Text = dv.Value.ToString();
|
||||
word.Selection.MoveLeft(Unit: Microsoft.Office.Interop.Word.WdUnits.wdCharacter, Count: 1);
|
||||
word.Selection.TypeText(Text: "");
|
||||
word.Selection.TypeText(Text: " ");
|
||||
word.Selection.SetRange(Start: pos + 1, End: pos2 + 1);
|
||||
|
||||
var withBlock = worddoc.Bookmarks;
|
||||
@@ -703,52 +717,60 @@ namespace OnDocOffice
|
||||
}
|
||||
else
|
||||
{
|
||||
//objWord.Visible = True
|
||||
// objWord.Selection.SetRange(Start:= pos, End:= pos2)
|
||||
// With docWord.Bookmarks
|
||||
// .Add(Range:= objWord.Selection.Range, Name:= Dokumentdaten.Rows(i).Item("beginntextmarke"))
|
||||
// .DefaultSorting = Microsoft.Office.Interop.Word.WdBookmarkSortBy.wdSortByName
|
||||
// .ShowHidden = False
|
||||
// End With
|
||||
word.Selection.SetRange(pos, pos2);
|
||||
var withBlock = worddoc.Bookmarks;
|
||||
withBlock.Add(Range: word.Selection.Range, Name: dv.TMBeginn.ToString());
|
||||
withBlock.DefaultSorting = Microsoft.Office.Interop.Word.WdBookmarkSortBy.wdSortByName;
|
||||
withBlock.ShowHidden = false;
|
||||
}
|
||||
}
|
||||
|
||||
//-------------------------------
|
||||
|
||||
//objWord.Selection.MoveLeft(Unit:= Microsoft.Office.Interop.Word.WdUnits.wdCharacter, Count:= 1)
|
||||
// objWord.Selection.MoveLeft(Unit:= Microsoft.Office.Interop.Word.WdUnits.wdCharacter, Count:= 2, Extend:= Microsoft.Office.Interop.Word.WdMovementType.wdExtend)
|
||||
// If objWord.Selection.Text = " " Then
|
||||
// objWord.Selection.MoveRight(Unit:= Microsoft.Office.Interop.Word.WdUnits.wdCharacter, Count:= 1)
|
||||
// objWord.Selection.MoveLeft(Unit:= Microsoft.Office.Interop.Word.WdUnits.wdCharacter, Count:= 1, Extend:= Microsoft.Office.Interop.Word.WdMovementType.wdExtend)
|
||||
// objWord.Selection.Delete(Unit:= Microsoft.Office.Interop.Word.WdUnits.wdCharacter, Count:= 1)
|
||||
// End If
|
||||
word.Selection.MoveLeft(Unit: Microsoft.Office.Interop.Word.WdUnits.wdCharacter, Count: 1);
|
||||
word.Selection.MoveLeft(Unit: Microsoft.Office.Interop.Word.WdUnits.wdCharacter, Count: 2, Extend: Microsoft.Office.Interop.Word.WdMovementType.wdExtend);
|
||||
if (word.Selection.Text == " ")
|
||||
{
|
||||
word.Selection.MoveRight(Unit: Microsoft.Office.Interop.Word.WdUnits.wdCharacter, Count: 1);
|
||||
word.Selection.MoveLeft(Unit: Microsoft.Office.Interop.Word.WdUnits.wdCharacter, Count: 1, Extend: Microsoft.Office.Interop.Word.WdMovementType.wdExtend);
|
||||
word.Selection.Delete(Unit: Microsoft.Office.Interop.Word.WdUnits.wdCharacter, Count: 1);
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() != "" && !dv.TMBeginn.ToString().Contains("TGEDKCursor"))
|
||||
{
|
||||
try
|
||||
if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() != "" && !dv.TMBeginn.ToString().Contains("TGEDKCursor"))
|
||||
{
|
||||
worddoc.Bookmarks[dv.TMBeginn.ToString()].Select();
|
||||
pos = worddoc.Bookmarks[dv.TMBeginn.ToString()].Start;
|
||||
worddoc.Bookmarks[dv.TMEnd.ToString()].Select();
|
||||
pos2 = worddoc.Bookmarks[dv.TMEnd.ToString()].Start;
|
||||
word.Selection.SetRange(pos, pos2);
|
||||
word.Selection.TypeText(Text: dv.Value.ToString());
|
||||
try
|
||||
{
|
||||
worddoc.Bookmarks[dv.TMBeginn.ToString()].Select();
|
||||
pos = worddoc.Bookmarks[dv.TMBeginn.ToString()].Start;
|
||||
worddoc.Bookmarks[dv.TMEnd.ToString()].Select();
|
||||
pos2 = worddoc.Bookmarks[dv.TMEnd.ToString()].Start;
|
||||
word.Selection.SetRange(pos, pos2);
|
||||
word.Selection.TypeText(Text: dv.Value.ToString());
|
||||
var withBlock = worddoc.Bookmarks;
|
||||
withBlock.Add(Range: word.Selection.Range, Name: dv.TMBeginn.ToString());
|
||||
withBlock.DefaultSorting = Microsoft.Office.Interop.Word.WdBookmarkSortBy.wdSortByName;
|
||||
withBlock.ShowHidden = false;
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
if (dv.FieldName.ToString() != "" && !dv.FieldName.Contains("TGEDKCursor"))
|
||||
{
|
||||
try
|
||||
if (dv.FieldName.ToString() != "" && !dv.FieldName.Contains("TGEDKCursor"))
|
||||
{
|
||||
|
||||
worddoc.FormFields[dv.FieldName.ToString()].Result = dv.Value;
|
||||
try
|
||||
{
|
||||
if (dv.FieldName.Contains("cc_"))
|
||||
{
|
||||
word.ActiveDocument.SelectContentControlsByTag(dv.FieldName)[1].Range.Text = dv.Value;
|
||||
}
|
||||
if (worddoc.FormFields[dv.FieldName].TextInput.Width != 0)
|
||||
{
|
||||
int fieldlen = worddoc.FormFields[dv.FieldName].TextInput.Width;
|
||||
worddoc.FormFields[dv.FieldName].TextInput.Width = fieldlen + 5;
|
||||
}
|
||||
worddoc.FormFields[dv.FieldName.ToString()].Result = dv.Value;
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//word.ScreenUpdating = true;
|
||||
Logging.Logging.Debug("Word Befüllen Ende", "clsOffice", dokumentid);
|
||||
@@ -768,7 +790,7 @@ namespace OnDocOffice
|
||||
word.Activate();
|
||||
Logging.Logging.Debug("Start Macros", "clsOffice", dokumentid);
|
||||
|
||||
run_macros(ref docdata, connectionstring);
|
||||
if(!editdoc) run_macros(ref docdata, connectionstring);
|
||||
|
||||
if (cursorpositionieren)
|
||||
{
|
||||
@@ -788,10 +810,11 @@ namespace OnDocOffice
|
||||
|
||||
Thread.Sleep(OfficeSleep);
|
||||
string b64 = fh.Base64FromFile(filename);
|
||||
word.Documents.Open(filename);
|
||||
word.Activate();
|
||||
Logging.Logging.Debug("Word geöffnet", "clsOffice", dokumentid);
|
||||
worddoc = null;
|
||||
|
||||
word.Documents.Open(filename);
|
||||
word.Activate();
|
||||
Logging.Logging.Debug("Word geöffnet", "clsOffice", dokumentid);
|
||||
|
||||
word = null;
|
||||
Logging.Logging.Debug("Generierung abgeschlossen", "clsOffice", dokumentid);
|
||||
dialogGenerate.Close();
|
||||
@@ -1297,8 +1320,8 @@ namespace OnDocOffice
|
||||
}
|
||||
else
|
||||
{
|
||||
// if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString() == "TGEDKFunktionLinksB99" || dv.TMBeginn.ToString() == "TGEDKFunktionRechtsB99"))
|
||||
if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString().Contains("FunktionLinks") || dv.TMBeginn.ToString().Contains("FunktionRechts")))
|
||||
// if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString() == "TGEDKFunktionLinksB99" || dv.TMBeginn.ToString() == "TGEDKFunktionRechtsB99"))
|
||||
if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString().Contains("FunktionLinks") || dv.TMBeginn.ToString().Contains("FunktionRechts")))
|
||||
{
|
||||
|
||||
}
|
||||
@@ -1310,11 +1333,12 @@ namespace OnDocOffice
|
||||
{
|
||||
bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString(), true, false);
|
||||
//bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
|
||||
bookmarkNavigator.InsertText(dv.Value.ToString());
|
||||
//bookmarkNavigator.InsertText(dv.Value.ToString());
|
||||
bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
|
||||
//TextBodyPart bookmarkContent = bookmarkNavigator.GetBookmarkContent();
|
||||
//string bookmarkText = ((Syncfusion.DocIO.DLS.WParagraph)bookmarkContent.BodyItems.FirstItem).Text;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user