From 8b8c0b8e3b04e16b137ac3fe7fa5d26aab16d3e2 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 17 Oct 2023 15:24:16 +0200 Subject: [PATCH 1/8] Essensbestellungen, Firma wird nun mitangegeben --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/UsrCntlEssensbestellungen.vb | 3 +++ Aviso/frmEssensbestellungenAdministration.vb | 13 ++++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index d788b69..913a780 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/UsrCntlEssensbestellungen.vb b/Aviso/UsrCntlEssensbestellungen.vb index f19116f..f09b309 100644 --- a/Aviso/UsrCntlEssensbestellungen.vb +++ b/Aviso/UsrCntlEssensbestellungen.vb @@ -256,6 +256,8 @@ Public Class UsrCntlessensbestellungen Exit Sub End If + Dim mitarbeiter As New cMitarbeiter(cbxMitarbeiter._value) + essen = New cEssensbestellung(cbxMenu._value, cbxMitarbeiter._value, cbxGebäude._value, cbxAbteilung._value, cbxMitarbeiter.Text, txtAnmerkung.Text) @@ -357,6 +359,7 @@ Public Class UsrCntlessensbestellungen essen.eb_datum = CDate(dt.Rows(0).Item("MenuDateVon")) essen.eb_gebaeude = cbxGebäude._value + essen.eb_firma = mitarbeiter.getFirma If CheckBox1.Checked = False Then essen.eb_abgerechnet = False diff --git a/Aviso/frmEssensbestellungenAdministration.vb b/Aviso/frmEssensbestellungenAdministration.vb index fe95109..fe48b04 100644 --- a/Aviso/frmEssensbestellungenAdministration.vb +++ b/Aviso/frmEssensbestellungenAdministration.vb @@ -43,7 +43,7 @@ Public Class frmEssensbestellungenAdministration Private Sub loadBestellungen() - Dim SQLString As String = "SELECT [eb_mitid] , [eb_mitname] , [eb_kw] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch], + Dim SQLString As String = "SELECT [eb_mitid] , [eb_mitname] ,[eb_firma] , [eb_kw] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch], [eb_donnerstag] ,[eb_freitag],[eb_datum],[eb_preis], [eb_anmerkung],[eb_storniert],[eb_storniert_am],[eb_abgerechnet],[eb_abgerechnet_am], [eb_gesendet], [eb_gesendet_am] FROM [tblEssensbestellungen] WHERE 1=1" @@ -66,6 +66,8 @@ Public Class frmEssensbestellungenAdministration .Columns("eb_mitname").HeaderText = "Mitarbeiter" .Columns("eb_mitname").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("eb_abteilung").Visible = False + .Columns("eb_firma").Width = 80 + .Columns("eb_firma").HeaderText = "Firma" .Columns("eb_datum").Width = 80 .Columns("eb_datum").HeaderText = "Datum" .Columns("eb_montag").Width = 80 @@ -447,7 +449,7 @@ Public Class frmEssensbestellungenAdministration Dim TextHTMLtable = "" TextHTMLtable &= "" - TextHTMLtable &= "" + TextHTMLtable &= "" If sender.Text = "Email" Then @@ -469,6 +471,7 @@ Public Class frmEssensbestellungenAdministration TextHTMLtable &= "" TextHTMLtable &= "" TextHTMLtable &= "" + TextHTMLtable &= "" TextHTMLtable &= "" If row("ID") <> 0 Then @@ -499,6 +502,7 @@ Public Class frmEssensbestellungenAdministration TextHTMLtable &= "" TextHTMLtable &= "" TextHTMLtable &= "" + TextHTMLtable &= "" TextHTMLtable &= "" Next @@ -614,7 +618,7 @@ Public Class frmEssensbestellungenAdministration ''LEFT([eb_kw],5) Dim SQLStringBEstellungen As String = "SELECT [eb_mitname] as Name ,[eb_mitid] as ID , [eb_kw] as KW , [eb_gebaeude] as Gebaeude ,[eb_abteilung] as Abteilung ,[eb_montag] As Montag ,[eb_dienstag] As Dienstag,[eb_mittwoch] As Mittwoch, - [eb_donnerstag] As Donnerstag , [eb_freitag] As Freitag, [eb_anmerkung] As Anmerkung , [eb_datum] As Datum , [eb_storniert] as Storniert + [eb_donnerstag] As Donnerstag , [eb_freitag] As Freitag, [eb_anmerkung] As Anmerkung , [eb_datum] As Datum , [eb_storniert] as Storniert, [eb_firma] as Firma FROM [tblEssensbestellungen] WHERE eb_kw = '" & cbxMailKW._value & "' AND eb_gebaeude = '" & cbxMailGebäude._value & "' AND ISNULL(eb_storniert,1)=0 Order by eb_datum" @@ -704,6 +708,7 @@ Public Class frmEssensbestellungenAdministration R("Anmerkung") = DBNull.Value R("Datum") = DBNull.Value R("Storniert") = DBNull.Value + R("Firma") = DBNull.Value R("Montag") = String.Join(" ", resultMontag) R("Dienstag") = String.Join(" ", resultDienstag) R("Mittwoch") = String.Join(" ", resultMittwoch) @@ -858,6 +863,7 @@ Public Class frmEssensbestellungenAdministration drFirst.Item("eb_gebaeude") = " " drFirst.Item("eb_abteilung") = " " drFirst.Item("eb_preis") = 0 + drFirst.Item("eb_firma") = " " dt.Rows.InsertAt(drFirst, 0) @@ -868,6 +874,7 @@ Public Class frmEssensbestellungenAdministration drLast.Item("eb_gebaeude") = " " drLast.Item("eb_abteilung") = " " drLast.Item("eb_preis") = txtMarkierteDS.Text.Replace("€", "") + drLast.Item("eb_firma") = " " dt.Rows.InsertAt(drLast, dt.Rows.Count) dt.Columns.Remove("eb_mitid") From e411886523d3d5100ed77eba8096b9dc89518843 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 18 Oct 2023 09:39:50 +0200 Subject: [PATCH 2/8] =?UTF-8?q?ATEZ=20=C3=84nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aviso/frmATEZ_NCTS.Designer.vb | 12 +++++++++ Aviso/frmATEZ_NCTS.vb | 46 +++++++++++++++++++++++++--------- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/Aviso/frmATEZ_NCTS.Designer.vb b/Aviso/frmATEZ_NCTS.Designer.vb index 43a04ba..d02d3a0 100644 --- a/Aviso/frmATEZ_NCTS.Designer.vb +++ b/Aviso/frmATEZ_NCTS.Designer.vb @@ -73,6 +73,7 @@ Partial Class frmATEZ_NCTS Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.lblAnh = New System.Windows.Forms.Label() + Me.Button3 = New System.Windows.Forms.Button() Me.pnlHead.SuspendLayout() CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -97,6 +98,7 @@ Partial Class frmATEZ_NCTS ' Me.pnlHead.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnlHead.BackColor = System.Drawing.Color.White + Me.pnlHead.Controls.Add(Me.Button3) Me.pnlHead.Controls.Add(Me.Label2) Me.pnlHead.Controls.Add(Me.cboProzedur) Me.pnlHead.Controls.Add(Me.lblInfo) @@ -959,6 +961,15 @@ Partial Class frmATEZ_NCTS Me.lblAnh.TabIndex = 151 Me.lblAnh.Visible = False ' + 'Button3 + ' + Me.Button3.Location = New System.Drawing.Point(470, 575) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(111, 23) + Me.Button3.TabIndex = 152 + Me.Button3.Text = "alle Anh. selekt." + Me.Button3.UseVisualStyleBackColor = True + ' 'frmATEZ_NCTS ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1028,4 +1039,5 @@ Partial Class frmATEZ_NCTS Friend WithEvents Label2 As Label Friend WithEvents cboProzedur As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents lblAnh As Label + Friend WithEvents Button3 As Button End Class diff --git a/Aviso/frmATEZ_NCTS.vb b/Aviso/frmATEZ_NCTS.vb index 7bd7741..1766d87 100644 --- a/Aviso/frmATEZ_NCTS.vb +++ b/Aviso/frmATEZ_NCTS.vb @@ -31,6 +31,7 @@ Public Class frmATEZ_NCTS Dim dgv As DataGridView = Nothing Dim atez_data As cATEZ_NCTS_DATA Dim atez = New cATEZ_NCTS_IN + Dim allSelected As Boolean = False Property BezugsNr As String = "" Property SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen @@ -203,13 +204,16 @@ Public Class frmATEZ_NCTS Return atezData.SAVE End If - If Not atez.setJsonPDF(atezData, dgvAnhaenge) Then - MsgBox("Fehler beim Erstellen der PDF-Daten!" & vbNewLine & "Vorgang abgebrochen!") - atezData.status = "Failure" - atezData.fehlerbeschreibung = "Fehler beim Erstellen der PDF-Daten!" - Return atezData.SAVE + If checkAttachment() Then + If Not atez.setJsonPDF(atezData, dgvAnhaenge) Then + MsgBox("Fehler beim Erstellen der PDF-Daten!" & vbNewLine & "Vorgang abgebrochen!") + atezData.status = "Failure" + atezData.fehlerbeschreibung = "Fehler beim Erstellen der PDF-Daten!" + Return atezData.SAVE + End If End If + Dim azetId = atez.SendRequestWithAuthHeader("application/json", failreDesc) If failreDesc <> "" Then @@ -307,6 +311,7 @@ Public Class frmATEZ_NCTS End Select initSeachboxes() + lblAnh.Visible = True @@ -616,11 +621,11 @@ Public Class frmATEZ_NCTS Next - If Not selectedDocuments Then - lblInfo.Text = "kein Anhang selektiert" - Cursor = Cursors.Default - Return selectedDocuments - End If + 'If Not selectedDocuments Then + ' lblInfo.Text = "kein Anhang selektiert" + ' Cursor = Cursors.Default + ' Return selectedDocuments + 'End If Return selectedDocuments @@ -745,12 +750,12 @@ Public Class frmATEZ_NCTS If dgvAnhaenge.Columns(e.ColumnIndex).Name = "anh_selekt" Then If Not IsDBNull(dgvAnhaenge.CurrentRow.Cells("anh_selekt").Value) AndAlso dgvAnhaenge.CurrentRow.Cells("anh_selekt").Value = True Then - countAnh += dgvAnhaenge.CurrentRow.Cells("anh_size").Value + countAnh += IIf(dgvAnhaenge.CurrentRow.Cells("anh_size").Value IsNot DBNull.Value, dgvAnhaenge.CurrentRow.Cells("anh_size").Value, 0) End If For Each Row As DataGridViewRow In dgvAnhaenge.Rows If Row.Cells("anh_selekt").Value IsNot DBNull.Value AndAlso Row.Cells("anh_selekt").Value = True AndAlso Row.Cells("anh_size").Value IsNot DBNull.Value Then - countAnh += Row.Cells("anh_size").Value + countAnh += IIf(Row.Cells("anh_size").Value IsNot DBNull.Value, Row.Cells("anh_size").Value, 0) End If Next @@ -763,4 +768,21 @@ Public Class frmATEZ_NCTS End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + If dgvAnhaenge.RowCount > 0 Then + Dim countAnh As Double = 0 + For Each Row As DataGridViewRow In dgvAnhaenge.Rows + If allSelected Then + Row.Cells("anh_selekt").Value = True + countAnh += IIf(Row.Cells("anh_size").Value IsNot DBNull.Value, Row.Cells("anh_size").Value, 0) + Else + Row.Cells("anh_selekt").Value = False + countAnh = 0 + End If + Next + allSelected = Not allSelected + lblAnh.Text = "Anhang in MB: " & countAnh.ToString + End If + End Sub End Class \ No newline at end of file From fabc65f628e45d97b9d1a0e704dc4e44576a9ba6 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 20 Oct 2023 14:35:53 +0200 Subject: [PATCH 3/8] commit_AVISO --- Aviso.sln | 42 ++-------------------- Aviso/Aviso.vbproj | 14 ++++---- Gemeinsames/Gemeinsames.vbproj | 8 ++--- Gemeinsames/rptSendungen.vb | 2 -- Gemeinsames/subRptSendungenATA.vb | 1 + Gemeinsames/subRptSendungenZollpruefung.vb | 1 + VERAG_TELEINFO/VERAG_TELEINFO.vbproj | 4 --- 7 files changed, 15 insertions(+), 57 deletions(-) diff --git a/Aviso.sln b/Aviso.sln index 9235345..b25c30d 100644 --- a/Aviso.sln +++ b/Aviso.sln @@ -19,12 +19,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AVISO_INFO", "AVISO_INFO\AV EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "NCTSPartnerWorker", "..\..\ADMIN\ADMIN\cNCTSPartnerWorker\NCTSPartnerWorker.vbproj", "{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AVISO_CHECKIN", "AVISO_CHECKIN\AVISO_CHECKIN.vbproj", "{CB95CC0E-D73A-4D11-9FF8-197A392D831F}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_TELEINFO", "VERAG_TELEINFO\VERAG_TELEINFO.vbproj", "{5193A729-058C-4C93-B7D3-0A228CA719CC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlathosysApiWrapper", "..\..\..\SCHNITTSTELLEN\PLATHOSYS\WRAPPER\PlathosysApiWrapper-master\PlathosysApiWrapper-master\PlathosysApiWrapper\PlathosysApiWrapper.csproj", "{A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sipdotnet", "..\..\dll\Linphone\WRAPPER\sipdotnet-master\sipdotnet-master\sipdotnet.csproj", "{BCB250F8-F74C-4768-8833-0F13FC8659B8}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bria_API_CSharp_SampleApp_3.0", "..\..\dll\BRIA\Bria_API_CSharp_SampleApp_3-main\Bria_API_CSharp_SampleApp_3-main\Bria_API_SampleApp_Phone\Bria_API_CSharp_SampleApp_3.0.csproj", "{1F68E194-88A8-47F2-B9F9-20E092EFA30A}" @@ -76,8 +72,8 @@ Global {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Release|x86.ActiveCfg = Release|x86 {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Release|x86.Build.0 = Release|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.ActiveCfg = Debug|x64 - {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x64 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.ActiveCfg = Debug|x64 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.Build.0 = Debug|x64 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x86.ActiveCfg = Debug|x86 @@ -136,7 +132,6 @@ Global {A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|x64.ActiveCfg = Debug|Any CPU - {A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|x64.Build.0 = Debug|Any CPU {A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|x86.ActiveCfg = Debug|Any CPU {A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|x86.Build.0 = Debug|Any CPU {A734141E-2C4E-4D70-81E8-A88184282AF5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -163,28 +158,11 @@ Global {2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|x64.Build.0 = Release|Any CPU {2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|x86.ActiveCfg = Release|Any CPU {2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|x86.Build.0 = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|x64.ActiveCfg = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|x64.Build.0 = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|x86.ActiveCfg = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|x86.Build.0 = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|Any CPU.Build.0 = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|x64.ActiveCfg = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|x64.Build.0 = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|x86.ActiveCfg = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|x86.Build.0 = Release|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|x64.ActiveCfg = Debug|Any CPU - {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|x64.Build.0 = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|x86.ActiveCfg = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|x86.Build.0 = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -195,22 +173,6 @@ Global {5193A729-058C-4C93-B7D3-0A228CA719CC}.Release|x64.Build.0 = Release|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Release|x86.ActiveCfg = Release|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Release|x86.Build.0 = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|x64.ActiveCfg = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|x64.Build.0 = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|x86.ActiveCfg = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|x86.Build.0 = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|Any CPU.Build.0 = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|x64.ActiveCfg = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|x64.Build.0 = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|x86.ActiveCfg = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|x86.Build.0 = Release|Any CPU {BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|Any CPU.Build.0 = Debug|Any CPU {BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index e3036ff..5d929da 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -80,10 +80,11 @@ My Project\app.manifest - C817B38BF41513AE566EFC65D0884C0F91F49E37 + 34D75D5089806BE69485715D014CE0611D10E677 - Aviso_1_TemporaryKey.pfx + + false @@ -92,7 +93,7 @@ LocalIntranet - false + true false @@ -141,6 +142,9 @@ ..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll + + ..\Gemeinsames\bin\Debug\Gemeinsames.dll + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.dll @@ -1475,10 +1479,6 @@ {289bcd77-bc00-4ba1-95ed-a79176d99525} SDL - - {110c923b-cb02-4fd0-af24-95e0f0eeeff5} - Gemeinsames - diff --git a/Gemeinsames/Gemeinsames.vbproj b/Gemeinsames/Gemeinsames.vbproj index 4158eac..6fb693e 100644 --- a/Gemeinsames/Gemeinsames.vbproj +++ b/Gemeinsames/Gemeinsames.vbproj @@ -123,10 +123,6 @@ - - False - ..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll - @@ -307,6 +303,10 @@ {50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f} DAKOSY_Worker_lib + + {a3b497bd-842c-4a2b-b398-ed1976849df1} + VERAG_PROG_ALLGEMEIN +
MitarbeiterMontagDienstagMittwochDonnerstagFreitagGebäudeAnmerkung
MitarbeiterMontagDienstagMittwochDonnerstagFreitagGebäudeAnmerkungFirma
" & row("Freitag") & "" & row("Gebaeude") & "" & row("Anmerkung") & "" & row("Firma") & "
" & row.Cells("eb_freitag").Value & "" & row.Cells("eb_gebaeude").Value & "" & row.Cells("eb_anmerkung").Value & "" & row.Cells("eb_firma").Value & "