diff --git a/app/DD-Record-Organiser/ClassLicence.vb b/app/DD-Record-Organiser/ClassLicence.vb index 229f512..5a034d6 100644 --- a/app/DD-Record-Organiser/ClassLicence.vb +++ b/app/DD-Record-Organiser/ClassLicence.vb @@ -44,6 +44,12 @@ Public Class ClassLicence ClassLogger.Add(">> Could not read License for LICENSE_SAP_Connect: " & ex.Message, False) LICENSE_SAP_Connect = False End Try + Try + LICENSE_SITE = CBool(split(4)) + Catch ex As Exception + ClassLogger.Add(">> Could not read License for LICENSE_SAP_Connect: " & ex.Message, False) + LICENSE_SITE = False + End Try Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in licensemanager:") End Try diff --git a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb index 3c9dfdb..ecc721c 100644 --- a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb @@ -61,6 +61,7 @@ Public LICENSE_COUNT As Integer = 0 Public LICENSE_DOSSIER_COUNT As Integer = 0 Public LICENSE_SAP_Connect As Boolean = False + Public LICENSE_SITE As Boolean = False Public LICENSE_DATE As Date Public CONNECTION_CHANGED As Boolean = False diff --git a/app/DD-Record-Organiser/frmLicense.designer.vb b/app/DD-Record-Organiser/frmLicense.designer.vb index 1a59469..0fa7d8a 100644 --- a/app/DD-Record-Organiser/frmLicense.designer.vb +++ b/app/DD-Record-Organiser/frmLicense.designer.vb @@ -37,6 +37,7 @@ Partial Class frmLicense Me.btnnewLicenses = New System.Windows.Forms.Button() Me.txtNewlicences = New System.Windows.Forms.TextBox() Me.lblnewlicenses = New System.Windows.Forms.Label() + Me.chkSite = New System.Windows.Forms.CheckBox() Me.grbBoxlicense.SuspendLayout() Me.SuspendLayout() ' @@ -59,6 +60,7 @@ Partial Class frmLicense ' 'grbBoxlicense ' + Me.grbBoxlicense.Controls.Add(Me.chkSite) Me.grbBoxlicense.Controls.Add(Me.lblClient) Me.grbBoxlicense.Controls.Add(Me.cmbClients) Me.grbBoxlicense.Controls.Add(Me.chkSAPConnect) @@ -129,6 +131,12 @@ Partial Class frmLicense resources.ApplyResources(Me.lblnewlicenses, "lblnewlicenses") Me.lblnewlicenses.Name = "lblnewlicenses" ' + 'chkSite + ' + resources.ApplyResources(Me.chkSite, "chkSite") + Me.chkSite.Name = "chkSite" + Me.chkSite.UseVisualStyleBackColor = True + ' 'frmLicense ' resources.ApplyResources(Me, "$this") @@ -161,4 +169,5 @@ Partial Class frmLicense Friend WithEvents chkSAPConnect As System.Windows.Forms.CheckBox Friend WithEvents lblClient As System.Windows.Forms.Label Friend WithEvents cmbClients As System.Windows.Forms.ComboBox + Friend WithEvents chkSite As System.Windows.Forms.CheckBox End Class diff --git a/app/DD-Record-Organiser/frmLicense.resx b/app/DD-Record-Organiser/frmLicense.resx index 8ceaf62..094add2 100644 --- a/app/DD-Record-Organiser/frmLicense.resx +++ b/app/DD-Record-Organiser/frmLicense.resx @@ -198,6 +198,39 @@ 2 + + True + + + NoControl + + + 164, 144 + + + Yes + + + 89, 20 + + + 20 + + + Site Addon + + + chkSite + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grbBoxlicense + + + 0 + True @@ -229,7 +262,7 @@ grbBoxlicense - 0 + 1 Tahoma, 9.75pt @@ -253,7 +286,7 @@ grbBoxlicense - 1 + 2 True @@ -283,7 +316,7 @@ grbBoxlicense - 2 + 3 True @@ -313,7 +346,7 @@ grbBoxlicense - 3 + 4 396, 72 @@ -334,7 +367,7 @@ grbBoxlicense - 4 + 5 222, 109 @@ -361,7 +394,7 @@ grbBoxlicense - 5 + 6 True @@ -388,7 +421,7 @@ grbBoxlicense - 6 + 7 MiddleLeft @@ -421,7 +454,7 @@ grbBoxlicense - 7 + 8 222, 74 @@ -448,7 +481,7 @@ grbBoxlicense - 8 + 9 True @@ -475,7 +508,7 @@ grbBoxlicense - 9 + 10 11, 42 diff --git a/app/DD-Record-Organiser/frmLicense.vb b/app/DD-Record-Organiser/frmLicense.vb index fcad2bb..aca3fa1 100644 --- a/app/DD-Record-Organiser/frmLicense.vb +++ b/app/DD-Record-Organiser/frmLicense.vb @@ -44,7 +44,7 @@ Public Class frmLicense _lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "") If Me.txtNewlicences.Text <> "" And txtDossierCount.Text <> "" Then 'Encode the license - Dim result As String = Me._lizenzManager.EncodeLicenseKey(txtNewlicences.Text & "#" & dtpGueltig_GI.Text & "#" & txtDossierCount.Text & "#" & chkSAPConnect.Checked, "#DigitalData35452!#") + Dim result As String = Me._lizenzManager.EncodeLicenseKey(txtNewlicences.Text & "#" & dtpGueltig_GI.Text & "#" & txtDossierCount.Text & "#" & chkSAPConnect.Checked & "#" & chkSite.Checked, "#DigitalData35452!#") Dim sql As String = String.Format("UPDATE TBDD_CLIENT SET LICENSE_PMO = '" & result & "' WHERE GUID = {0}", CLIENT_ID) If ClassDatabase.Execute_non_Query(sql, True) = True Then @@ -65,13 +65,13 @@ Public Class frmLicense dtpGueltig_GI.Value = LICENSE_DATE txtDossierCount.Text = LICENSE_DOSSIER_COUNT Try - chkSAPConnect.Checked = LICENSE_SAP_Connect Catch ex As Exception ClassLogger.Add(">> Could not read License for SAP-Connect: " & ex.Message, False) LICENSE_SAP_Connect = False chkSAPConnect.Checked = False End Try + chkSite.Checked = LICENSE_SITE If Neu = True Then If CInt(LICENSE_COUNT) > 0 Then Dim msg As String = "Die Lizenz wurde aktualisiert!" & vbNewLine & Now diff --git a/app/DD-Record-Organiser/frmLicense_User.Designer.vb b/app/DD-Record-Organiser/frmLicense_User.Designer.vb index 3c0d4be..536f348 100644 --- a/app/DD-Record-Organiser/frmLicense_User.Designer.vb +++ b/app/DD-Record-Organiser/frmLicense_User.Designer.vb @@ -31,9 +31,11 @@ Partial Class frmLicense_User Me.Label5 = New System.Windows.Forms.Label() Me.lbLicenceCount = New System.Windows.Forms.Label() Me.lbDossierCount = New System.Windows.Forms.Label() - Me.lbSAPConnect = New System.Windows.Forms.Label() Me.lbValidUntil = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.chkSAP = New System.Windows.Forms.CheckBox() + Me.chkSite = New System.Windows.Forms.CheckBox() Me.SuspendLayout() ' 'Label1 @@ -77,12 +79,6 @@ Partial Class frmLicense_User resources.ApplyResources(Me.lbDossierCount, "lbDossierCount") Me.lbDossierCount.Name = "lbDossierCount" ' - 'lbSAPConnect - ' - Me.lbSAPConnect.BackColor = System.Drawing.SystemColors.Control - resources.ApplyResources(Me.lbSAPConnect, "lbSAPConnect") - Me.lbSAPConnect.Name = "lbSAPConnect" - ' 'lbValidUntil ' resources.ApplyResources(Me.lbValidUntil, "lbValidUntil") @@ -95,13 +91,32 @@ Partial Class frmLicense_User Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.TabStop = False ' + 'Label6 + ' + resources.ApplyResources(Me.Label6, "Label6") + Me.Label6.Name = "Label6" + ' + 'chkSAP + ' + resources.ApplyResources(Me.chkSAP, "chkSAP") + Me.chkSAP.Name = "chkSAP" + Me.chkSAP.UseVisualStyleBackColor = True + ' + 'chkSite + ' + resources.ApplyResources(Me.chkSite, "chkSite") + Me.chkSite.Name = "chkSite" + Me.chkSite.UseVisualStyleBackColor = True + ' 'frmLicense_User ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.chkSite) + Me.Controls.Add(Me.chkSAP) + Me.Controls.Add(Me.Label6) Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.lbValidUntil) - Me.Controls.Add(Me.lbSAPConnect) Me.Controls.Add(Me.lbDossierCount) Me.Controls.Add(Me.lbLicenceCount) Me.Controls.Add(Me.Label5) @@ -123,7 +138,9 @@ Partial Class frmLicense_User Friend WithEvents Label5 As System.Windows.Forms.Label Friend WithEvents lbLicenceCount As System.Windows.Forms.Label Friend WithEvents lbDossierCount As System.Windows.Forms.Label - Friend WithEvents lbSAPConnect As System.Windows.Forms.Label Friend WithEvents lbValidUntil As System.Windows.Forms.Label Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox + Friend WithEvents Label6 As System.Windows.Forms.Label + Friend WithEvents chkSAP As System.Windows.Forms.CheckBox + Friend WithEvents chkSite As System.Windows.Forms.CheckBox End Class diff --git a/app/DD-Record-Organiser/frmLicense_User.resx b/app/DD-Record-Organiser/frmLicense_User.resx index d363a18..75474da 100644 --- a/app/DD-Record-Organiser/frmLicense_User.resx +++ b/app/DD-Record-Organiser/frmLicense_User.resx @@ -147,7 +147,7 @@ $this - 10 + 12 175, 25 @@ -168,7 +168,7 @@ $this - 9 + 11 True @@ -198,7 +198,7 @@ $this - 8 + 10 True @@ -228,7 +228,7 @@ $this - 7 + 9 True @@ -258,7 +258,7 @@ $this - 6 + 8 True @@ -267,7 +267,7 @@ Tahoma, 9.75pt, style=Bold - 12, 143 + 12, 171 73, 16 @@ -288,7 +288,7 @@ $this - 5 + 7 Tahoma, 9.75pt @@ -318,7 +318,7 @@ $this - 4 + 6 Tahoma, 9.75pt @@ -348,43 +348,13 @@ $this - 3 - - - Tahoma, 9.75pt - - - 264, 115 - - - 100, 23 - - - 12 - - - Inaktiv - - - MiddleRight - - - lbSAPConnect - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 + 5 Tahoma, 9.75pt - 264, 140 + 264, 168 100, 23 @@ -408,7 +378,7 @@ $this - 1 + 4 15, 52 @@ -429,6 +399,94 @@ $this + 3 + + + True + + + Tahoma, 9.75pt, style=Bold + + + + NoControl + + + 13, 144 + + + 85, 16 + + + 15 + + + Site AddOn: + + + Label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + False + + + 349, 120 + + + 15, 14 + + + 16 + + + chkSAP + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + False + + + 349, 146 + + + 15, 14 + + + 17 + + + chkSite + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 @@ -438,7 +496,7 @@ 6, 13 - 376, 179 + 376, 209 Tahoma, 8.25pt @@ -609,7 +667,6 @@ AAA= - CenterScreen diff --git a/app/DD-Record-Organiser/frmLicense_User.vb b/app/DD-Record-Organiser/frmLicense_User.vb index 0855b45..ec809fc 100644 --- a/app/DD-Record-Organiser/frmLicense_User.vb +++ b/app/DD-Record-Organiser/frmLicense_User.vb @@ -45,17 +45,14 @@ End If If (CBool(LICENSE_SAP_Connect) = True) Then - If USER_LANGUAGE = "de-DE" Then - lbSAPConnect.Text = "Aktiv" - Else - lbSAPConnect.Text = "Active" - End If + chkSAP.Checked = True Else - If USER_LANGUAGE = "de-DE" Then - lbSAPConnect.Text = "Inaktiv" - Else - lbSAPConnect.Text = "Inactive" - End If + chkSAP.Checked = False + End If + If (CBool(LICENSE_SITE) = True) Then + chkSite.Checked = True + Else + chkSite.Checked = False End If End Sub End Class \ No newline at end of file