Compare commits

...

8 Commits

30 changed files with 60 additions and 17 deletions

View File

@ -230,6 +230,40 @@
<ItemGroup> <ItemGroup>
<SplashScreen Include="hermes_splash.png" /> <SplashScreen Include="hermes_splash.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Resource Include="doc\img\main.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="doc\img\add.png" />
<Resource Include="doc\img\first_launch_1.png" />
<Resource Include="doc\img\first_launch_2.png" />
<Resource Include="doc\img\list_1.png" />
<Resource Include="doc\img\list_2.png" />
<Resource Include="doc\img\menu_display.png" />
<Resource Include="doc\img\menu_edit.png" />
<Resource Include="doc\img\menu_file.png" />
<Resource Include="doc\img\menu_tools.png" />
<Resource Include="doc\img\smartscreen_1.png" />
<Resource Include="doc\img\smartscreen_2.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="doc\img\publi_1.png" />
<Resource Include="doc\img\publi_2.png" />
<Resource Include="doc\img\publi_3.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="doc\img\ovh_1.png" />
<Resource Include="doc\img\ovh_2.png" />
<Resource Include="doc\img\ovh_3.png" />
<Resource Include="doc\img\ovh_4.png" />
<Resource Include="doc\img\ovh_5.png" />
<Resource Include="doc\img\ovh_6.png" />
<Resource Include="doc\img\ovh_7.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="doc\img\sms_1.png" />
<Resource Include="doc\img\sms_2.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>

View File

@ -154,12 +154,6 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_UNDEFINED" "MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_5FE7F4CD40C5D5EAEC6A24FAE0548A1E"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_EDA497A114444E23814EEE023731C727" "OwnerKey" = "8:_EDA497A114444E23814EEE023731C727"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -193,6 +187,12 @@
"OwnerKey" = "8:_19F88EB0C5E322CF5572D8C5A094E0A2" "OwnerKey" = "8:_19F88EB0C5E322CF5572D8C5A094E0A2"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_5FE7F4CD40C5D5EAEC6A24FAE0548A1E"
"MsmSig" = "8:_UNDEFINED"
}
} }
"Configurations" "Configurations"
{ {
@ -812,15 +812,15 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Hermes" "ProductName" = "8:Hermes"
"ProductCode" = "8:{34F15BE4-83E0-406C-AB16-5CCB92F214C7}" "ProductCode" = "8:{3B44B09A-1491-4CE0-A6A5-ABD54F4C14F8}"
"PackageCode" = "8:{A3A58C60-1261-4F23-91A2-F2308E51DDAE}" "PackageCode" = "8:{618674BD-7E73-4707-ABF3-4183A348D565}"
"UpgradeCode" = "8:{A8FB75F3-57A5-4B7D-A0AE-9E87F69529B0}" "UpgradeCode" = "8:{A8FB75F3-57A5-4B7D-A0AE-9E87F69529B0}"
"AspNetVersion" = "8:2.0.50727.0" "AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE" "InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:0.9.4" "ProductVersion" = "8:1.0.0"
"Manufacturer" = "8:Aztrom" "Manufacturer" = "8:Aztrom"
"ARPHELPTELEPHONE" = "8:" "ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:" "ARPHELPLINK" = "8:"

View File

@ -51,6 +51,6 @@ using System.Windows;
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
// en utilisant '*', comme indiqué ci-dessous : // en utilisant '*', comme indiqué ci-dessous :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.4.0")] [assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("0.9.4.0")] [assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: NeutralResourcesLanguage("fr-FR")] [assembly: NeutralResourcesLanguage("fr-FR")]

View File

@ -26,7 +26,7 @@
<GridViewColumn Header="Nom" DisplayMemberBinding="{Binding Nom}" Width="120"/> <GridViewColumn Header="Nom" DisplayMemberBinding="{Binding Nom}" Width="120"/>
<GridViewColumn Header="Prénom" DisplayMemberBinding="{Binding Prenom}" Width="120"/> <GridViewColumn Header="Prénom" DisplayMemberBinding="{Binding Prenom}" Width="120"/>
<GridViewColumn Header="Mobile" DisplayMemberBinding="{Binding Mobile}" Width="120"/> <GridViewColumn Header="Mobile" DisplayMemberBinding="{Binding Mobile}" Width="120"/>
<GridViewColumn Header="Statut de l'envoi" DisplayMemberBinding="{Binding Status}" Width="290"/> <GridViewColumn Header="Statut de l'envoi" DisplayMemberBinding="{Binding Status}" Width="280"/>
</GridView> </GridView>
</ListView.View> </ListView.View>
</ListView> </ListView>

View File

@ -132,11 +132,20 @@ namespace Hermes {
} catch(WebException ex) { } catch(WebException ex) {
error = true; error = true;
WebResponse resp = ex.Response; WebResponse resp = ex.Response;
if(resp == null) {
string errorMsg = ex.Message == null ? "" : ex.Message;
stat.Status = $"Erreur de transmission : {errorMsg}";
continue;
}
try {
using(var stream = resp.GetResponseStream()) { using(var stream = resp.GetResponseStream()) {
var reader = new StreamReader(stream); StreamReader reader = new StreamReader(stream);
String result = reader.ReadToEnd().Trim(); String result = reader.ReadToEnd().Trim();
stat.Status = result; stat.Status = result;
} }
} catch(Exception) {
stat.Status = $"Erreur de transmission";
}
} catch(Exception ex) { } catch(Exception ex) {
error = true; error = true;
string errorMsg = ex.Message == null ? "" : ex.Message; string errorMsg = ex.Message == null ? "" : ex.Message;
@ -152,7 +161,7 @@ namespace Hermes {
Mouse.OverrideCursor = previousCursor; Mouse.OverrideCursor = previousCursor;
if(error) { if(error) {
MessageBox.Show("Plusieurs envois se sont mal déroulés. Vérifiez la validité des numéros de téléphone.", "Envoi de SMS", MessageBoxButton.OK, MessageBoxImage.Error); MessageBox.Show("Plusieurs envois se sont mal déroulés. Certains numéros de téléphone ne sont peut-être pas valides.", "Envoi de SMS", MessageBoxButton.OK, MessageBoxImage.Error);
} }
} }

BIN
doc/img/add.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
doc/img/first_launch_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
doc/img/first_launch_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
doc/img/list_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
doc/img/list_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
doc/img/main.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
doc/img/menu_display.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

BIN
doc/img/menu_edit.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
doc/img/menu_file.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
doc/img/menu_tools.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
doc/img/ovh_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
doc/img/ovh_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

BIN
doc/img/ovh_3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
doc/img/ovh_4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
doc/img/ovh_5.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
doc/img/ovh_6.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
doc/img/ovh_7.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
doc/img/publi_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

BIN
doc/img/publi_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

BIN
doc/img/publi_3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

BIN
doc/img/smartscreen_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

BIN
doc/img/smartscreen_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
doc/img/sms_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
doc/img/sms_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 68 KiB