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

Update 20250118

Browse Source
This commit is contained in:
Stefan Hutter
2025-01-18 21:13:54 +01:00
parent cfd7c00451
commit bc996921a1
65 changed files with 1041 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Client/Client.csproj
View File

@@ -536,6 +536,12 @@
<Compile Include="DocMgmt\FrmDokumenterstellung.Designer.cs">
<DependentUpon>FrmDokumenterstellung.cs</DependentUpon>
</Compile>
<Compile Include="DocMgmt\frmDokumentpaketNeugenerierung.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DocMgmt\frmDokumentpaketNeugenerierung.Designer.cs">
<DependentUpon>frmDokumentpaketNeugenerierung.cs</DependentUpon>
</Compile>
<Compile Include="DocMgmt\frmNote.cs">
<SubType>Form</SubType>
</Compile>
@@ -776,6 +782,9 @@
<EmbeddedResource Include="DocMgmt\FrmDokumenterstellung.resx">
<DependentUpon>FrmDokumenterstellung.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DocMgmt\frmDokumentpaketNeugenerierung.resx">
<DependentUpon>frmDokumentpaketNeugenerierung.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DocMgmt\frmNote.resx">
<DependentUpon>frmNote.cs</DependentUpon>
</EmbeddedResource>

32
Client/DocMgmt/DokTypDetails.cs
View File

@@ -16,6 +16,9 @@ namespace OnDoc.DocMgmt
public partial class DokTypDetails : SfForm
{
private int dokumenttypnr { get; set; } = 0;
private int einzeldokument { get; set; } = 0;
private bool dokumentpaket { get; set; } = false;
public DokTypDetails()
{
InitializeComponent();
@@ -33,12 +36,39 @@ namespace OnDoc.DocMgmt
this.Style.ShadowOpacity = Theaming.ShadowOpacity;
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
this.dokumenttypnr=dokumenttypnr;
}
public DokTypDetails(int dokumenttypnr, int einzeldokument)
{
InitializeComponent();
this.Style.TitleBar.BackColor = Theaming.Titelbar();
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
this.Style.ShadowOpacity = Theaming.ShadowOpacity;
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
this.dokumenttypnr = dokumenttypnr;
this.einzeldokument=einzeldokument;
}
public DokTypDetails(int dokumenttypnr, bool dokumentpaket)
{
InitializeComponent();
this.Style.TitleBar.BackColor = Theaming.Titelbar();
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
this.Style.ShadowOpacity = Theaming.ShadowOpacity;
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
this.dokumenttypnr = dokumenttypnr;
this.dokumentpaket = dokumentpaket;
}
private void DokTypDetails_Load(object sender, EventArgs e)
{
dokTypDetail1.dokumenttypnr=dokumenttypnr;
dokTypDetail1.einzeldokument = einzeldokument;
dokTypDetail1.dokumentpaket = dokumentpaket;
dokTypDetail1.Refresh_Details();
}
}

132
Client/DocMgmt/DokTypSelect.cs
View File

@@ -58,7 +58,7 @@ namespace OnDoc.DocMgmt
grpFavoriten.Visible = false;
grpVorlagen.Visible = true;
RibbonButtonVorlagen.Checked = true;
}
else
{
@@ -86,26 +86,61 @@ namespace OnDoc.DocMgmt
{
toolstripCombobox_Fachverantwortung.Items.Add(dr[0].ToString());
}
if (this.favoriten) {
if (this.favoriten)
{
RibbonButtonVorlagen.Checked = false;
RibbonButtonFavoriten.Checked = true;
RibbonButtonFavoriten_Click(sender, e);
}
else {
load_standard("");
toolstriptextboxsearch.Focus();
}
else
{
load_standard("");
toolstriptextboxsearch.Focus();
}
if (vorlagentype == 2) { this.ribbonPanel4.Visible = false; }else { this.ribbonPanel4.Visible=true; }
}
public void get_einzeldokumente(string where)
{
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.add_parameter("@manr", AppParams.CurrentMitarbeiter.ToString());
db.add_parameter("@where", where);
db.add_parameter("@einzeldokumente", "1");
db.Get_Tabledata("sp_ondoc_dokerstellung", true, false);
if (db.dsdaten.Tables[0].Rows.Count < 1)
{
db = null;
return;
}
TreeNodeAdv tnnativ = new TreeNodeAdv();
tnnativ.Text = "Dokumente ohne Archivierung";
tnnativ.LeftImageIndices = new int[] { 0 };
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{
TreeNodeAdv tnnativ2 = new TreeNodeAdv();
tnnativ2.Tag = dr[0].ToString();
tnnativ2.Text = dr[1].ToString()+" [Ohne Archivierung]";
tnnativ2.TagObject = dr;
tnnativ2.LeftImageIndices = new int[] { Convert.ToInt32(dr["apptype"]) };
tnnativ.Nodes.Add(tnnativ2);
}
if (tnnativ.Nodes.Count > 0)
{
treeViewAdv1.Nodes.Add(tnnativ);
}
db = null;
if (where != "") { tnnativ.ExpandAll(); }
}
TreeNodeAdv[] nodestoexpand = new TreeNodeAdv[50];
int nodextoexpandindex = 1;
public void load_standard(string filter, string filter_fachverantwortung="")
public void load_standard(string filter, string filter_fachverantwortung = "")
{
Cursor = Cursors.WaitCursor;
if (AppParams.connectionstring == "")
{
@@ -136,6 +171,7 @@ namespace OnDoc.DocMgmt
}
}
if (vorlagentype == 1)
{
this.Text = "Vorlage auswählen";
@@ -173,7 +209,7 @@ namespace OnDoc.DocMgmt
{
//Creates a TreeNode if the parent equals 0
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString());
// if (dr["OnBase_Dokumenttyp]"].ToString().Trim() != "") { root.Text = root.Text + " [" + dr["OnBase_Dokumenttyp"].ToString() + "]"; }
// if (dr["OnBase_Dokumenttyp]"].ToString().Trim() != "") { root.Text = root.Text + " [" + dr["OnBase_Dokumenttyp"].ToString() + "]"; }
root.Tag = Convert.ToInt32(dr["id"]) * -1;
root.TagObject = dr;
root.LeftImageIndices = new int[] { 0 };
@@ -192,9 +228,14 @@ namespace OnDoc.DocMgmt
}
}
catch { }
} else
{ treeViewAdv1.ExpandAll();
}
else
{
treeViewAdv1.ExpandAll();
}
db = null;
get_einzeldokumente(where);
}
else
{
@@ -236,9 +277,10 @@ namespace OnDoc.DocMgmt
}
}
treeViewAdv1.ExpandAll();
db = null;
}
@@ -353,7 +395,7 @@ namespace OnDoc.DocMgmt
//Recursively builds the tree
PopulateTree_Favoriten(dr, root);
}
}
treeViewAdv2.ExpandAll();
@@ -483,7 +525,7 @@ namespace OnDoc.DocMgmt
//toolStrip1.Visible = treeViewAdv2.Visible;
//if (treeViewAdv2.Visible == false)
//{
// this.Width = treeViewAdv1.Width + 10;
//}
//else
@@ -515,7 +557,7 @@ namespace OnDoc.DocMgmt
private void RibbonButtonVorlagen_Click(object sender, EventArgs e)
{
if (RibbonButtonVorlagen.Checked == true)
{
@@ -534,7 +576,7 @@ namespace OnDoc.DocMgmt
{
if (RibbonButtonFavoriten.Checked == true)
{
Load_Favoriten("");
favoriten = true;
treevisibility();
@@ -551,7 +593,7 @@ namespace OnDoc.DocMgmt
public void New_Favoriten()
{
RibbonButtonVorlagen.Checked = false;
this.favoriten= true;
this.favoriten = true;
RibbonButtonVorlagen_Click(null, null);
RibbonButtonFavoriten_Click(null, null);
@@ -564,12 +606,12 @@ namespace OnDoc.DocMgmt
private void treevisibility()
{
if (RibbonButtonVorlagen.Checked == true & RibbonButtonFavoriten.Checked==false)
{
grpVorlagen.Visible = true;
grpFavoriten.Visible = false;
grpVorlagen.Dock = DockStyle.Fill;
}
if (RibbonButtonVorlagen.Checked == true & RibbonButtonFavoriten.Checked == false)
{
grpVorlagen.Visible = true;
grpFavoriten.Visible = false;
grpVorlagen.Dock = DockStyle.Fill;
}
if (RibbonButtonVorlagen.Checked == false & RibbonButtonFavoriten.Checked == true)
{
grpVorlagen.Visible = false;
@@ -578,11 +620,11 @@ namespace OnDoc.DocMgmt
}
if (RibbonButtonVorlagen.Checked == false & RibbonButtonFavoriten.Checked == false)
{
grpVorlagen.Visible= false;
grpVorlagen.Visible = false;
grpFavoriten.Visible = false;
}
if (RibbonButtonVorlagen.Checked == true & RibbonButtonFavoriten.Checked == true)
if (RibbonButtonVorlagen.Checked == true & RibbonButtonFavoriten.Checked == true)
{
grpVorlagen.Visible = true;
grpFavoriten.Visible = true;
@@ -917,16 +959,42 @@ namespace OnDoc.DocMgmt
{
System.Data.DataRow row = treeViewAdv1.SelectedNode.TagObject as System.Data.DataRow;
dokumenttypnr = Convert.ToInt32(row["ID"]);
DokTypDetails dd = new DokTypDetails(dokumenttypnr);
dd.ShowDialog();
if (vorlagentype == 2)
{
DokTypDetails dd = new DokTypDetails(dokumenttypnr, true);
dd.ShowDialog();
return;
}
if (treeViewAdv1.SelectedNode.Text.Contains("Ohne Archivierung]"))
{
DokTypDetails dd = new DokTypDetails(dokumenttypnr,1);
dd.ShowDialog();
} else
{
DokTypDetails dd = new DokTypDetails(dokumenttypnr);
dd.ShowDialog();
}
}
private void detailsAnzeigenToolStripMenuItem1_Click(object sender, EventArgs e)
{
System.Data.DataRow row = treeViewAdv2.SelectedNode.TagObject as System.Data.DataRow;
dokumenttypnr = Convert.ToInt32(row[6]);
DokTypDetails dd = new DokTypDetails(dokumenttypnr);
dd.ShowDialog();
if (treeViewAdv2.SelectedNode.Text.Contains("Ohne Archivierung]"))
{
DokTypDetails dd = new DokTypDetails(dokumenttypnr, 1);
dd.ShowDialog();
}
else
{
DokTypDetails dd = new DokTypDetails(dokumenttypnr);
dd.ShowDialog();
}
// DokTypDetails dd = new DokTypDetails(dokumenttypnr);
// dd.ShowDialog();
}
private void DokTypSelect_SizeChanged(object sender, EventArgs e)

1
Client/DocMgmt/Dokumentpaket.Designer.cs generated
View File

@@ -233,6 +233,7 @@
this.sfListView1.TabIndex = 18;
this.sfListView1.Text = "sfListView1";
this.sfListView1.SelectionChanged += new System.EventHandler<Syncfusion.WinForms.ListView.Events.ItemSelectionChangedEventArgs>(this.sfListView1_SelectionChanged);
this.sfListView1.ItemChecking += new System.EventHandler<Syncfusion.WinForms.ListView.Events.ItemCheckingEventArgs>(this.sfListView1_ItemChecking);
this.sfListView1.ItemChecked += new System.EventHandler<Syncfusion.WinForms.ListView.Events.ItemCheckedEventArgs>(this.sfListView1_ItemChecked);
//
// TabControlDokuments

42
Client/DocMgmt/Dokumentpaket.cs
View File

@@ -26,6 +26,7 @@ using NLog.LayoutRenderers.Wrappers;
using BroadcastListener.Classes;
using BroadcastListener.Interfaces;
using static BroadcastListener.Classes.Factory;
using Windows.Graphics.Display;
namespace OnDoc.DocMgmt
{
@@ -89,6 +90,11 @@ namespace OnDoc.DocMgmt
dokList1.dokument_loeschen(dokumentid);
Generate_Docs(dokumentid);
}
if (sender.Function == "Generierung")
{
string dokumenttypnr = sender.Details;
Generate_Docs(dokumenttypnr);
}
}
}
private bool NeuesDokumentpaket()
@@ -100,6 +106,7 @@ namespace OnDoc.DocMgmt
}
private void Dokumentpaket_Load(object sender, EventArgs e)
{
//sfListView1.CheckBoxSelectionMode = CheckBoxSelectionMode.CheckOnItemClick;
this.BeginUpdate();
if (dokumentpaketnr == 0)
{
@@ -237,10 +244,12 @@ namespace OnDoc.DocMgmt
{
if (txtbpnummer.Text != "") { newdoc.partnernr = Convert.ToInt32(txtbpnummer.Text); }
}
newdoc.Refresh_Details();
TabPageAdv tabPage = new TabPageAdv(r[3].ToString());
tabPage.Controls.Add(newdoc);
TabControlDokuments.TabPages.Add(tabPage);
}
private void remove_uc(System.Data.DataRow r)
@@ -372,6 +381,7 @@ namespace OnDoc.DocMgmt
this.Close();
}
private bool check_all_doks()
{
string errormessage = "";
@@ -381,6 +391,7 @@ namespace OnDoc.DocMgmt
{
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
uc.ausDokumentpaket = true;
uc.genertated_dokumentid=uc.genertated_dokumentid;
dokumenterror = "";
if (uc.partnernr == 0) { dokumenterror = dokumenterror + "- Kein Partner gewählt" + Environment.NewLine; }
@@ -418,8 +429,18 @@ namespace OnDoc.DocMgmt
}
if (!dokList1.grid_empty() && dokList1.get_selected_records() != 0)
{
if (MessageBox.Show("Die bereits generierten Dokumente löschen?", "Generierung", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
if (MessageBox.Show("Alle Dokumente neu genererieren?"+Environment.NewLine+"(Bestehende Dokumente werden gelöscht)", "Generierung", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
if (MessageBox.Show("Neu hinzugefügte Dokumente generieren?","Generierung",MessageBoxButtons.YesNo, MessageBoxIcon.Question)== DialogResult.No) { return; }
foreach (TabPageAdv tab in TabControlDokuments.TabPages)
{
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
if (uc.genertated_dokumentid == null)
{
Generate_Docs("", uc);
}
}
return;
}
else
@@ -434,7 +455,7 @@ namespace OnDoc.DocMgmt
progressBarAdv1.Visible = true;
Generate_Docs();
}
private void Generate_Docs(string idokumentid="") {
private void Generate_Docs(string idokumentid="",UCAllgemeineDokumentParam iuc = null) {
string filter = "dokumentid in ('";
foreach (TabPageAdv tab in TabControlDokuments.TabPages)
{
@@ -442,9 +463,8 @@ namespace OnDoc.DocMgmt
Application.DoEvents();
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
if (idokumentid == "" || uc.genertated_dokumentid == idokumentid)
if (((idokumentid == "" || uc.genertated_dokumentid == idokumentid) && iuc==null) || uc==iuc)
{
//uc.Set_Edit_later();
uc.Update_DocGenData();
clsDocData dokdata = new clsDocData();
@@ -551,16 +571,26 @@ namespace OnDoc.DocMgmt
private void sfListView1_SelectionChanged(object sender, ItemSelectionChangedEventArgs e)
{
var dr = e.AddedItems[0] as DataRowView;
foreach (TabPageAdv p in TabControlDokuments.TabPages)
{
if (p.Text == dr[3].ToString())
{
TabControlDokuments.SelectedTab=p; return;
TabControlDokuments.SelectedTab=p;
return;
}
}
sfListView1.CheckedItems.Add(this.sfListView1.SelectedItem);
return;
}
private void sfListView1_ItemChecking(object sender, ItemCheckingEventArgs e)
{
//int a = 1;
}
}
}

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

@@ -1226,7 +1226,7 @@
//
this.panelLoad.BackColor = System.Drawing.Color.Silver;
this.panelLoad.Controls.Add(this.label4);
this.panelLoad.Location = new System.Drawing.Point(488, 46);
this.panelLoad.Location = new System.Drawing.Point(488, 71);
this.panelLoad.Name = "panelLoad";
this.panelLoad.Size = new System.Drawing.Size(578, 100);
this.panelLoad.TabIndex = 6;

8
Client/DocMgmt/Serienbrief.cs
View File

@@ -982,6 +982,14 @@ namespace OnDoc.UIControls
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
try
{
if (sb.dsempfaenger.Tables[0].Rows[0]["Status"].ToString() == "-1")
{
sb.dsempfaenger.Tables[0].Rows.RemoveAt(0);
}
}
catch { }
add_partner(ps.partnernr.ToString());
}
}

46
Client/DocMgmt/frmDokumentpaketNeugenerierung.Designer.cs generated Normal file
View File

@@ -0,0 +1,46 @@
namespace OnDoc.DocMgmt
{
partial class frmDokumentpaketNeugenerierung
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.SuspendLayout();
//
// frmDokumentpaketNeugenerierung
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(518, 258);
this.Name = "frmDokumentpaketNeugenerierung";
this.Text = "frmDokumentpaketNeugenerierung";
this.ResumeLayout(false);
}
#endregion
}
}

20
Client/DocMgmt/frmDokumentpaketNeugenerierung.cs Normal file
View File

@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace OnDoc.DocMgmt
{
public partial class frmDokumentpaketNeugenerierung : Form
{
public frmDokumentpaketNeugenerierung()
{
InitializeComponent();
}
}
}

120
Client/DocMgmt/frmDokumentpaketNeugenerierung.resx Normal file
View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

2
Client/DocMgmt/frmNote.Designer.cs generated
View File

@@ -76,7 +76,7 @@
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 4;
this.button1.Text = "Speichern";
this.button1.Text = "Ablehnen";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//

3
Client/DocMgmt/frmNote.cs
View File

@@ -25,7 +25,7 @@ namespace OnDoc.DocMgmt
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
}
public frmNote(string dokumentid)
public frmNote(string dokumentid, string SaveButtonText ="")
{
InitializeComponent();
this.Style.TitleBar.BackColor = Theaming.Titelbar();
@@ -33,6 +33,7 @@ namespace OnDoc.DocMgmt
this.Style.ShadowOpacity = Theaming.ShadowOpacity;
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
this.dokumentid= dokumentid;
if ( SaveButtonText != "" ) {this.button1.Text= SaveButtonText;}
}

66
Client/DocMgmt/frmToApproval.cs
View File

@@ -18,6 +18,9 @@ namespace OnDoc.DocMgmt
public partial class frmToApproval : SfForm
{
public string dokumentid { get; set; } ="";
DB db = new DB(AppParams.connectionstring);
DB db1 = new DB(AppParams.connectionstring);
public frmToApproval()
{
InitializeComponent();
@@ -25,49 +28,64 @@ namespace OnDoc.DocMgmt
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
this.Style.ShadowOpacity = Theaming.ShadowOpacity;
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
Closing += Form_Closing;
}
private void frmToApproval_Load(object sender, EventArgs e)
private void Form_Closing(object sender, CancelEventArgs e)
{
db = null;
db1 = null;
}
private void frmToApproval_Load(object sender, EventArgs e)
{
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.Get_Tabledata("SP_Dokumentbearbeitung_Mitarbeiter", true, false);
cbboxunterschriftlinks.DataSource = db.dsdaten.Tables[0];
cbboxunterschriftrechts.DataSource = db.dsdaten.Tables[0];
cbboxunterschriftlinks.DisplayMember = "name";
cbboxunterschriftlinks.ValueMember = "mitarbeiternr";
cbboxunterschriftrechts.DisplayMember = "name";
cbboxunterschriftrechts.ValueMember = "mitarbeiternr";
db.Get_Tabledata("Select * from dokument where dokumentid='"+dokumentid+"'",false,true);
cbboxunterschriftlinks.SelectedValue = db.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString();
cbboxunterschriftrechts.SelectedValue = db.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString();
if (dokumentid=="") { return; }
update_dokdetails();
}
public void update_dokdetails() {
btntoapproval.Enabled = true;
db1.Get_Tabledata("Select * from dokument where dokumentid='"+dokumentid+"'",false,true);
cbboxunterschriftlinks.SelectedValue = db1.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString();
cbboxunterschriftrechts.SelectedValue = db1.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString();
pxapproval1.Visible = false;
pxapproval2.Visible = false;
cbboxunterschriftlinks.Enabled = true;
cbboxunterschriftrechts.Enabled = true;
if (db.dsdaten.Tables[0].Rows[0]["ersteller"].ToString()== db.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString())
if (db1.dsdaten.Tables[0].Rows[0]["ersteller"].ToString()== db1.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString())
{
cbboxunterschriftlinks.Enabled = false;
pxapproval1.Visible = true;
}
if (db.dsdaten.Tables[0].Rows[0]["ersteller"].ToString() == db.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString())
if (db1.dsdaten.Tables[0].Rows[0]["ersteller"].ToString() == db1.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString())
{
cbboxunterschriftrechts.Enabled = false;
pxapproval2.Visible = true;
}
if (db.dsdaten.Tables[0].Rows[0]["toApprove"].ToString() == "True")
if (db1.dsdaten.Tables[0].Rows[0]["toApprove"].ToString() == "True")
{
if (cbboxunterschriftlinks.SelectedValue.ToString() == db.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString())
if (cbboxunterschriftlinks.SelectedValue.ToString() == db1.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString())
{
cbboxunterschriftlinks.Enabled = false;
//pxapproval2.Visible = true;
}
if (cbboxunterschriftrechts.SelectedValue.ToString() == db.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString())
if (cbboxunterschriftrechts.SelectedValue.ToString() == db1.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString())
{
cbboxunterschriftrechts.Enabled = false;
//pxapproval2.Visible = true;
@@ -75,19 +93,19 @@ namespace OnDoc.DocMgmt
}
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approved"])){
if (Convert.ToBoolean(db1.dsdaten.Tables[0].Rows[0]["approved"])){
cbboxunterschriftlinks.Enabled = false;
pxapproval1.Visible = true;
cbboxunterschriftrechts.Enabled = false;
pxapproval2.Visible = true;
btntoapproval.Enabled = false;
}
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approval1"]))
if (Convert.ToBoolean(db1.dsdaten.Tables[0].Rows[0]["approval1"]))
{
cbboxunterschriftlinks.Enabled = false;
pxapproval1.Visible = true;
}
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approval2"]))
if (Convert.ToBoolean(db1.dsdaten.Tables[0].Rows[0]["approval2"]))
{
cbboxunterschriftrechts.Enabled = false;
pxapproval2.Visible = true;
@@ -97,10 +115,16 @@ namespace OnDoc.DocMgmt
private void btntoapproval_Click(object sender, EventArgs e)
{
insert_bewilligung();
this.DialogResult = DialogResult.OK;
this.Close();
}
public void insert_bewilligung() {
if (!btntoapproval.Enabled) { return; };
DB dB = new DB(AppParams.connectionstring);
string sql = "Update dokument_Bewilligung set aktiv=0, mutiert_am=getdate(), mutierer = " + AppParams.CurrentMitarbeiter.ToString();
sql = sql + " where dokumentid='" + dokumentid + "' and abgelehnt=0 and bewilligt=0";
dB.Exec_SQL(sql);
@@ -167,9 +191,13 @@ namespace OnDoc.DocMgmt
{
dB.insert_note(AppParams.CurrentMitarbeiter, "Hinweis zur Unterschriftenprüfung", txtnachricht.Text, dokumentid);
}
this.Close();
}
public void close_window()
{
this.Close();
}
private void btncancel_Click(object sender, EventArgs e)
{

2
Client/Klassen/clsAppParams.cs
View File

@@ -48,6 +48,8 @@ namespace OnDoc.Klassen
public static string pathNativVorlagen { get; set; } = "";
public static int Office_Fill_DocIO { get; set; } = 0;
public static bool StartApp { get; set; } = false;
static AppParams()
{

9
Client/Klassen/clsProcessWatch.cs
View File

@@ -89,6 +89,7 @@ namespace OnDoc.Klassen
RemoveFromList(fc.dokumentid);
Remove_Dok_in_Bearbeitung(fc.dokumentid);
Remove_Dokumentbearbeitung_Zwingend(fc.dokumentid);
Remove_Approvals(fc.dokumentid);
return;
}
else
@@ -116,6 +117,14 @@ namespace OnDoc.Klassen
db.Exec_SQL("Update dokument set bearbeitung_zwingend=0 where dokumentid='" + dokumentid + "'");
db = null;
}
private static void Remove_Approvals(string dokumentid)
{
DB db = new DB(AppParams.connectionstring);
db.Exec_SQL("Update dokument_bewilligung set aktiv=0, mutiert_am=getdate(), mutierer="+AppParams.CurrentMitarbeiter.ToString()+" where dokumentid='" + dokumentid + "'");
db = null;
}
private static void Save_File(string dokumentid, string filename)
{
DB db = new DB(AppParams.connectionstring);

4
Client/Program.cs
View File

@@ -113,8 +113,10 @@ namespace OnDoc
// // MyForm = new Start();
// Application.Run(MyForm);
AppParams.StartApp = true;
Application.Run(new Start());
AppParams.StartApp = false;
//Application.Run(new Dummy());

3
Client/Start.cs
View File

@@ -111,7 +111,8 @@ namespace OnDoc
Logging.Logging.Debug("Start - Ende", "start.cs", "");
AppParams.StartApp = false;
dokList1.refresh_dokumente();
}

25
Client/UIControls/Approval.Designer.cs generated
View File

@@ -63,6 +63,8 @@
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonApproved = new System.Windows.Forms.RibbonButton();
this.ribbonButtonNotApproved = new System.Windows.Forms.RibbonButton();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
this.ribbonButton1 = new System.Windows.Forms.RibbonButton();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -101,7 +103,7 @@
this.groupBox1.Size = new System.Drawing.Size(300, 876);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Dokumente zum Bewilligen";
this.groupBox1.Text = "Dokumente";
//
// treeViewAdv1
//
@@ -250,6 +252,7 @@
// sfListView1
//
this.sfListView1.AccessibleName = "ScrollControl";
this.sfListView1.AutoHideScrollBars = true;
this.sfListView1.BackColor = System.Drawing.SystemColors.Window;
this.sfListView1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.sfListView1.Location = new System.Drawing.Point(3, 369);
@@ -414,6 +417,7 @@
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1083, 790);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// ribbon3
//
@@ -443,6 +447,7 @@
//
this.ribbonTab1.Name = "ribbonTab1";
this.ribbonTab1.Panels.Add(this.ribbonPanel1);
this.ribbonTab1.Panels.Add(this.ribbonPanel2);
this.ribbonTab1.Text = "";
//
// ribbonPanel1
@@ -471,6 +476,22 @@
this.ribbonButtonNotApproved.Text = "Abgelehnt";
this.ribbonButtonNotApproved.Click += new System.EventHandler(this.ribbonButtonNotApproved_Click);
//
// ribbonPanel2
//
this.ribbonPanel2.ButtonMoreVisible = false;
this.ribbonPanel2.Items.Add(this.ribbonButton1);
this.ribbonPanel2.Name = "ribbonPanel2";
this.ribbonPanel2.Text = "";
//
// ribbonButton1
//
this.ribbonButton1.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32;
this.ribbonButton1.LargeImage = global::OnDoc.Properties.Resources.Refresh_32x32_32;
this.ribbonButton1.Name = "ribbonButton1";
this.ribbonButton1.SmallImage = global::OnDoc.Properties.Resources.Refresh_24x24_32;
this.ribbonButton1.Text = "Aktualisieren";
this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click);
//
// Approval
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -521,5 +542,7 @@
private System.Windows.Forms.TextBox txtNote;
private System.Windows.Forms.TextBox txtnotewriter;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.RibbonPanel ribbonPanel2;
private System.Windows.Forms.RibbonButton ribbonButton1;
}
}

102
Client/UIControls/Approval.cs
View File

@@ -1,6 +1,7 @@
using Database;
using OnDoc.DocMgmt;
using OnDoc.Klassen;
using Syncfusion.Windows.Forms.Edit;
using Syncfusion.Windows.Forms.Tools;
using System;
using System.Collections.Generic;
@@ -45,6 +46,9 @@ namespace OnDoc.UIControls
}
private void treeViewAdv1_NodeMouseClick(object sender, Syncfusion.Windows.Forms.Tools.TreeViewAdvMouseClickEventArgs e)
{
update_details(e.Node.Tag as string);
}
private void update_details(string nodetag){
try {
notes.Rows.Clear(); ;
notes.Columns.Clear();
@@ -52,9 +56,9 @@ namespace OnDoc.UIControls
notes.Columns.Add("Betreff");
notes.Columns.Add("Note");
notes.Columns.Add("Notewriter");
this.docPreview1.Show_Doc(e.Node.Tag as string);
this.docPreview1.Show_Doc(nodetag);
Database.DB db = new Database.DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from View_Relaunach_Approval_Doc where dokumentid='" + e.Node.Tag as string + "'", false, true);
db.Get_Tabledata("Select * from View_Relaunach_Approval_Doc where dokumentid='" + nodetag + "'", false, true);
this.txtdokumentid.Text = db.dsdaten.Tables[0].Rows[0]["Dokumentid"].ToString();
this.txtbezeichnung.Text = db.dsdaten.Tables[0].Rows[0]["bezeichnung"].ToString();
this.txtPartnerNr.Text = db.dsdaten.Tables[0].Rows[0]["nrpar00"].ToString();
@@ -101,12 +105,12 @@ namespace OnDoc.UIControls
db.Get_Tabledata("Select * from view_relaunch_approval where mitarbeiter_bewilligung=" + manr.ToString() + " order by bewilligungstyp, nrpar00, bezeichnung", false, true);
TreeNodeAdv tn1 = new TreeNodeAdv();
TreeNodeAdv tn2 = new TreeNodeAdv();
//TreeNodeAdv tn1 = new TreeNodeAdv();
//TreeNodeAdv tn2 = new TreeNodeAdv();
TreeNodeAdv tnpartner = null;
tn1.Text = "Unterschfit links";
tn2.Text = "Unterschrift rechts";
//tn1.Text = "Unterschfit links";
//tn2.Text = "Unterschrift rechts";
int tmppartner = 0;
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
{
@@ -115,7 +119,8 @@ namespace OnDoc.UIControls
tmppartner = Convert.ToInt32(dr["nrpar00"]);
tnpartner = new TreeNodeAdv();
tnpartner.Text = dr["nrpar00"].ToString() + " " + dr["bkpar00"].ToString();
if (dr["bewilligungstyp"].ToString() == "1") { tn1.Nodes.Add(tnpartner); } else { tn2.Nodes.Add(tnpartner); }
if (dr["bewilligungstyp"].ToString() == "1") {
treeViewAdv1.Nodes.Add(tnpartner); } else { treeViewAdv1.Nodes.Add(tnpartner); }
}
TreeNodeAdv tndok = new TreeNodeAdv();
tndok.Text = dr["bezeichnung"].ToString();
@@ -123,14 +128,19 @@ namespace OnDoc.UIControls
tndok.TagObject = dr;
tnpartner.Nodes.Add(tndok);
}
if (tn1.Nodes.Count > 0) { treeViewAdv1.Nodes.Add(tn1); }
if (tn2.Nodes.Count > 0) { treeViewAdv1.Nodes.Add(tn2); }
//if (tn1.Nodes.Count > 0) { treeViewAdv1.Nodes.Add(tn1); }
//if (tn2.Nodes.Count > 0) { treeViewAdv1.Nodes.Add(tn2); }
treeViewAdv1.ExpandAll();
if (treeViewAdv1.Nodes.Count > 0)
{
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0].Nodes[0];
update_details(treeViewAdv1.SelectedNode.Tag as string);
}
}
private void ribbonButtonNotApproved_Click(object sender, EventArgs e)
{
frmNote note = new frmNote(treeViewAdv1.SelectedNode.Tag.ToString());
frmNote note = new frmNote(treeViewAdv1.SelectedNode.Tag.ToString(),"Ablehnen");
DataRow dr = treeViewAdv1.SelectedNode.TagObject as DataRow;
if (note.ShowDialog() == DialogResult.OK)
@@ -139,9 +149,9 @@ namespace OnDoc.UIControls
string sql = "update dokument_bewilligung set abgelehnt=1, abgelehnt_am = '" + DateTime.Now.ToString() + "' where id=" + dr["id"].ToString();
db.Exec_SQL(sql);
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
TreeNodeAdv tp = treeViewAdv1.SelectedNode.Parent;
treeViewAdv1.SelectedNode.Parent.Nodes.Remove(treeViewAdv1.SelectedNode);
// treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
// TreeNodeAdv tp = treeViewAdv1.SelectedNode.Parent;
// treeViewAdv1.SelectedNode.Parent.Nodes.Remove(treeViewAdv1.SelectedNode);
if (dr["Bewilligungstyp"].ToString() == "2")
{
db.Exec_SQL("Update dokument set approved=0, approval2=0 where dokumentid='" + dr["dokumentid"].ToString()+"'");
@@ -150,10 +160,12 @@ namespace OnDoc.UIControls
{
db.Exec_SQL("Update dokument set approved=0, approval1=0 where dokumentid='" + dr["dokumentid"].ToString()+"'");
}
if (tp.Nodes.Count < 1)
{
tp.Parent.Nodes.Remove(tp);
}
remove_node();
//if (tp.Nodes.Count < 1)
//{
// tp.Parent.Nodes.Remove(tp);
//}
db = null;
Logging.DocLog.Info("Dokument geprüft - abgelehnt", "Dokumentprüfung", dr["dokumentid"].ToString(),"","");
@@ -167,10 +179,6 @@ namespace OnDoc.UIControls
DataRow dr = treeViewAdv1.SelectedNode.TagObject as DataRow;
string sql = "update dokument_bewilligung set bewilligt=1, bewilligt_am = '" + DateTime.Now.ToString() + "' where id=" + dr["id"].ToString();
db.Exec_SQL(sql);
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
TreeNodeAdv tp = treeViewAdv1.SelectedNode.Parent;
treeViewAdv1.SelectedNode.Parent.Nodes.Remove(treeViewAdv1.SelectedNode);
if (dr["Bewilligungstyp"].ToString() == "2")
{
db.Exec_SQL("Update dokument set approval2=1 where dokumentid='" + dr["dokumentid"].ToString() + "'");
@@ -181,6 +189,58 @@ namespace OnDoc.UIControls
}
db = null;
Logging.DocLog.Info("Dokument geprüft", "Dokumentprüfung", dr["dokumentid"].ToString(), "", "");
remove_node();
}
private void remove_node()
{
this.txtdokumentid.Text = "";
this.txtbezeichnung.Text = "";
this.txtPartnerNr.Text = "";
this.txtPartner.Text = "";
this.txterstelltam.Text = "";
this.txtersteller.Text = "";
this.txtmutiertam.Text = "";
this.txtmutierer.Text = "";
this.txtVerantwortlich.Text = "";
this.docPreview1.clear_viewer();
TreeNodeAdv tparent = treeViewAdv1.SelectedNode.Parent;
tparent.Nodes.Remove(treeViewAdv1.SelectedNode);
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
if (tparent.Nodes.Count < 1)
{
treeViewAdv1.Nodes.Remove(tparent);
}
else
{
treeViewAdv1.SelectedNode = tparent.Nodes[0];
}
if (treeViewAdv1.Nodes.Count < 1)
{
}
else
{
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0].Nodes[0];
}
try
{
update_details(treeViewAdv1.SelectedNode.Tag as string);
}
catch { }
}
private void ribbonButton1_Click(object sender, EventArgs e)
{
Update_Docs(AppParams.CurrentMitarbeiter);
try
{
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0].Nodes[0];
update_details(treeViewAdv1.SelectedNode.Tag as string);
}
catch { }
}
}
}

66
Client/UIControls/DokList.Designer.cs generated
View File

@@ -48,6 +48,7 @@ namespace OnDoc.UICintrols
this.wordInterOPEditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.historyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.tsrbvorschau = new System.Windows.Forms.ToolStripComboBox();
@@ -56,6 +57,7 @@ namespace OnDoc.UICintrols
this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.panel2 = new System.Windows.Forms.Panel();
this.lblTitel = new System.Windows.Forms.Label();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
@@ -151,9 +153,9 @@ namespace OnDoc.UICintrols
this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig();
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.zurUnterschriftenPrüfungToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -170,6 +172,8 @@ namespace OnDoc.UICintrols
this.dokumentAnzeigenToolStripMenuItem,
this.dokumentBearbeitenToolStripMenuItem,
this.dokumentLöschenToolStripMenuItem,
this.toolStripMenuItem2,
this.zurUnterschriftenPrüfungToolStripMenuItem,
this.archivierenToolStripMenuItem,
this.druckenToolStripMenuItem,
this.dokumentKopierenToolStripMenuItem,
@@ -184,14 +188,13 @@ namespace OnDoc.UICintrols
this.historyToolStripMenuItem,
this.dokumentFürPartnerErstellenToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 362);
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 390);
//
// dokumentAnzeigenToolStripMenuItem
//
this.dokumentAnzeigenToolStripMenuItem.Name = "dokumentAnzeigenToolStripMenuItem";
this.dokumentAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentAnzeigenToolStripMenuItem.Text = "Dokument anzeigen";
this.dokumentAnzeigenToolStripMenuItem.Visible = false;
this.dokumentAnzeigenToolStripMenuItem.Click += new System.EventHandler(this.dokumentAnzeigenToolStripMenuItem_Click);
//
// dokumentBearbeitenToolStripMenuItem
@@ -300,6 +303,14 @@ namespace OnDoc.UICintrols
this.historyToolStripMenuItem.Text = "History";
this.historyToolStripMenuItem.Click += new System.EventHandler(this.historyToolStripMenuItem_Click);
//
// dokumentFürPartnerErstellenToolStripMenuItem
//
this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem";
this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen";
this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
//
// toolStrip1
//
this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -412,6 +423,16 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.ColumnResizing += new Syncfusion.WinForms.DataGrid.Events.ColumnResizingEventHandler(this.sfDataGrid1_ColumnResizing);
this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent);
//
// docPreview1
//
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -587,7 +608,7 @@ namespace OnDoc.UICintrols
this.RibbonPannelAproval.Items.Add(this.ribbonButtonApproval);
this.RibbonPannelAproval.Items.Add(this.ribbonItemGroupApproveCounter);
this.RibbonPannelAproval.Name = "RibbonPannelAproval";
this.RibbonPannelAproval.Text = "Prüfung";
this.RibbonPannelAproval.Text = "Unterschriftenprüfung";
//
// ribbonButtonApproval
//
@@ -595,7 +616,7 @@ namespace OnDoc.UICintrols
this.ribbonButtonApproval.LargeImage = global::OnDoc.Properties.Resources.Approval_32x32_32;
this.ribbonButtonApproval.Name = "ribbonButtonApproval";
this.ribbonButtonApproval.SmallImage = global::OnDoc.Properties.Resources.Approval_24x24_32;
this.ribbonButtonApproval.Text = "Bewilligen";
this.ribbonButtonApproval.Text = "Offene Prüfungen";
this.ribbonButtonApproval.Click += new System.EventHandler(this.ribbonButtonApproval_Click_1);
//
// ribbonItemGroupApproveCounter
@@ -1241,24 +1262,6 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// dokumentFürPartnerErstellenToolStripMenuItem
//
this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem";
this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen";
this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
//
// docPreview1
//
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
@@ -1267,6 +1270,19 @@ namespace OnDoc.UICintrols
this.dokwerte1.Size = new System.Drawing.Size(0, 694);
this.dokwerte1.TabIndex = 7;
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(276, 6);
//
// zurUnterschriftenPrüfungToolStripMenuItem
//
this.zurUnterschriftenPrüfungToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Approval_16x16_32;
this.zurUnterschriftenPrüfungToolStripMenuItem.Name = "zurUnterschriftenPrüfungToolStripMenuItem";
this.zurUnterschriftenPrüfungToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.zurUnterschriftenPrüfungToolStripMenuItem.Text = "Zur Unterschriften-Prüfung";
this.zurUnterschriftenPrüfungToolStripMenuItem.Click += new System.EventHandler(this.zurUnterschriftenPrüfungToolStripMenuItem_Click);
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1416,5 +1432,7 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonPanel ribbonPanel3;
private System.Windows.Forms.RibbonButton ribbonButton4;
private System.Windows.Forms.ToolStripMenuItem dokumentFürPartnerErstellenToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
private System.Windows.Forms.ToolStripMenuItem zurUnterschriftenPrüfungToolStripMenuItem;
}
}

117
Client/UIControls/DokList.cs
View File

@@ -102,6 +102,7 @@ namespace OnDoc.UICintrols
GridDateTimeColumn gdt = e.Column as GridDateTimeColumn;
gdt.Pattern = (Syncfusion.WinForms.Input.Enums.DateTimePattern)Syncfusion.Windows.Shared.DateTimePattern.FullDateTime;
}
}
public void OnListen(string message, SenderInfo sender)
@@ -324,9 +325,11 @@ namespace OnDoc.UICintrols
dokwerte1.Update_Werte(selected_dokumentid);
}
ribbonButtonToApproval.Enabled = false;
zurUnterschriftenPrüfungToolStripMenuItem.Enabled = false;
if (faksimile == "True")
{
ribbonButtonToApproval.Enabled=true;
zurUnterschriftenPrüfungToolStripMenuItem.Enabled = true;
}
if (bearbeitung_zwingend == "True")
{
@@ -356,8 +359,13 @@ namespace OnDoc.UICintrols
Broadcaster().Broadcast(selected_dokumentid, new SenderInfo("Doklist", "UpdateView", ""));
return;
}
if (AppParams.StartApp == false)
{
docPreview1.Show_Doc(selected_dokumentid);
docPreview1.Hide_Editbuttons();
}
}
private void sfDataGrid1_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
@@ -623,6 +631,7 @@ namespace OnDoc.UICintrols
private void tsrbvorschau_SelectedIndexChanged(object sender, EventArgs e)
{
vorschauposition = tsrbvorschau.Text;
switch (vorschauposition)
{
@@ -644,6 +653,7 @@ namespace OnDoc.UICintrols
docPreview1.Visible = true;
docPreview1.Show_Doc(selected_dokumentid);
docPreview1.Hide_Editbuttons();
break;
case "Eigenes Fenster":
this.splitContainer1.SplitterDistance = this.Height;
@@ -690,7 +700,8 @@ namespace OnDoc.UICintrols
if (RibbonButtonAttributeEinAusblenden.Checked) { currentview["Attributes"] = 1; } else { currentview["Attributes"] = 0; }
currentview["Splitterdistance"] = splitContainer1.SplitterDistance;
MemoryStream ms = new MemoryStream();
this.sfDataGrid1.Serialize(ms);
//gaga
//this.sfDataGrid1.Serialize(ms);
currentview["Gridsettings"]= Convert.ToBase64String(ms.ToArray());
}
@@ -963,6 +974,7 @@ namespace OnDoc.UICintrols
{
try
{
//MessageBox.Show(e.Column.MappingName);
if (e.Column.MappingName == "zu_retournieren")
{
e.Handled = true;
@@ -997,6 +1009,14 @@ namespace OnDoc.UICintrols
//e.DisplayText = e.DisplayText.ToString("dd.MM.yyyy hh:mm:ss");
//int i = 0;
}
if (e.Column.MappingName == "Termin")
{
var dataRow = (e.DataRow.RowData as DataRowView).Row;
if (Convert.ToDateTime(dataRow["Mutiert am"]) < new DateTime(2000,1,1))
{
e.DisplayText = "";
}
}
if (e.Column.MappingName == "fileext")
{
try
@@ -1337,10 +1357,51 @@ namespace OnDoc.UICintrols
{
if (!row_selected()) return;
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count == 1) {
frmToApproval fa = new frmToApproval();
fa.dokumentid = selected_dokumentid;
fa.ShowDialog();
return;
}
frmToApproval fa = new frmToApproval();
fa.dokumentid = selected_dokumentid;
fa.ShowDialog();
int error = 0;
foreach (var record in records)
{
var datarow = record as DataRowView;
string toapprove = datarow["toapprove"].ToString();
if (toapprove == "False") { error = 1; }
}
if (error != 0){
MessageBox.Show("Es sind Dokumente in der Auswahl, welche keine Prüfung benötigten. Bitte auswahl anpassen.", "Prüfung", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
if (MessageBox.Show("Gewählte Dokumente zur Unterschriftenprüfung "+Environment.NewLine+"(ohne Kommentar-Möglichkeit)?", "Dokument zur Unterschriftenprüfung?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) {
frmToApproval fa = new frmToApproval();
fa.Visible = false;
fa.Show();
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
string toapprove = datarow["toapprove"].ToString();
if (toapprove == "True") {
fa.dokumentid = documentid;
fa.update_dokdetails();
fa.insert_bewilligung();
}
}
fa.close_window();
}
refresh_dokumente();
//frmToApproval fa = new frmToApproval();
//fa.dokumentid = selected_dokumentid;
//fa.ShowDialog();
}
public void upruefung()
@@ -1620,16 +1681,16 @@ namespace OnDoc.UICintrols
}
return Encoding.UTF8.GetString(Convert.FromBase64String(text));
}
private void ribbonButton4_Click(object sender, EventArgs e)
{
if (System.IO.File.Exists(@"x:\gridsettings.xml"))
{
using (var file = File.Open(@"x:\gridsettings.xml", FileMode.Open))
{
this.sfDataGrid1.Deserialize(file);
}
}
}
//private void ribbonButton4_Click(object sender, EventArgs e)
//{
// if (System.IO.File.Exists(@"x:\gridsettings.xml"))
// {
// using (var file = File.Open(@"x:\gridsettings.xml", FileMode.Open))
// {
// this.sfDataGrid1.Deserialize(file);
// }
// }
//}
private void ribbonCBAnsicht_DropDownItemClicked(object sender, System.Windows.Forms.RibbonItemEventArgs e)
@@ -1693,14 +1754,27 @@ namespace OnDoc.UICintrols
string sql = "insert Mitarbeiter_GridSettings (mitarbeiterid, erstellt_am, aktiv, bezeichnung, gridsettings,standard, Preview, Attributes,splitterdistance) values(";
sql = sql + AppParams.CurrentMitarbeiter.ToString() + ",getdate(),1,'" + sa.selectedtext + "','" + inputAsString + "'," + sa.alsStandard.ToString();
sql = sql + ", "+ tsrbvorschau.SelectedIndex.ToString()+", "+Attribute.ToString()+ ", "+distance.ToString()+")";
db.Exec_SQL(sql);
//db.Exec_SQL(sql);
db.Get_Tabledata_for_Update("Select * from mitarbeiter_gridsettings where id = -1", false, true);
System.Data.DataRow dr = db.daten.Tables[0].NewRow();
dr[1]=AppParams.CurrentMitarbeiter.ToString();
dr[2]=DateTime.Now;
dr[3] = true;
dr[4] = sa.selectedtext;
dr[5] = inputAsString;
dr[6] = sa.alsStandard;
dr[7] = tsrbvorschau.SelectedIndex;
dr[8] = Attribute;
dr[9] = distance;
db.daten.Tables[0].Rows.Add(dr);
db.Update_Data();
db = null;
if (sa.alsStandard != 1) { refresh_ansichten(sa.selectedtext); } else { refresh_ansichten(); }
//using (var file = File.Create(@"x:\gridsettings4.xml"))
//{
// this.sfDataGrid1.Serialize(file);
//}
}
}
@@ -2105,6 +2179,11 @@ namespace OnDoc.UICintrols
}
private void zurUnterschriftenPrüfungToolStripMenuItem_Click(object sender, EventArgs e)
{
ribbonButtonToApproval_Click(sender, e);
}
}

6
Client/UIControls/DokList.resx
View File

@@ -524,19 +524,19 @@
<data name="ribbonButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButton4.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButton4.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vQAADr0BR/uQrQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

61
Client/UIControls/DokTypDetail.Designer.cs generated
View File

@@ -30,17 +30,24 @@
{
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.sfDataGrid2 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.groupBox2 = new System.Windows.Forms.GroupBox();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid2)).BeginInit();
this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
// sfDataGrid1
//
this.sfDataGrid1.AccessibleName = "Table";
this.sfDataGrid1.AllowEditing = false;
this.sfDataGrid1.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.LastColumnFill;
this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Left;
this.sfDataGrid1.Location = new System.Drawing.Point(0, 0);
this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Top;
this.sfDataGrid1.Location = new System.Drawing.Point(3, 16);
this.sfDataGrid1.Name = "sfDataGrid1";
this.sfDataGrid1.Size = new System.Drawing.Size(406, 720);
this.sfDataGrid1.Size = new System.Drawing.Size(405, 341);
this.sfDataGrid1.Style.HeaderStyle.FilterIconColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(29)))), ((int)(((byte)(29)))));
this.sfDataGrid1.TabIndex = 1;
this.sfDataGrid1.Text = "sfDataGrid1";
@@ -48,21 +55,60 @@
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(406, 0);
this.docPreview1.Location = new System.Drawing.Point(411, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(606, 720);
this.docPreview1.Size = new System.Drawing.Size(601, 720);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.groupBox2);
this.groupBox1.Controls.Add(this.sfDataGrid1);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Left;
this.groupBox1.Location = new System.Drawing.Point(0, 0);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(411, 720);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
//
// sfDataGrid2
//
this.sfDataGrid2.AccessibleName = "Table";
this.sfDataGrid2.AllowEditing = false;
this.sfDataGrid2.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.LastColumnFill;
this.sfDataGrid2.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfDataGrid2.Location = new System.Drawing.Point(3, 16);
this.sfDataGrid2.Name = "sfDataGrid2";
this.sfDataGrid2.Size = new System.Drawing.Size(399, 341);
this.sfDataGrid2.Style.HeaderStyle.FilterIconColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(29)))), ((int)(((byte)(29)))));
this.sfDataGrid2.TabIndex = 2;
this.sfDataGrid2.Text = "sfDataGrid2";
this.sfDataGrid2.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid2_CellClick);
//
// groupBox2
//
this.groupBox2.Controls.Add(this.sfDataGrid2);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox2.Location = new System.Drawing.Point(3, 357);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(405, 360);
this.groupBox2.TabIndex = 3;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Vorlagen im Paket (für Vorschau Eintrag auswählen)";
//
// DokTypDetail
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.docPreview1);
this.Controls.Add(this.sfDataGrid1);
this.Controls.Add(this.groupBox1);
this.Name = "DokTypDetail";
this.Size = new System.Drawing.Size(1012, 720);
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit();
this.groupBox1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid2)).EndInit();
this.groupBox2.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -71,5 +117,8 @@
private DocPreview docPreview1;
private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid1;
private System.Windows.Forms.GroupBox groupBox1;
private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid2;
private System.Windows.Forms.GroupBox groupBox2;
}
}

98
Client/UIControls/DokTypDetail.cs
View File

@@ -18,6 +18,9 @@ namespace OnDoc.UIControls
public partial class DokTypDetail : UserControl
{
public int dokumenttypnr { get; set; } = 0;
public int einzeldokument { get; set; } = 0;
public bool dokumentpaket { get; set; } = false;
public DokTypDetail()
{
InitializeComponent();
@@ -32,12 +35,62 @@ namespace OnDoc.UIControls
public void Refresh_Details()
{
DB dB = new DB(AppParams.connectionstring);
dB.Get_Tabledata("Select * from view_ondoc_doctypdetail where nr=" + dokumenttypnr.ToString(), false, true);
DataTable details = new DataTable();
details.Columns.Add("Element");
details.Columns.Add("Inhalt");
if (dokumentpaket)
{
sfDataGrid1.Dock = DockStyle.Top;
groupBox2.Dock = DockStyle.Fill;
groupBox2.Visible = true;
}
else
{
sfDataGrid1.Dock = DockStyle.Fill;
groupBox2.Visible = false;
}
DB dB = new DB(AppParams.connectionstring);
if (einzeldokument == 0)
{
dB.Get_Tabledata("Select * from view_ondoc_doctypdetail where nr=" + dokumenttypnr.ToString(), false, true);
}
if (einzeldokument==1)
{
dB.Get_Tabledata("Select * from view_ondoc_doctypdetail_nativ where nr=" + dokumenttypnr.ToString(), false, true);
}
if (dokumentpaket)
{
dB.Get_Tabledata("Select [Nr],[Bezeichung],[Beschreibung],[Hinweis],[zwingend],[sort],[ID],[DokTyp] from view_ondoc_docpacdetail where nr=" + dokumenttypnr.ToString()+" order by sort", false, true);
for (int i = 0; i < 4; i++)
{
System.Data.DataRow dr1 = details.NewRow();
dr1[0]= dB.dsdaten.Tables[0].Columns[i].ColumnName;
dr1[1] = dB.dsdaten.Tables[0].Rows[0][i].ToString();
details.Rows.Add(dr1);
}
sfDataGrid1.DataSource= details;
dB.dsdaten.Tables[0].Columns.RemoveAt(0);
dB.dsdaten.Tables[0].Columns.RemoveAt(0);
dB.dsdaten.Tables[0].Columns.RemoveAt(0);
dB.dsdaten.Tables[0].Columns.RemoveAt(0);
dB.dsdaten.Tables[0].Columns.RemoveAt(0);
dB.dsdaten.Tables[0].Columns.RemoveAt(0);
sfDataGrid2.DataSource = dB.dsdaten.Tables[0];
//sfDataGrid2.Columns[0].Visible = false;
//sfDataGrid2.Columns[1].Visible = false;
//sfDataGrid2.Columns[2].Visible = false;
//sfDataGrid2.Columns[3].Visible = false;
dB = null;
return;
}
foreach (DataColumn dc in dB.dsdaten.Tables[0].Columns)
{
if (dc.ColumnName != "Image")
@@ -96,5 +149,46 @@ namespace OnDoc.UIControls
dB = null;
}
private void sfDataGrid2_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
string id = "";
string apptype = "";
string image = "";
try
{
var rowIndex = e.DataRow.RowIndex;
//Get the column index value
var columnIndex = e.DataColumn.ColumnIndex;
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
id = dataRow["id"].ToString();
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select apptype,image from view_ondoc_docpacdetail where nr= " + this.dokumenttypnr.ToString() + " and id=" + id, false, true);
apptype = db.dsdaten.Tables[0].Rows[0][0].ToString().ToUpper();
image = db.dsdaten.Tables[0].Rows[0][1].ToString();
db = null;
DocGet dg = new DocGet(AppParams.connectionstring);
string PDF = "";
switch (apptype)
{
case "WORD":
PDF = dg.Convert_Word_To_PDF(image);
break;
case "EXCEL":
PDF = dg.Convert_Excel_To_PDF(image);
break;
case "PDF":
PDF = image;
break;
default:
break;
}
docPreview1.show_base64(PDF, "Dokumenttyp: " + dokumenttypnr.ToString());
dg = null;
}
catch { }
}
}
}

2
Client/UIControls/Dokwerte.Designer.cs generated
View File

@@ -42,6 +42,7 @@
// sfDataGrid1
//
this.sfDataGrid1.AccessibleName = "Table";
this.sfDataGrid1.AllowEditing = false;
this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfDataGrid1.Location = new System.Drawing.Point(0, 100);
this.sfDataGrid1.Name = "sfDataGrid1";
@@ -87,6 +88,7 @@
// sfdatagridpruefung
//
this.sfdatagridpruefung.AccessibleName = "Table";
this.sfdatagridpruefung.AllowEditing = false;
this.sfdatagridpruefung.BackColor = System.Drawing.SystemColors.Window;
this.sfdatagridpruefung.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfdatagridpruefung.Location = new System.Drawing.Point(3, 16);

3
Client/UIControls/UCAllgemeineDokumentParam.Designer.cs generated
View File

@@ -645,12 +645,13 @@
//
// btnErneutGenerierung
//
this.btnErneutGenerierung.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.btnErneutGenerierung.Location = new System.Drawing.Point(900, 64);
this.btnErneutGenerierung.Name = "btnErneutGenerierung";
this.btnErneutGenerierung.Size = new System.Drawing.Size(138, 23);
this.btnErneutGenerierung.TabIndex = 25;
this.btnErneutGenerierung.Text = "Erneut generieren";
this.btnErneutGenerierung.UseVisualStyleBackColor = true;
this.btnErneutGenerierung.UseVisualStyleBackColor = false;
this.btnErneutGenerierung.Visible = false;
this.btnErneutGenerierung.Click += new System.EventHandler(this.btnErneutGenerierung_Click);
//

8
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -827,11 +827,15 @@ namespace OnDoc.UIControls
{
Broadcaster().Broadcast("DokumentPaket", new SenderInfo("NeuGenerierung", "NeuGenerierung", genertated_dokumentid));
}
private void btnGenerieren_Click(object sender, EventArgs e)
{
Broadcaster().Broadcast("DokumentPaket", new SenderInfo("NeuGenerierung", "Generierung", dokumenttypnr.ToString()));
}
public void Show_Neugenerieren()
{
btnErneutGenerierung.Visible = true;
}
private void rbzustaendigkube_CheckedChanged(object sender, EventArgs e)
{
@@ -931,5 +935,7 @@ namespace OnDoc.UIControls
}
catch { }
}
}
}

BIN
Client/bin/Debug/Database.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/Database.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocClient.zip
View File

Binary file not shown.

BIN
Client/bin/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
View File

@@ -1 +1 @@
0ebfa8660e9a4803f2c070035283fb2abe7589fb363960199b8d3b0282a9d215
6ee05635a2fc158c8632aa1f66864359a3e91ff6455341d3d86f10936b410e21

1
Client/obj/Debug/Client.csproj.FileListAbsolute.txt
View File

@@ -367,3 +367,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\vbBarcodes.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\MW6.SDK.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.AdminDokTypGenerierung.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.SerienbriefTemplateLoad.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.frmDokumentpaketNeugenerierung.resources

BIN
Client/obj/Debug/Client.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.DocMgmt.frmDokumentpaketNeugenerierung.resources Normal file
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/obj/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.