update 20250212

Client/Client.csproj.user

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>
-    </StartArguments>
+    <StartArguments>ondoc:%3ffunktion=openclient&amp;partnernr=1000208</StartArguments>
   </PropertyGroup>
   <PropertyGroup>
     <PublishUrlHistory>publish\</PublishUrlHistory>

Client/Diverses/SplashScreen.Designer.cs

@@ -64,7 +64,7 @@
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(177, 26);
             this.label2.TabIndex = 2;
-            this.label2.Text = "10. Februar 2025";
+            this.label2.Text = "12. Februar 2025";
             // 
             // SplashScreen
             // 

Client/Klassen/clsAppParams.cs

@@ -37,6 +37,7 @@ namespace OnDoc.Klassen
         public static string barcodefontsize { get; set; } = "";
         public static string barcodetextposition { get; set; } = "";
         public static bool isSysadmin { get; set; } = false;
+        public static bool showlogin { get; set; } = false;
         public static string currenttgnummer { get; set; }="";
 
         public static string ZusatzFont { get; set; } = "";

Client/Start.cs

@@ -71,8 +71,15 @@ namespace OnDoc
             }
             AppParams.CurrentMitarbeiter = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["mitarbeiternr"].ToString());
             AppParams.currenttgnummer = mitarbeiter;
-            db.Get_Tabledata("select count(*) from ondoc_admin where tgnummer='"+AppParams.currenttgnummer+"'", false, true);
-            if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) { AppParams.isSysadmin = true; } else { AppParams.isSysadmin = false; }
+            db.Get_Tabledata("select count(*) from ondoc_admin where tgnummer='"+AppParams.currenttgnummer+"' and aktiv=1", false, true);
+            if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) { 
+                AppParams.isSysadmin = true; 
+                AppParams.showlogin = true;
+                
+            } else { 
+                AppParams.isSysadmin = false;
+                AppParams.showlogin = false;
+            }
             db.dsdaten.Tables.Clear();
             db.Get_Tabledata("Select * from [applikation] where applikationsnr = 1", false, true);
             panel1.Visible = false;
@@ -233,6 +240,7 @@ namespace OnDoc
                 {
                     ExternalCall.sourceparam = sr.ReadToEnd();
                     ExternalCall.sourceparam = ExternalCall.sourceparam.Replace("\r\n", "");
+
                     sr.Close();
                 }
                 ExternalCall.executed = false;
@@ -246,6 +254,13 @@ namespace OnDoc
 
             if (ExternalCall.sourceparam != "" && ExternalCall.parseparams())
             {
+                if (ExternalCall.function.ToLower() == "openclient")
+                {
+                    if (ExternalCall.partnernr != "")
+                    {
+                        dokList1.refresh_edk_partner(Convert.ToInt32(ExternalCall.partnernr));
+                    }
+                }
                 if (ExternalCall.function.ToLower()=="ucheck")
                 {
                     dokList1.StartPruefung();

Client/UIControls/DokList.Designer.cs

@@ -63,7 +63,6 @@ namespace OnDoc.UICintrols
             this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
-            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();
@@ -167,6 +166,7 @@ namespace OnDoc.UICintrols
             this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
             this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
+            this.docPreview1 = new OnDoc.UIControls.DocPreview();
             this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
             this.ctxMenuDokList.SuspendLayout();
             this.toolStrip1.SuspendLayout();
@@ -484,16 +484,6 @@ namespace OnDoc.UICintrols
             this.sfDataGrid1.ColumnResizing += new Syncfusion.WinForms.DataGrid.Events.ColumnResizingEventHandler(this.sfDataGrid1_ColumnResizing);
             this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent);
             // 
-            // 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;
@@ -1394,6 +1384,16 @@ namespace OnDoc.UICintrols
             this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
             this.ribbonButton5.Text = "Load";
             // 
+            // 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;
+            // 
             // dokwerte1
             // 
             this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;

Client/UIControls/DokList.cs

@@ -212,7 +212,17 @@ namespace OnDoc.UICintrols
                 }
                 index = index + 1;
             }
-            if (selindex > 0) { ribbonCBAnsicht.SelectedIndex = selindex ; }
+            if (selindex > 0)
+            {
+                try
+                {
+                    ribbonCBAnsicht.SelectedIndex = selindex;
+                }
+                catch
+                {
+                    ribbonCBAnsicht.SelectedIndex = selindex - 1;
+                }
+            }
             db = null;
             //            if (standardview != "") { refresh_view(standardview); }
             if (standardview != null) { refresh_view(standardview); }
@@ -453,20 +463,24 @@ namespace OnDoc.UICintrols
 
         private void dokumentBearbeitenToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (!row_selected()) return;
-            var records = sfDataGrid1.View.GetSelectedRecords();
-            if (records.Count > 1)
+            try
             {
-                if (MessageBox.Show("Mehrere Dokumente zum Bearbeiten öffnen?", "Dokument bearbeiten", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
+                if (!row_selected()) return;
+                var records = sfDataGrid1.View.GetSelectedRecords();
+                if (records.Count > 1)
+                {
+                    if (MessageBox.Show("Mehrere Dokumente zum Bearbeiten öffnen?", "Dokument bearbeiten", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
 
-            }
-            foreach (var record in records)
-            {
-                var datarow = record as DataRowView;
-                string documentid = datarow["dokumentid"].ToString();
-                dokument_bearbeiten(documentid, false);
+                }
+                foreach (var record in records)
+                {
+                    var datarow = record as DataRowView;
+                    string documentid = datarow["dokumentid"].ToString();
+                    dokument_bearbeiten(documentid, false);
 
+                }
             }
+            catch { }
         }
         public void dokument_bearbeiten(string dokid, bool newdok = false)
         {
@@ -1038,6 +1052,7 @@ namespace OnDoc.UICintrols
             this.sfDataGrid1.ShowGroupDropArea = false;
             this.lblTitel.Text = "";
             this.RibbonButtonNewDoc.Visible = false;
+            this.ribbonPanelNeu.Visible = false;
             //this.RibbonPanelDoklist.Visible = false;
             this.RibbonBtnVorschauNo.Visible = false;
             this.RibbonButtonVorschauRechts.Visible = false;
@@ -1151,7 +1166,7 @@ namespace OnDoc.UICintrols
                         }
                         if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X")
                         {
-                            if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"]) == false == false)
+                            if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"]) == false )
                                 if (Convert.ToBoolean(dataRow["toapprove"]) == true)
                                 {
                                     if (Convert.ToBoolean(dataRow["approved"]) == true)
@@ -1519,13 +1534,14 @@ namespace OnDoc.UICintrols
             try
             {
                 ribbonLabelToApprove.Text = "";
+                ribbonLabelToApprove.Visible = false;
                 DB db1 = new DB(AppParams.connectionstring);
                 db1.Get_Tabledata("Select count(*) from view_relaunch_approval  where  bewilligt=0 and abgelehnt = 0 and mitarbeiter_bewilligung=" + AppParams.CurrentMitarbeiter.ToString(), false, true);
                 if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) == 0)
                 {
 
                     //ribbonLabelToApprove.Text = "";
-                    ribbonLabelToApprove.Visible = false;
+                    //ribbonLabelToApprove.Visible = false;
 
                 }
                 else
@@ -1538,7 +1554,7 @@ namespace OnDoc.UICintrols
                 {
 
                     //ribbonLabelToApprove.Text = "";
-                    ribbonLabelToApprove.Visible = false;
+                    //ribbonLabelToApprove.Visible = false;
 
                 }
                 else
@@ -1608,12 +1624,14 @@ namespace OnDoc.UICintrols
             ribbonVorlagen.Visible = AppParams.isSysadmin;
             ribbonBerechtigung.Visible = AppParams.isSysadmin;
             ribbonpanelanalyse.Visible = AppParams.isSysadmin;
-            RibbonPanelDiverses.Visible = AppParams.isSysadmin;
-            
+            RibbonPanelDiverses.Visible = true;
+            ribbonPanel3.Visible = AppParams.isSysadmin;
+            ribbonPanel4.Visible = AppParams.isSysadmin;
             RibbonTabAdmin.Visible = false;
             RibbonTabAdmin.Visible = true;
             ribbonSaveGridView.Enabled = AppParams.isSysadmin;
             ribbonSaveGridView.Visible = AppParams.isSysadmin;
+            ribbonAnmelden.Visible = AppParams.showlogin;
 
             //pos_elements();
         }
@@ -2478,6 +2496,7 @@ namespace OnDoc.UICintrols
                 var datarow = record as DataRowView;
                 string documentid = datarow["dokumentid"].ToString();
                 DOCGEN.DocGen dg = new DocGen(AppParams.connectionstring,AppParams.RESTURI,AppParams.apikey);
+                
                 if (dg.signdoc(selected_dokumentid, AppParams.tempdir))
                 {
                     DB db = new DB(AppParams.connectionstring);

Client/UIControls/UCAllgemeineDokumentParam.cs

@@ -744,7 +744,6 @@ namespace OnDoc.UIControls
             if (rbEditlater.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; }
             if (rbasPDF.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDF; }
             if (rbasPDFarchivieren.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDFArchivieren; }
-
             docgendata.dokumentwerte = gridDokwertlist.DataSource as DataTable;
 
 
@@ -778,7 +777,7 @@ namespace OnDoc.UIControls
             if (docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF) { dokdata.Result_as_PDF = "True"; } else { dokdata.Result_as_PDF = "False"; }
             if (docgendata.digitaleunterschrift == true) { dokdata.As_Faksimile = "True"; } else { dokdata.As_Faksimile = "False"; }
             if (docgendata.frormularOhneUnterschrift == true) { dokdata.Form_ohne_Unterschrift = "True"; } else { dokdata.Form_ohne_Unterschrift = "False"; }
-
+           
             dokdata.Zustaendig_Kube = "0";
             if (this.rbzustaendigkube.Checked)
             {
@@ -825,7 +824,7 @@ namespace OnDoc.UIControls
             {
                 dokdata.approval1 = 0;
                 dokdata.approval2 = 0;
-
+                dokdata.toapprove = 1;
                 try
                 {
                     if (cbboxunterschriftlinks.Text == "") { dokdata.approval1 = 1; }