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

MS1808_14:45

Browse Source
This commit is contained in:
SchreiberM
2016-08-18 14:42:29 +02:00
parent bcee2404d5
commit 6655079922
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/DD-Record-Organiser/DD-Record-Organiser.vbproj
View File

@@ -81,8 +81,9 @@
<Reference Include="CommandLine">
<HintPath>..\..\3rdparty\lib\Commandline\CommandLine.dll</HintPath>
</Reference>
<Reference Include="DD_Rights">
<HintPath>..\..\..\DDLibraries\DD_Libraries\bin\Debug\DD_Rights.dll</HintPath>
<Reference Include="DD_Rights, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll</HintPath>
</Reference>
<Reference Include="DevExpress.BonusSkins.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

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

@@ -333,8 +333,8 @@ Public Class frmConstructorDesigner
docsearch = 0
End If
Dim sql = "UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = " & docsearch & "', CHANGED_WHO = '" & Environment.UserName & "' where FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID
If ClassDatabase.Execute_non_Query(sql) = True Then
Dim sql = "UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = " & docsearch & " , CHANGED_WHO = '" & Environment.UserName & "' where FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID
If ClassDatabase.Execute_non_Query(sql, True) = True Then
lblSaveDocSearch.Visible = True
lblSaveDocSearch.Text = "Data saved - " & Now
End If

2
app/DD-Record-Organiser/frmUserKonfig.vb
View File

@@ -561,6 +561,8 @@
Dim del = "EXEC [dbo].[PRPMO_DELETE_USER] " & USER_GUIDTextBox.Text
If ClassDatabase.Execute_non_Query(del, True) = True Then
Load_User()
Else
MsgBox("Unexpected Error while deleting User.", MsgBoxStyle.Exclamation)
End If
End If

5
app/RecordOrganizer_RightManager/RecordOrganizer_RightManager.vbproj
View File

@@ -50,9 +50,8 @@
<ApplicationIcon>navigate_right2.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="DD_Rights, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\DDLibraries\DD_Libraries\bin\Debug\DD_Rights.dll</HintPath>
<Reference Include="DD_Rights">
<HintPath>..\..\..\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />

8
app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb
View File

@@ -6,6 +6,7 @@ Public Class frmCheckRightsEntity
Private _error As Boolean = False
Private countfiles As Integer = 0
Private WorkingFiles As Integer = 0
Private ENTITY_ID As Integer
Private Sub frmCheckRightsEntity_Load(sender As Object, e As EventArgs) Handles Me.Load
Try
Dim sql = String.Format("SELECT T.FORM_ID, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T.[FORM_VIEW_ID]), 1) AS FORM_TITLE FROM VWPMO_CONSTRUCTOR_FORMS T WHERE DOCUMENT_VIEW = 1", USER_LANGUAGE)
@@ -22,12 +23,13 @@ Public Class frmCheckRightsEntity
Private Sub btnCheckRights_Click(sender As Object, e As EventArgs) Handles btnCheckRights.Click
If cmbentity.SelectedIndex <> -1 Then
Try
ENTITY_ID = cmbentity.SelectedValue
Me.ProgressBar1.Visible = True
'BackgroundWorker erstellen ...
BW_RightsEntity = New BackgroundWorker
BW_RightsEntity.WorkerReportsProgress = True
DT_FILES = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM VWPMO_WD_DOC_SEARCH where ENTITY_ID = {0}", cmbentity.SelectedValue))
If DD_Rights.ClassRights.Init(cmbentity.SelectedValue, chklogging.Checked, DT_FILES.Rows.Count) = False Then
DT_FILES = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM VWPMO_WD_DOC_SEARCH where ENTITY_ID = {0}", ENTITY_ID))
If DD_Rights.ClassRights.Init(ENTITY_ID, chklogging.Checked, DT_FILES.Rows.Count) = False Then
MsgBox("Could not init rights management. " & vbNewLine & "Check logfile", MsgBoxStyle.Critical)
Exit Sub
End If
@@ -68,8 +70,6 @@ Public Class frmCheckRightsEntity
If DD_Rights.ClassRights.MSG_RESULT <> "" Then
MsgBox("Unexpected Errors in setting rights: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Exclamation)
_error = True
Else
End If
Else
_error = True

2
app/SetupWiX/Product.wxs
View File

@@ -111,7 +111,7 @@
<Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
<File Id="SnapPanelLib" Name="SnapPanelControl.dll" Source="SnapPanelControl.dll" KeyPath="yes" />
<File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="DLLLicenseManager.dll" KeyPath="no" />
<File Id="DD_Rights" Name="DD_Rights.dll" Source="E:\SchreiberM\Visual Studio\GIT\DDLibraries\DD_Libraries\bin\Debug\DD_Rights.dll" KeyPath="no" />
<File Id="DD_Rights" Name="DD_Rights.dll" Source="E:\SchreiberM\Visual Studio\GIT\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll" KeyPath="no" />
</Component>
<!-- DD Bibliotheken -->
<Component Id="BasicLibs" Guid="37238CB0-6DC3-4B1B-9438-52FA7D478897">