AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS_18.10

Browse Source
This commit is contained in:
SchreiberM
2016-10-19 09:11:33 +02:00
parent 353f161c57
commit 11ec67a434
8 changed files with 194 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/DD-Record-Organiser/ClassLicence.vb
View File

@@ -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

1
app/DD-Record-Organiser/ModuleRuntimeVariables.vb
View File

@@ -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

9
app/DD-Record-Organiser/frmLicense.designer.vb generated
View File

@@ -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

53
app/DD-Record-Organiser/frmLicense.resx
View File

@@ -198,6 +198,39 @@
<data name="&gt;&gt;lblPW.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="chkSite.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="chkSite.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="chkSite.Location" type="System.Drawing.Point, System.Drawing">
<value>164, 144</value>
</data>
<data name="chkSite.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
<value>Yes</value>
</data>
<data name="chkSite.Size" type="System.Drawing.Size, System.Drawing">
<value>89, 20</value>
</data>
<data name="chkSite.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="chkSite.Text" xml:space="preserve">
<value>Site Addon</value>
</data>
<data name="&gt;&gt;chkSite.Name" xml:space="preserve">
<value>chkSite</value>
</data>
<data name="&gt;&gt;chkSite.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;chkSite.Parent" xml:space="preserve">
<value>grbBoxlicense</value>
</data>
<data name="&gt;&gt;chkSite.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="lblClient.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -229,7 +262,7 @@
<value>grbBoxlicense</value>
</data>
<data name="&gt;&gt;lblClient.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="cmbClients.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 9.75pt</value>
@@ -253,7 +286,7 @@
<value>grbBoxlicense</value>
</data>
<data name="&gt;&gt;cmbClients.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="chkSAPConnect.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -283,7 +316,7 @@
<value>grbBoxlicense</value>
</data>
<data name="&gt;&gt;chkSAPConnect.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="Label5.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -313,7 +346,7 @@
<value>grbBoxlicense</value>
</data>
<data name="&gt;&gt;Label5.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="dtpGueltig_GI.Location" type="System.Drawing.Point, System.Drawing">
<value>396, 72</value>
@@ -334,7 +367,7 @@
<value>grbBoxlicense</value>
</data>
<data name="&gt;&gt;dtpGueltig_GI.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="txtDossierCount.Location" type="System.Drawing.Point, System.Drawing">
<value>222, 109</value>
@@ -361,7 +394,7 @@
<value>grbBoxlicense</value>
</data>
<data name="&gt;&gt;txtDossierCount.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="Label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -388,7 +421,7 @@
<value>grbBoxlicense</value>
</data>
<data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="btnnewLicenses.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
@@ -421,7 +454,7 @@
<value>grbBoxlicense</value>
</data>
<data name="&gt;&gt;btnnewLicenses.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="txtNewlicences.Location" type="System.Drawing.Point, System.Drawing">
<value>222, 74</value>
@@ -448,7 +481,7 @@
<value>grbBoxlicense</value>
</data>
<data name="&gt;&gt;txtNewlicences.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="lblnewlicenses.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -475,7 +508,7 @@
<value>grbBoxlicense</value>
</data>
<data name="&gt;&gt;lblnewlicenses.ZOrder" xml:space="preserve">
<value>9</value>
<value>10</value>
</data>
<data name="grbBoxlicense.Location" type="System.Drawing.Point, System.Drawing">
<value>11, 42</value>

4
app/DD-Record-Organiser/frmLicense.vb
View File

@@ -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

35
app/DD-Record-Organiser/frmLicense_User.Designer.vb generated
View File

@@ -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

143
app/DD-Record-Organiser/frmLicense_User.resx
View File

@@ -147,7 +147,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
<value>10</value>
<value>12</value>
</data>
<data name="cmbClients.Location" type="System.Drawing.Point, System.Drawing">
<value>175, 25</value>
@@ -168,7 +168,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;cmbClients.ZOrder" xml:space="preserve">
<value>9</value>
<value>11</value>
</data>
<data name="Label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -198,7 +198,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
<value>8</value>
<value>10</value>
</data>
<data name="Label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -228,7 +228,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
<value>7</value>
<value>9</value>
</data>
<data name="Label4.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -258,7 +258,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
<value>6</value>
<value>8</value>
</data>
<data name="Label5.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -267,7 +267,7 @@
<value>Tahoma, 9.75pt, style=Bold</value>
</data>
<data name="Label5.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 143</value>
<value>12, 171</value>
</data>
<data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
<value>73, 16</value>
@@ -288,7 +288,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;Label5.ZOrder" xml:space="preserve">
<value>5</value>
<value>7</value>
</data>
<data name="lbLicenceCount.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 9.75pt</value>
@@ -318,7 +318,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lbLicenceCount.ZOrder" xml:space="preserve">
<value>4</value>
<value>6</value>
</data>
<data name="lbDossierCount.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 9.75pt</value>
@@ -348,43 +348,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lbDossierCount.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="lbSAPConnect.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 9.75pt</value>
</data>
<data name="lbSAPConnect.Location" type="System.Drawing.Point, System.Drawing">
<value>264, 115</value>
</data>
<data name="lbSAPConnect.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 23</value>
</data>
<data name="lbSAPConnect.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
</data>
<data name="lbSAPConnect.Text" xml:space="preserve">
<value>Inaktiv</value>
</data>
<data name="lbSAPConnect.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleRight</value>
</data>
<data name="&gt;&gt;lbSAPConnect.Name" xml:space="preserve">
<value>lbSAPConnect</value>
</data>
<data name="&gt;&gt;lbSAPConnect.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lbSAPConnect.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lbSAPConnect.ZOrder" xml:space="preserve">
<value>2</value>
<value>5</value>
</data>
<data name="lbValidUntil.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 9.75pt</value>
</data>
<data name="lbValidUntil.Location" type="System.Drawing.Point, System.Drawing">
<value>264, 140</value>
<value>264, 168</value>
</data>
<data name="lbValidUntil.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 23</value>
@@ -408,7 +378,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lbValidUntil.ZOrder" xml:space="preserve">
<value>1</value>
<value>4</value>
</data>
<data name="GroupBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>15, 52</value>
@@ -429,6 +399,94 @@
<value>$this</value>
</data>
<data name="&gt;&gt;GroupBox1.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="Label6.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="Label6.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 9.75pt, style=Bold</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Label6.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="Label6.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 144</value>
</data>
<data name="Label6.Size" type="System.Drawing.Size, System.Drawing">
<value>85, 16</value>
</data>
<data name="Label6.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
</data>
<data name="Label6.Text" xml:space="preserve">
<value>Site AddOn:</value>
</data>
<data name="&gt;&gt;Label6.Name" xml:space="preserve">
<value>Label6</value>
</data>
<data name="&gt;&gt;Label6.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label6.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;Label6.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="chkSAP.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="chkSAP.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="chkSAP.Location" type="System.Drawing.Point, System.Drawing">
<value>349, 120</value>
</data>
<data name="chkSAP.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
</data>
<data name="chkSAP.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
</data>
<data name="&gt;&gt;chkSAP.Name" xml:space="preserve">
<value>chkSAP</value>
</data>
<data name="&gt;&gt;chkSAP.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;chkSAP.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;chkSAP.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="chkSite.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="chkSite.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="chkSite.Location" type="System.Drawing.Point, System.Drawing">
<value>349, 146</value>
</data>
<data name="chkSite.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
</data>
<data name="chkSite.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
</data>
<data name="&gt;&gt;chkSite.Name" xml:space="preserve">
<value>chkSite</value>
</data>
<data name="&gt;&gt;chkSite.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;chkSite.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;chkSite.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -438,7 +496,7 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>376, 179</value>
<value>376, 209</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8.25pt</value>
@@ -609,7 +667,6 @@
AAA=
</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
</data>

17
app/DD-Record-Organiser/frmLicense_User.vb
View File

@@ -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