Compare commits

..

No commits in common. "f9feff0bf52c160ab0ae6ae7dce720bb5d1b96bb" and "d0a11d62bb393b67c61df953778070f3838ac03d" have entirely different histories.

1 changed files with 6 additions and 12 deletions

View File

@ -35,7 +35,7 @@
ShowFilterRow="ShowFilterRow"> ShowFilterRow="ShowFilterRow">
<Columns> <Columns>
<DxGridCommandColumn Width="135" MinWidth="135" Visible="AcDomain.IsDeveloperVersion" DeleteButtonVisible="AcDomain.IsDeveloperVersion" EditButtonVisible="AcDomain.IsDeveloperVersion" FixedPosition="GridColumnFixedPosition.Left"/> <DxGridCommandColumn Width="135" MinWidth="135" Visible="AcDomain.IsDeveloperVersion" DeleteButtonVisible="AcDomain.IsDeveloperVersion" EditButtonVisible="AcDomain.IsDeveloperVersion" FixedPosition="GridColumnFixedPosition.Left"/>
<DxGridDataColumn FieldName="SenderId" Caption=" " Width="30px" ShowInColumnChooser="AcDomain.IsDeveloperVersion" DisplayFormat="N" AllowSort="false"> <DxGridDataColumn FieldName="SenderId" Caption="/" Width="30px" ShowInColumnChooser="AcDomain.IsDeveloperVersion" DisplayFormat="N">
<CellDisplayTemplate> <CellDisplayTemplate>
@{ @{
var isOutgoing = ((EmailMessage)context.DataItem).SenderId == myUserId; var isOutgoing = ((EmailMessage)context.DataItem).SenderId == myUserId;
@ -85,19 +85,19 @@
</DxGridDataColumn> </DxGridDataColumn>
<DxGridDataColumn FieldName="Id" Width="150" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N"/> <DxGridDataColumn FieldName="Id" Width="150" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N"/>
<DxGridDataColumn FieldName="ContextId" Width="150px" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N"/> <DxGridDataColumn FieldName="ContextId" Width="150px" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N"/>
<DxGridDataColumn FieldName="Created" Caption="Received" DisplayFormat="g" Width="@(IsMessageTextVisible ? 140.ToString() : 85.ToString())" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center"> <DxGridDataColumn FieldName="Created" Caption="Received" DisplayFormat="g" Width="@(IsMessageTextVisible ? 140.ToString() : 80.ToString())" SortIndex="0" SortOrder="GridColumnSortOrder.Descending" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center">
<CellDisplayTemplate> <CellDisplayTemplate>
@{ @{
var created = ((EmailMessage)context.DataItem).Created; var created = ((EmailMessage)context.DataItem).Created;
if (IsMessageTextVisible) if (!IsMessageTextVisible)
{ {
@created.ToString("g") <p style="padding: 3px; margin: 0 auto;">@created.ToString("yy.MM.dd")</p>
<p style="padding: 3px; margin: 0 auto;">@created.ToString("HH:mm")</p>
} }
else else
{ {
<div style="padding: 3px 3px 1px 3px; margin: 0 auto;">@created.ToString("d").Replace(" ", string.Empty)</div> <text>@created.ToString("g")</text>
<div style="padding: 2px 3px 3px 3px; margin: 0 auto;">@created.ToString("t").Replace(" ", string.Empty)</div>
} }
} }
</CellDisplayTemplate> </CellDisplayTemplate>
@ -109,12 +109,6 @@
@{ @{
var subjectString = ((EmailMessage)context.DataItem).Subject; var subjectString = ((EmailMessage)context.DataItem).Subject;
<p style="word-break: normal; white-space: normal; padding: 0; margin: 0 auto;">@subjectString</p> <p style="word-break: normal; white-space: normal; padding: 0; margin: 0 auto;">@subjectString</p>
if (!IsMessageTextVisible)
{
var textString = System.Text.RegularExpressions.Regex.Replace(((EmailMessage)context.DataItem).Text!, "<(.|\n)*?>", string.Empty);
<div style="padding-top: 3px; color: darkgray">@textString</div>
}
} }
</CellDisplayTemplate> </CellDisplayTemplate>
</DxGridDataColumn> </DxGridDataColumn>