notazof/yavsc
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

Merge branch 'vnext' of github.com:pazof/yavsc into vnext

Browse source
This commit is contained in:
Paul Schneider 2016-11-10 12:31:23 +01:00
commit c47e2b4621
6 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BookAStar/BookAStar/Data/RemoteEntity.cs
View file

@ -137,7 +137,7 @@ namespace BookAStar.Data
{ {
// TODO throw custom exception, and catch to inform user // TODO throw custom exception, and catch to inform user
var errcontent = await response.Content.ReadAsStringAsync(); var errcontent = await response.Content.ReadAsStringAsync();
Debug.WriteLine($"Create failed posting {stringContent} @ {controllerUri.AbsoluteUri}"); Debug.WriteLine($"Create failed posting {stringContent} @ {controllerUri.AbsoluteUri}: {errcontent}");
} }
else else
{ {

6
BookAStar/BookAStar/Interfaces/IEstimate.cs
View file

@ -5,9 +5,9 @@ namespace BookAStar.Model.Interfaces
{ {
public interface IEstimate public interface IEstimate
{ {
IList<string> AttachedFiles { get; set; } List<string> AttachedFiles { get; set; }
IList<string> AttachedGraphics { get; } List<string> AttachedGraphics { get; }
IList<BillingLine> Bill { get; set; } List<BillingLine> Bill { get; set; }
string ClientId { get; set; } string ClientId { get; set; }
long? CommandId { get; set; } long? CommandId { get; set; }
string CommandType { get; set; } string CommandType { get; set; }

6
BookAStar/BookAStar/Model/Workflow/Estimate.cs
View file

@ -15,7 +15,7 @@ namespace BookAStar.Model.Workflow
// Markdown expected // Markdown expected
public string Description { get; set; } public string Description { get; set; }
public string Title { get; set; } public string Title { get; set; }
public IList<BillingLine> Bill { get; set; } public List<BillingLine> Bill { get; set; }
/// <summary> /// <summary>
/// List of attached graphic files /// List of attached graphic files
/// to this estimate, as relative pathes to /// to this estimate, as relative pathes to
@ -23,7 +23,7 @@ namespace BookAStar.Model.Workflow
/// In db, they are separated by <c>:</c> /// In db, they are separated by <c>:</c>
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public IList<string> AttachedGraphics { get; set; } public List<string> AttachedGraphics { get; set; }
[JsonIgnore] [JsonIgnore]
public string AttachedGraphicsString public string AttachedGraphicsString
{ {
@ -37,7 +37,7 @@ namespace BookAStar.Model.Workflow
/// In db, they are separated by <c>:</c> /// In db, they are separated by <c>:</c>
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public IList<string> AttachedFiles { get; set; } public List<string> AttachedFiles { get; set; }
[JsonIgnore] [JsonIgnore]
public string AttachedFilesString public string AttachedFilesString
{ {

6
BookAStar/BookAStar/Pages/EditBillingLinePage.xaml
View file

@ -93,12 +93,14 @@
Path=IsValid, Path=IsValid,
Converter={StaticResource boolToStyleImage}}" /> Converter={StaticResource boolToStyleImage}}" />
</StackLayout> </StackLayout>
<Button Text="Términé" <StackLayout Orientation="Horizontal">
<Button Text="Supprimer"
Command="{Binding DeleteCommand}" Command="{Binding DeleteCommand}"
Clicked="OnValidateClicked"></Button> Clicked="OnDeleteClicked"></Button>
<Button Text="Términé" <Button Text="Términé"
Command="{Binding ValidateCommand}" Command="{Binding ValidateCommand}"
Clicked="OnValidateClicked"></Button> Clicked="OnValidateClicked"></Button>
</StackLayout> </StackLayout>
</StackLayout>
</ScrollView> </ScrollView>
</ContentPage> </ContentPage>

5
BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
View file

@ -16,7 +16,10 @@ namespace BookAStar.Pages
picker.Items.Add(du); picker.Items.Add(du);
BindingContext = model; BindingContext = model;
} }
public void OnDeleteClicked(object sender, EventArgs e)
{
throw new NotImplementedException();
}
public void OnValidateClicked (object sender, EventArgs e) public void OnValidateClicked (object sender, EventArgs e)
{ {
this.Navigation.PopAsync(); this.Navigation.PopAsync();

2
BookAStar/BookAStar/ViewModels/EditEstimateViewModel.cs
View file

@ -31,7 +31,7 @@ namespace BookAStar.ViewModels
private void Bill_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) private void Bill_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
{ {
Data.Bill = Bill; Data.Bill = new List<BillingLine>( Bill );
NotifyPropertyChanged("FormattedTotal"); NotifyPropertyChanged("FormattedTotal");
} }
private Estimate data; private Estimate data;