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

MS

Browse Source
This commit is contained in:
Digital Data - Marlon Schreiber 2017-10-25 16:11:42 +02:00
parent dbe79d49ef
commit c10f43fe75
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD-Record-Organizer/DD-Record-Organizer.vbproj
View File

@ -180,7 +180,7 @@
</Reference> </Reference>
<Reference Include="Interop.WINDREAMLib"> <Reference Include="Interop.WINDREAMLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath> <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes> <EmbedInteropTypes>False</EmbedInteropTypes>
</Reference> </Reference>
<Reference Include="Interop.WMOBRWSLib"> <Reference Include="Interop.WMOBRWSLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll</HintPath> <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll</HintPath>

4
app/DD-Record-Organizer/frmConstructor_Main.vb
View File

@ -1104,6 +1104,9 @@ Public Class frmConstructor_Main
tslblFileslocked.Visible = True tslblFileslocked.Visible = True
Doc_ReadOnlyHandler(False) Doc_ReadOnlyHandler(False)
End If End If
If RIGHT_ADD_R = False Then
tsButtonAdd.Enabled = False
End If
Else Else
If DT_RIGHTS_GROUP.Rows.Count > 0 Or DT_RIGHTS_USER.Rows.Count > 0 Then If DT_RIGHTS_GROUP.Rows.Count > 0 Or DT_RIGHTS_USER.Rows.Count > 0 Then
'DATENSATZ-RECHTE 'DATENSATZ-RECHTE
@ -4225,6 +4228,7 @@ Public Class frmConstructor_Main
End If End If
Catch ex As Exception Catch ex As Exception
ClassLogger.Add("Unexpected Error in Drag_Drop: " & ex.Message) ClassLogger.Add("Unexpected Error in Drag_Drop: " & ex.Message)
MsgBox("Unexpected Error in DragDrop - Please check the log for further information!", MsgBoxStyle.Exclamation)
Finally Finally
End Try End Try

45
app/DD-Record-Organizer/frmWD_IndexFile.vb
View File

@ -46,32 +46,31 @@ Public Class frmWD_IndexFile
sw.Done() sw.Done()
sw = New SW("CheckFileExists") sw = New SW("CheckFileExists")
Dim existsonlyasMaster = False Dim existsonlyasMaster = False
If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer, True) = True Then If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer) = True Then
sw.Done() Dim msg = "Eine Datei mit identischem Namen existiert bereits! Wollen Sie die bestehende Datei ersetzen?"
If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer) = True Then If USER_LANGUAGE <> "de-DE" Then
ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", "FILE ALREADY EXISTED WITH NON-USER RIGHTS: " & CURRENT_NEWFILENAME) msg = "There is already a file with the same name! Would You like to replace the file?"
existsonlyasMaster = True
End If End If
If existsonlyasMaster = True Then Dim result As MsgBoxResult
CURRENT_NEWFILENAME = ClassHelper.Versionierung_Datei(CURRENT_NEWFILENAME) result = MessageBox.Show(msg, "File alredy exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", "NEW FILENAME: " & CURRENT_NEWFILENAME) If result = MsgBoxResult.Yes Then
If clsWD_SET.Delete_WDFile(CURRENT_NEWFILENAME.Substring(2)) = False Then
Return False
End If
Else Else
Dim msg = "Eine Datei mit identischem Namen existiert bereits! Wollen Sie die bestehende Datei ersetzen?" CURRENT_NEWFILENAME = ClassHelper.Versionierung_Datei(CURRENT_NEWFILENAME)
If USER_LANGUAGE <> "de-DE" Then End If
msg = "There is already a file with the same name! Would You like to replace the file?" Else
End If If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer, True) = True Then
ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", "FILE ALREADY EXISTED WITH NON-USER RIGHTS: " & CURRENT_NEWFILENAME)
Dim result As MsgBoxResult CURRENT_NEWFILENAME = ClassHelper.Versionierung_Datei(CURRENT_NEWFILENAME)
result = MessageBox.Show(msg, "File alredy exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) existsonlyasMaster = True
If result = MsgBoxResult.Yes Then Dim msg = "Eine Datei mit identischem Namen existiert bereits!" & vbNewLine & "Sie besitzen allerdings nicht die Rechte diese Datei zu bearbeiten." & vbNewLine & "Aus diesem Grund wird Ihre Datei versioniert!"
If clsWD_SET.Delete_WDFile(CURRENT_NEWFILENAME.Substring(2)) = False Then If USER_LANGUAGE <> "de-DE" Then
Return False msg = "There is already a file with the same name!" & vbNewLine & "But You do not own the rights to work it." & vbNewLine & "Therefore Your file will be versioned!"
End If End If
Else MsgBox(msg, MsgBoxStyle.Information)
CURRENT_NEWFILENAME = ClassHelper.Versionierung_Datei(CURRENT_NEWFILENAME)
End If
End If End If
End If End If
sw.Done() sw.Done()
'################################################################# '#################################################################