AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://172.24.11.74:90/scm/git/ProcessManagerClient

Browse Source
This commit is contained in:
Digital Data - Marlon Schreiber 2018-06-12 17:29:41 +02:00
commit 867e00d301
5 changed files with 466 additions and 1031 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/DD_PM_WINDREAM/ClassInit.vb
View File

@ -85,10 +85,10 @@ Public Class ClassInit
Dim dtUser As DataTable = ClassDatabase.Return_Datatable(sql)
CURRENT_USER_ID = dtUser.Rows(0).Item("GUID")
CURRENT_USER_SURNAME = dtUser.Rows(0).Item("NAME")
CURRENT_USER_PRENAME = dtUser.Rows(0).Item("PRENAME")
CURRENT_USER_SHORTNAME = dtUser.Rows(0).Item("SHORTNAME")
CURRENT_USER_EMAIL = dtUser.Rows(0).Item("EMAIL")
CURRENT_USER_SURNAME = IIf(IsDBNull(dtUser.Rows(0).Item("NAME")), "", dtUser.Rows(0).Item("NAME"))
CURRENT_USER_PRENAME = IIf(IsDBNull(dtUser.Rows(0).Item("PRENAME")), "", dtUser.Rows(0).Item("PRENAME"))
CURRENT_USER_SHORTNAME = IIf(IsDBNull(dtUser.Rows(0).Item("SHORTNAME")), "", dtUser.Rows(0).Item("SHORTNAME"))
CURRENT_USER_EMAIL = IIf(IsDBNull(dtUser.Rows(0).Item("EMAIL")), "", dtUser.Rows(0).Item("EMAIL"))
CURRENT_USER_LANGUAGE = dtUser.Rows(0).Item("LANGUAGE")
If IsDBNull(CURRENT_USER_ID) Or IsNothing(CURRENT_USER_ID) Then

3
app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
View File

@ -56,8 +56,7 @@
<ApplicationIcon>PM_ohne_slogan_128px.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="DD_LIB_Standards, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="DD_LIB_Standards">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll</HintPath>
</Reference>
<Reference Include="DevExpress.Charts.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />

8
app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb generated
View File

@ -49,7 +49,7 @@ Partial Class frmProfileDesigner
Dim VEKTOR_DELIMITERLabel As System.Windows.Forms.Label
Dim WORK_HISTORY_ENTRYLabel As System.Windows.Forms.Label
Dim SQL_VIEWLabel As System.Windows.Forms.Label
Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.SplitContainer_Profilzuordnung2 = New System.Windows.Forms.SplitContainer()
Me.gridAssignedUsers = New DevExpress.XtraGrid.GridControl()
Me.TBPROFILE_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@ -1581,7 +1581,7 @@ Partial Class frmProfileDesigner
'
'tsBtnCancel
'
Me.tsBtnCancel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text
Me.tsBtnCancel.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.delete_12x12
resources.ApplyResources(Me.tsBtnCancel, "tsBtnCancel")
Me.tsBtnCancel.Name = "tsBtnCancel"
'
@ -1953,8 +1953,8 @@ Partial Class frmProfileDesigner
'TBPM_ERROR_LOGDataGridView
'
Me.TBPM_ERROR_LOGDataGridView.AllowUserToAddRows = False
DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan
Me.TBPM_ERROR_LOGDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
Me.TBPM_ERROR_LOGDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.TBPM_ERROR_LOGDataGridView.AutoGenerateColumns = False
Me.TBPM_ERROR_LOGDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.TBPM_ERROR_LOGDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn17, Me.DataGridViewTextBoxColumn22, Me.DataGridViewTextBoxColumn23, Me.DataGridViewTextBoxColumn24, Me.DataGridViewTextBoxColumn25})

1467
app/DD_PM_WINDREAM/frmProfileDesigner.resx
View File

File diff suppressed because it is too large Load Diff

11
app/DD_PM_WINDREAM/frmProfileDesigner.vb
View File

@ -1,4 +1,5 @@
Imports System.Data.SqlClient
Imports System.ComponentModel
Imports System.Data.SqlClient
Imports System.IO
Imports DD_LIB_Standards
Imports DevExpress.XtraGrid
@ -964,4 +965,12 @@ Public Class frmProfileDesigner
Private Sub tsBtnCancel_Click(sender As Object, e As EventArgs) Handles tsBtnCancel.Click
CancelFinalIndexInsert()
End Sub
Private Sub frmProfileDesigner_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing
CancelFinalIndexInsert()
End Sub
Private Sub TabControl2_SelectedIndexChanged_1(sender As Object, e As EventArgs) Handles TabControl2.SelectedIndexChanged
CancelFinalIndexInsert()
End Sub
End Class