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

update 20250209

Browse Source
This commit is contained in:
Stefan Hutter
2025-02-09 20:44:54 +01:00
parent c316b40507
commit f8f1404ef9
136 changed files with 549632 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Client/DocMgmt/frmNote.cs
View File

@@ -16,6 +16,11 @@ namespace OnDoc.DocMgmt
public partial class frmNote : SfForm
{
public string dokumentid { get; set; }
public int notiznr { get; set; } = 0;
public string betreff { get; set; } = "";
public string notiz { get; set; } = "";
public frmNote()
{
InitializeComponent();
@@ -45,7 +50,9 @@ namespace OnDoc.DocMgmt
private void button1_Click(object sender, EventArgs e)
{
Database.DB db = new Database.DB(AppParams.connectionstring);
db.insert_note(AppParams.CurrentMitarbeiter,txtbetreff.Text,textBox1.Text,dokumentid);
this.notiznr=db.insert_note(AppParams.CurrentMitarbeiter,txtbetreff.Text,textBox1.Text,dokumentid);
this.notiz = textBox1.Text;
this.betreff = txtbetreff.Text;
DialogResult = DialogResult.OK;
}
}

46
Client/DocMgmt/frmToApproval.cs
View File

@@ -149,6 +149,7 @@ namespace OnDoc.DocMgmt
{
if (!btntoapproval.Enabled) { return; };
DB dB = new DB(AppParams.connectionstring);
int mailid = 1;
string sql = "";
if (!isserienbrief)
{
@@ -156,7 +157,7 @@ namespace OnDoc.DocMgmt
sql = sql + " where dokumentid='" + dokumentid + "' and abgelehnt=0 and bewilligt=0";
dB.Exec_SQL(sql);
dB.Get_Tabledata_for_Update("select top 1 * from dokument_bewilligung where id=-2", false, true);
mailid = 1;
}
else
{
@@ -164,7 +165,7 @@ namespace OnDoc.DocMgmt
sql = sql + " where serienbriefnr='" + serienbriefnr + "' and abgelehnt=0 and bewilligt=0";
dB.Exec_SQL(sql);
dB.Get_Tabledata_for_Update("select top 1 * from serienbrief_bewilligung where id=-2", false, true);
mailid = 2;
}
//dB.Exec_SQL(sql);
//dB.Get_Tabledata_for_Update("select top 1 * from dokument_bewilligung where id=-2", false, true);
@@ -192,8 +193,21 @@ namespace OnDoc.DocMgmt
dr["notiz"] = txtnachricht.Text;
dB.daten.Tables[0].Rows.Add(dr);
dB.Update_Data();
string id = "";
if (!isserienbrief)
{
dB.Get_Tabledata("Select top 1 id from dokument_Bewilligung where dokumentid='" + dokumentid + "' order by id desc", false, true);
id = dB.dsdaten.Tables[0].Rows[0][0].ToString();
}
else
{
dB.Get_Tabledata("Select top 1 id from Serienbrief_Bewilligung where serienbriefnr='" + serienbriefnr + "' order by id desc", false, true);
id = dB.dsdaten.Tables[0].Rows[0][0].ToString();
}
clsMailer mailer = new clsMailer();
mailer.sendmail(1, cbboxunterschriftlinks.SelectedValue.ToString(), "", "", dokumentid, "");
mailer.sendmail(mailid, cbboxunterschriftlinks.SelectedValue.ToString(), "", "", dokumentid, "", AppParams.CurrentMitarbeiter.ToString(), id);
mailer = null;
if (dokumentid != "")
{
@@ -221,8 +235,23 @@ namespace OnDoc.DocMgmt
dr["notiz"] = txtnachricht.Text;
dB.daten.Tables[0].Rows.Add(dr);
dB.Update_Data();
string id = "";
if (!isserienbrief)
{
dB.Get_Tabledata("Select top 1 id from dokument_Bewilligung where dokumentid='" + dokumentid + "' order by id desc", false, true);
id = dB.dsdaten.Tables[0].Rows[0][0].ToString();
mailid = 1;
}
else
{
dB.Get_Tabledata("Select top 1 id from Serienbrief_Bewilligung where serienbriefnr='" + serienbriefnr + "' order by id desc", false, true);
id = dB.dsdaten.Tables[0].Rows[0][0].ToString();
mailid = 2;
}
clsMailer mailer = new clsMailer();
mailer.sendmail(1, cbboxunterschriftrechts.SelectedValue.ToString(), "", "", dokumentid, "");
mailer.sendmail(mailid, cbboxunterschriftrechts.SelectedValue.ToString(), "", "", dokumentid, "", AppParams.CurrentMitarbeiter.ToString(), id);
mailer = null;
if (!isserienbrief)
@@ -248,11 +277,12 @@ namespace OnDoc.DocMgmt
}
this.Close();
}
dB = null;
}
if (txtnachricht.Text.Trim() != "")
{
dB.insert_note(AppParams.CurrentMitarbeiter, "Hinweis zur Unterschriftenprüfung", txtnachricht.Text, dokumentid);
}
//if (txtnachricht.Text.Trim() != "")
//{
// dB.insert_note(AppParams.CurrentMitarbeiter, "Hinweis zur Unterschriftenprüfung", txtnachricht.Text, dokumentid);
//}
}