jj: Subject Encoding & Deleting Groups

This commit is contained in:
Jonathan Jenne 2017-08-09 14:52:45 +02:00
parent 48b8d5cc51
commit 5863a41702
5 changed files with 11144 additions and 9180 deletions

File diff suppressed because it is too large Load Diff

View File

@ -451,6 +451,15 @@
<data name="SHORTNAMELabel.Text" xml:space="preserve">
<value>Initials:</value>
</data>
<data name="XtraTabPage1.Text" xml:space="preserve">
<value>Documenttypes</value>
</data>
<data name="XtraTabPage2.Text" xml:space="preserve">
<value>User-/Groupmanagement</value>
</data>
<data name="XtraTabPage5.Text" xml:space="preserve">
<value>Misc Settings</value>
</data>
<data name="GroupBox6.Text" xml:space="preserve">
<value>Overwrite file?</value>
</data>
@ -466,6 +475,36 @@
<data name="lblObjekttyp.Text" xml:space="preserve">
<value>Objecttype:</value>
</data>
<data name="XtraTabPage3.Size" type="System.Drawing.Size, System.Drawing">
<value>974, 258</value>
</data>
<data name="XtraTabPage3.Text" xml:space="preserve">
<value>manual Indicies</value>
</data>
<data name="XtraTabControl2.Size" type="System.Drawing.Size, System.Drawing">
<value>980, 286</value>
</data>
<data name="XtraTabPage6.Size" type="System.Drawing.Size, System.Drawing">
<value>974, 258</value>
</data>
<data name="XtraTabPage6.Text" xml:space="preserve">
<value>Postprocessing manual Indicies</value>
</data>
<data name="XtraTabPage4.Size" type="System.Drawing.Size, System.Drawing">
<value>974, 258</value>
</data>
<data name="XtraTabPage4.Text" xml:space="preserve">
<value>automatic/static Indicies</value>
</data>
<data name="XtraTabPage9.Size" type="System.Drawing.Size, System.Drawing">
<value>974, 258</value>
</data>
<data name="XtraTabPage9.Text" xml:space="preserve">
<value>Assignment Documenttype-Groups</value>
</data>
<data name="XtraTabPage10.Size" type="System.Drawing.Size, System.Drawing">
<value>974, 258</value>
</data>
<data name="SAVE_VALUECheckBox.Text" xml:space="preserve">
<value>Remember last successful input</value>
</data>
@ -555,15 +594,6 @@
dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
</value>
</data>
<data name="XtraTabPage3.Size" type="System.Drawing.Size, System.Drawing">
<value>974, 258</value>
</data>
<data name="XtraTabPage3.Text" xml:space="preserve">
<value>manual Indicies</value>
</data>
<data name="XtraTabControl2.Size" type="System.Drawing.Size, System.Drawing">
<value>980, 286</value>
</data>
<data name="lblsavePostProcess.Size" type="System.Drawing.Size, System.Drawing">
<value>182, 17</value>
</data>
@ -659,12 +689,6 @@
dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
</value>
</data>
<data name="XtraTabPage6.Size" type="System.Drawing.Size, System.Drawing">
<value>974, 258</value>
</data>
<data name="XtraTabPage6.Text" xml:space="preserve">
<value>Postprocessing manual Indicies</value>
</data>
<data name="lblWindowParameter.Size" type="System.Drawing.Size, System.Drawing">
<value>113, 13</value>
</data>
@ -785,15 +809,12 @@ The received values can be written to Indicies or used to rename a file.</value>
dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
</value>
</data>
<data name="XtraTabPage4.Size" type="System.Drawing.Size, System.Drawing">
<value>974, 258</value>
</data>
<data name="XtraTabPage4.Text" xml:space="preserve">
<value>automatic/static Indicies</value>
</data>
<data name="Button2.Text" xml:space="preserve">
<value>Delete</value>
</data>
<data name="GroupBox3.Text" xml:space="preserve">
<value>New group assignment</value>
</data>
<data name="lblnewDokartZuordnung.Size" type="System.Drawing.Size, System.Drawing">
<value>163, 13</value>
</data>
@ -809,27 +830,21 @@ The received values can be written to Indicies or used to rename a file.</value>
<data name="btnAddDokartGroupRelation.Text" xml:space="preserve">
<value>Assign Documenttype to group</value>
</data>
<data name="GroupBox3.Text" xml:space="preserve">
<value>New group assignment</value>
</data>
<data name="Label8.Size" type="System.Drawing.Size, System.Drawing">
<value>258, 13</value>
</data>
<data name="Label8.Text" xml:space="preserve">
<value>This Documenttype is assigned the following groups:</value>
</data>
<data name="XtraTabPage9.Size" type="System.Drawing.Size, System.Drawing">
<value>974, 258</value>
</data>
<data name="XtraTabPage9.Text" xml:space="preserve">
<value>Assignment Documenttype-Groups</value>
</data>
<data name="Label25.Size" type="System.Drawing.Size, System.Drawing">
<value>336, 13</value>
</data>
<data name="Label25.Text" xml:space="preserve">
<value>Contents of Date-Indicies are converted to YYYYMMDD automatically</value>
</data>
<data name="GroupBox5.Text" xml:space="preserve">
<value>New Subdirectory:</value>
</data>
<data name="Label20.Size" type="System.Drawing.Size, System.Drawing">
<value>81, 15</value>
</data>
@ -851,18 +866,12 @@ The received values can be written to Indicies or used to rename a file.</value>
<data name="Label18.Text" xml:space="preserve">
<value>from Index-Value (auto or manual):</value>
</data>
<data name="GroupBox5.Text" xml:space="preserve">
<value>New Subdirectory:</value>
</data>
<data name="Label17.Size" type="System.Drawing.Size, System.Drawing">
<value>113, 15</value>
</data>
<data name="Label17.Text" xml:space="preserve">
<value>Variable folderpath</value>
</data>
<data name="XtraTabPage10.Size" type="System.Drawing.Size, System.Drawing">
<value>974, 258</value>
</data>
<data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
<value>92, 13</value>
</data>
@ -973,18 +982,24 @@ The received values can be written to Indicies or used to rename a file.</value>
<data name="AKTIVCheckBox.Text" xml:space="preserve">
<value>Active</value>
</data>
<data name="XtraTabPage1.Text" xml:space="preserve">
<value>Documenttypes</value>
</data>
<data name="lblsaveUSer.Size" type="System.Drawing.Size, System.Drawing">
<value>131, 13</value>
</data>
<data name="lblsaveUSer.Text" xml:space="preserve">
<value>User successfully saved!</value>
</data>
<data name="XtraTabPage7.Text" xml:space="preserve">
<value>Assignment Group to User</value>
</data>
<data name="XtraTabPage8.Text" xml:space="preserve">
<value>Groupmanagement</value>
</data>
<data name="btnDeleteGroupRelation.Text" xml:space="preserve">
<value>Delete</value>
</data>
<data name="GroupBox2.Text" xml:space="preserve">
<value>New Groupassignment:</value>
</data>
<data name="lblnewUserZuordnung.Size" type="System.Drawing.Size, System.Drawing">
<value>163, 13</value>
</data>
@ -1000,18 +1015,12 @@ The received values can be written to Indicies or used to rename a file.</value>
<data name="btnAddGroupRelation.Text" xml:space="preserve">
<value>Assign user to group</value>
</data>
<data name="GroupBox2.Text" xml:space="preserve">
<value>New Groupassignment:</value>
</data>
<data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
<value>188, 13</value>
</data>
<data name="Label4.Text" xml:space="preserve">
<value>User is assigned the following groups:</value>
</data>
<data name="XtraTabPage7.Text" xml:space="preserve">
<value>Assignment Group to User</value>
</data>
<data name="lblsaveTBDD_USER_GROUPS.Size" type="System.Drawing.Size, System.Drawing">
<value>166, 17</value>
</data>
@ -1095,9 +1104,6 @@ The received values can be written to Indicies or used to rename a file.</value>
dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
</value>
</data>
<data name="XtraTabPage8.Text" xml:space="preserve">
<value>Groupmanagement</value>
</data>
<data name="ToolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@ -1175,8 +1181,8 @@ The received values can be written to Indicies or used to rename a file.</value>
<data name="ToolStripButton23.Text" xml:space="preserve">
<value>Add AD User</value>
</data>
<data name="XtraTabPage2.Text" xml:space="preserve">
<value>User-/Groupmanagement</value>
<data name="GroupBox1.Text" xml:space="preserve">
<value>Indexmapping for Email-Indexing</value>
</data>
<data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 17</value>
@ -1199,12 +1205,6 @@ The received values can be written to Indicies or used to rename a file.</value>
<data name="btnidxemail_add.Text" xml:space="preserve">
<value>Add</value>
</data>
<data name="GroupBox1.Text" xml:space="preserve">
<value>Indexmapping for Email-Indexing</value>
</data>
<data name="XtraTabPage5.Text" xml:space="preserve">
<value>Misc Settings</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAICAAAAEACACoCAAAFgAAACgAAAAgAAAAQAAAAAEACAAAAAAAgAQAAAAAAAAAAAAAAAAAAAAA

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,11 @@
Public Class frmAdministration
Imports System.ComponentModel
Public Class frmAdministration
Public Shared _Namenkonvention As String
Public Shared _aktDokart_Id As Integer
Private GroupToDelete As Integer = Nothing
Private IsInsert As Boolean = False
Dim frmloaded As Boolean = False
Private Sub TBDD_DOKUMENTARTBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBDD_DOKUMENTARTBindingNavigatorSaveItem.Click
@ -360,7 +365,7 @@
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Add IndexMan: ")
End Try
End Sub
Private Sub ToolStripButton7_Click(sender As Object, e As EventArgs) Handles ToolStripButton7.Click
@ -480,7 +485,7 @@
Me.IDX_EMAIL_SUBJECTComboBox.Items.Add(index)
Me.IDX_EMAIL_TOComboBox.Items.Add(index)
End Select
Next
End If
@ -578,7 +583,7 @@
End Try
End Sub
Private Sub XtraTabControl2_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl2.SelectedPageChanged
Load_TabData()
Load_TabData()
End Sub
Private Sub ToolStripButton22_Click(sender As Object, e As EventArgs) Handles ToolStripButton22.Click
Save_IndexAuto()
@ -594,7 +599,7 @@
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Add IndexeAuto: ")
End Try
End Sub
Private Sub TBDD_INDEX_AUTOMBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBDD_INDEX_AUTOMBindingSource.CurrentChanged
@ -651,7 +656,7 @@
' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent()
End Sub
Private Sub TYPEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TYPEComboBox.SelectedIndexChanged
@ -783,8 +788,14 @@
Try
TBDD_USER_GROUPSBindingSource.EndEdit()
If MyDataset.TBDD_USER_GROUPS.GetChanges Is Nothing = False Then
Dim changes = MyDataset.TBDD_USER_GROUPS.GetChanges()
' If a Group was selected and deleted, delete references in TBDD_USRGRP_DOCTYPE and TBDD_GROUPS_USER
If Not IsNothing(GroupToDelete) And MyDataset.TBDD_USER_GROUPS.GetChanges(DataRowState.Deleted) Is Nothing = False Then
ClassDatabase.Execute_non_Query($"DELETE FROM TBDD_USRGRP_DOKTYPE WHERE GROUP_ID = {GroupToDelete}")
ClassDatabase.Execute_non_Query($"DELETE FROM TBDD_GROUPS_USER WHERE GROUP_ID = {GroupToDelete}")
GroupToDelete = Nothing
End If
CHANGED_WHOTextBox5.Text = Environment.UserName
TBDD_INDEX_MAN_POSTPROCESSINGBindingSource.EndEdit()
@ -836,7 +847,7 @@
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Add User-Relation: ")
End Try
End If
End Sub
@ -918,8 +929,8 @@
End If
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Delete DocType: ")
End Try
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Delete DocType: ")
End Try
End If
End Sub
@ -944,7 +955,7 @@
End Sub
Private Sub ToolStripButton14_Click(sender As Object, e As EventArgs) Handles ToolStripButton14.Click
Save_User
Save_User()
End Sub
Sub Save_User()
Try
@ -959,7 +970,7 @@
End If
If ClassDatabase.Execute_Scalar("SELECT MODULE_GI FROM TBDD_USER WHERE GUID = " & USER_GUIDTextBox.Text, MyConnectionString) = 0 Then
Dim sql As String = "UPDATE TBDD_USER SET MODULE_GI = 1 where GUID = " & USER_GUIDTextBox.Text
ClassDatabase.Execute_non_Query(Sql)
ClassDatabase.Execute_non_Query(sql)
End If
Catch ex As Exception
@ -1156,4 +1167,15 @@
Private Sub tsbtnRefreshAutomatic_Click(sender As Object, e As EventArgs) Handles tsbtnRefreshAutomatic.Click
Load_INDEXE_AUTO(Me.DOKART_GUIDTextBox.Text)
End Sub
End Class
Private Sub ToolStripButton33_Click(sender As Object, e As EventArgs) Handles ToolStripButton33.Click
Dim list As ListBox = ListBox4
If Not IsNothing(list.SelectedItem) Then
Dim item As DataRowView = list.SelectedItem
GroupToDelete = Integer.Parse(item.Row.Item("GUID"))
Else
GroupToDelete = Nothing
End If
End Sub
End Class

View File

@ -1332,7 +1332,7 @@ Public Class frmIndex
End If
_step = "4"
' Regular Expressions vorbereiten
If fromPattern <> "" And toPattern <> "" Then
_step = "4.1"
Dim FromRegexList As New List(Of Regex)
@ -1343,7 +1343,7 @@ Public Class frmIndex
FromRegexList.Add(fromRegex)
ToRegexList.Add(toRegex)
Dim emailFrom
Dim emailTo
' Email Absender und Empfänger
@ -1418,7 +1418,7 @@ Public Class frmIndex
_step = "6.1.x"
ClassLogger.Add(" >> emailFrom is Nothing?!")
End If
If Not IsNothing(emailTo) Then
_step = "6.1.1 " & emailTo.ToString
emailTo = emailTo.Replace("<", "")
@ -2071,7 +2071,7 @@ Public Class frmIndex
' Return False
End If
End If
Next
If LogErrorsOnly = False Then ClassLogger.Add(" >> Replaced and complete SQL-result: " & SqlString, False)
If LogErrorsOnly = False Then ClassLogger.Add(" >> Ausführen SQL....", False)
@ -2206,7 +2206,7 @@ Public Class frmIndex
Me.grpBetreff.Dock = DockStyle.Top
Me.grpbxMailBody.Dock = DockStyle.Fill
Dim msg_email As New Msg.Message(CURRENT_WORKFILE)
msg_email.Encoding = Encoding.Unicode
'msg_email.Encoding = Encoding.Unicode
Dim headers As String = ClassEmailHeaderExtractor.getMessageHeaders(msg_email)
If LogErrorsOnly = False Then ClassLogger.Add(" EMAIL-HEADER: " & headers, False)
@ -2226,11 +2226,17 @@ Public Class frmIndex
If My.Computer.FileSystem.FileExists(tempFilename) Then
My.Computer.FileSystem.DeleteFile(tempFilename)
End If
If msg_email_unicode.Subject = "" Then
Dim codepage As Integer = Console.OutputEncoding.CodePage
Dim msg_email_subject As New Msg.Message()
msg_email_subject.Encoding = Encoding.GetEncoding(codepage)
msg_email_subject.Open(CURRENT_WORKFILE)
If msg_email_subject.Subject = "" Then
Me.txtBetreff.Text = "!!No subject in email!!"
Else
If LogErrorsOnly = False Then ClassLogger.Add(" ...subject before converting: '" & msg_email_unicode.Subject & "'", False)
Dim betreff = ClassHelper.encode_utf8(msg_email_unicode.Subject)
If LogErrorsOnly = False Then ClassLogger.Add(" ...subject before converting: '" & msg_email_subject.Subject & "'", False)
Dim betreff = ClassHelper.encode_utf8(msg_email_subject.Subject)
If Not IsNothing(betreff) Then
If ClassHelper.CheckSpecialSigns(betreff) > 0 Then
@ -2240,10 +2246,10 @@ Public Class frmIndex
Me.txtBetreff.Text = betreff
Else
ClassLogger.Add(" ...subject could not be converted to utf8!", False)
Me.txtBetreff.Text = msg_email_unicode.Subject
Me.txtBetreff.Text = msg_email_subject.Subject
End If
End If
'Try
Dim wFile As System.IO.FileStream
Dim byteData() As Byte