Skip to content

Commit 0d97683

Browse files
author
Ryosuke Uchiyama
committed
バージョン変更、UI微修正
1 parent 6f45515 commit 0d97683

3 files changed

Lines changed: 53 additions & 42 deletions

File tree

‎AutomaticReservation_UI/Common/WebDriverFactory.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ public static IWebDriver CreateInstance(AppSettings.BrowserName browserName)
2727
chromeDriverService.HideCommandPromptWindow = true;
2828
// ブラウザを非表示にする
2929
var chromeOptions = new ChromeOptions();
30-
//chromeOptions.AddArguments(new List<string>() { "headless", "lang=ja" });
31-
chromeOptions.AddArguments(new List<string>() { "lang=ja" });
30+
chromeOptions.AddArguments(new List<string>() { "headless", "lang=ja" });
3231
//chromeOptions.AddArguments(new List<string>() { "lang=ja" });
3332
return new ChromeDriver(chromeDriverService, chromeOptions);
3433

‎AutomaticReservation_UI/MainWindow.xaml‎

Lines changed: 50 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -74,47 +74,59 @@
7474
<ColumnDefinition Width="auto"/>
7575
</Grid.ColumnDefinitions>
7676
<Grid Grid.Column="0">
77-
<StackPanel Orientation="Horizontal">
78-
<ComboBox materialDesign:HintAssist.Hint="都道府県" ItemsSource="{Binding Path=ColPrefCode}" DisplayMemberPath="PrefName" SelectedItem="{Binding Path=SelectedPrefCode}" Margin="0,0,20,0"/>
79-
<ComboBox materialDesign:HintAssist.Hint="ホテル名" ItemsSource="{Binding Path=ColLimitedHotel}" DisplayMemberPath="HotelName" SelectedItem="{Binding Path=SelectedHotel}" Margin="0,0,20,0"/>
80-
<DatePicker x:Name="TargetDatePicker" Width="100" materialDesign:HintAssist.Hint="宿泊日" VerticalAlignment="Center">
81-
<DatePicker.SelectedDate>
82-
<Binding Path="CheckinDate" UpdateSourceTrigger="PropertyChanged">
83-
<Binding.ValidationRules>
84-
<domain:FutureDateValidationRule ValidatesOnTargetUpdated="True"/>
85-
</Binding.ValidationRules>
86-
</Binding>
87-
</DatePicker.SelectedDate>
88-
</DatePicker>
89-
<TextBlock Text="から1泊" Opacity="1.0" VerticalAlignment="Bottom" Margin="0,0,20,0"/>
90-
<ComboBox materialDesign:HintAssist.Hint="部屋タイプ" ItemsSource="{Binding Path=ColRoomType}" DisplayMemberPath="RoomTypeName" SelectedItem="{Binding Path=SelectedRoomType}" Margin="0,0,20,0"/>
91-
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding Path=StrictRoomType}" Margin="0,0,5,0"/>
92-
<TextBlock Text="厳密な部屋タイプ" VerticalAlignment="Center" Margin="0,0,20,0" ToolTip="部屋タイプで選択した部屋タイプに限定して予約を行います"/>
93-
<ComboBox materialDesign:HintAssist.Hint="チェックイン予定時刻" ItemsSource="{Binding Path=ColCheckinTime}" DisplayMemberPath="CheckinName" SelectedItem="{Binding Path=SelectedCheckinTime}" Margin="0,0,20,0"/>
94-
95-
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" IsChecked="{Binding Path=ChkNoSmoking}" Margin="0,0,10,0">
96-
禁煙
97-
</CheckBox>
98-
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" IsChecked="{Binding Path=ChkSmoking}" Margin="0,0,10,0">
99-
喫煙
100-
</CheckBox>
101-
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding Path=IsSmokingFirst}" Margin="0,0,5,0">
102-
<ToggleButton.IsEnabled>
103-
<MultiBinding Converter="{StaticResource BoolMultiConverter}">
104-
<Binding Path="ChkNoSmoking"/>
105-
<Binding Path="ChkSmoking"/>
106-
</MultiBinding>
107-
</ToggleButton.IsEnabled>
108-
</ToggleButton>
109-
<TextBlock Text="喫煙を優先" VerticalAlignment="Center" Margin="0,0,20,0" ToolTip="禁煙・喫煙両方にチェックが入っていた場合に喫煙を優先して検索します"/>
110-
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding Path=ChkAutoRetry}" Margin="0,0,5,0"/>
111-
<TextBlock Text="自動リトライ" VerticalAlignment="Center" Margin="0,0,20,0" ToolTip="復帰可能なエラーを検知し自動でリトライを行います"/>
112-
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding Path=ChkOverwrite}" Margin="0,0,5,0"/>
113-
<TextBlock Text="上書き" VerticalAlignment="Center" Margin="0,0,20,0" ToolTip="既に同一日で予約があった場合に上書きします"/>
77+
<StackPanel Orientation="Vertical">
78+
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
79+
<ComboBox materialDesign:HintAssist.Hint="都道府県" ItemsSource="{Binding Path=ColPrefCode}" DisplayMemberPath="PrefName" SelectedItem="{Binding Path=SelectedPrefCode}" Margin="0,0,20,0"/>
80+
<ComboBox materialDesign:HintAssist.Hint="ホテル名" ItemsSource="{Binding Path=ColLimitedHotel}" DisplayMemberPath="HotelName" SelectedItem="{Binding Path=SelectedHotel}" Margin="0,0,20,0"/>
81+
<DatePicker x:Name="TargetDatePicker" Width="100" materialDesign:HintAssist.Hint="宿泊日" VerticalAlignment="Center">
82+
<DatePicker.SelectedDate>
83+
<Binding Path="CheckinDate" UpdateSourceTrigger="PropertyChanged">
84+
<Binding.ValidationRules>
85+
<domain:FutureDateValidationRule ValidatesOnTargetUpdated="True"/>
86+
</Binding.ValidationRules>
87+
</Binding>
88+
</DatePicker.SelectedDate>
89+
</DatePicker>
90+
<TextBlock Text="から1泊" Opacity="1.0" VerticalAlignment="Bottom" Margin="0,0,20,0"/>
91+
<ComboBox materialDesign:HintAssist.Hint="チェックイン予定時刻" ItemsSource="{Binding Path=ColCheckinTime}" DisplayMemberPath="CheckinName" SelectedItem="{Binding Path=SelectedCheckinTime}" Margin="0,0,20,0"/>
92+
</StackPanel>
93+
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
94+
<ComboBox materialDesign:HintAssist.Hint="部屋タイプ" ItemsSource="{Binding Path=ColRoomType}" DisplayMemberPath="RoomTypeName" SelectedItem="{Binding Path=SelectedRoomType}" Margin="0,0,20,0"/>
95+
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" IsChecked="{Binding Path=ChkNoSmoking}" Margin="0,0,10,0">
96+
禁煙
97+
</CheckBox>
98+
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" IsChecked="{Binding Path=ChkSmoking}" Margin="0,0,10,0">
99+
喫煙
100+
</CheckBox>
101+
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding Path=IsSmokingFirst}" Margin="0,0,5,0">
102+
<ToggleButton.IsEnabled>
103+
<MultiBinding Converter="{StaticResource BoolMultiConverter}">
104+
<Binding Path="ChkNoSmoking"/>
105+
<Binding Path="ChkSmoking"/>
106+
</MultiBinding>
107+
</ToggleButton.IsEnabled>
108+
</ToggleButton>
109+
<TextBlock Text="喫煙を優先" VerticalAlignment="Center" Margin="0,0,20,0" ToolTip="禁煙・喫煙両方にチェックが入っていた場合に喫煙を優先して検索します"/>
110+
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding Path=StrictRoomType}" Margin="0,0,5,0"/>
111+
<TextBlock Text="厳密な部屋タイプ" VerticalAlignment="Center" Margin="0,0,20,0" ToolTip="選択した部屋タイプ名に限定して予約を行います"/>
112+
</StackPanel>
113+
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
114+
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding Path=ChkAutoRetry}" Margin="0,0,5,0"/>
115+
<TextBlock Text="自動リトライ" VerticalAlignment="Center" Margin="0,0,20,0" ToolTip="復帰可能なエラーを検知し自動でリトライを行います"/>
116+
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding Path=ChkOverwrite}" Margin="0,0,5,0"/>
117+
<TextBlock Text="上書き" VerticalAlignment="Center" Margin="0,0,20,0" ToolTip="既に同一日で予約があった場合に上書きします"/>
118+
</StackPanel>
114119
</StackPanel>
115120
</Grid>
116121
<Grid Grid.Column="1">
117-
<Button Content="{materialDesign:PackIcon Play}" Command="{Binding BtnExecute}" HorizontalAlignment="Right" Width="80"/>
122+
<Button Command="{Binding BtnExecute}" MinWidth="80" MinHeight="40">
123+
<Button.Content>
124+
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
125+
<materialDesign:PackIcon Kind="Play" HorizontalAlignment="Center"/>
126+
<TextBlock Text="予約開始" HorizontalAlignment="Center"/>
127+
</StackPanel>
128+
</Button.Content>
129+
</Button>
118130
</Grid>
119131
</Grid>
120132
</wpf:ColorZone>

‎AutomaticReservation_UI/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
// You can specify all the values or you can default the Build and Revision Numbers
5454
// by using the '*' as shown below:
5555
// [assembly: AssemblyVersion("1.0.*")]
56-
[assembly: AssemblyVersion("2023.9.12.0")]
57-
[assembly: AssemblyFileVersion("2023.9.12.0")]
56+
[assembly: AssemblyVersion("2023.10.28.0")]
57+
[assembly: AssemblyFileVersion("2023.10.28.0")]
5858

5959
// log4netを利用するための設定
6060
[assembly: log4net.Config.XmlConfigurator(ConfigFile= @"Log4net.Config.xml", Watch=true)]

0 commit comments

Comments
 (0)