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

20241212

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-12 19:04:58 +01:00
parent 220e5ff9cf
commit 67ad74f145
48 changed files with 326 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
Client/UIControls/DokList.cs
View File

@@ -40,6 +40,7 @@ using NLog.Config;
using OnDoc.Versandstrasse;
using System.Data.SqlClient;
using Windows.ApplicationModel.VoiceCommands;
using Syncfusion.Windows.Forms;
@@ -64,6 +65,9 @@ namespace OnDoc.UICintrols
public bool interop { get; set; } = false;
public bool runmacros { get; set; } = false;
private string currentview { get; set; } = "";
private string paketview { get; set; }="";
public string Search_Docid { get; set; } = "";
private System.Data.DataTable Ansichten { get; set; }
@@ -130,10 +134,23 @@ namespace OnDoc.UICintrols
string standardview = "";
foreach (System.Data.DataRow dr in Ansichten.Rows)
{
RibbonLabel rl = new RibbonLabel();
rl.Text = dr["bezeichnung"].ToString();
rl.Tag = Convert.ToInt32(dr["id"]);
ribbonCBAnsicht.DropDownItems.Add(rl);
if (Convert.ToInt32(rl.Tag)==-102 && AppParams.isSysadmin)
{
ribbonCBAnsicht.DropDownItems.Add(rl);
}
if (Convert.ToInt32(rl.Tag)==-102)
{
paketview = dr["gridsettings"].ToString();
}
if (Convert.ToInt32(rl.Tag) != -102 )
{
ribbonCBAnsicht.DropDownItems.Add(rl);
}
if (Convert.ToBoolean(dr["standard"]) == true && Bezeichnung == "")
{
ribbonCBAnsicht.SelectedItem = rl;
@@ -184,6 +201,14 @@ namespace OnDoc.UICintrols
if (datafilter != "")
{
refresh_dokumente_filtered(layout);
if (layout == "view_dokumentpaket")
{
refresh_view(paketview);
} else
{
refresh_view(currentview);
}
return;
}
DB db = new DB(AppParams.connectionstring);
@@ -201,10 +226,12 @@ namespace OnDoc.UICintrols
//this.sfDataGrid1.DataSource = dokumente;
sfDataGrid1.View.AutoExpandGroups = true;
this.timer1.Enabled = true;
refresh_view(currentview);
//foreach (GridColumn gd in sfDataGrid1.Columns)
//{
// sfDataGrid1.GroupColumnDescriptions.Add(new GroupColumnDescription() { ColumnName = gd.MappingName });
//}
//sfDataGrid1.RowHeight = 60;
}
public void refresh_dokumente_filtered(string layout = "")
@@ -802,11 +829,11 @@ namespace OnDoc.UICintrols
var dataRow = (e.DataRow.RowData as DataRowView).Row;
if (Convert.ToBoolean(dataRow["zu_retournieren"]) == true)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Barcode_24x24_32, e.Bounds.X + 20, e.Bounds.Y + 3);
Pen borderPen = new Pen(Color.LightGray);
e.Graphics.DrawLine(borderPen, e.Bounds.Right, e.Bounds.Top, e.Bounds.Right, e.Bounds.Bottom);
e.Graphics.DrawLine(borderPen, e.Bounds.Left, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom);
e.Graphics.DrawImage(OnDoc.Properties.Resources.Barcode_16x16_32, e.Bounds.X + 20, e.Bounds.Y + 3);
}
Pen borderPen = new Pen(Color.LightGray);
e.Graphics.DrawLine(borderPen, e.Bounds.Right, e.Bounds.Top, e.Bounds.Right, e.Bounds.Bottom);
e.Graphics.DrawLine(borderPen, e.Bounds.Left, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom);
return;
}
if (e.Column.MappingName == "fileext")
@@ -823,7 +850,6 @@ namespace OnDoc.UICintrols
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "D")
{
//word
Logging.Logging.Debug("IdonHandler", "OnDocClient", dataRow["dokumentid"].ToString() + Convert.ToString(dataRow["Bearbeitung_Zwingend"]));
if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"])== false)
{
if (Convert.ToBoolean(dataRow["ToApprove"]) == true)
@@ -847,7 +873,8 @@ namespace OnDoc.UICintrols
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_Edit_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
return;
// return;
}
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X")
{
@@ -1224,10 +1251,9 @@ namespace OnDoc.UICintrols
ribbonpanelanalyse.Visible = AppParams.isSysadmin;
RibbonTabAdmin.Visible = false;
RibbonTabAdmin.Visible = true;
if (AppParams.isSysadmin)
{
ribbonSaveGridView.Enabled = AppParams.isSysadmin;
ribbonSaveGridView.Visible = AppParams.isSysadmin;
}
//pos_elements();
}
@@ -1341,7 +1367,8 @@ namespace OnDoc.UICintrols
private void refresh_view(string base64string)
{
//return;
byte[] bytes = Convert.FromBase64String(base64string);
string plaintext = Strings.Base64Decode(base64string);
string tagesdatum = DateTime.Now.ToString("yyyy-MM-ddT00:00:00");
@@ -1349,6 +1376,13 @@ namespace OnDoc.UICintrols
plaintext = plaintext.Replace("@today@", tagesdatum);
plaintext = Strings.Base64Encode(plaintext);
bytes = Convert.FromBase64String(plaintext);
if (plaintext == "")
{
if (AppParams.isSysadmin) { ribbonCBAnsicht.SelectedIndex = 1; } else { ribbonCBAnsicht.SelectedIndex = 0; }
return;
}
currentview=plaintext;
using (MemoryStream ms = new MemoryStream(bytes))
{
this.sfDataGrid1.Deserialize(ms);
@@ -1418,7 +1452,7 @@ namespace OnDoc.UICintrols
sfDataGrid1.ClearGrouping();
sfDataGrid1.ClearSelection();
sfDataGrid1.ClearSorting();
ribbonCBAnsicht.SelectedIndex = 0;
ribbonCBAnsicht.SelectedIndex = 1;
}
private void RibbonButtonViewSave_Click(object sender, EventArgs e)
@@ -1456,9 +1490,8 @@ namespace OnDoc.UICintrols
{
string bez = ribbonCBAnsicht.SelectedItem.Text.Trim();
if (bez.Length < 4) { bez = bez + " "; }
if (bez == "" || bez == " Heu")
{
int ID = Convert.ToInt32(ribbonCBAnsicht.SelectedItem.Tag);
if (ID < 0) {
MessageBox.Show("Die gewählte Standard-Ansicht kann nicht gelöscht werden", "Ansicht löschen", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}
@@ -1479,21 +1512,27 @@ namespace OnDoc.UICintrols
private void ribbonButton4_Click_1(object sender, EventArgs e)
{
string bez = ribbonCBAnsicht.SelectedItem.Text.Trim();
string id = ribbonCBAnsicht.SelectedItem.Tag.ToString();
if (id=="-100" || id == "-101")
{
if (MessageBox.Show("Standard-Ansicht " + bez + " überschreiben?", "Ansichten", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
MemoryStream ms = new MemoryStream();
this.sfDataGrid1.Serialize(ms);
string inputAsString = Convert.ToBase64String(ms.ToArray());
DB db = new DB(AppParams.connectionstring);
db.Exec_SQL("Update mitarbeiter_gridsettings set gridsettings='" + inputAsString + "' where id=" + id.ToString());
db = null;
}
FileHelper fh = new FileHelper();
string b = fh.Base64FromFile(@"x:\gridsettings2.xml");
DB db = new DB(AppParams.connectionstring);
db.Exec_SQL("Update mitarbeiter_gridsettings set gridsettings='" + b + "' where id=-100");
using (var file = File.Open(@"x:\gridsettings2.xml", FileMode.Open))
{
this.sfDataGrid1.Deserialize(file);
}
using (var file = File.Open(@"x:\gridsettings2.xml", FileMode.Open))
{
this.sfDataGrid1.Serialize(file);
}
}
private void archivierenToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1717,6 +1756,7 @@ namespace OnDoc.UICintrols
private void ribbonButton6_Click(object sender, EventArgs e)
{
refresh_dokumente();
}
}