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

update 20241225

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-25 11:42:23 +01:00
parent 4093f8764d
commit 4455cca85a
284 changed files with 100326 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Client/UIControls/Administrator/edk_viewer.cs
View File

@@ -47,20 +47,20 @@ namespace OnDoc.UIControls.Administrator
mitarbeiternr = Convert.ToInt32(cbboxzustaendigmitarbeiter.SelectedValue);
} catch { mitarbeiternr = 0; }
}
string datum = dateTimePicker1.Value.ToString("yyyy-MM-dd");
string datum = "Convert(Datetime,'"+dateTimePicker1.Value.ToString("yyyy-MM-dd 00:00:00")+"',102)";
DB db = new DB(AppParams.connectionstring);
string sql = "";
if (rblog.Checked)
{
sql = "select top "+numericUpDown1.Value.ToString()+" rowid, mitarbeiternr, insert_timestamp,dbo.binarytobase64(xmldata) from edk_log";
sql = sql + " where insert_timestamp >= '" + datum + "' ";
sql = sql + " where insert_timestamp >= " + datum + " ";
if (mitarbeiternr > 0) { sql = sql + " and mitarbeiternr=" + mitarbeiternr.ToString(); }
sql = sql + " order by rowid desc";
}
else
{
sql = "select top "+numericUpDown1.Value.ToString()+" rowid, tgnummer, insert_timestamp, dbo.binarytobase64(xmldata) from edk_data ";
sql = sql + " where insert_timestamp >= '" + datum + "' ";
sql = sql + " where insert_timestamp >= " + datum + " ";
if (mitarbeiternr > 0)
{

13
Client/UIControls/DokList.cs
View File

@@ -726,10 +726,12 @@ namespace OnDoc.UICintrols
Dokumenterstellung frmnewdok = new Dokumenterstellung(partnernr, dokumenttypnr, profilnr);
if (interaktion == "No")
{
frmnewdok.Visible = false;
frmnewdok.Show();
frmnewdok.Visible = false;
frmnewdok.Dokument_Erstellen();
frmnewdok.Dispose();
}
else
@@ -771,7 +773,16 @@ namespace OnDoc.UICintrols
interop = frmnewdok.interop;
runmacros = frmnewdok.runmacros;
string filename = frmnewdok.filename;
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.add_parameter("@dokumentid", selected_dokumentid);
db.Get_Tabledata("ondoc_check_delete_einzeldokument", true, false);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) {
db = null;
return;
}
db.Dok_in_Bearbeietung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
db = null;
clsProcessWatch.AddToList(selected_dokumentid, filename, "Word");