|
@@ -141,6 +141,18 @@ namespace PRSDesktop
|
|
|
e.Column.Width = 100;
|
|
|
e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
|
|
|
}
|
|
|
+ else if (value.Path.Path.Equals("Created By"))
|
|
|
+ {
|
|
|
+ e.Column.Width = 100;
|
|
|
+ e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
|
|
|
+ }
|
|
|
+ else if (value.Path.Path.Equals("Created"))
|
|
|
+ {
|
|
|
+ e.Column.Width = 100;
|
|
|
+ e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
|
|
|
+ (e.Column as GridDateTimeColumn).Pattern = DateTimePattern.CustomPattern;
|
|
|
+ (e.Column as GridDateTimeColumn).CustomPattern = "dd MMM yy hh:mm";
|
|
|
+ }
|
|
|
else
|
|
|
{
|
|
|
var data = dataGrid.ItemsSource as DataTable;
|
|
@@ -480,6 +492,8 @@ namespace PRSDesktop
|
|
|
var colstype = typeof(Columns<>).MakeGenericType(type);
|
|
|
var cols = Activator.CreateInstance(colstype) as IColumns;
|
|
|
cols.Add("ID");
|
|
|
+ cols.Add("CreatedBy");
|
|
|
+ cols.Add("Created");
|
|
|
|
|
|
foreach (var col in parentcols.ColumnNames())
|
|
|
cols.Add("Parent." + col);
|
|
@@ -544,9 +558,12 @@ namespace PRSDesktop
|
|
|
}
|
|
|
|
|
|
data.Columns.Add("Description", typeof(string));
|
|
|
+ data.Columns.Add("Created", typeof(DateTime));
|
|
|
+ data.Columns.Add("Created By", typeof(string));
|
|
|
data.Columns.Add("Completed", typeof(DateTime));
|
|
|
data.Columns.Add("Completed By", typeof(string));
|
|
|
- if(isEntityForm)
|
|
|
+
|
|
|
+ if (isEntityForm)
|
|
|
data.Columns.Add("Processed", typeof(bool));
|
|
|
|
|
|
if (variables.Any())
|
|
@@ -603,11 +620,12 @@ namespace PRSDesktop
|
|
|
}
|
|
|
|
|
|
datarow["Description"] = string.Join(" : ", desc);
|
|
|
-
|
|
|
+ datarow["Created By"] = (string)row["CreatedBy"];
|
|
|
+ datarow["Created"] = (DateTime)row["Created"];
|
|
|
datarow["Completed"] = (DateTime)row["FormCompleted"];
|
|
|
- datarow["Completed By"] = (string)row["FormCompletedBy.UserID"];
|
|
|
+ datarow["Completed By"] = (string)row["FormCompletedBy.UserID"];
|
|
|
|
|
|
- if(isEntityForm)
|
|
|
+ if (isEntityForm)
|
|
|
datarow["Processed"] = (bool)row["Processed"];
|
|
|
|
|
|
if(parentType == typeof(JobITP))
|