Update 20250118

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

View File

@@ -102,6 +102,7 @@ namespace OnDoc.UICintrols
GridDateTimeColumn gdt = e.Column as GridDateTimeColumn;
gdt.Pattern = (Syncfusion.WinForms.Input.Enums.DateTimePattern)Syncfusion.Windows.Shared.DateTimePattern.FullDateTime;
}
}
public void OnListen(string message, SenderInfo sender)
@@ -324,9 +325,11 @@ namespace OnDoc.UICintrols
dokwerte1.Update_Werte(selected_dokumentid);
}
ribbonButtonToApproval.Enabled = false;
zurUnterschriftenPrüfungToolStripMenuItem.Enabled = false;
if (faksimile == "True")
{
ribbonButtonToApproval.Enabled=true;
zurUnterschriftenPrüfungToolStripMenuItem.Enabled = true;
}
if (bearbeitung_zwingend == "True")
{
@@ -356,8 +359,13 @@ namespace OnDoc.UICintrols
Broadcaster().Broadcast(selected_dokumentid, new SenderInfo("Doklist", "UpdateView", ""));
return;
}
if (AppParams.StartApp == false)
{
docPreview1.Show_Doc(selected_dokumentid);
docPreview1.Hide_Editbuttons();
}
}
private void sfDataGrid1_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
@@ -623,6 +631,7 @@ namespace OnDoc.UICintrols
private void tsrbvorschau_SelectedIndexChanged(object sender, EventArgs e)
{
vorschauposition = tsrbvorschau.Text;
switch (vorschauposition)
{
@@ -644,6 +653,7 @@ namespace OnDoc.UICintrols
docPreview1.Visible = true;
docPreview1.Show_Doc(selected_dokumentid);
docPreview1.Hide_Editbuttons();
break;
case "Eigenes Fenster":
this.splitContainer1.SplitterDistance = this.Height;
@@ -690,7 +700,8 @@ namespace OnDoc.UICintrols
if (RibbonButtonAttributeEinAusblenden.Checked) { currentview["Attributes"] = 1; } else { currentview["Attributes"] = 0; }
currentview["Splitterdistance"] = splitContainer1.SplitterDistance;
MemoryStream ms = new MemoryStream();
this.sfDataGrid1.Serialize(ms);
//gaga
//this.sfDataGrid1.Serialize(ms);
currentview["Gridsettings"]= Convert.ToBase64String(ms.ToArray());
}
@@ -963,6 +974,7 @@ namespace OnDoc.UICintrols
{
try
{
//MessageBox.Show(e.Column.MappingName);
if (e.Column.MappingName == "zu_retournieren")
{
e.Handled = true;
@@ -997,6 +1009,14 @@ namespace OnDoc.UICintrols
//e.DisplayText = e.DisplayText.ToString("dd.MM.yyyy hh:mm:ss");
//int i = 0;
}
if (e.Column.MappingName == "Termin")
{
var dataRow = (e.DataRow.RowData as DataRowView).Row;
if (Convert.ToDateTime(dataRow["Mutiert am"]) < new DateTime(2000,1,1))
{
e.DisplayText = "";
}
}
if (e.Column.MappingName == "fileext")
{
try
@@ -1337,10 +1357,51 @@ namespace OnDoc.UICintrols
{
if (!row_selected()) return;
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count == 1) {
frmToApproval fa = new frmToApproval();
fa.dokumentid = selected_dokumentid;
fa.ShowDialog();
return;
}
frmToApproval fa = new frmToApproval();
fa.dokumentid = selected_dokumentid;
fa.ShowDialog();
int error = 0;
foreach (var record in records)
{
var datarow = record as DataRowView;
string toapprove = datarow["toapprove"].ToString();
if (toapprove == "False") { error = 1; }
}
if (error != 0){
MessageBox.Show("Es sind Dokumente in der Auswahl, welche keine Prüfung benötigten. Bitte auswahl anpassen.", "Prüfung", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
if (MessageBox.Show("Gewählte Dokumente zur Unterschriftenprüfung "+Environment.NewLine+"(ohne Kommentar-Möglichkeit)?", "Dokument zur Unterschriftenprüfung?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) {
frmToApproval fa = new frmToApproval();
fa.Visible = false;
fa.Show();
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
string toapprove = datarow["toapprove"].ToString();
if (toapprove == "True") {
fa.dokumentid = documentid;
fa.update_dokdetails();
fa.insert_bewilligung();
}
}
fa.close_window();
}
refresh_dokumente();
//frmToApproval fa = new frmToApproval();
//fa.dokumentid = selected_dokumentid;
//fa.ShowDialog();
}
public void upruefung()
@@ -1620,16 +1681,16 @@ namespace OnDoc.UICintrols
}
return Encoding.UTF8.GetString(Convert.FromBase64String(text));
}
private void ribbonButton4_Click(object sender, EventArgs e)
{
if (System.IO.File.Exists(@"x:\gridsettings.xml"))
{
using (var file = File.Open(@"x:\gridsettings.xml", FileMode.Open))
{
this.sfDataGrid1.Deserialize(file);
}
}
}
//private void ribbonButton4_Click(object sender, EventArgs e)
//{
// if (System.IO.File.Exists(@"x:\gridsettings.xml"))
// {
// using (var file = File.Open(@"x:\gridsettings.xml", FileMode.Open))
// {
// this.sfDataGrid1.Deserialize(file);
// }
// }
//}
private void ribbonCBAnsicht_DropDownItemClicked(object sender, System.Windows.Forms.RibbonItemEventArgs e)
@@ -1693,14 +1754,27 @@ namespace OnDoc.UICintrols
string sql = "insert Mitarbeiter_GridSettings (mitarbeiterid, erstellt_am, aktiv, bezeichnung, gridsettings,standard, Preview, Attributes,splitterdistance) values(";
sql = sql + AppParams.CurrentMitarbeiter.ToString() + ",getdate(),1,'" + sa.selectedtext + "','" + inputAsString + "'," + sa.alsStandard.ToString();
sql = sql + ", "+ tsrbvorschau.SelectedIndex.ToString()+", "+Attribute.ToString()+ ", "+distance.ToString()+")";
db.Exec_SQL(sql);
//db.Exec_SQL(sql);
db.Get_Tabledata_for_Update("Select * from mitarbeiter_gridsettings where id = -1", false, true);
System.Data.DataRow dr = db.daten.Tables[0].NewRow();
dr[1]=AppParams.CurrentMitarbeiter.ToString();
dr[2]=DateTime.Now;
dr[3] = true;
dr[4] = sa.selectedtext;
dr[5] = inputAsString;
dr[6] = sa.alsStandard;
dr[7] = tsrbvorschau.SelectedIndex;
dr[8] = Attribute;
dr[9] = distance;
db.daten.Tables[0].Rows.Add(dr);
db.Update_Data();
db = null;
if (sa.alsStandard != 1) { refresh_ansichten(sa.selectedtext); } else { refresh_ansichten(); }
//using (var file = File.Create(@"x:\gridsettings4.xml"))
//{
// this.sfDataGrid1.Serialize(file);
//}
}
}
@@ -2105,6 +2179,11 @@ namespace OnDoc.UICintrols
}
private void zurUnterschriftenPrüfungToolStripMenuItem_Click(object sender, EventArgs e)
{
ribbonButtonToApproval_Click(sender, e);
}
}