Compare commits
5 Commits
b14d193c86
...
feature_re
| Author | SHA1 | Date | |
|---|---|---|---|
| bc3486abea | |||
| 923830a90f | |||
| 3ba48ca760 | |||
| e8bd6bdbe5 | |||
| 983b6e01fd |
@@ -12,6 +12,7 @@ namespace BeWo
|
||||
FeatureCustomerWohnhilfe,
|
||||
FeatureWohnheimWohneinheit,
|
||||
FeatureAuswertungenQuittierungsbelege,
|
||||
FeatureDokumentenVorlage,
|
||||
FeatureDakota
|
||||
}
|
||||
|
||||
@@ -24,7 +25,7 @@ namespace BeWo
|
||||
{
|
||||
#if DEBUG
|
||||
|
||||
//return _CurrentConfig ?? (_CurrentConfig = SimpleAutoLogin);
|
||||
return _CurrentConfig ?? (_CurrentConfig = Feature_Dokumenten_Vorlage);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -86,5 +87,12 @@ namespace BeWo
|
||||
SelectView = UIContext.Finance,
|
||||
SelectIndex = 8
|
||||
};
|
||||
|
||||
public static DebugConfig Feature_Dokumenten_Vorlage => new DebugConfig()
|
||||
{
|
||||
DebugConfigMode = DebugConfigMode.FeatureDokumentenVorlage,
|
||||
AutoLogin = true,
|
||||
SelectView = UIContext.Dokumente
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -260,11 +260,20 @@ namespace BeWo.View.Detail
|
||||
}
|
||||
private void TemplatesTreeView_MouseDoubleClick(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
var selection = TreeListControlTemplates.SelectedItem as PlatzhalterVM;
|
||||
var platzhalter = TreeListControlTemplates.SelectedItem as PlatzhalterVM;
|
||||
|
||||
if (selection.Platzhalter != null)
|
||||
if (platzhalter.Platzhalter != null)
|
||||
{
|
||||
EditorControl.Document.InsertText(EditorControl.Document.CaretPosition, "[" + selection.Platzhalter + "]");
|
||||
var doc = EditorControl.Document;
|
||||
var selection = doc.Selection;
|
||||
|
||||
if(selection.Length > 0)
|
||||
{
|
||||
doc.Delete(selection);
|
||||
}
|
||||
|
||||
var range = EditorControl.Document.InsertText(EditorControl.Document.CaretPosition, "[" + platzhalter.Platzhalter + "]");
|
||||
EditorControl.Document.Selection = range;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -121,7 +121,7 @@
|
||||
</StackPanel>
|
||||
</GroupBox.Header>
|
||||
<Grid Background="{StaticResource ObjectEditBackgroundBrush}">
|
||||
<TabControl Visibility="Visible">
|
||||
<TabControl Margin="1" Visibility="Visible">
|
||||
<TabItem Visibility="Visible">
|
||||
<TabItem.Header>
|
||||
<TextBlock
|
||||
|
||||
@@ -1717,7 +1717,6 @@ namespace BeWo.View.Master
|
||||
templateVM.Data = Encoding.ASCII.GetBytes(text);
|
||||
UploadTemplateBasedDocument(control.selectedFolder.DataContract.BeWoFolderDC, templateVM.Name, (long)objectOid, templateVM);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +21,6 @@ namespace BeWo.Service.Vorlagen
|
||||
var alleVorlagentabellen = DAOFactory.GenericDAO.GetAllActive<Vorlagentabelle>();
|
||||
|
||||
return MapperFactory.VorlagentabelleDC_Vorlagentabelle.MapToNewDCs(alleVorlagentabellen);
|
||||
|
||||
}
|
||||
public static DokumentvorlageDC InsertTemplate(DokumentvorlageDC dc)
|
||||
{
|
||||
@@ -162,8 +161,6 @@ namespace BeWo.Service.Vorlagen
|
||||
sonstiges.Children.Add(datum);
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
liste.Add(personendaten);
|
||||
liste.Add(adressdatenKlient);
|
||||
//liste.Add(adressdatenOrganisation);
|
||||
|
||||
Reference in New Issue
Block a user