#MailMerge - doesn't work at this time

This commit is contained in:
Alexander Mikhailov
2019-05-14 10:55:30 +03:00
parent 40274f00c3
commit 023f6c7649
2 changed files with 3 additions and 3 deletions

View File

@@ -123,7 +123,7 @@ namespace DevExpress.DevAV {
moduleControl.Parent = modulesContainer;
navBar.SendToBack();
modulesContainer.ResumeLayout();
Text = string.Format("{1} - {0}", ViewModel.GetModuleCaption(ViewModel.SelectedModuleType), "DevAV");
Text = string.Format("{1} - {0}", ViewModel.GetModuleCaption(ViewModel.SelectedModuleType), "DevAV (.Net Core 3.0)");
IRibbonModule ribbonModuleControl = moduleControl as IRibbonModule;
if(ribbonModuleControl != null) {
Ribbon.MergeRibbon(ribbonModuleControl.Ribbon);

View File

@@ -109,7 +109,7 @@ namespace DevExpress.DevAV.ViewModels {
}
[Command(UseCommandManager = false, CanExecuteMethodName = "CanPrintProfile")]
public void MailMerge() {
ShowDocument<EmployeeMailMergeViewModel>("MailMerge", null);
//ShowDocument<EmployeeMailMergeViewModel>("MailMerge", null);
}
[Command]
public void QuickLetter(EmployeeMailTemplate mailTemplate) {
@@ -119,7 +119,7 @@ namespace DevExpress.DevAV.ViewModels {
return CanQuickLetterCore(SelectedEntity, mailTemplate);
}
protected internal void QuickLetterCore(Employee employee, EmployeeMailTemplate mailTemplate) {
ShowDocument<EmployeeMailMergeViewModel>("MailMerge", mailTemplate);
//ShowDocument<EmployeeMailMergeViewModel>("MailMerge", mailTemplate);
}
protected internal bool CanQuickLetterCore(Employee employee, EmployeeMailTemplate mailTemplate) {
return employee != null;