Compare commits
	
		
			2 Commits
		
	
	
		
			v0.3.4
			...
			e79f4baa2f
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e79f4baa2f | |||
| b79ba14f9e | 
@@ -7,7 +7,7 @@
 | 
				
			|||||||
    <UseWPF>true</UseWPF>
 | 
					    <UseWPF>true</UseWPF>
 | 
				
			||||||
    <PreserveCompilationContext>true</PreserveCompilationContext>
 | 
					    <PreserveCompilationContext>true</PreserveCompilationContext>
 | 
				
			||||||
    <ApplicationIcon>elwig.ico</ApplicationIcon>
 | 
					    <ApplicationIcon>elwig.ico</ApplicationIcon>
 | 
				
			||||||
    <Version>0.3.4</Version>
 | 
					    <Version>0.3.5</Version>
 | 
				
			||||||
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
 | 
					    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
 | 
				
			||||||
  </PropertyGroup>
 | 
					  </PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -503,8 +503,8 @@ namespace Elwig.Windows {
 | 
				
			|||||||
                    if (groups.Count == 1) {
 | 
					                    if (groups.Count == 1) {
 | 
				
			||||||
                        var g = groups.First().Key;
 | 
					                        var g = groups.First().Key;
 | 
				
			||||||
                        if (g != "") {
 | 
					                        if (g != "") {
 | 
				
			||||||
                            StatusWeight.Text += $" ({g})";
 | 
					                            StatusWeight.Text += $" [{g}]";
 | 
				
			||||||
                            StatusGradation.Text += $" ({g})";
 | 
					                            StatusGradation.Text += $" [{g}]";
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        var sortGroups = parts
 | 
					                        var sortGroups = parts
 | 
				
			||||||
@@ -514,12 +514,12 @@ namespace Elwig.Windows {
 | 
				
			|||||||
                            .ToList();
 | 
					                            .ToList();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        if (sortGroups.Count > 1 && sortGroups.Count <= 4) {
 | 
					                        if (sortGroups.Count > 1 && sortGroups.Count <= 4) {
 | 
				
			||||||
                            StatusWeight.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item2:N0} kg" + (g.Key == "" ? "" : $" ({g.Key})")))}";
 | 
					                            StatusWeight.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item2:N0} kg ({(double)g.Item2 / weight:0%})" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
 | 
				
			||||||
                            StatusGradation.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" ({g.Key})")))}";
 | 
					                            StatusGradation.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
                    } else if (groups.Count <= 4) {
 | 
					                    } else if (groups.Count <= 4) {
 | 
				
			||||||
                        StatusWeight.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item2:N0} kg" + (g.Key == "" ? "" : $" ({g.Key})")))}";
 | 
					                        StatusWeight.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item2:N0} kg ({(double)g.Item2 / weight:0%})" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
 | 
				
			||||||
                        StatusGradation.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" ({g.Key})")))}";
 | 
					                        StatusGradation.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            } else {
 | 
					            } else {
 | 
				
			||||||
@@ -918,7 +918,7 @@ namespace Elwig.Windows {
 | 
				
			|||||||
                if (App.Config.Debug) {
 | 
					                if (App.Config.Debug) {
 | 
				
			||||||
                    doc.Show();
 | 
					                    doc.Show();
 | 
				
			||||||
                } else {
 | 
					                } else {
 | 
				
			||||||
                    doc.Print(2);
 | 
					                    await doc.Print(2);
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            FinishButton.Cursor = null;
 | 
					            FinishButton.Cursor = null;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user