diff --git a/FWCreateCalendar/FWCreateCalendar.vbproj b/FWCreateCalendar/FWCreateCalendar.vbproj index 14a3bc5..ecc3ede 100644 --- a/FWCreateCalendar/FWCreateCalendar.vbproj +++ b/FWCreateCalendar/FWCreateCalendar.vbproj @@ -182,7 +182,10 @@ - + + + + MyApplicationCodeGenerator Application.Designer.vb diff --git a/FWCreateCalendar/Feuerwehr 2019.xlsx b/FWCreateCalendar/_Docs/2019_Dienstplan.xlsx similarity index 100% rename from FWCreateCalendar/Feuerwehr 2019.xlsx rename to FWCreateCalendar/_Docs/2019_Dienstplan.xlsx diff --git a/FWCreateCalendar/_Docs/2022_Dienstplan_FFWeitefeld_V1.0.xlsx b/FWCreateCalendar/_Docs/2022_Dienstplan_FFWeitefeld_V1.0.xlsx new file mode 100644 index 0000000..9a83379 Binary files /dev/null and b/FWCreateCalendar/_Docs/2022_Dienstplan_FFWeitefeld_V1.0.xlsx differ diff --git a/FWCreateCalendar/_Docs/2023_Dienstplan_FFWeitefeld.xlsx b/FWCreateCalendar/_Docs/2023_Dienstplan_FFWeitefeld.xlsx new file mode 100644 index 0000000..eac26d2 Binary files /dev/null and b/FWCreateCalendar/_Docs/2023_Dienstplan_FFWeitefeld.xlsx differ diff --git a/FWCreateCalendar/_Docs/2024_Dienstplan_FFWeitefeld.xlsx b/FWCreateCalendar/_Docs/2024_Dienstplan_FFWeitefeld.xlsx new file mode 100644 index 0000000..28d2555 Binary files /dev/null and b/FWCreateCalendar/_Docs/2024_Dienstplan_FFWeitefeld.xlsx differ diff --git a/FWCreateCalendar/frmMain.Designer.vb b/FWCreateCalendar/frmMain.Designer.vb index 330e463..2979f2e 100644 --- a/FWCreateCalendar/frmMain.Designer.vb +++ b/FWCreateCalendar/frmMain.Designer.vb @@ -121,7 +121,7 @@ Partial Class frmMain 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnOpenFile, Me.btnCategories, Me.btnExport, Me.SwitchToDayViewItem1, Me.SwitchToWorkWeekViewItem1, Me.SwitchToWeekViewItem1, Me.SwitchToFullWeekViewItem1, Me.SwitchToMonthViewItem1, Me.SwitchToTimelineViewItem1, Me.SwitchToGanttViewItem1, Me.SwitchToAgendaViewItem1, Me.SwitchToYearViewItem1, Me.SwitchTimeScalesItem1, Me.ChangeScaleWidthItem1, Me.SwitchTimeScalesCaptionItem1, Me.SwitchCompressWeekendItem1, Me.SwitchShowWorkTimeOnlyItem1, Me.SwitchCellsAutoHeightItem1, Me.ChangeSnapToCellsUIItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.btnOpenFile, Me.btnCategories, Me.btnExport, Me.SwitchToDayViewItem1, Me.SwitchToWorkWeekViewItem1, Me.SwitchToWeekViewItem1, Me.SwitchToFullWeekViewItem1, Me.SwitchToMonthViewItem1, Me.SwitchToTimelineViewItem1, Me.SwitchToGanttViewItem1, Me.SwitchToAgendaViewItem1, Me.SwitchToYearViewItem1, Me.SwitchTimeScalesItem1, Me.ChangeScaleWidthItem1, Me.SwitchTimeScalesCaptionItem1, Me.SwitchCompressWeekendItem1, Me.SwitchShowWorkTimeOnlyItem1, Me.SwitchCellsAutoHeightItem1, Me.ChangeSnapToCellsUIItem1}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 31) Me.RibbonControl1.MaxItemId = 20 Me.RibbonControl1.Name = "RibbonControl1" @@ -321,7 +321,7 @@ Partial Class frmMain ' Me.tpCalendar.Controls.Add(Me.sched) Me.tpCalendar.Name = "tpCalendar" - Me.tpCalendar.Size = New System.Drawing.Size(650, 521) + Me.tpCalendar.Size = New System.Drawing.Size(650, 517) Me.tpCalendar.Text = "Kalender" ' 'sched @@ -332,7 +332,8 @@ Partial Class frmMain Me.sched.Location = New System.Drawing.Point(0, 0) Me.sched.MenuManager = Me.RibbonControl1 Me.sched.Name = "sched" - Me.sched.Size = New System.Drawing.Size(650, 521) + Me.sched.OptionsBehavior.ClientTimeZoneId = "UTC" + Me.sched.Size = New System.Drawing.Size(650, 517) Me.sched.Start = New Date(2021, 12, 27, 0, 0, 0, 0) Me.sched.TabIndex = 0 Me.sched.Text = "SchedulerControl1" @@ -352,17 +353,18 @@ Partial Class frmMain ' ' ' - Me.schedStorage.Appointments.Labels.CreateNewLabel(0, "Keine", "&Keine", System.Drawing.SystemColors.Window) - Me.schedStorage.Appointments.Labels.CreateNewLabel(1, "Wichtig", "W&ichtig", System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(194, Byte), Integer), CType(CType(190, Byte), Integer))) - Me.schedStorage.Appointments.Labels.CreateNewLabel(2, "Geschäftlich", "&Geschäftlich", System.Drawing.Color.FromArgb(CType(CType(168, Byte), Integer), CType(CType(213, Byte), Integer), CType(CType(255, Byte), Integer))) - Me.schedStorage.Appointments.Labels.CreateNewLabel(3, "Persönliche", "&Privat", System.Drawing.Color.FromArgb(CType(CType(193, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(156, Byte), Integer))) - Me.schedStorage.Appointments.Labels.CreateNewLabel(4, "Urlaub", "&Urlaub", System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(228, Byte), Integer), CType(CType(199, Byte), Integer))) - Me.schedStorage.Appointments.Labels.CreateNewLabel(5, "Teilnahme erforderlich", "Teiln&ahme erforderlich", System.Drawing.Color.FromArgb(CType(CType(244, Byte), Integer), CType(CType(206, Byte), Integer), CType(CType(147, Byte), Integer))) - Me.schedStorage.Appointments.Labels.CreateNewLabel(6, "Anreise einplanen", "&Anreise notwendig", System.Drawing.Color.FromArgb(CType(CType(199, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(255, Byte), Integer))) - Me.schedStorage.Appointments.Labels.CreateNewLabel(7, "Vorbereitung notwendig", "Vorbereitung ¬wendig", System.Drawing.Color.FromArgb(CType(CType(207, Byte), Integer), CType(CType(219, Byte), Integer), CType(CType(152, Byte), Integer))) - Me.schedStorage.Appointments.Labels.CreateNewLabel(8, "Geburtstag", "Ge&burtstag", System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(207, Byte), Integer), CType(CType(233, Byte), Integer))) - Me.schedStorage.Appointments.Labels.CreateNewLabel(9, "Jahrestag", "J&ahrestag", System.Drawing.Color.FromArgb(CType(CType(141, Byte), Integer), CType(CType(233, Byte), Integer), CType(CType(223, Byte), Integer))) - Me.schedStorage.Appointments.Labels.CreateNewLabel(10, "Telefonanruf", "&Telefonanruf", System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(247, Byte), Integer), CType(CType(165, Byte), Integer))) + Me.schedStorage.Appointments.Labels.CreateNewLabel(0, "None", "&None", System.Drawing.SystemColors.Window) + Me.schedStorage.Appointments.Labels.CreateNewLabel(1, "Important", "&Important", System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(194, Byte), Integer), CType(CType(190, Byte), Integer))) + Me.schedStorage.Appointments.Labels.CreateNewLabel(2, "Business", "&Business", System.Drawing.Color.FromArgb(CType(CType(168, Byte), Integer), CType(CType(213, Byte), Integer), CType(CType(255, Byte), Integer))) + Me.schedStorage.Appointments.Labels.CreateNewLabel(3, "Personal", "&Personal", System.Drawing.Color.FromArgb(CType(CType(193, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(156, Byte), Integer))) + Me.schedStorage.Appointments.Labels.CreateNewLabel(4, "Vacation", "&Vacation", System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(228, Byte), Integer), CType(CType(199, Byte), Integer))) + Me.schedStorage.Appointments.Labels.CreateNewLabel(5, "Must Attend", "Must &Attend", System.Drawing.Color.FromArgb(CType(CType(244, Byte), Integer), CType(CType(206, Byte), Integer), CType(CType(147, Byte), Integer))) + Me.schedStorage.Appointments.Labels.CreateNewLabel(6, "Travel Required", "&Travel Required", System.Drawing.Color.FromArgb(CType(CType(199, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(255, Byte), Integer))) + Me.schedStorage.Appointments.Labels.CreateNewLabel(7, "Needs Preparation", "&Needs Preparation", System.Drawing.Color.FromArgb(CType(CType(207, Byte), Integer), CType(CType(219, Byte), Integer), CType(CType(152, Byte), Integer))) + Me.schedStorage.Appointments.Labels.CreateNewLabel(8, "Birthday", "&Birthday", System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(207, Byte), Integer), CType(CType(233, Byte), Integer))) + Me.schedStorage.Appointments.Labels.CreateNewLabel(9, "Anniversary", "&Anniversary", System.Drawing.Color.FromArgb(CType(CType(141, Byte), Integer), CType(CType(233, Byte), Integer), CType(CType(223, Byte), Integer))) + Me.schedStorage.Appointments.Labels.CreateNewLabel(10, "Phone Call", "Phone &Call", System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(247, Byte), Integer), CType(CType(165, Byte), Integer))) + Me.schedStorage.TimeZoneId = "UTC" ' 'SFD ' diff --git a/FWCreateCalendar/frmMain.vb b/FWCreateCalendar/frmMain.vb index f63fbbb..f935e3c 100644 --- a/FWCreateCalendar/frmMain.vb +++ b/FWCreateCalendar/frmMain.vb @@ -1,4 +1,5 @@ Option Strict On +Imports System.Globalization Imports System.IO Imports DevExpress.Data Imports DevExpress.Spreadsheet @@ -126,6 +127,8 @@ Public Class frmMain xlBlatt = CType(xlMappe.Worksheets(1), Excel.Worksheet) Dim Events As New List(Of EventEntry) Dim ev As EventEntry + 'Dim culture = CultureInfo.CreateSpecificCulture("de-DE") + Dim headerfound As Boolean Dim HeaderRow As Integer @@ -255,6 +258,8 @@ Public Class frmMain End Sub Private Sub Exporter_AppointmentExporting(sender As Object, e As AppointmentExportingEventArgs) + 'e.Appointment.TimeZoneId = sched.OptionsBehavior.ClientTimeZoneId + 'e.Appointment.TimeZoneId = "Europe/Berlin" If CType(e.Appointment.GetSourceObject(schedStorage), EventEntry).Exclude OrElse CType(e.Appointment.GetSourceObject(schedStorage), EventEntry).IsInvalid Then e.Cancel = True End If