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

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)
{