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

update 20241211

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-11 22:24:49 +01:00
parent 2c42687a40
commit 220e5ff9cf
97 changed files with 1649 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client/Client.csproj
+21
View File
@@ -596,6 +596,27 @@
</ItemGroup>
<ItemGroup>
<Content Include="OnDoc6_Transparent.ico" />
<None Include="Resources\Person_32x32-32.png" />
<None Include="Resources\Person_24x24-32.png" />
<None Include="Resources\Person_16x16-32.png" />
<None Include="Resources\Person_256x256-32.png" />
<None Include="Resources\Person_48x48-32.png" />
<None Include="Resources\Person_16x16-32 %282%291.png" />
<None Include="Resources\Person_48x48-321.png" />
<None Include="Resources\Person_32x32-321.png" />
<None Include="Resources\Person_256x256-321.png" />
<None Include="Resources\Person_24x24-321.png" />
<None Include="Resources\Person_16x16-321.png" />
<None Include="Resources\Person_32x32-32 %282%29.png" />
<None Include="Resources\Person_24x24-32 %282%29.png" />
<None Include="Resources\Person_16x16-32 %282%29.png" />
<None Include="Resources\Person_256x256-32 %282%29.png" />
<None Include="Resources\Person_48x48-32 %282%29.png" />
<None Include="Resources\Attribut_48x48-32.png" />
<None Include="Resources\Attribut_32x32-32.png" />
<None Include="Resources\Attribut_24x24-32.png" />
<None Include="Resources\Attribut_16x16-32.png" />
<None Include="Resources\Attribut_256x256-32.png" />
<None Include="Resources\officevorlage_256x256-32.png" />
<None Include="Resources\officevorlage_48x48-32.png" />
<None Include="Resources\officevorlage_32x32-32.png" />
Client/DocMgmt/Dokumentpaket.Designer.cs
Generated
+8 -7
View File
@@ -148,7 +148,7 @@
this.ribbon1.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013;
this.ribbon1.OrbVisible = false;
this.ribbon1.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F);
this.ribbon1.Size = new System.Drawing.Size(1807, 121);
this.ribbon1.Size = new System.Drawing.Size(2120, 121);
this.ribbon1.TabIndex = 17;
this.ribbon1.Tabs.Add(this.ribbonTab1);
this.ribbon1.TabSpacing = 4;
@@ -260,7 +260,7 @@
this.pnlfooter.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pnlfooter.Location = new System.Drawing.Point(2, 802);
this.pnlfooter.Name = "pnlfooter";
this.pnlfooter.Size = new System.Drawing.Size(1807, 47);
this.pnlfooter.Size = new System.Drawing.Size(2120, 47);
this.pnlfooter.TabIndex = 20;
//
// progressBarAdv1
@@ -270,14 +270,15 @@
this.progressBarAdv1.BackSegments = false;
this.progressBarAdv1.CustomText = null;
this.progressBarAdv1.CustomWaitingRender = false;
this.progressBarAdv1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.progressBarAdv1.ForeColor = System.Drawing.Color.Blue;
this.progressBarAdv1.ForegroundImage = null;
this.progressBarAdv1.Location = new System.Drawing.Point(16, 16);
this.progressBarAdv1.Location = new System.Drawing.Point(0, 24);
this.progressBarAdv1.MultipleColors = new System.Drawing.Color[] {
System.Drawing.Color.Empty};
this.progressBarAdv1.Name = "progressBarAdv1";
this.progressBarAdv1.SegmentWidth = 12;
this.progressBarAdv1.Size = new System.Drawing.Size(1733, 23);
this.progressBarAdv1.Size = new System.Drawing.Size(2120, 23);
this.progressBarAdv1.TabIndex = 0;
this.progressBarAdv1.Text = "progressBarGeneraate";
this.progressBarAdv1.Visible = false;
@@ -348,7 +349,7 @@
this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox3.Location = new System.Drawing.Point(1326, 123);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(483, 679);
this.groupBox3.Size = new System.Drawing.Size(796, 679);
this.groupBox3.TabIndex = 23;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Generierte Dokumente";
@@ -370,14 +371,14 @@
this.dokList1.selected_cellvalue = null;
this.dokList1.selected_dokumentid = null;
this.dokList1.selected_partnernr = null;
this.dokList1.Size = new System.Drawing.Size(477, 660);
this.dokList1.Size = new System.Drawing.Size(790, 660);
this.dokList1.TabIndex = 0;
//
// Dokumentpaket
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1811, 851);
this.ClientSize = new System.Drawing.Size(2124, 851);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.pnlleft);
Client/DocMgmt/Dokumentpaket.cs
+1 -1
View File
@@ -100,7 +100,7 @@ namespace OnDoc.DocMgmt
if (!NeuesDokumentpaket()){ this.Close(); return; };
}
Update_PaketDetails();
dokList1.set_vorschau_aus_dp();
if (this.txtbpnummer.Text == "") { btnSearchBP_Click(sender, e); }
this.EndUpdate();
Client/DocMgmt/Serienbrief.cs
+2 -1
View File
@@ -437,6 +437,7 @@ namespace OnDoc.UIControls
try
{
panelLoad.Visible = true;
System.Windows.Forms.Application.DoEvents();
this.sb = null;
this.sb = new serienbrief();
sb.dokumenttypnr = DokTypSelect.dokumenttypnr;
@@ -947,7 +948,7 @@ namespace OnDoc.UIControls
{
add_progress();
System.Windows.Forms.Application.DoEvents();
dr = sb.dsempfaenger.Tables[0].Select("Partnernr='" + dt.Rows[i][0].ToString() + "'");
dr = sb.dsempfaenger.Tables[0].Select("Partnernr='" + dt.Rows[i][0].ToString() + "' and status<>'1'");
if (dr.Length == 0)
{
dr = sb.dsempfaenger.Tables[0].Select("Partnernr=''");
Client/DocMgmt/frmToApproval.Designer.cs
Generated
+4 -2
View File
@@ -47,7 +47,8 @@
//
// cbboxunterschriftrechts
//
this.cbboxunterschriftrechts.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxunterschriftrechts.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
this.cbboxunterschriftrechts.ComboBoxMode = Syncfusion.WinForms.ListView.Enums.ComboBoxMode.MultiSelection;
this.cbboxunterschriftrechts.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxunterschriftrechts.Location = new System.Drawing.Point(216, 62);
this.cbboxunterschriftrechts.Name = "cbboxunterschriftrechts";
@@ -59,7 +60,8 @@
//
// cbboxunterschriftlinks
//
this.cbboxunterschriftlinks.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxunterschriftlinks.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
this.cbboxunterschriftlinks.ComboBoxMode = Syncfusion.WinForms.ListView.Enums.ComboBoxMode.MultiSelection;
this.cbboxunterschriftlinks.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxunterschriftlinks.Location = new System.Drawing.Point(216, 27);
this.cbboxunterschriftlinks.Name = "cbboxunterschriftlinks";
Client/DocMgmt/frmToApproval.resx
+561 -561
View File
File diff suppressed because it is too large Load Diff
Client/Helper/TableHelper.cs
+20 -13
View File
@@ -34,24 +34,31 @@ namespace OnDoc.Helper
}
}
public static void FormatTable(ref DataTable tbl, string tablename, ref SfDataGrid grid)
public static void FormatTable(ref DataTable tbl, string tablename, ref SfDataGrid grid, bool use_sort = true)
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from spalten where aktiv=1 and tabelle='" + tablename + "'", false, true);
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{
foreach (DataColumn dc in tbl.Columns)
{
if (dr["tabellenspalte"].ToString() == dc.ColumnName)
{
dc.SetOrdinal(Convert.ToInt32(dr["reihenfolge"].ToString()));
break;
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from spalten where aktiv=1 and tabelle='" + tablename + "'", false, true);
if (use_sort)
{
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{
foreach (DataColumn dc in tbl.Columns)
{
if (dr["tabellenspalte"].ToString() == dc.ColumnName)
{
if (tablename != "Partner")
dc.SetOrdinal(Convert.ToInt32(dr["reihenfolge"].ToString()));
break;
}
}
tbl.AcceptChanges();
}
tbl.AcceptChanges();
}
grid.DataSource = tbl;
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{
Client/Klassen/clsPartner.cs
+12
View File
@@ -16,6 +16,7 @@ namespace OnDoc.Klassen
{
private static string Connectionstring = "";
public static DataTable partnerliste;
public static string tableleyout { get; set; } = "";
public static void set_connectionstring(string connectionstring)
{
Connectionstring = connectionstring;
@@ -32,6 +33,17 @@ namespace OnDoc.Klassen
db.add_parameter("@anz", anzahl.ToString());
db.add_parameter("@fnkt", fnkt.ToString());
partnerliste = db.Get_Tabledata("sp_partner_search", true, false);
//int i = 0;
//foreach (DataColumn dc in partnerliste.Columns)
//{
// dc.SetOrdinal(i);
// i++;
//}
//partnerliste.Columns.Add("Partnerart");
//foreach (System.Data.DataRow row in partnerliste.Rows)
//{
// if (Convert.ToInt32(row[0]) > 999999) { row["Partnerart"] = 2; } else { row["Partnerart"] = 1; }
//}
return partnerliste;
}
finally { db = null; }
Client/Properties/Resources.Designer.cs
Generated
+100
View File
@@ -260,6 +260,56 @@ namespace OnDoc.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Attribut_16x16_32 {
get {
object obj = ResourceManager.GetObject("Attribut_16x16_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Attribut_24x24_32 {
get {
object obj = ResourceManager.GetObject("Attribut_24x24_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Attribut_256x256_32 {
get {
object obj = ResourceManager.GetObject("Attribut_256x256_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Attribut_32x32_32 {
get {
object obj = ResourceManager.GetObject("Attribut_32x32_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Attribut_48x48_32 {
get {
object obj = ResourceManager.GetObject("Attribut_48x48_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
@@ -1860,6 +1910,56 @@ namespace OnDoc.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Person_16x16_32 {
get {
object obj = ResourceManager.GetObject("Person_16x16_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Person_24x24_32 {
get {
object obj = ResourceManager.GetObject("Person_24x24_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Person_256x256_32 {
get {
object obj = ResourceManager.GetObject("Person_256x256_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Person_32x32_32 {
get {
object obj = ResourceManager.GetObject("Person_32x32_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Person_48x48_32 {
get {
object obj = ResourceManager.GetObject("Person_48x48_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
Client/Properties/Resources.resx
+30
View File
@@ -178,6 +178,21 @@
<data name="Approval_OK_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Approval_OK_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Attribut_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Attribut_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Attribut_24x24_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Attribut_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Attribut_256x256_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Attribut_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Attribut_32x32_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Attribut_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Attribut_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Attribut_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Barcode_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Barcode_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -658,6 +673,21 @@
<data name="PDF_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\PDF_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Person_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Person_24x24_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Person_256x256_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Person_32x32_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Person_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Pprofil_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Pprofil_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Client/Resources/Attribut_16x16-32.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 310 B

Client/Resources/Attribut_24x24-32.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 544 B

Client/Resources/Attribut_256x256-32.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB

Client/Resources/Attribut_32x32-32.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 702 B

Client/Resources/Attribut_48x48-32.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

Client/Resources/Person_16x16-32 (2).png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 737 B

Client/Resources/Person_16x16-32 (2)1.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 737 B

Client/Resources/Person_16x16-32.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 737 B

Client/Resources/Person_16x16-321.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 649 B

Client/Resources/Person_24x24-32 (2).png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

Client/Resources/Person_24x24-32.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

Client/Resources/Person_24x24-321.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

Client/Resources/Person_256x256-32 (2).png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

Client/Resources/Person_256x256-32.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

Client/Resources/Person_256x256-321.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

Client/Resources/Person_32x32-32 (2).png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

Client/Resources/Person_32x32-32.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

Client/Resources/Person_32x32-321.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

Client/Resources/Person_48x48-32 (2).png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

Client/Resources/Person_48x48-32.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

Client/Resources/Person_48x48-321.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

Client/UIControls/DokList.Designer.cs
Generated
+56 -33
View File
@@ -53,8 +53,6 @@ namespace OnDoc.UICintrols
this.tsbtnpreviewbottom = new System.Windows.Forms.ToolStripButton();
this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.panel2 = new System.Windows.Forms.Panel();
this.lblTitel = new System.Windows.Forms.Label();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
@@ -135,7 +133,7 @@ namespace OnDoc.UICintrols
this.ribbonButton2 = new System.Windows.Forms.RibbonButton();
this.RibbonButtonBerechtigungsgruppe = new System.Windows.Forms.RibbonButton();
this.ribbonButtonSysadmins = new System.Windows.Forms.RibbonButton();
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
this.ribbonpanelanalyse = new System.Windows.Forms.RibbonPanel();
this.ribbonbuttonedklog = new System.Windows.Forms.RibbonButton();
this.ribbonbuttonedkverarbeitung = new System.Windows.Forms.RibbonButton();
this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig();
@@ -143,6 +141,11 @@ namespace OnDoc.UICintrols
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
this.ribbonButton6 = new System.Windows.Forms.RibbonButton();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -171,6 +174,7 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.TabIndex = 0;
this.sfDataGrid1.ToolTipOpening += new Syncfusion.WinForms.DataGrid.Events.ToolTipOpeningEventHandler(this.sfDataGrid1_ToolTipOpening_1);
this.sfDataGrid1.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.sfDataGrid1_DrawCell);
this.sfDataGrid1.SelectionChanged += new Syncfusion.WinForms.DataGrid.Events.SelectionChangedEventHandler(this.sfDataGrid1_SelectionChanged);
this.sfDataGrid1.FilterChanged += new Syncfusion.WinForms.DataGrid.Events.FilterChangedEventHandler(this.sfDataGrid1_FilterChanged);
this.sfDataGrid1.DataSourceChanged += new Syncfusion.WinForms.DataGrid.Events.DataSourceChangedEventHandler(this.sfDataGrid1_DataSourceChanged);
this.sfDataGrid1.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellClick);
@@ -363,7 +367,6 @@ namespace OnDoc.UICintrols
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.sfDataGrid1);
this.splitContainer1.Panel1.Controls.Add(this.dokwerte1);
//
// splitContainer1.Panel2
//
@@ -372,24 +375,6 @@ namespace OnDoc.UICintrols
this.splitContainer1.SplitterDistance = 343;
this.splitContainer1.TabIndex = 2;
//
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
this.dokwerte1.Location = new System.Drawing.Point(1709, 0);
this.dokwerte1.Name = "dokwerte1";
this.dokwerte1.Size = new System.Drawing.Size(0, 343);
this.dokwerte1.TabIndex = 1;
//
// docPreview1
//
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -740,6 +725,7 @@ namespace OnDoc.UICintrols
this.ribbonTabAnsicht.Panels.Add(this.RibbonPannelAnsicht);
this.ribbonTabAnsicht.Panels.Add(this.ribbonPanelVorschau);
this.ribbonTabAnsicht.Panels.Add(this.ribbonPanelAttribute);
this.ribbonTabAnsicht.Panels.Add(this.ribbonPanel1);
this.ribbonTabAnsicht.Text = "Ansicht";
//
// RibbonPannelAnsicht
@@ -1003,7 +989,7 @@ namespace OnDoc.UICintrols
this.RibbonTabAdmin.Panels.Add(this.ribbonAnmelden);
this.RibbonTabAdmin.Panels.Add(this.ribbonVorlagen);
this.RibbonTabAdmin.Panels.Add(this.ribbonBerechtigung);
this.RibbonTabAdmin.Panels.Add(this.ribbonPanel1);
this.RibbonTabAdmin.Panels.Add(this.ribbonpanelanalyse);
this.RibbonTabAdmin.Text = "Administration";
//
// RibbonPanelDiverses
@@ -1039,7 +1025,7 @@ namespace OnDoc.UICintrols
// ribbonVorlagen
//
this.ribbonVorlagen.ButtonMoreVisible = false;
this.ribbonVorlagen.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Right;
this.ribbonVorlagen.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Left;
this.ribbonVorlagen.Items.Add(this.RibbonButtonDokumenttyp);
this.ribbonVorlagen.Items.Add(this.RibbonButtonVorlagen);
this.ribbonVorlagen.Items.Add(this.ribbonButtonVorlagenfeldregel);
@@ -1052,7 +1038,7 @@ namespace OnDoc.UICintrols
this.RibbonButtonDokumenttyp.LargeImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonDokumenttyp.LargeImage")));
this.RibbonButtonDokumenttyp.Name = "RibbonButtonDokumenttyp";
this.RibbonButtonDokumenttyp.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonDokumenttyp.SmallImage")));
this.RibbonButtonDokumenttyp.Text = "Dokumenttyp";
this.RibbonButtonDokumenttyp.Text = "Vorlagentyp";
this.RibbonButtonDokumenttyp.Click += new System.EventHandler(this.RibbonButtonDokumenttyp_Click);
//
// RibbonButtonVorlagen
@@ -1109,12 +1095,12 @@ namespace OnDoc.UICintrols
this.ribbonButtonSysadmins.Text = "Sys-Admins";
this.ribbonButtonSysadmins.Click += new System.EventHandler(this.ribbonButtonSysadmins_Click);
//
// ribbonPanel1
// ribbonpanelanalyse
//
this.ribbonPanel1.Items.Add(this.ribbonbuttonedklog);
this.ribbonPanel1.Items.Add(this.ribbonbuttonedkverarbeitung);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = "Analyse-Tools";
this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedklog);
this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedkverarbeitung);
this.ribbonpanelanalyse.Name = "ribbonpanelanalyse";
this.ribbonpanelanalyse.Text = "Analyse-Tools";
//
// ribbonbuttonedklog
//
@@ -1166,12 +1152,46 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
this.dokwerte1.Location = new System.Drawing.Point(1709, 153);
this.dokwerte1.Name = "dokwerte1";
this.dokwerte1.Size = new System.Drawing.Size(0, 694);
this.dokwerte1.TabIndex = 7;
//
// docPreview1
//
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// ribbonPanel1
//
this.ribbonPanel1.Items.Add(this.ribbonButton6);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = "Dokumentliste";
//
// ribbonButton6
//
this.ribbonButton6.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32;
this.ribbonButton6.LargeImage = global::OnDoc.Properties.Resources.Refresh_32x32_32;
this.ribbonButton6.Name = "ribbonButton6";
this.ribbonButton6.SmallImage = global::OnDoc.Properties.Resources.Refresh_24x24_32;
this.ribbonButton6.Text = "Aktualisieren";
this.ribbonButton6.Click += new System.EventHandler(this.ribbonButton6_Click);
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.lblToApprove);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.dokwerte1);
this.Controls.Add(this.lblToApprove);
this.Controls.Add(this.panel2);
this.Controls.Add(this.ribbon2);
this.Name = "DokList";
@@ -1297,14 +1317,17 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonTab RibbonTabNativVorlagen;
private System.Windows.Forms.RibbonPanel ribbonPanelNativVorlagen;
private System.Windows.Forms.RibbonButton ribbonButtonNativVorlagen;
private UIControls.Dokwerte dokwerte1;
private System.Windows.Forms.ToolStripMenuItem attributeAnzeigenVersteckenToolStripMenuItem;
private System.Windows.Forms.RibbonPanel ribbonPanelAttribute;
private System.Windows.Forms.RibbonButton RibbonButtonAttributeEinAusblenden;
private System.Windows.Forms.RibbonButton ribbonButtonVorlagenfeldregel;
private System.Windows.Forms.RibbonButton ribbonButtonSysadmins;
private System.Windows.Forms.RibbonPanel ribbonPanel1;
private System.Windows.Forms.RibbonPanel ribbonpanelanalyse;
private System.Windows.Forms.RibbonButton ribbonbuttonedklog;
private System.Windows.Forms.RibbonButton ribbonbuttonedkverarbeitung;
private Syncfusion.Pdf.PdfConfig pdfConfig2;
private UIControls.Dokwerte dokwerte1;
private System.Windows.Forms.RibbonPanel ribbonPanel1;
private System.Windows.Forms.RibbonButton ribbonButton6;
}
}
Client/UIControls/DokList.cs
+54 -6
View File
@@ -180,6 +180,7 @@ namespace OnDoc.UICintrols
}
public void refresh_dokumente(string layout = "")
{
if (datafilter != "")
{
refresh_dokumente_filtered(layout);
@@ -200,7 +201,10 @@ namespace OnDoc.UICintrols
//this.sfDataGrid1.DataSource = dokumente;
sfDataGrid1.View.AutoExpandGroups = true;
this.timer1.Enabled = true;
//foreach (GridColumn gd in sfDataGrid1.Columns)
//{
// sfDataGrid1.GroupColumnDescriptions.Add(new GroupColumnDescription() { ColumnName = gd.MappingName });
//}
}
public void refresh_dokumente_filtered(string layout = "")
@@ -253,6 +257,8 @@ namespace OnDoc.UICintrols
archivierenToolStripMenuItem.Enabled = true;
}
}
if (vorschauposition == "Keine Vorschau") { return; }
if (Separate_Vorschau_offen)
{
@@ -528,7 +534,7 @@ namespace OnDoc.UICintrols
docPreview1.Hide_Editbuttons();
break;
case "Vorschau rechts":
this.splitContainer1.SplitterDistance = this.Width / 2;
this.splitContainer1.SplitterDistance = this.Width / 3;
this.splitContainer1.Orientation = Orientation.Vertical;
docPreview1.Visible = true;
docPreview1.Show_Doc(selected_dokumentid);
@@ -596,6 +602,10 @@ namespace OnDoc.UICintrols
createnewdoc(0, 0);
}
public void set_vorschau_aus_dp()
{
tsrbvorschau.SelectedIndex = 2;
}
public void StartPruefung()
{
ribbonButtonApproval_Click(null, null);
@@ -726,6 +736,7 @@ namespace OnDoc.UICintrols
dB.Exec_SQL("Update dokument set verantwortlich=" + ma.result + " where dokumentid = '" + selected_dokumentid + "'");
dB = null;
Logging.DocLog.Info("Verantwortung zugewiesen auf " + ma.result.ToString(), "Doklist", selected_dokumentid, selected_partnernr, "Verantwortung zugewiesen");
refresh_dokumente();
}
}
@@ -781,9 +792,10 @@ namespace OnDoc.UICintrols
private void sfDataGrid1_DrawCell(object sender, DrawCellEventArgs e)
{
if (e.Column.MappingName == "zu_retournieren")
{
e.Handled = true;
e.Column.CellStyle.HorizontalAlignment = HorizontalAlignment.Center;
e.Handled = true;
var selectedItem = e.DataRow;
@@ -795,6 +807,7 @@ namespace OnDoc.UICintrols
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")
{
@@ -834,6 +847,7 @@ namespace OnDoc.UICintrols
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_Edit_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
return;
}
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X")
{
@@ -867,9 +881,11 @@ namespace OnDoc.UICintrols
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;
}
catch { }
}
e.Handled = false;
}
private void zellenwertInZwischenablageKopierenToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1205,6 +1221,7 @@ namespace OnDoc.UICintrols
security = null;
ribbonVorlagen.Visible = AppParams.isSysadmin;
ribbonBerechtigung.Visible = AppParams.isSysadmin;
ribbonpanelanalyse.Visible = AppParams.isSysadmin;
RibbonTabAdmin.Visible = false;
RibbonTabAdmin.Visible = true;
if (AppParams.isSysadmin)
@@ -1337,9 +1354,9 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.Deserialize(ms);
}
//sfDataGrid1.ShowToolTip = true;
//sfDataGrid1.ToolTipOption.AutoPopDelay = 500;
//sfDataGrid1.ToolTipOption.InitialDelay = 500;
sfDataGrid1.ShowToolTip = true;
sfDataGrid1.ToolTipOption.AutoPopDelay = 500;
sfDataGrid1.ToolTipOption.InitialDelay = 500;
sfDataGrid1.ShowToolTip = true;
System.Windows.Forms.Application.DoEvents();
@@ -1521,6 +1538,7 @@ namespace OnDoc.UICintrols
{
e.ToolTipInfo.Items.Clear();
Syncfusion.WinForms.Controls.ToolTipItem tt = new Syncfusion.WinForms.Controls.ToolTipItem();
tt.Text = "Ich bin der Tooltip";
e.ToolTipInfo.Items.Add(tt);
}
@@ -1670,6 +1688,36 @@ namespace OnDoc.UICintrols
TableEditor tb = new TableEditor("OnDoc_EDK_Routing");
tb.Show();
}
private void sfDataGrid1_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count > 1)
{
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["Bearbeitung_Zwingend"].ToString();
if (datarow["Bearbeitung_Zwingend"].ToString() == "True")
{
RibbonButtonArchivToOnBase.Enabled = false;
archivierenToolStripMenuItem.Enabled = false;
break;
}
if (datarow["ToApprove"].ToString() == "True" && datarow["approved"].ToString() == "False")
{
RibbonButtonArchivToOnBase.Enabled = false;
archivierenToolStripMenuItem.Enabled = false;
break;
}
}
}
}
private void ribbonButton6_Click(object sender, EventArgs e)
{
refresh_dokumente();
}
}
}
Client/UIControls/DokList.resx
+12 -9
View File
@@ -506,55 +506,55 @@
<data name="ribbonButtonSysadmins.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vwAADr8BOAVTJAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonSysadmins.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vwAADr8BOAVTJAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonSysadmins.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vwAADr8BOAVTJAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="ribbonbuttonedklog.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedklog.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedklog.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="ribbonbuttonedkverarbeitung.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedkverarbeitung.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedkverarbeitung.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -581,4 +581,7 @@
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<metadata name="pdfConfig2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>464, 17</value>
</metadata>
</root>
Client/UIControls/Dokwerte.Designer.cs
Generated
+1 -1
View File
@@ -65,7 +65,7 @@
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(3, 9);
this.label1.Location = new System.Drawing.Point(3, 13);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(79, 20);
this.label1.TabIndex = 0;
Client/UIControls/Partnersuche.Designer.cs
Generated
+1
View File
@@ -107,6 +107,7 @@
this.trefferlistedata.Size = new System.Drawing.Size(531, 222);
this.trefferlistedata.TabIndex = 0;
this.trefferlistedata.Text = "sfDataGrid1";
this.trefferlistedata.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.trefferlistedata_DrawCell);
this.trefferlistedata.SelectionChanged += new Syncfusion.WinForms.DataGrid.Events.SelectionChangedEventHandler(this.trefferlistedata_SelectionChanged);
this.trefferlistedata.DoubleClick += new System.EventHandler(this.trefferlistedata_DoubleClick);
//
Client/UIControls/Partnersuche.cs
+32 -4
View File
@@ -15,6 +15,7 @@ using Syncfusion.WinForms.DataGrid;
using System.Web.UI.WebControls;
using Syncfusion.Data;
using Syncfusion.WinForms.DataGrid.Interactivity;
using System.IO;
namespace OnDoc.UIControls
{
@@ -38,7 +39,8 @@ namespace OnDoc.UIControls
trefferlistedata.DataSource = clsPartner.get_partnerliste();
try
{
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata);
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
if (trefferlistedata.RowCount > 0) {sfButton1.Enabled = true;}
trefferlistedata.SelectedIndex = 0;
}
@@ -47,12 +49,15 @@ namespace OnDoc.UIControls
private void btnsuche_Click(object sender, EventArgs e)
{
if (txtPartnerNr.Text.Trim() != "")
{
string s = txtPartnerNr.Text.Replace(".", "").Trim();
if (DivFnkt.IsNumeric(s))
{
trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 0);
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata,true);
if (clsPartner.partnerliste.Rows.Count == 1)
{
trefferlistedata.SelectedIndex = 0;
@@ -64,6 +69,7 @@ namespace OnDoc.UIControls
{
string s = txtKurzname.Text.Trim();
trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 1);
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata,true);
if (clsPartner.partnerliste.Rows.Count == 1)
{
trefferlistedata.SelectedIndex = 0;
@@ -72,7 +78,7 @@ namespace OnDoc.UIControls
}
try
{
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata);
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata,true);
trefferlistedata.SelectedIndex = 0;
try
{
@@ -140,8 +146,7 @@ namespace OnDoc.UIControls
void TableControl_DoubleClick(object sender, System.EventArgs e)
{
try
try
{
partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00"));
partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00");
@@ -152,5 +157,28 @@ namespace OnDoc.UIControls
catch { }
}
private void trefferlistedata_DrawCell(object sender, Syncfusion.WinForms.DataGrid.Events.DrawCellEventArgs e)
{
if (e.Column.MappingName == "Typ")
{
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
if (Convert.ToInt32(dataRow["Typ"]) == 1)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Partner_16x16_32, e.Bounds.X+5 , e.Bounds.Y+3);
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Person_16x16_32,e.Bounds.X + 5, 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.Handled = true;
return;
}
e.Handled = false;
}
}
}
Client/UIControls/UCAllgemeineDokumentParam.cs
+2 -2
View File
@@ -291,7 +291,7 @@ namespace OnDoc.UIControls
{
bpperson_error = true;
bpperson_error_type = 1;
if (!ausDokumentpaket) MessageBox.Show("Das gewöhlte Dokument muss für eine Person erstellt werden", "BP/Person", MessageBoxButtons.OK, MessageBoxIcon.Error);
if (!ausDokumentpaket) MessageBox.Show("Das gewählte Dokument muss für eine Person erstellt werden", "BP/Person", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
@@ -299,7 +299,7 @@ namespace OnDoc.UIControls
{
bpperson_error = true;
bpperson_error_type = 2;
if(!ausDokumentpaket) MessageBox.Show("Das gewöhlte Dokument muss für ein BP erstellt werden", "BP/Person", MessageBoxButtons.OK, MessageBoxIcon.Error);
if(!ausDokumentpaket) MessageBox.Show("Das gewählte Dokument muss für ein BP erstellt werden", "BP/Person", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
}
Client/bin/Debug/OnDoc.exe
BIN
View File
Binary file not shown.
Client/bin/Debug/OnDoc.pdb
BIN
View File
Binary file not shown.
Client/bin/Debug/OnDocClient.zip
BIN
View File
Binary file not shown.
Client/bin/Debug/de-DE/OnDoc.resources.dll
BIN
View File
Binary file not shown.
Client/obj/Debug/Client.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
BIN
View File
Binary file not shown.
Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
Client/obj/Debug/OnDoc.DocMgmt.frmToApproval.resources
BIN
View File
Binary file not shown.
Client/obj/Debug/OnDoc.Properties.Resources.resources
BIN
View File
Binary file not shown.
Client/obj/Debug/OnDoc.UICintrols.DokList.resources
BIN
View File
Binary file not shown.
Client/obj/Debug/OnDoc.exe
BIN
View File
Binary file not shown.
Client/obj/Debug/OnDoc.pdb
BIN
View File
Binary file not shown.
Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
BIN
View File
Binary file not shown.
Client/obj/Debug/de-DE/OnDoc.resources.dll
BIN
View File
Binary file not shown.