aktueller Stand
This commit is contained in:
@@ -34,17 +34,17 @@ namespace FasdDesktopUi.Basics.UiActions
|
||||
|
||||
private string Recommendation { get; set; }
|
||||
|
||||
private cHealthCardDetailsTable ValuedDetailsData = null;
|
||||
private readonly cHealthCardDetailsTable _valuedDetailsData = null;
|
||||
|
||||
public cShowDetailedDataAction(cHealthCardStateBase StateDefinition, int DayIndex = 0, cHealthCardDetailsTable ValuedDetailsData = null)
|
||||
public cShowDetailedDataAction(cHealthCardStateBase stateDefinition, int dayIndex = 0, cHealthCardDetailsTable valuedDetailsData = null)
|
||||
{
|
||||
this.StateDefinition = StateDefinition;
|
||||
this.DayIndex = DayIndex;
|
||||
this.DetailsTitle = StateDefinition.Names.GetValue();
|
||||
this.Recommendation = StateDefinition.Descriptions.GetValue();
|
||||
if (this.Recommendation == String.Empty)
|
||||
this.Recommendation = null;
|
||||
this.ValuedDetailsData = ValuedDetailsData;
|
||||
StateDefinition = stateDefinition;
|
||||
DayIndex = dayIndex;
|
||||
DetailsTitle = stateDefinition.Names.GetValue();
|
||||
Recommendation = stateDefinition.Descriptions.GetValue();
|
||||
if (Recommendation == string.Empty)
|
||||
Recommendation = null;
|
||||
_valuedDetailsData = valuedDetailsData;
|
||||
}
|
||||
|
||||
public override async Task<bool> RunUiActionAsync(object sender, UIElement UiLocation, bool isDetailedLayout, cSupportCaseDataProvider dataProvider)
|
||||
@@ -61,7 +61,7 @@ namespace FasdDesktopUi.Basics.UiActions
|
||||
|
||||
if (StateDefinition.Details is cHealthCardDetailsValued)
|
||||
{
|
||||
if (ValuedDetailsData == null)
|
||||
if (_valuedDetailsData == null)
|
||||
return false;
|
||||
}
|
||||
else
|
||||
@@ -240,26 +240,37 @@ namespace FasdDesktopUi.Basics.UiActions
|
||||
|
||||
private cDetailedDataModel GetValuedDataModel()
|
||||
{
|
||||
if (!(StateDefinition.Details is cHealthCardDetailsValued _details) || ValuedDetailsData == null)
|
||||
if (!(StateDefinition.Details is cHealthCardDetailsValued details) || _valuedDetailsData == null)
|
||||
return null;
|
||||
|
||||
if (ValuedDetailsData.Columns.Count > 1)
|
||||
var _colCount = details.Count;
|
||||
|
||||
if (_colCount == 0)
|
||||
return null;
|
||||
|
||||
var _rowHeadings = _details.Select(v => v.Names.GetValue() as object).ToList();
|
||||
var rowHeadings = details.Select(v => (object)v.Names.GetValue()).ToList();
|
||||
cDetailedDataModel output = new cDetailedDataModel()
|
||||
{
|
||||
Heading = StateDefinition.Names.GetValue(),
|
||||
FullDetailedData = new List<object>(),
|
||||
HasColumnHeaders = _rowHeadings.Count > 1
|
||||
HasColumnHeaders = _colCount > 1
|
||||
};
|
||||
|
||||
if (_rowHeadings.Count > 1)
|
||||
output.FullDetailedData.Add(_rowHeadings);
|
||||
if (rowHeadings.Count > 1)
|
||||
output.FullDetailedData.Add(rowHeadings);
|
||||
|
||||
var _data = ValuedDetailsData.Values[0];
|
||||
var _data = _valuedDetailsData.Values[0];
|
||||
foreach (var _row in _data)
|
||||
output.FullDetailedData.Add(new List<object>() { _row[0] });
|
||||
{
|
||||
var _rowValues = new List<object>();
|
||||
for (int i = 0; i < _colCount; i++)
|
||||
{
|
||||
_rowValues.Add(_row[i]);
|
||||
}
|
||||
output.FullDetailedData.Add(_rowValues);
|
||||
}
|
||||
|
||||
var _json = Newtonsoft.Json.JsonConvert.SerializeObject(output);
|
||||
|
||||
return output;
|
||||
}
|
||||
@@ -307,7 +318,7 @@ namespace FasdDesktopUi.Basics.UiActions
|
||||
var valueProcessing = splitColumnName.Length > 1 ? splitColumnName[1] : null;
|
||||
|
||||
rawColumnIndexes.Add(rawColumnIndex);
|
||||
displayTypes.Add(cUtility.GetRawValueType(displayType));
|
||||
displayTypes.Add(displayType);
|
||||
valueProcessings.Add(valueProcessing);
|
||||
}
|
||||
|
||||
@@ -326,7 +337,8 @@ namespace FasdDesktopUi.Basics.UiActions
|
||||
shouldHideRow = true;
|
||||
}
|
||||
|
||||
cUtility.RawValueFormatter.SetDefaultCulture(new System.Globalization.CultureInfo(cFasdCockpitConfig.Instance.SelectedLanguage));
|
||||
cUtility.RawValueFormatter.SetDefaultCulture(new CultureInfo(cFasdCockpitConfig.Instance.SelectedLanguage));
|
||||
cUtility.RawValueFormatter.SetDefaultTimeZone(TimeZoneInfo.Local);
|
||||
|
||||
foreach (var index in rawColumnIndexes)
|
||||
{
|
||||
@@ -366,6 +378,8 @@ namespace FasdDesktopUi.Basics.UiActions
|
||||
output.FullDetailedData.Add(displayValuesOfRow);
|
||||
}
|
||||
|
||||
var _json = Newtonsoft.Json.JsonConvert.SerializeObject(output);
|
||||
|
||||
return output;
|
||||
}
|
||||
catch (Exception E)
|
||||
|
||||
Reference in New Issue
Block a user