dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENI-2 Funktion damit der Admin das Storniert Flag einer Anmeldung zurücksetzen kann (über Kontextmenü in der Suche)

Browse Source 
Arbeit an der Version 5.2.0
This commit is contained in:
Daniel Schick 2019-05-14 10:01:29 +00:00
parent 549f78a6e9
commit d4c898ed93
9 changed files with 59 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ENI-2/ENI2/ENI2/ENI2.csproj
View File

@ -35,8 +35,8 @@
<MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage>
<ApplicationRevision>3</ApplicationRevision>
<ApplicationVersion>5.1.7.%2a</ApplicationVersion>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>5.2.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
@ -85,11 +85,14 @@
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>DBBB0891995CB133BFEBAA82DFB101EE9701C465</ManifestCertificateThumbprint>
<ManifestCertificateThumbprint>E2879001C2E0FD9E6735E0585D11C8355DBEF3EA</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>ENI2_2_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="ExcelDataReader, Version=3.5.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
<HintPath>packages\ExcelDataReader.3.5.0\lib\net45\ExcelDataReader.dll</HintPath>
@ -602,6 +605,7 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<None Include="ENI2_2_TemporaryKey.pfx" />
<None Include="Service References\LockingServiceReference\ENI2.LockingServiceReference.CoreLock.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>

BIN
ENI-2/ENI2/ENI2/ENI2_2_TemporaryKey.pfx Normal file
View File

Binary file not shown.

1
ENI-2/ENI2/ENI2/MainWindow.xaml.cs
View File

@ -514,6 +514,7 @@ namespace ENI2
if (this.userEntity.IsAdmin)
{
this.buttonUserAdmin.Visibility = Visibility.Visible;
this.sucheControl.AdminMode = true;
// this.buttonEditRules.Visibility = Visibility.Visible; // wird aktuell doch nicht so umgesetzt
}
break;

11
ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs generated
View File

@ -19,7 +19,7 @@ namespace ENI2.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources {
@ -4373,6 +4373,15 @@ namespace ENI2.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Reset &quot;Cancelled&quot; flag in database.
/// </summary>
public static string textUndoCancel {
get {
return ResourceManager.GetString("textUndoCancel", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Unlock.
/// </summary>

3
ENI-2/ENI2/ENI2/Properties/Resources.resx
View File

@ -1660,4 +1660,7 @@
<data name="textEntries" xml:space="preserve">
<value>entries</value>
</data>
<data name="textUndoCancel" xml:space="preserve">
<value>Reset "Cancelled" flag in database</value>
</data>
</root>

37
ENI-2/ENI2/ENI2/SucheControl.xaml.cs
View File

@ -24,6 +24,7 @@ namespace ENI2
private List<MessageCore> anmeldungen = new List<MessageCore>();
private object searchLock = new object();
private ILog _log = LogManager.GetLogger("SucheControl");
private MenuItem cancelItem;
#region Construction
@ -37,17 +38,51 @@ namespace ENI2
{
this.dataGrid.ContextMenu = new ContextMenu();
this.dataGrid.CanUserAddRows = false;
this.dataGrid.ContextMenuOpening += ContextMenu_ContextMenuOpening;
MenuItem addItem = new MenuItem();
addItem.Header = Properties.Resources.textCopyClip;
addItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/documents.png")) };
addItem.Click += new RoutedEventHandler(this.copyID);
this.dataGrid.ContextMenu.Items.Add(addItem);
}
cancelItem = new MenuItem();
cancelItem.Header = Properties.Resources.textUndoCancel;
cancelItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/delete.png")) };
cancelItem.Click += CancelItem_Click;
cancelItem.Visibility = Visibility.Collapsed;
this.dataGrid.ContextMenu.Items.Add(cancelItem);
}
#endregion
public event MessageCore.MessageCoreSelectedHandler MessageCoreSelected;
public bool AdminMode { get; set; }
#region Context menu events
private void ContextMenu_ContextMenuOpening(object sender, ContextMenuEventArgs e)
{
MessageCore selectedCore = this.dataGrid.SelectedItem as MessageCore;
cancelItem.Visibility = (this.AdminMode && (selectedCore.Cancelled ?? false)) ? Visibility.Visible : Visibility.Collapsed;
}
private void CancelItem_Click(object sender, RoutedEventArgs e)
{
MessageCore selectedCore = this.dataGrid.SelectedItem as MessageCore;
if(selectedCore.Cancelled ?? false)
{
if(MessageBox.Show("Undo cancel flag?", "Confirmation", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
{
selectedCore.Cancelled = false;
DBManager.Instance.Save(selectedCore);
}
}
}
#endregion
#region event handler searching
private void Button_Click(object sender, RoutedEventArgs e)

BIN
Stundensheet.xlsx
View File

Binary file not shown.

2
nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("5.1.7")]
[assembly: AssemblyInformationalVersion("5.2.0")]
[assembly: AssemblyCopyright("Copyright © 2014-2019 schick Informatik")]
[assembly: AssemblyTrademark("")]

2
nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("5.1.7.*")]
[assembly: AssemblyVersion("5.2.0.*")]