Index: TAOR rework/TAOR rework/Configuraties/config text mappers/ConfigsTextMapper.vb
===================================================================
diff -u -r2410 -r2413
--- TAOR rework/TAOR rework/Configuraties/config text mappers/ConfigsTextMapper.vb (.../ConfigsTextMapper.vb) (revision 2410)
+++ TAOR rework/TAOR rework/Configuraties/config text mappers/ConfigsTextMapper.vb (.../ConfigsTextMapper.vb) (revision 2413)
@@ -67,11 +67,6 @@
file.WriteLine("%VOORBEELD")
file.WriteLine("%PRINTER Tigerstop | Tigerstop")
file.WriteLine()
- file.WriteLine("%ETIKETPRINTER, INSTELLEN WINDOWS PRINTER")
- file.WriteLine("%Naam van Printer volgens Windows")
- file.WriteLine("%VOORBEELD")
- file.WriteLine("%ETIKETPRINTER Microsoft Print to PDF")
- file.WriteLine()
file.WriteLine("%BACKLOGPATHPRINTER CONFIG, voor kiezen van de folder waar de bestanden die afgedrukt worden naar worden gebackupped")
file.WriteLine("%VOORBEELD")
file.WriteLine("%BACKLOGPATHPRINTER \\NOTES01\Shared\Multi media\TAOR rework\Printer_backlog")
Index: TAOR rework/TAOR rework/Rework/PrinterBacklogDocMapper.vb
===================================================================
diff -u -r1869 -r2413
--- TAOR rework/TAOR rework/Rework/PrinterBacklogDocMapper.vb (.../PrinterBacklogDocMapper.vb) (revision 1869)
+++ TAOR rework/TAOR rework/Rework/PrinterBacklogDocMapper.vb (.../PrinterBacklogDocMapper.vb) (revision 2413)
@@ -1,6 +1,4 @@
Imports System.IO
-Imports System.Runtime.InteropServices
-Imports Microsoft.Office.Interop
Imports Microsoft.Office.Interop.Word
@@ -9,6 +7,7 @@
Public Sub addPrinterBacklogDoc(trayNummer As Integer, text As String, isSpecial As Boolean)
Dim bestandsPath As String = Configs.printerBacklogPath
Dim trayNummerTekst As String = trayNummer.ToString
+
'vullen met nullen
For index = 1 To 4 - trayNummerTekst.Length
trayNummerTekst = "0" & trayNummerTekst
@@ -18,31 +17,13 @@
If isSpecial Then
bestandsnaam &= "_Special"
End If
- Dim fullPath As String = Path.Combine(bestandsPath, bestandsnaam)
- Dim oWord As Object
- Dim oDoc As Object
+
+ Dim fullPath As String = Path.Combine(bestandsPath, bestandsnaam & ".txt")
Try
- oWord = CreateObject("Word.Application")
- oDoc = New Word.Document
+ File.WriteAllText(fullPath, text)
Catch ex As Exception
- Throw New Exception("Print backlog kon niet worden aangemaakt, omdat Word niet is geïnstalleerd")
+ Throw New Exception("Print backlog kon niet worden aangemaakt: " & ex.Message)
End Try
- Try
-
- Dim oPara1 As Paragraph = oDoc.Content.Paragraphs.Add
- oPara1.Range.Font.Name = "Courier New"
- oPara1.Range.Font.Bold = False
- oPara1.Range.Font.Size = 13
- oPara1.Range.Text = text
-
- oDoc.SaveAs2(fullPath)
- Dim save_changes As Object = False
- oDoc.Close(save_changes)
- oWord.Quit(save_changes)
-
- Catch ex As Exception
- Throw New Exception("Print backlog kon niet worden aangemaakt" & vbNewLine & ex.Message)
- End Try
End Sub
End Module
\ No newline at end of file
Index: TAOR rework/TAOR rework/TAOR rework.vbproj
===================================================================
diff -u -r2408 -r2413
--- TAOR rework/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 2408)
+++ TAOR rework/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 2413)
@@ -17,7 +17,7 @@
false
- \\NOTES01\Shared\Multi media\TAOR rework\
+ \\NOTES01\Shared\Multi media\TAOR rework\Test\
true
Unc
true
@@ -32,8 +32,8 @@
true
publish.htm
false
- 5
- 7.18.0.%2a
+ 1
+ 7.19.0.%2a
false
true
true
Index: TAOR rework/TAOR rework/controllers/Domeincontroller.vb
===================================================================
diff -u -r2174 -r2413
--- TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 2174)
+++ TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 2413)
@@ -1,8 +1,4 @@
-Imports System.Runtime.Remoting.Messaging
-Imports TA_OR_rework
-Imports TA_OR_rework.SpecialLadenRepository
-
-Public Class Domeincontroller
+Public Class Domeincontroller
Private Shared instance As Domeincontroller
Private reworkRep As ReworkRepository
Private reworkTrayslotRep As ReworkTraySlotRepository
@@ -250,9 +246,9 @@
(type.Equals("L") And anderType.Equals("R")) Or (type.Equals("R") And anderType.Equals("L")) Or
(type.Equals("C") And anderType.Equals("D")) Or (type.Equals("D") And anderType.Equals("C")) Or
(type.Equals("E") And anderType.Equals("F")) Or (type.Equals("F") And anderType.Equals("E")) Or
- (type.Equals("X") And anderType.Equals("Y")) Or (type.Equals("Y") And anderType.Equals("X")) Or
+ (type.Equals("X") And anderType.Equals("Y")) Or (type.Equals("Y") And anderType.Equals("X")) Or
(type.Equals("G") And anderType.Equals("H")) Or (type.Equals("H") And anderType.Equals("G")) Or
- (type.Equals("M") And anderType.Equals("N")) Or (type.Equals("N") And anderType.Equals("M")) Or
+ (type.Equals("M") And anderType.Equals("N")) Or (type.Equals("N") And anderType.Equals("M")) Or
(type.Equals("A") And anderType.Equals("A")) Or
(type.Equals("B") And anderType.Equals("B")) Or
(type.Equals("L") And anderType.Equals("L")) Or
@@ -264,9 +260,9 @@
(type.Equals("X") And anderType.Equals("X")) Or
(type.Equals("Y") And anderType.Equals("Y")) Or
(type.Equals("G") And anderType.Equals("G")) Or
- (type.Equals("H") And anderType.Equals("H")) Or
- (type.Equals("M") And anderType.Equals("M")) Or
- (type.Equals("N") And anderType.Equals("N"))then
+ (type.Equals("H") And anderType.Equals("H")) Or
+ (type.Equals("M") And anderType.Equals("M")) Or
+ (type.Equals("N") And anderType.Equals("N")) Then
Dim paar(1) As Rework
paar(0) = gesplitsteReworksBatchEnDossier(0)
paar(1) = mogelijkZelfdeType
Index: TAOR rework/TAOR rework/Configuraties/Configs.vb
===================================================================
diff -u -r2410 -r2413
--- TAOR rework/TAOR rework/Configuraties/Configs.vb (.../Configs.vb) (revision 2410)
+++ TAOR rework/TAOR rework/Configuraties/Configs.vb (.../Configs.vb) (revision 2413)
@@ -27,7 +27,6 @@
laadOnderdelen()
laadArdisPath()
laadBartenderConfigs()
- laadEtiketPrinterNaam()
laadPrinterBacklogPath()
laadHelpPDFPath()
laadOnderdelenKleuren()
@@ -220,33 +219,6 @@
#End Region
-#Region "Etiket printer"
-
- Private _etiketPrinterNaam As String
-
- Private Sub laadEtiketPrinterNaam()
-
- For teller As Integer = 0 To _algemeneConfigs.Count - 1
- Dim lijn As String = _algemeneConfigs(teller)
-
- If lijn.ToLower.StartsWith("etiketprinter") Then
- _etiketPrinterNaam = lijn.Replace("etiketprinter", "").Replace("ETIKETPRINTER", "").Trim
- _algemeneConfigs.RemoveAt(teller)
- Exit For
- End If
- Next
-
- If _etiketPrinterNaam Is Nothing OrElse _etiketPrinterNaam.Equals("") Then
- Throw New Exception("EtiketPrinter is niet geconfigureerd.")
- End If
- End Sub
-
- Public Function geefEtiketPrinterNaam() As String
- Return _etiketPrinterNaam
- End Function
-
-#End Region
-
#Region "printerbacklog locatie"
Private _printerBacklogPath As String
Index: TAOR rework/TAOR rework/TAOR rework.vbproj.user
===================================================================
diff -u -r1964 -r2413
--- TAOR rework/TAOR rework/TAOR rework.vbproj.user (.../TAOR rework.vbproj.user) (revision 1964)
+++ TAOR rework/TAOR rework/TAOR rework.vbproj.user (.../TAOR rework.vbproj.user) (revision 2413)
@@ -1,7 +1,7 @@
- \\NOTES01\Shared\Multi media\TAOR rework\|\\NOTES01\Shared\Multi media\TAOR rework\beta\|G:\Multi media\|G:\Multi media\TAOR rework\beta\|r je\
+ \\NOTES01\Shared\Multi media\TAOR rework\Test\|\\NOTES01\Shared\Multi media\TAOR rework\|\\NOTES01\Shared\Multi media\TAOR rework\beta\|G:\Multi media\|G:\Multi media\TAOR rework\beta\
Index: TAOR rework/TAOR rework/formulieren/FormReworkTrayPrinter.vb
===================================================================
diff -u -r2412 -r2413
--- TAOR rework/TAOR rework/formulieren/FormReworkTrayPrinter.vb (.../FormReworkTrayPrinter.vb) (revision 2412)
+++ TAOR rework/TAOR rework/formulieren/FormReworkTrayPrinter.vb (.../FormReworkTrayPrinter.vb) (revision 2413)
@@ -37,7 +37,7 @@
Dim message As String = "Printers beschikbaar op dit systeem: " & String.Join(", ", availablePrinters)
LogBestandTextMapper.WriteToFile("Printer", message, False)
- Dim defaultPrinter As String = Configs.geefEtiketPrinterNaam()
+ Dim defaultPrinter As String = PrintDocument.PrinterSettings.PrinterName
If Not availablePrinters.Contains(defaultPrinter) Then
MessageBox.Show("De ingestelde printer '" & defaultPrinter & "' is niet gevonden." & vbCrLf & "Selecteer de printer om op af te drukken.",
@@ -58,7 +58,6 @@
End If
End If
-
Catch ex As Exception
MessageBox.Show(ex.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error)
End Try
@@ -172,6 +171,7 @@
vulTextboxMetReworkTray()
Else
verwerkDeItems()
+
If Configs.geefVerwerkStatus Then
Try
opslaanBacklog()
@@ -217,6 +217,7 @@
Private Sub opslaanBacklog()
'alle trays overlopen en builder opnieuw vullen
+ LogBestandTextMapper.WriteToFile("Backlog", "backlogdocumenten opslaan", False)
For _nummerTray = 1 To _aantalTrays
vulBuilderMetInfo()
@@ -234,6 +235,7 @@
End If
Next
+ LogBestandTextMapper.WriteToFile("Backlog", "backlogdocumenten opslaan", True)
End Sub
#Region "tonen"