update 20241008

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

View File

@@ -456,6 +456,11 @@ namespace OnDoc.UICintrols
{
createnewdoc(0, 0);
}
public void StartPruefung()
{
ribbonButtonApproval_Click(null, null);
}
public void createnewdoc(int partnernr, int dokumenttypnr, bool Favoriten = false, string interaktion = "Yes", string showdoc = "Yes")
{
@@ -593,6 +598,11 @@ namespace OnDoc.UICintrols
public void hide_panels()
{
this.RibbonButtonFavoriten.Visible = false;
this.RibbonPanelSuche.Visible = false;
this.RibbonPannelAproval.Visible = false;
this.lblToApprove.Visible = false;
this.cbboxMitarbeiter.Visible = false;
this.RibbonPanelExit.Visible = false;
this.RibbonPanelProfil.Visible = false;
this.RibbonPanelCreate.Visible = false;
@@ -621,9 +631,25 @@ namespace OnDoc.UICintrols
var dataRow = (e.DataRow.RowData as DataRowView).Row;
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "D")
{
//word
if (dataRow[11].ToString() != "1")
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
if (Convert.ToBoolean(dataRow[16]) == true)
{
if (Convert.ToBoolean(dataRow[17]) == true)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_ToApprove_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
}
else
{
@@ -633,9 +659,21 @@ namespace OnDoc.UICintrols
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X")
{
if (dataRow[11].ToString() != "1")
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
if (Convert.ToBoolean(dataRow[16]) == true)
{
if (Convert.ToBoolean(dataRow[17]) == true)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_ToApprove_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_Edit_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
@@ -806,7 +844,7 @@ namespace OnDoc.UICintrols
private void ribbonButtonApproval_Click(object sender, EventArgs e)
{
if (this.lblToApprove.Text == "") { MessageBox.Show("Es sind keine Bewilligungen ausstehend.", "Bewilligung", MessageBoxButtons.OK, MessageBoxIcon.Information); return; }
if (this.lblToApprove.Text == "") { MessageBox.Show("Es stehen keine Dokumente zur Unterschriftenprüfung an.", "Unterschriftenprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information); return; }
frmBewilligung bw = new frmBewilligung();
bw.Show();
}
@@ -821,7 +859,7 @@ namespace OnDoc.UICintrols
private void Refresh_Bewilligungen()
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select count(*) from view_relaunch_offene_Bewilligungen where mitarbeiter_bewilligung=" + AppParams.CurrentMitarbieter.ToString(), false, true);
db.Get_Tabledata("Select count(*) from view_relaunch_approval where bewilligt=0 and abgelehnt = 0 and mitarbeiter_bewilligung=" + AppParams.CurrentMitarbieter.ToString(), false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) == 0)
{
this.lblToApprove.Text = "";