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

update 20241008

Browse Source
This commit is contained in:
Stefan Hutter
2024-10-08 20:16:10 +02:00
parent 4fbeb345ee
commit b8a392b514
110 changed files with 2061 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,6 +116,7 @@ namespace OnDoc.DocMgmt
this.ribbonPanel1.Items.Add(this.ribbonButton1);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = "Schliessen";
this.ribbonPanel1.Visible = false;
//
// ribbonButton1
//

2
Client/DocMgmt/DokTypSelect.resx
View File

@@ -284,7 +284,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk
CAAAAk1TRnQBSQFMAgEBAgEAAVgBAAFYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAWABAAFgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

32
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -15,10 +15,13 @@ using Syncfusion.WinForms.DataGrid;
using Syncfusion.WinForms.DataGrid.Interactivity;
using Database;
using OnDoc.UIControls;
using BroadcastListener.Classes;
using BroadcastListener.Interfaces;
using static BroadcastListener.Classes.Factory;
namespace OnDoc.DocMgmt
{
public partial class Dokumenterstellung : SfForm
public partial class Dokumenterstellung : SfForm, IMessageListener1
{
public int partnernr { get; set; } = 0;
public int profilnr { get; set; } = 0;
@@ -34,6 +37,7 @@ namespace OnDoc.DocMgmt
public Dokumenterstellung()
{
InitializeComponent();
Broadcaster().AddListener(this);
}
public Dokumenterstellung(int Partnernr, int Dokumenttpynr, int Profilnr)
@@ -42,6 +46,8 @@ namespace OnDoc.DocMgmt
partnernr = Partnernr;
dokumenttypnr = Dokumenttpynr;
profilnr = Profilnr;
Broadcaster().AddListener(this);
Closing += Form_Closing;
}
public Dokumenterstellung(int Partnernr, int Dokumenttypnr, int Profilnr, string Interaktion, string Showdoc)
@@ -52,7 +58,24 @@ namespace OnDoc.DocMgmt
profilnr = Profilnr;
interaktion= Interaktion;
showdoc = Showdoc;
Broadcaster().AddListener(this);
Closing += Form_Closing;
}
private void Form_Closing(object sender, CancelEventArgs e)
{
Broadcaster().RemoveListener(this);
}
public void OnListen(string message, SenderInfo sender)
{
if (message == "BtnErstellung")
{
if (ucAllgemeineDokumentParam1.uniqid == sender.Details)
{
if (sender.Function == "Disable") { btnDokumenterstellen.Enabled = false; } else { btnDokumenterstellen.Enabled = true; }
}
}
}
private void Dokumenterstellung_Load(object sender, EventArgs e)
{
@@ -62,6 +85,10 @@ namespace OnDoc.DocMgmt
ucAllgemeineDokumentParam1.partnernr = partnernr;
ucAllgemeineDokumentParam1.profilnr = profilnr;
ucAllgemeineDokumentParam1.Refresh_Details();
//if (ucAllgemeineDokumentParam1.check_bp_person() == false)
//{
// btnDokumenterstellen.Enabled = false;
//}
}
@@ -72,7 +99,7 @@ namespace OnDoc.DocMgmt
public void Dokument_Erstellen()
{
if (ucAllgemeineDokumentParam1.check_fields()==false) {
MessageBox.Show(ucAllgemeineDokumentParam1.check_error);
MessageBox.Show(ucAllgemeineDokumentParam1.check_error,"Feldwerte",MessageBoxButtons.OK,MessageBoxIcon.Error);
return; };
ucAllgemeineDokumentParam1.Update_DocGenData();
clsDocData dokdata = new clsDocData();
@@ -103,6 +130,7 @@ namespace OnDoc.DocMgmt
//if (dok.extension.Substring(0,1).ToUpper() == "D") { System.Diagnostics.Process.Start("winword.exe", filename); }
//if (dok.extension.Substring(0, 1).ToUpper() == "X") { System.Diagnostics.Process.Start("excel.exe", filename); }
//clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
this.Close();
return;
}

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

@@ -40,6 +40,8 @@
this.ribbonTab1 = new System.Windows.Forms.RibbonTab();
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonExit = new System.Windows.Forms.RibbonButton();
this.ribbonPanel5 = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonNew = new System.Windows.Forms.RibbonButton();
this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonGenerieren = new System.Windows.Forms.RibbonButton();
this.RibbonButtonGenerate = new System.Windows.Forms.RibbonButton();
@@ -55,8 +57,6 @@
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.dokList1 = new OnDoc.UICintrols.DokList();
this.ribbonPanel5 = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonNew = new System.Windows.Forms.RibbonButton();
((System.ComponentModel.ISupportInitialize)(this.TabControlDokuments)).BeginInit();
this.TabControlDokuments.SuspendLayout();
this.pnlfooter.SuspendLayout();
@@ -89,6 +89,7 @@
//
this.txtpersonnummer.Location = new System.Drawing.Point(72, 65);
this.txtpersonnummer.Name = "txtpersonnummer";
this.txtpersonnummer.ReadOnly = true;
this.txtpersonnummer.Size = new System.Drawing.Size(100, 20);
this.txtpersonnummer.TabIndex = 3;
//
@@ -96,6 +97,7 @@
//
this.txtbpnummer.Location = new System.Drawing.Point(72, 18);
this.txtbpnummer.Name = "txtbpnummer";
this.txtbpnummer.ReadOnly = true;
this.txtbpnummer.Size = new System.Drawing.Size(100, 20);
this.txtbpnummer.TabIndex = 2;
this.txtbpnummer.Leave += new System.EventHandler(this.textBox1_Leave);
@@ -165,6 +167,7 @@
this.ribbonPanel1.Items.Add(this.RibbonButtonExit);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = null;
this.ribbonPanel1.Visible = false;
//
// RibbonButtonExit
//
@@ -175,6 +178,22 @@
this.RibbonButtonExit.Text = "Schliessen";
this.RibbonButtonExit.Click += new System.EventHandler(this.RibbonButtonExit_Click);
//
// ribbonPanel5
//
this.ribbonPanel5.ButtonMoreVisible = false;
this.ribbonPanel5.Items.Add(this.ribbonButtonNew);
this.ribbonPanel5.Name = "ribbonPanel5";
this.ribbonPanel5.Text = "";
//
// ribbonButtonNew
//
this.ribbonButtonNew.Image = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32;
this.ribbonButtonNew.LargeImage = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32;
this.ribbonButtonNew.Name = "ribbonButtonNew";
this.ribbonButtonNew.SmallImage = global::OnDoc.Properties.Resources.NewDokPaket_24x24_32;
this.ribbonButtonNew.Text = "Neu";
this.ribbonButtonNew.Click += new System.EventHandler(this.ribbonButtonNew_Click);
//
// ribbonPanel3
//
this.ribbonPanel3.ButtonMoreVisible = false;
@@ -208,6 +227,7 @@
this.sfListView1.Size = new System.Drawing.Size(249, 530);
this.sfListView1.TabIndex = 18;
this.sfListView1.Text = "sfListView1";
this.sfListView1.SelectionChanged += new System.EventHandler<Syncfusion.WinForms.ListView.Events.ItemSelectionChangedEventArgs>(this.sfListView1_SelectionChanged);
this.sfListView1.ItemChecked += new System.EventHandler<Syncfusion.WinForms.ListView.Events.ItemCheckedEventArgs>(this.sfListView1_ItemChecked);
//
// TabControlDokuments
@@ -309,6 +329,7 @@
this.btnSearchPerson.Size = new System.Drawing.Size(33, 23);
this.btnSearchPerson.TabIndex = 7;
this.btnSearchPerson.UseVisualStyleBackColor = true;
this.btnSearchPerson.Click += new System.EventHandler(this.btnSearchPerson_Click);
//
// groupBox2
//
@@ -338,32 +359,18 @@
this.dokList1.docartnr = 0;
this.dokList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dokList1.forMaNr = 0;
this.dokList1.interop = false;
this.dokList1.Location = new System.Drawing.Point(3, 16);
this.dokList1.mitarbeiternr = 0;
this.dokList1.Name = "dokList1";
this.dokList1.partnernr = 0;
this.dokList1.profilnr = 0;
this.dokList1.runmacros = false;
this.dokList1.selected_cellvalue = null;
this.dokList1.selected_dokumentid = null;
this.dokList1.Size = new System.Drawing.Size(477, 660);
this.dokList1.TabIndex = 0;
//
// ribbonPanel5
//
this.ribbonPanel5.ButtonMoreVisible = false;
this.ribbonPanel5.Items.Add(this.ribbonButtonNew);
this.ribbonPanel5.Name = "ribbonPanel5";
this.ribbonPanel5.Text = "";
//
// ribbonButtonNew
//
this.ribbonButtonNew.Image = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32;
this.ribbonButtonNew.LargeImage = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32;
this.ribbonButtonNew.Name = "ribbonButtonNew";
this.ribbonButtonNew.SmallImage = global::OnDoc.Properties.Resources.NewDokPaket_24x24_32;
this.ribbonButtonNew.Text = "Neu";
this.ribbonButtonNew.Click += new System.EventHandler(this.ribbonButtonNew_Click);
//
// Dokumentpaket
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

168
Client/DocMgmt/Dokumentpaket.cs
View File

@@ -19,6 +19,10 @@ using Syncfusion.WinForms.DataGrid;
using Syncfusion.WinForms.DataGrid.Interactivity;
using Syncfusion.WinForms.ListView.Enums;
using Syncfusion.WinForms.ListView.Events;
using Syncfusion.WinForms.ListView;
using OnDoc.UIControls.Administrator;
using System.Diagnostics;
using NLog.LayoutRenderers.Wrappers;
namespace OnDoc.DocMgmt
{
@@ -47,21 +51,25 @@ namespace OnDoc.DocMgmt
}
private void NeuesDokumentpaket()
private bool NeuesDokumentpaket()
{
DokTypSelect dt = new DokTypSelect();
dt.vorlagentype = 2;
dt.ShowDialog();
if (dt.DialogResult == DialogResult.OK) { dokumentpaketnr = Convert.ToInt32(dt.dokumenttypnr); }
if (dt.DialogResult == DialogResult.OK) { dokumentpaketnr = Convert.ToInt32(dt.dokumenttypnr); return true; } else { return false; }
}
private void Dokumentpaket_Load(object sender, EventArgs e)
{
this.BeginUpdate();
if (dokumentpaketnr == 0)
{
NeuesDokumentpaket();
if (!NeuesDokumentpaket()){ this.Close(); return; };
}
Update_PaketDetails();
if (this.txtbpnummer.Text == "") { btnSearchBP_Click(sender, e); }
this.EndUpdate();
}
private void Update_PaketDetails() {
Cursor = Cursors.WaitCursor;
@@ -124,9 +132,39 @@ namespace OnDoc.DocMgmt
private void btnSearchBP_Click(object sender, EventArgs e)
{
UCAllgemeineDokumentParam newdoc = new UCAllgemeineDokumentParam();
doclist.Add(newdoc);
Refresh_DocTab();
Partnersuche ps = new Partnersuche();
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
this.txtbpnummer.Text = ps.partnernr.ToString(); ;
this.lblKurznameBP.Text = ps.partnerkurzname.ToString();
if (this.txtbpnummer.Text.Length > 9)
{
MessageBox.Show("Beim gewählten Partner handelt es ich nicht um einBP.", "Partnerselektion", MessageBoxButtons.OK, MessageBoxIcon.Error);
this.txtbpnummer.Text = "";
this.lblKurznameBP.Text = "";
return;
}
set_bp_person(ps.partnernr,0);
}
}
private void btnSearchPerson_Click(object sender, EventArgs e)
{
Partnersuche ps = new Partnersuche();
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
this.txtpersonnummer.Text = ps.partnernr.ToString();
this.lblKurznamePerson.Text = ps.partnerkurzname.ToString();
if (this.txtpersonnummer.Text.Length < 9) {
MessageBox.Show("Beim gewählten Partner handelt es ich nicht um eine Person.", "Partnerselektion", MessageBoxButtons.OK, MessageBoxIcon.Error);
this.txtpersonnummer.Text = "";
this.lblKurznamePerson.Text = "";
return;
}
set_bp_person(0,ps.partnernr);
}
}
private void add_uc(System.Data.DataRow r)
{
@@ -135,8 +173,15 @@ namespace OnDoc.DocMgmt
newdoc.Dock= DockStyle.Fill;
newdoc.checkpartner = false;
newdoc.dokumenttypnr = Convert.ToInt32(r[2]);
if (newdoc.set_personendokument() == true)
{
if (txtpersonnummer.Text != "") { newdoc.partnernr = Convert.ToInt32(txtpersonnummer.Text); }
}
else
{
if (txtbpnummer.Text != "") { newdoc.partnernr = Convert.ToInt32(txtbpnummer.Text); }
}
if (txtbpnummer.Text !="") { newdoc.partnernr = Convert.ToInt32(txtbpnummer.Text); }
newdoc.Refresh_Details();
TabPageAdv tabPage = new TabPageAdv(r[3].ToString());
tabPage.Controls.Add(newdoc);
@@ -201,17 +246,58 @@ namespace OnDoc.DocMgmt
}
}
private void textBox1_Leave(object sender, EventArgs e)
private void set_bp_person(int bpnummer, int personnummer)
{
Database.DB db = new Database.DB(AppParams.connectionstring);
db.clear_parameter();
if (bpnummer !=0) db.add_parameter("@partnernr", bpnummer.ToString());
if (personnummer !=0) db.add_parameter("@partnernr", personnummer.ToString());
db.Get_Tabledata("sp_ondoc_bp_person", true, false);
if (bpnummer!=0 && db.dsdaten.Tables[0].Rows.Count ==1)
{
txtbpnummer.Text = db.dsdaten.Tables[0].Rows[0]["bp_nr"].ToString();
lblKurznameBP.Text = db.dsdaten.Tables[0].Rows[0]["bp_kurzname"].ToString();
txtpersonnummer.Text = "";
if (txtpersonnummer.Text=="")
{
txtpersonnummer.Text = db.dsdaten.Tables[0].Rows[0]["pers_nr"].ToString();
lblKurznamePerson.Text = db.dsdaten.Tables[0].Rows[0]["person_kurzname"].ToString();
}
update_dokumente_bp_person(bpnummer, true);
if (txtpersonnummer.Text!="") { update_dokumente_bp_person(Convert.ToInt32(txtpersonnummer.Text), false); }
}
}
private void update_dokumente_bp_person(int partnernr, bool bp)
{
try
{
foreach (TabPageAdv tab in TabControlDokuments.TabPages)
{
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
uc.partnernr = Convert.ToInt32(txtbpnummer.Text);
uc.update_partner();
uc.ausDokumentpaket = true;
if (bp && !uc.personendokument)
{
uc.partnernr = partnernr;
uc.update_partner();
}
if (!bp && uc.personendokument)
{
uc.partnernr = partnernr;
uc.update_partner();
}
uc.ausDokumentpaket = false;
}
}catch { }
}
catch { }
}
private void textBox1_Leave(object sender, EventArgs e)
{
//set_bp_person();
}
@@ -230,9 +316,49 @@ namespace OnDoc.DocMgmt
this.Close();
}
private bool check_all_doks()
{
string errormessage = "";
string dokumenterror = "";
foreach (TabPageAdv tab in TabControlDokuments.TabPages)
{
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
uc.ausDokumentpaket = true;
dokumenterror = "";
if (uc.partnernr == 0) { dokumenterror = dokumenterror + "- Kein Partner gewählt" + Environment.NewLine; }
else
{
uc.check_bp_person();
if (uc.bpperson_error_type == 1) { dokumenterror = dokumenterror + "- Dokument muss für eine Person erstellt werden" + Environment.NewLine; }
if (uc.bpperson_error_type == 2) { dokumenterror = dokumenterror + "- Dokument muss für einen BP erstellt werden" + Environment.NewLine; }
}
if (!uc.check_fields())
{
dokumenterror = dokumenterror + uc.check_error + Environment.NewLine;
}
uc.ausDokumentpaket = false;
if (dokumenterror!="") { errormessage = errormessage + Environment.NewLine+ tab.Text +":"+ Environment.NewLine + dokumenterror; }
}
if (errormessage != "")
{
MessageBox.Show(errormessage, "Folgende Fehler korrigieren:", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
return true;
}
private void RibbonButtonGenerieren_Click(object sender, EventArgs e)
{
if (check_all_doks()==false)
{
return;
}
string filter = "dokumentid in ('";
progressBarAdv1.Minimum = 0;
progressBarAdv1.Maximum = TabControlDokuments.TabPages.Count;
@@ -244,7 +370,7 @@ namespace OnDoc.DocMgmt
Application.DoEvents();
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
uc.partnernr = Convert.ToInt32(txtbpnummer.Text);
// uc.partnernr = Convert.ToInt32(txtbpnummer.Text);
uc.Set_Edit_later();
uc.Update_DocGenData();
clsDocData dokdata = new clsDocData();
@@ -305,8 +431,24 @@ namespace OnDoc.DocMgmt
public void ribbonButtonNew_Click(object sender, EventArgs e)
{
NeuesDokumentpaket();
if (!NeuesDokumentpaket()) { return; }
Update_PaketDetails();
}
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;
}
}
return;
}
}
}

2
Client/DocMgmt/Dokumentpaket.resx
View File

@@ -166,7 +166,7 @@
<data name="RibbonButtonGenerieren.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vgAADr4B6kKxwAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="btnSearchBP.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

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

@@ -50,7 +50,7 @@
this.Name = "frmBewilligung";
this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center;
this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
this.Text = "Bewilligung";
this.Text = "Unterschriftenprüfung";
this.Load += new System.EventHandler(this.frmBewilligung_Load);
this.ResumeLayout(false);

104
Client/DocMgmt/frmToApproval.Designer.cs generated
View File

@@ -31,24 +31,25 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmToApproval));
this.cbboxunterschriftrechts = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxunterschriftlinks = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxbewilligungsinstanz = new Syncfusion.WinForms.ListView.SfComboBox();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.txtnachricht = new System.Windows.Forms.TextBox();
this.btntoapproval = new System.Windows.Forms.Button();
this.btncancel = new System.Windows.Forms.Button();
this.pxapproval1 = new System.Windows.Forms.PictureBox();
this.pxapproval2 = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftrechts)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftlinks)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxbewilligungsinstanz)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pxapproval1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pxapproval2)).BeginInit();
this.SuspendLayout();
//
// cbboxunterschriftrechts
//
this.cbboxunterschriftrechts.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxunterschriftrechts.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxunterschriftrechts.Location = new System.Drawing.Point(216, 103);
this.cbboxunterschriftrechts.Location = new System.Drawing.Point(216, 62);
this.cbboxunterschriftrechts.Name = "cbboxunterschriftrechts";
this.cbboxunterschriftrechts.Size = new System.Drawing.Size(287, 19);
this.cbboxunterschriftrechts.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
@@ -60,7 +61,7 @@
//
this.cbboxunterschriftlinks.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxunterschriftlinks.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxunterschriftlinks.Location = new System.Drawing.Point(216, 68);
this.cbboxunterschriftlinks.Location = new System.Drawing.Point(216, 27);
this.cbboxunterschriftlinks.Name = "cbboxunterschriftlinks";
this.cbboxunterschriftlinks.Size = new System.Drawing.Size(287, 19);
this.cbboxunterschriftlinks.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
@@ -68,61 +69,40 @@
this.cbboxunterschriftlinks.TabIndex = 11;
this.cbboxunterschriftlinks.TabStop = false;
//
// cbboxbewilligungsinstanz
//
this.cbboxbewilligungsinstanz.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxbewilligungsinstanz.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxbewilligungsinstanz.Location = new System.Drawing.Point(216, 36);
this.cbboxbewilligungsinstanz.Name = "cbboxbewilligungsinstanz";
this.cbboxbewilligungsinstanz.Size = new System.Drawing.Size(287, 19);
this.cbboxbewilligungsinstanz.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxbewilligungsinstanz.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxbewilligungsinstanz.TabIndex = 10;
this.cbboxbewilligungsinstanz.TabStop = false;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(29, 36);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(90, 13);
this.label1.TabIndex = 13;
this.label1.Text = "Bewilligung durch";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(29, 72);
this.label2.Location = new System.Drawing.Point(29, 31);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(173, 13);
this.label2.Size = new System.Drawing.Size(151, 13);
this.label2.TabIndex = 14;
this.label2.Text = "Unterschfrift links bewilligung durch";
this.label2.Text = "Unterschfrift links prüfen durch";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(29, 103);
this.label3.Location = new System.Drawing.Point(29, 62);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(181, 13);
this.label3.Size = new System.Drawing.Size(159, 13);
this.label3.TabIndex = 15;
this.label3.Text = "Unterschfrift rechts bewilligung durch";
this.label3.Text = "Unterschfrift rechts prüfen durch";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(29, 145);
this.label4.Location = new System.Drawing.Point(29, 104);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(53, 13);
this.label4.TabIndex = 16;
this.label4.Text = "Nachricht";
//
// textBox1
// txtnachricht
//
this.textBox1.Location = new System.Drawing.Point(216, 142);
this.textBox1.Multiline = true;
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(287, 146);
this.textBox1.TabIndex = 17;
this.txtnachricht.Location = new System.Drawing.Point(216, 101);
this.txtnachricht.Multiline = true;
this.txtnachricht.Name = "txtnachricht";
this.txtnachricht.Size = new System.Drawing.Size(287, 146);
this.txtnachricht.TabIndex = 17;
//
// btntoapproval
//
@@ -130,7 +110,7 @@
this.btntoapproval.Name = "btntoapproval";
this.btntoapproval.Size = new System.Drawing.Size(171, 23);
this.btntoapproval.TabIndex = 18;
this.btntoapproval.Text = "zur Bewilligung senden";
this.btntoapproval.Text = "zur Prüfung";
this.btntoapproval.UseVisualStyleBackColor = true;
this.btntoapproval.Click += new System.EventHandler(this.btntoapproval_Click);
//
@@ -142,31 +122,55 @@
this.btncancel.TabIndex = 19;
this.btncancel.Text = "Abbruch";
this.btncancel.UseVisualStyleBackColor = true;
this.btncancel.Click += new System.EventHandler(this.btncancel_Click);
//
// pxapproval1
//
this.pxapproval1.Image = ((System.Drawing.Image)(resources.GetObject("pxapproval1.Image")));
this.pxapproval1.InitialImage = ((System.Drawing.Image)(resources.GetObject("pxapproval1.InitialImage")));
this.pxapproval1.Location = new System.Drawing.Point(509, 19);
this.pxapproval1.Name = "pxapproval1";
this.pxapproval1.Size = new System.Drawing.Size(33, 32);
this.pxapproval1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pxapproval1.TabIndex = 20;
this.pxapproval1.TabStop = false;
//
// pxapproval2
//
this.pxapproval2.Image = ((System.Drawing.Image)(resources.GetObject("pxapproval2.Image")));
this.pxapproval2.InitialImage = ((System.Drawing.Image)(resources.GetObject("pxapproval2.InitialImage")));
this.pxapproval2.Location = new System.Drawing.Point(509, 57);
this.pxapproval2.Name = "pxapproval2";
this.pxapproval2.Size = new System.Drawing.Size(33, 32);
this.pxapproval2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pxapproval2.TabIndex = 21;
this.pxapproval2.TabStop = false;
//
// frmToApproval
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(529, 347);
this.ClientSize = new System.Drawing.Size(557, 347);
this.Controls.Add(this.pxapproval2);
this.Controls.Add(this.pxapproval1);
this.Controls.Add(this.btncancel);
this.Controls.Add(this.btntoapproval);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.txtnachricht);
this.Controls.Add(this.label4);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.cbboxunterschriftrechts);
this.Controls.Add(this.cbboxunterschriftlinks);
this.Controls.Add(this.cbboxbewilligungsinstanz);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "frmToApproval";
this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center;
this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
this.Text = "Dokument bewilligen lassen";
this.Text = "Prüfung der Unterschriften";
this.Load += new System.EventHandler(this.frmToApproval_Load);
((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftrechts)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftlinks)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxbewilligungsinstanz)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pxapproval1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pxapproval2)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -176,13 +180,13 @@
private Syncfusion.WinForms.ListView.SfComboBox cbboxunterschriftrechts;
private Syncfusion.WinForms.ListView.SfComboBox cbboxunterschriftlinks;
private Syncfusion.WinForms.ListView.SfComboBox cbboxbewilligungsinstanz;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.TextBox txtnachricht;
private System.Windows.Forms.Button btntoapproval;
private System.Windows.Forms.Button btncancel;
private System.Windows.Forms.PictureBox pxapproval1;
private System.Windows.Forms.PictureBox pxapproval2;
}
}

91
Client/DocMgmt/frmToApproval.cs
View File

@@ -30,33 +30,96 @@ namespace OnDoc.DocMgmt
db.clear_parameter();
db.Get_Tabledata("SP_Dokumentbearbeitung_Mitarbeiter", true, false);
cbboxbewilligungsinstanz.DataSource = db.dsdaten.Tables[0];
cbboxunterschriftlinks.DataSource = db.dsdaten.Tables[0];
cbboxunterschriftrechts.DataSource = db.dsdaten.Tables[0];
cbboxbewilligungsinstanz.DisplayMember = "name";
cbboxbewilligungsinstanz.ValueMember = "mitarbeiternr";
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();
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())
{
cbboxunterschriftlinks.Enabled = false;
pxapproval1.Visible = true;
}
if (db.dsdaten.Tables[0].Rows[0]["ersteller"].ToString() == db.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString())
{
cbboxunterschriftrechts.Enabled = false;
pxapproval2.Visible = true;
}
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approved"])){
cbboxunterschriftlinks.Enabled = false;
pxapproval1.Visible = true;
cbboxunterschriftrechts.Enabled = false;
pxapproval2.Visible = true;
btntoapproval.Enabled = false;
}
}
private void btntoapproval_Click(object sender, EventArgs e)
{
DB dB = new DB(AppParams.connectionstring);
dB.Get_Tabledata_for_Update("select top 1 * from dokument_bewilligung where id=-2", false, true);
DataRow dr = dB.daten.Tables[0].NewRow();
dr["dokumentid"]=this.dokumentid;
dr["mitarbeiter_bewilligung"] = this.cbboxbewilligungsinstanz.SelectedValue;
dr["bewilligt"] = false;
dr["bewilligungstyp"] = 1;
dr["erstellt_am"]=DateTime.Now;
dr["mutiert_am"] = DateTime.Now;
dr["mutierer"] = AppParams.CurrentMitarbieter;
dr["aktiv"] = true;
dB.daten.Tables[0].Rows.Add(dr);
dB.Update_Data();
if (pxapproval1.Visible == false)
{
DataRow dr = dB.daten.Tables[0].NewRow();
dr["dokumentid"] = this.dokumentid;
dr["mitarbeiter_bewilligung"] = cbboxunterschriftlinks.SelectedValue.ToString();
dr["bewilligt"] = false;
dr["abgelehnt"] = false;
dr["bewilligungstyp"] = 1;
dr["erstellt_am"] = DateTime.Now;
dr["mutiert_am"] = DateTime.Now;
dr["mutierer"] = AppParams.CurrentMitarbieter;
dr["aktiv"] = true;
dr["notiz"] = txtnachricht.Text;
dB.daten.Tables[0].Rows.Add(dr);
dB.Update_Data();
}
if (pxapproval2.Visible == false)
{
DataRow dr = dB.daten.Tables[0].NewRow();
dr["dokumentid"] = this.dokumentid;
dr["mitarbeiter_bewilligung"] = cbboxunterschriftrechts.SelectedValue.ToString();
dr["bewilligt"] = false;
dr["abgelehnt"] = false;
dr["bewilligungstyp"] = 2;
dr["erstellt_am"] = DateTime.Now;
dr["mutiert_am"] = DateTime.Now;
dr["mutierer"] = AppParams.CurrentMitarbieter;
dr["aktiv"] = true;
dr["notiz"] = txtnachricht.Text;
dB.daten.Tables[0].Rows.Add(dr);
dB.Update_Data();
}
if (pxapproval1.Visible && pxapproval2.Visible)
{
MessageBox.Show("Die Unterschriftenprüfung für dieses Dokument ist bereits erfolgt", "Unterschriftenprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information);
this.Close();
}
if (txtnachricht.Text.Trim() != "")
{
dB.insert_note(AppParams.CurrentMitarbieter, "Hinweis zur Unterschriftenprüfung", txtnachricht.Text, dokumentid);
}
}
private void btncancel_Click(object sender, EventArgs e)
{
this.Close();
}
}
}

1120
Client/DocMgmt/frmToApproval.resx
View File

File diff suppressed because it is too large Load Diff