Other
This commit is contained in:
@@ -0,0 +1 @@
|
||||
DevExpress.ExpressApp.SystemModule.SystemModule, DevExpress.ExpressApp.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -62,7 +62,7 @@ Friend NotInheritable Class Program
|
||||
End If
|
||||
Try
|
||||
'AddHandler Application.Idle, AddressOf Application_Idle
|
||||
|
||||
winApplication.DatabaseUpdateMode = DatabaseUpdateMode.UpdateOldDatabase
|
||||
AddHandler AuditTrailService.Instance.SaveAuditTrailData, AddressOf Instance_SaveAuditTrailData
|
||||
AddHandler winApplication.CreateCustomUserModelDifferenceStore, AddressOf winApplication_CreateCustomUserModelDifferenceStore
|
||||
AddHandler winApplication.LastLogonParametersWriting, AddressOf winApplication_LastLogonParametersWriting
|
||||
|
||||
@@ -112,6 +112,8 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="DevExpress.ExpressApp.Notifications.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.ExpressApp.Notifications.Win.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Pdf.v17.2.Core">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<Private>True</Private>
|
||||
@@ -272,9 +274,8 @@
|
||||
<Reference Include="Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Npgsql.2.2.7\lib\net40\Mono.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Newtonsoft.Json">
|
||||
<HintPath>..\..\..\..\..\..\jSON\Bin\Net\Newtonsoft.Json.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Npgsql, Version=2.2.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Npgsql.2.2.7\lib\net40\Npgsql.dll</HintPath>
|
||||
@@ -453,6 +454,10 @@
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\SISBusiness.Module.CSharp\SISBusiness.Module.CSharp.csproj">
|
||||
<Project>{B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}</Project>
|
||||
<Name>SISBusiness.Module.CSharp</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\SISBusiness.Module.Win\SISBusiness.Module.Win.vbproj">
|
||||
<Project>{98539DCF-BF11-4158-AEC0-4B008A404A0E}</Project>
|
||||
<Name>SISBusiness.Module.Win</Name>
|
||||
|
||||
+23
-8
@@ -56,23 +56,22 @@ Partial Public Class SISBusinessWindowsFormsApplication
|
||||
Me.ChartWindowsFormsModule1 = New DevExpress.ExpressApp.Chart.Win.ChartWindowsFormsModule()
|
||||
Me.PivotGridModule1 = New DevExpress.ExpressApp.PivotGrid.PivotGridModule()
|
||||
Me.PivotGridWindowsFormsModule1 = New DevExpress.ExpressApp.PivotGrid.Win.PivotGridWindowsFormsModule()
|
||||
Me.NotificationsModule1 = New DevExpress.ExpressApp.Notifications.NotificationsModule()
|
||||
Me.NotificationsWindowsFormsModule1 = New DevExpress.ExpressApp.Notifications.Win.NotificationsWindowsFormsModule()
|
||||
Me.CSharpModule1 = New SISBusiness.[Module].CSharp.CSharpModule()
|
||||
CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
'
|
||||
'module5
|
||||
'
|
||||
Me.module5.AllowValidationDetailsAccess = True
|
||||
Me.module5.IgnoreWarningAndInformationRules = False
|
||||
'
|
||||
'sqlConnection1
|
||||
'
|
||||
Me.sqlConnection1.ConnectionString = "Data Source=(local);Initial Catalog=SISBusiness;Integrated Security=SSPI;Pooling=" & _
|
||||
Me.sqlConnection1.ConnectionString = "Data Source=(local);Initial Catalog=SISBusiness;Integrated Security=SSPI;Pooling=" &
|
||||
"false"
|
||||
Me.sqlConnection1.FireInfoMessageEventOnUserErrors = False
|
||||
'
|
||||
'ViewVariantsModule1
|
||||
'
|
||||
Me.ViewVariantsModule1.GenerateVariantsNode = True
|
||||
Me.ViewVariantsModule1.ShowAdditionalNavigation = False
|
||||
'
|
||||
'SecurityComplex1
|
||||
'
|
||||
Me.SecurityComplex1.Authentication = Me.AuthenticationStandard1
|
||||
@@ -85,6 +84,7 @@ Partial Public Class SISBusinessWindowsFormsApplication
|
||||
'
|
||||
'PivotChartModuleBase1
|
||||
'
|
||||
Me.PivotChartModuleBase1.DataAccessMode = DevExpress.ExpressApp.CollectionSourceDataAccessMode.Client
|
||||
Me.PivotChartModuleBase1.ShowAdditionalNavigation = False
|
||||
'
|
||||
'AuditTrailModule2
|
||||
@@ -96,6 +96,15 @@ Partial Public Class SISBusinessWindowsFormsApplication
|
||||
Me.ReportsModule1.EnableInplaceReports = True
|
||||
Me.ReportsModule1.ReportDataType = GetType(DevExpress.Persistent.BaseImpl.ReportData)
|
||||
'
|
||||
'NotificationsModule1
|
||||
'
|
||||
Me.NotificationsModule1.CanAccessPostponedItems = False
|
||||
Me.NotificationsModule1.NotificationsRefreshInterval = System.TimeSpan.Parse("00:05:00")
|
||||
Me.NotificationsModule1.NotificationsStartDelay = System.TimeSpan.Parse("00:00:05")
|
||||
Me.NotificationsModule1.ShowDismissAllAction = False
|
||||
Me.NotificationsModule1.ShowNotificationsWindow = True
|
||||
Me.NotificationsModule1.ShowRefreshAction = False
|
||||
'
|
||||
'SISBusinessWindowsFormsApplication
|
||||
'
|
||||
Me.ApplicationName = "SISBusiness"
|
||||
@@ -109,6 +118,8 @@ Partial Public Class SISBusinessWindowsFormsApplication
|
||||
Me.Modules.Add(Me.ViewVariantsModule1)
|
||||
Me.Modules.Add(Me.securityModule1)
|
||||
Me.Modules.Add(Me.AuditTrailModule2)
|
||||
Me.Modules.Add(Me.KpiModule1)
|
||||
Me.Modules.Add(Me.NotificationsModule1)
|
||||
Me.Modules.Add(Me.module3)
|
||||
Me.Modules.Add(Me.FileAttachmentsWindowsFormsModule1)
|
||||
Me.Modules.Add(Me.HtmlPropertyEditorWindowsFormsModule1)
|
||||
@@ -121,18 +132,19 @@ Partial Public Class SISBusinessWindowsFormsApplication
|
||||
Me.Modules.Add(Me.TreeListEditorsWindowsFormsModule1)
|
||||
Me.Modules.Add(Me.ChartModule1)
|
||||
Me.Modules.Add(Me.ChartWindowsFormsModule1)
|
||||
Me.Modules.Add(Me.KpiModule1)
|
||||
Me.Modules.Add(Me.PivotGridModule1)
|
||||
Me.Modules.Add(Me.PivotGridWindowsFormsModule1)
|
||||
Me.Modules.Add(Me.SchedulerModuleBase1)
|
||||
Me.Modules.Add(Me.SchedulerWindowsFormsModule1)
|
||||
Me.Modules.Add(Me.NotificationsWindowsFormsModule1)
|
||||
Me.Modules.Add(Me.module4)
|
||||
Me.Modules.Add(Me.CSharpModule1)
|
||||
Me.ResourcesExportedToModel.Add(GetType(DevExpress.ExpressApp.Win.Localization.NavBarControlLocalizer))
|
||||
Me.ResourcesExportedToModel.Add(GetType(DevExpress.ExpressApp.Win.Localization.LayoutControlLocalizer))
|
||||
Me.ResourcesExportedToModel.Add(GetType(DevExpress.ExpressApp.Win.Localization.GridControlLocalizer))
|
||||
Me.ResourcesExportedToModel.Add(GetType(DevExpress.ExpressApp.Localization.PreviewControlLocalizer))
|
||||
Me.ResourcesExportedToModel.Add(GetType(DevExpress.ExpressApp.Win.Localization.BarControlLocalizer))
|
||||
Me.ResourcesExportedToModel.Add(GetType(ServerDataLogLocalizer))
|
||||
Me.ResourcesExportedToModel.Add(GetType(DevExpress.ExpressApp.Security.ServerDataLogLocalizer))
|
||||
Me.ResourcesExportedToModel.Add(GetType(DevExpress.ExpressApp.Win.Localization.RichEditControlLocalizer))
|
||||
Me.ResourcesExportedToModel.Add(GetType(DevExpress.ExpressApp.Win.Localization.TreeListControlLocalizer))
|
||||
Me.ResourcesExportedToModel.Add(GetType(DevExpress.ExpressApp.Win.Localization.VerticalGridControlLocalizer))
|
||||
@@ -188,4 +200,7 @@ Partial Public Class SISBusinessWindowsFormsApplication
|
||||
Friend WithEvents ChartWindowsFormsModule1 As DevExpress.ExpressApp.Chart.Win.ChartWindowsFormsModule
|
||||
Friend WithEvents PivotGridModule1 As DevExpress.ExpressApp.PivotGrid.PivotGridModule
|
||||
Friend WithEvents PivotGridWindowsFormsModule1 As DevExpress.ExpressApp.PivotGrid.Win.PivotGridWindowsFormsModule
|
||||
Friend WithEvents NotificationsModule1 As DevExpress.ExpressApp.Notifications.NotificationsModule
|
||||
Friend WithEvents NotificationsWindowsFormsModule1 As DevExpress.ExpressApp.Notifications.Win.NotificationsWindowsFormsModule
|
||||
Friend WithEvents CSharpModule1 As [Module].CSharp.CSharpModule
|
||||
End Class
|
||||
|
||||
@@ -25,24 +25,9 @@ Partial Public Class SISBusinessWindowsFormsApplication
|
||||
End Sub
|
||||
|
||||
Private Sub SISBusinessWindowsFormsApplication_DatabaseVersionMismatch(ByVal sender As Object, ByVal e As DevExpress.ExpressApp.DatabaseVersionMismatchEventArgs) Handles MyBase.DatabaseVersionMismatch
|
||||
#If EASYTEST Then
|
||||
|
||||
e.Updater.Update()
|
||||
e.Handled = True
|
||||
#Else
|
||||
If System.Diagnostics.Debugger.IsAttached Then
|
||||
e.Updater.Update()
|
||||
e.Handled = True
|
||||
Else
|
||||
Throw New InvalidOperationException( _
|
||||
"The application cannot connect to the specified database, because the latter doesn't exist or its version is older than that of the application." & vbCrLf & _
|
||||
"This error occurred because the automatic database update was disabled when the application was started without debugging." & vbCrLf & _
|
||||
"To avoid this error, you should either start the application under Visual Studio in debug mode, or modify the " & _
|
||||
"source code of the 'DatabaseVersionMismatch' event handler to enable automatic database update, " & _
|
||||
"or manually create a database using the 'DBUpdater' tool." & vbCrLf & _
|
||||
"Anyway, refer to the 'Update Application and Database Versions' help topic at http://www.devexpress.com/Help/?document=ExpressApp/CustomDocument2795.htm " & _
|
||||
"for more detailed information. If this doesn't help, please contact our Support Team at http://www.devexpress.com/Support/Center/")
|
||||
End If
|
||||
#End If
|
||||
End Sub
|
||||
Protected Overrides Function GetTraceLogDirectory() As String
|
||||
Return MyBase.GetTraceLogDirectory()
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net40" />
|
||||
<package id="Npgsql" version="2.2.7" targetFramework="net40" />
|
||||
</packages>
|
||||
Reference in New Issue
Block a user