30-11-23
This commit is contained in:
parent
1b88a6cff7
commit
c2de72be74
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
#Region "Status Fields"
|
#Region "Status Fields"
|
||||||
Public Enum EnvelopeStatus
|
Public Enum EnvelopeStatus
|
||||||
|
Invalid = 0
|
||||||
EnvelopeCreated = 1001
|
EnvelopeCreated = 1001
|
||||||
EnvelopeSaved = 1002
|
EnvelopeSaved = 1002
|
||||||
EnvelopeQueued = 1003
|
EnvelopeQueued = 1003
|
||||||
@ -29,20 +30,6 @@
|
|||||||
Unsigned = 0
|
Unsigned = 0
|
||||||
Signed = 1
|
Signed = 1
|
||||||
End Enum
|
End Enum
|
||||||
|
|
||||||
''' <summary>
|
|
||||||
''' This is a status, which is called Type because it fits with the other action fields
|
|
||||||
''' </summary>
|
|
||||||
'Public Enum EnvelopeHistoryActionType
|
|
||||||
' Created = 0
|
|
||||||
' Saved = 1
|
|
||||||
' Sent = 2
|
|
||||||
' EmailSent = 3
|
|
||||||
' Delivered = 4
|
|
||||||
' Seen = 5
|
|
||||||
' Signed = 6
|
|
||||||
' Rejected = 7
|
|
||||||
'End Enum
|
|
||||||
#End Region
|
#End Region
|
||||||
|
|
||||||
#Region "Type Fields"
|
#Region "Type Fields"
|
||||||
|
|||||||
@ -45,7 +45,21 @@
|
|||||||
<OptionInfer>On</OptionInfer>
|
<OptionInfer>On</OptionInfer>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
|
<Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.Pdf.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.PivotGrid.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.RichEdit.v21.2.Export, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.Xpo.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
|
<Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.XtraGauges.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DigitalData.Modules.Base, Version=1.3.4.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="DigitalData.Modules.Base, Version=1.3.4.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
|
<HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
|
||||||
@ -137,6 +151,15 @@
|
|||||||
<DependentUpon>Settings.settings</DependentUpon>
|
<DependentUpon>Settings.settings</DependentUpon>
|
||||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="Reports\ReportCreator.vb" />
|
||||||
|
<Compile Include="Reports\ReportItem.vb" />
|
||||||
|
<Compile Include="Reports\ReportSource.vb" />
|
||||||
|
<Compile Include="Reports\rptEnvelopeHistory.Designer.vb">
|
||||||
|
<DependentUpon>rptEnvelopeHistory.vb</DependentUpon>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="Reports\rptEnvelopeHistory.vb">
|
||||||
|
<SubType>Component</SubType>
|
||||||
|
</Compile>
|
||||||
<Compile Include="Services\ActionService.vb" />
|
<Compile Include="Services\ActionService.vb" />
|
||||||
<Compile Include="Services\EmailService.vb" />
|
<Compile Include="Services\EmailService.vb" />
|
||||||
<Compile Include="Services\HistoryService.vb" />
|
<Compile Include="Services\HistoryService.vb" />
|
||||||
@ -172,12 +195,16 @@
|
|||||||
</Compile>
|
</Compile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<EmbeddedResource Include="My Project\licenses.licx" />
|
||||||
<EmbeddedResource Include="My Project\Resources.resx">
|
<EmbeddedResource Include="My Project\Resources.resx">
|
||||||
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
|
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
|
||||||
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
|
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
|
||||||
<CustomToolNamespace>My.Resources</CustomToolNamespace>
|
<CustomToolNamespace>My.Resources</CustomToolNamespace>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
|
<EmbeddedResource Include="Reports\rptEnvelopeHistory.resx">
|
||||||
|
<DependentUpon>rptEnvelopeHistory.vb</DependentUpon>
|
||||||
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="Strings\Email.en.resx">
|
<EmbeddedResource Include="Strings\Email.en.resx">
|
||||||
<Generator>ResXFileCodeGenerator</Generator>
|
<Generator>ResXFileCodeGenerator</Generator>
|
||||||
<LastGenOutput>Email.en.Designer.vb</LastGenOutput>
|
<LastGenOutput>Email.en.Designer.vb</LastGenOutput>
|
||||||
|
|||||||
@ -71,7 +71,7 @@ Public Class EnvelopeModel
|
|||||||
|
|
||||||
Public Function List() As IEnumerable(Of Envelope)
|
Public Function List() As IEnumerable(Of Envelope)
|
||||||
Try
|
Try
|
||||||
Dim oSql = $"SELECT * FROM [dbo].[TBSIG_ENVELOPE] WHERE USER_ID = {State.UserId} AND STATUS IN (0,1,2,3)"
|
Dim oSql = $"SELECT * FROM [dbo].[TBSIG_ENVELOPE] WHERE USER_ID = {State.UserId} AND STATUS IN (1001,1002,1003,1004,1005)"
|
||||||
Dim oTable = Database.GetDatatable(oSql)
|
Dim oTable = Database.GetDatatable(oSql)
|
||||||
|
|
||||||
Return oTable?.Rows.Cast(Of DataRow).
|
Return oTable?.Rows.Cast(Of DataRow).
|
||||||
|
|||||||
1
EnvelopeGenerator.Common/My Project/licenses.licx
Normal file
1
EnvelopeGenerator.Common/My Project/licenses.licx
Normal file
@ -0,0 +1 @@
|
|||||||
|
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
16
EnvelopeGenerator.Common/Reports/ReportCreator.vb
Normal file
16
EnvelopeGenerator.Common/Reports/ReportCreator.vb
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
Imports System.IO
|
||||||
|
Imports DevExpress.XtraPrinting
|
||||||
|
|
||||||
|
Public Class ReportCreator
|
||||||
|
Public Shared Async Function CreateReport(pReportItems As List(Of ReportItem)) As Task(Of Byte())
|
||||||
|
Dim oSource As New ReportSource With {.Items = pReportItems}
|
||||||
|
Dim oReport As New rptEnvelopeHistory() With {.DataSource = oSource, .DataMember = "Items"}
|
||||||
|
|
||||||
|
Await oReport.CreateDocumentAsync()
|
||||||
|
|
||||||
|
Using oStream As New MemoryStream()
|
||||||
|
Await oReport.ExportToPdfAsync(oStream, New PdfExportOptions)
|
||||||
|
Return oStream.ToArray()
|
||||||
|
End Using
|
||||||
|
End Function
|
||||||
|
End Class
|
||||||
7
EnvelopeGenerator.Common/Reports/ReportItem.vb
Normal file
7
EnvelopeGenerator.Common/Reports/ReportItem.vb
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
Public Class ReportItem
|
||||||
|
|
||||||
|
Public Property ItemStatus As Constants.EnvelopeStatus
|
||||||
|
Public Property ItemUserReference As String
|
||||||
|
Public Property ItemDate As Date
|
||||||
|
|
||||||
|
End Class
|
||||||
3
EnvelopeGenerator.Common/Reports/ReportSource.vb
Normal file
3
EnvelopeGenerator.Common/Reports/ReportSource.vb
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Public Class ReportSource
|
||||||
|
Public Property Items As List(Of ReportItem)
|
||||||
|
End Class
|
||||||
304
EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.Designer.vb
generated
Normal file
304
EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.Designer.vb
generated
Normal file
@ -0,0 +1,304 @@
|
|||||||
|
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
|
||||||
|
Partial Public Class rptEnvelopeHistory
|
||||||
|
Inherits DevExpress.XtraReports.UI.XtraReport
|
||||||
|
|
||||||
|
'XtraReport overrides dispose to clean up the component list.
|
||||||
|
<System.Diagnostics.DebuggerNonUserCode()> _
|
||||||
|
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
|
||||||
|
If disposing AndAlso components IsNot Nothing Then
|
||||||
|
components.Dispose()
|
||||||
|
End If
|
||||||
|
MyBase.Dispose(disposing)
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
'Required by the Designer
|
||||||
|
Private components As System.ComponentModel.IContainer
|
||||||
|
|
||||||
|
'NOTE: The following procedure is required by the Designer
|
||||||
|
'It can be modified using the Designer.
|
||||||
|
'Do not modify it using the code editor.
|
||||||
|
<System.Diagnostics.DebuggerStepThrough()> _
|
||||||
|
Private Sub InitializeComponent()
|
||||||
|
Me.components = New System.ComponentModel.Container()
|
||||||
|
Me.TopMargin = New DevExpress.XtraReports.UI.TopMarginBand()
|
||||||
|
Me.BottomMargin = New DevExpress.XtraReports.UI.BottomMarginBand()
|
||||||
|
Me.ReportHeader = New DevExpress.XtraReports.UI.ReportHeaderBand()
|
||||||
|
Me.GroupHeader1 = New DevExpress.XtraReports.UI.GroupHeaderBand()
|
||||||
|
Me.Detail = New DevExpress.XtraReports.UI.DetailBand()
|
||||||
|
Me.pageInfo1 = New DevExpress.XtraReports.UI.XRPageInfo()
|
||||||
|
Me.pageInfo2 = New DevExpress.XtraReports.UI.XRPageInfo()
|
||||||
|
Me.label1 = New DevExpress.XtraReports.UI.XRLabel()
|
||||||
|
Me.table1 = New DevExpress.XtraReports.UI.XRTable()
|
||||||
|
Me.tableRow1 = New DevExpress.XtraReports.UI.XRTableRow()
|
||||||
|
Me.tableCell1 = New DevExpress.XtraReports.UI.XRTableCell()
|
||||||
|
Me.tableCell2 = New DevExpress.XtraReports.UI.XRTableCell()
|
||||||
|
Me.tableCell3 = New DevExpress.XtraReports.UI.XRTableCell()
|
||||||
|
Me.table2 = New DevExpress.XtraReports.UI.XRTable()
|
||||||
|
Me.tableRow2 = New DevExpress.XtraReports.UI.XRTableRow()
|
||||||
|
Me.tableCell4 = New DevExpress.XtraReports.UI.XRTableCell()
|
||||||
|
Me.tableCell5 = New DevExpress.XtraReports.UI.XRTableCell()
|
||||||
|
Me.tableCell6 = New DevExpress.XtraReports.UI.XRTableCell()
|
||||||
|
Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components)
|
||||||
|
Me.Title = New DevExpress.XtraReports.UI.XRControlStyle()
|
||||||
|
Me.DetailCaption1 = New DevExpress.XtraReports.UI.XRControlStyle()
|
||||||
|
Me.DetailData1 = New DevExpress.XtraReports.UI.XRControlStyle()
|
||||||
|
Me.DetailData3_Odd = New DevExpress.XtraReports.UI.XRControlStyle()
|
||||||
|
Me.PageInfo = New DevExpress.XtraReports.UI.XRControlStyle()
|
||||||
|
CType(Me.table1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
|
CType(Me.table2, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
|
CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
|
CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
|
'
|
||||||
|
'TopMargin
|
||||||
|
'
|
||||||
|
Me.TopMargin.Dpi = 254.0!
|
||||||
|
Me.TopMargin.HeightF = 254.0!
|
||||||
|
Me.TopMargin.Name = "TopMargin"
|
||||||
|
'
|
||||||
|
'BottomMargin
|
||||||
|
'
|
||||||
|
Me.BottomMargin.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.pageInfo1, Me.pageInfo2})
|
||||||
|
Me.BottomMargin.Dpi = 254.0!
|
||||||
|
Me.BottomMargin.HeightF = 254.0!
|
||||||
|
Me.BottomMargin.Name = "BottomMargin"
|
||||||
|
'
|
||||||
|
'ReportHeader
|
||||||
|
'
|
||||||
|
Me.ReportHeader.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.label1})
|
||||||
|
Me.ReportHeader.Dpi = 254.0!
|
||||||
|
Me.ReportHeader.HeightF = 152.4!
|
||||||
|
Me.ReportHeader.Name = "ReportHeader"
|
||||||
|
'
|
||||||
|
'GroupHeader1
|
||||||
|
'
|
||||||
|
Me.GroupHeader1.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.table1})
|
||||||
|
Me.GroupHeader1.Dpi = 254.0!
|
||||||
|
Me.GroupHeader1.GroupUnion = DevExpress.XtraReports.UI.GroupUnion.WithFirstDetail
|
||||||
|
Me.GroupHeader1.HeightF = 71.12!
|
||||||
|
Me.GroupHeader1.Name = "GroupHeader1"
|
||||||
|
'
|
||||||
|
'Detail
|
||||||
|
'
|
||||||
|
Me.Detail.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.table2})
|
||||||
|
Me.Detail.Dpi = 254.0!
|
||||||
|
Me.Detail.HeightF = 63.42!
|
||||||
|
Me.Detail.HierarchyPrintOptions.Indent = 50.8!
|
||||||
|
Me.Detail.Name = "Detail"
|
||||||
|
'
|
||||||
|
'pageInfo1
|
||||||
|
'
|
||||||
|
Me.pageInfo1.Dpi = 254.0!
|
||||||
|
Me.pageInfo1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
|
||||||
|
Me.pageInfo1.Name = "pageInfo1"
|
||||||
|
Me.pageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime
|
||||||
|
Me.pageInfo1.SizeF = New System.Drawing.SizeF(796.0!, 58.0!)
|
||||||
|
Me.pageInfo1.StyleName = "PageInfo"
|
||||||
|
'
|
||||||
|
'pageInfo2
|
||||||
|
'
|
||||||
|
Me.pageInfo2.Dpi = 254.0!
|
||||||
|
Me.pageInfo2.LocationFloat = New DevExpress.Utils.PointFloat(796.0!, 0!)
|
||||||
|
Me.pageInfo2.Name = "pageInfo2"
|
||||||
|
Me.pageInfo2.SizeF = New System.Drawing.SizeF(796.0!, 58.0!)
|
||||||
|
Me.pageInfo2.StyleName = "PageInfo"
|
||||||
|
Me.pageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight
|
||||||
|
Me.pageInfo2.TextFormatString = "Seite {0} von {1}"
|
||||||
|
'
|
||||||
|
'label1
|
||||||
|
'
|
||||||
|
Me.label1.Dpi = 254.0!
|
||||||
|
Me.label1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
|
||||||
|
Me.label1.Name = "label1"
|
||||||
|
Me.label1.SizeF = New System.Drawing.SizeF(1592.0!, 61.45361!)
|
||||||
|
Me.label1.StyleName = "Title"
|
||||||
|
Me.label1.Text = "Envelope History"
|
||||||
|
'
|
||||||
|
'table1
|
||||||
|
'
|
||||||
|
Me.table1.Dpi = 254.0!
|
||||||
|
Me.table1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
|
||||||
|
Me.table1.Name = "table1"
|
||||||
|
Me.table1.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow1})
|
||||||
|
Me.table1.SizeF = New System.Drawing.SizeF(1592.0!, 71.12!)
|
||||||
|
'
|
||||||
|
'tableRow1
|
||||||
|
'
|
||||||
|
Me.tableRow1.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell1, Me.tableCell2, Me.tableCell3})
|
||||||
|
Me.tableRow1.Dpi = 254.0!
|
||||||
|
Me.tableRow1.Name = "tableRow1"
|
||||||
|
Me.tableRow1.Weight = 1.0R
|
||||||
|
'
|
||||||
|
'tableCell1
|
||||||
|
'
|
||||||
|
Me.tableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None
|
||||||
|
Me.tableCell1.Dpi = 254.0!
|
||||||
|
Me.tableCell1.Name = "tableCell1"
|
||||||
|
Me.tableCell1.StyleName = "DetailCaption1"
|
||||||
|
Me.tableCell1.StylePriority.UseBorders = False
|
||||||
|
Me.tableCell1.Text = "Item Status"
|
||||||
|
Me.tableCell1.Weight = 0.28459106138603174R
|
||||||
|
'
|
||||||
|
'tableCell2
|
||||||
|
'
|
||||||
|
Me.tableCell2.Dpi = 254.0!
|
||||||
|
Me.tableCell2.Name = "tableCell2"
|
||||||
|
Me.tableCell2.StyleName = "DetailCaption1"
|
||||||
|
Me.tableCell2.Text = "Item User Reference"
|
||||||
|
Me.tableCell2.Weight = 0.46912142499607412R
|
||||||
|
'
|
||||||
|
'tableCell3
|
||||||
|
'
|
||||||
|
Me.tableCell3.Dpi = 254.0!
|
||||||
|
Me.tableCell3.Name = "tableCell3"
|
||||||
|
Me.tableCell3.StyleName = "DetailCaption1"
|
||||||
|
Me.tableCell3.Text = "Item Date"
|
||||||
|
Me.tableCell3.Weight = 0.24628753278722715R
|
||||||
|
'
|
||||||
|
'table2
|
||||||
|
'
|
||||||
|
Me.table2.Dpi = 254.0!
|
||||||
|
Me.table2.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
|
||||||
|
Me.table2.Name = "table2"
|
||||||
|
Me.table2.OddStyleName = "DetailData3_Odd"
|
||||||
|
Me.table2.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow2})
|
||||||
|
Me.table2.SizeF = New System.Drawing.SizeF(1592.0!, 63.42!)
|
||||||
|
'
|
||||||
|
'tableRow2
|
||||||
|
'
|
||||||
|
Me.tableRow2.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell4, Me.tableCell5, Me.tableCell6})
|
||||||
|
Me.tableRow2.Dpi = 254.0!
|
||||||
|
Me.tableRow2.Name = "tableRow2"
|
||||||
|
Me.tableRow2.Weight = 11.683999633789062R
|
||||||
|
'
|
||||||
|
'tableCell4
|
||||||
|
'
|
||||||
|
Me.tableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None
|
||||||
|
Me.tableCell4.Dpi = 254.0!
|
||||||
|
Me.tableCell4.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[ItemStatus]")})
|
||||||
|
Me.tableCell4.Name = "tableCell4"
|
||||||
|
Me.tableCell4.StyleName = "DetailData1"
|
||||||
|
Me.tableCell4.StylePriority.UseBorders = False
|
||||||
|
Me.tableCell4.Weight = 0.28459106138603174R
|
||||||
|
'
|
||||||
|
'tableCell5
|
||||||
|
'
|
||||||
|
Me.tableCell5.Dpi = 254.0!
|
||||||
|
Me.tableCell5.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[ItemUserReference]")})
|
||||||
|
Me.tableCell5.Name = "tableCell5"
|
||||||
|
Me.tableCell5.StyleName = "DetailData1"
|
||||||
|
Me.tableCell5.Weight = 0.46912142499607412R
|
||||||
|
'
|
||||||
|
'tableCell6
|
||||||
|
'
|
||||||
|
Me.tableCell6.Dpi = 254.0!
|
||||||
|
Me.tableCell6.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[ItemDate]")})
|
||||||
|
Me.tableCell6.Name = "tableCell6"
|
||||||
|
Me.tableCell6.StyleName = "DetailData1"
|
||||||
|
Me.tableCell6.Weight = 0.24628751361789417R
|
||||||
|
'
|
||||||
|
'ObjectDataSource1
|
||||||
|
'
|
||||||
|
Me.ObjectDataSource1.DataMember = "Items"
|
||||||
|
Me.ObjectDataSource1.DataSource = GetType(EnvelopeGenerator.Common.ReportSource)
|
||||||
|
Me.ObjectDataSource1.Name = "ObjectDataSource1"
|
||||||
|
'
|
||||||
|
'Title
|
||||||
|
'
|
||||||
|
Me.Title.BackColor = System.Drawing.Color.Transparent
|
||||||
|
Me.Title.BorderColor = System.Drawing.Color.Black
|
||||||
|
Me.Title.Borders = DevExpress.XtraPrinting.BorderSide.None
|
||||||
|
Me.Title.BorderWidth = 1.0!
|
||||||
|
Me.Title.Font = New System.Drawing.Font("Arial", 14.25!)
|
||||||
|
Me.Title.ForeColor = System.Drawing.Color.FromArgb(CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer))
|
||||||
|
Me.Title.Name = "Title"
|
||||||
|
Me.Title.Padding = New DevExpress.XtraPrinting.PaddingInfo(15, 15, 0, 0, 254.0!)
|
||||||
|
'
|
||||||
|
'DetailCaption1
|
||||||
|
'
|
||||||
|
Me.DetailCaption1.BackColor = System.Drawing.Color.FromArgb(CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer))
|
||||||
|
Me.DetailCaption1.BorderColor = System.Drawing.Color.White
|
||||||
|
Me.DetailCaption1.Borders = DevExpress.XtraPrinting.BorderSide.Left
|
||||||
|
Me.DetailCaption1.BorderWidth = 2.0!
|
||||||
|
Me.DetailCaption1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
|
||||||
|
Me.DetailCaption1.ForeColor = System.Drawing.Color.White
|
||||||
|
Me.DetailCaption1.Name = "DetailCaption1"
|
||||||
|
Me.DetailCaption1.Padding = New DevExpress.XtraPrinting.PaddingInfo(15, 15, 0, 0, 254.0!)
|
||||||
|
Me.DetailCaption1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
|
||||||
|
'
|
||||||
|
'DetailData1
|
||||||
|
'
|
||||||
|
Me.DetailData1.BorderColor = System.Drawing.Color.Transparent
|
||||||
|
Me.DetailData1.Borders = DevExpress.XtraPrinting.BorderSide.Left
|
||||||
|
Me.DetailData1.BorderWidth = 2.0!
|
||||||
|
Me.DetailData1.Font = New System.Drawing.Font("Arial", 8.25!)
|
||||||
|
Me.DetailData1.ForeColor = System.Drawing.Color.Black
|
||||||
|
Me.DetailData1.Name = "DetailData1"
|
||||||
|
Me.DetailData1.Padding = New DevExpress.XtraPrinting.PaddingInfo(15, 15, 0, 0, 254.0!)
|
||||||
|
Me.DetailData1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
|
||||||
|
'
|
||||||
|
'DetailData3_Odd
|
||||||
|
'
|
||||||
|
Me.DetailData3_Odd.BackColor = System.Drawing.Color.FromArgb(CType(CType(231, Byte), Integer), CType(CType(231, Byte), Integer), CType(CType(231, Byte), Integer))
|
||||||
|
Me.DetailData3_Odd.BorderColor = System.Drawing.Color.Transparent
|
||||||
|
Me.DetailData3_Odd.Borders = DevExpress.XtraPrinting.BorderSide.None
|
||||||
|
Me.DetailData3_Odd.BorderWidth = 1.0!
|
||||||
|
Me.DetailData3_Odd.Font = New System.Drawing.Font("Arial", 8.25!)
|
||||||
|
Me.DetailData3_Odd.ForeColor = System.Drawing.Color.Black
|
||||||
|
Me.DetailData3_Odd.Name = "DetailData3_Odd"
|
||||||
|
Me.DetailData3_Odd.Padding = New DevExpress.XtraPrinting.PaddingInfo(15, 15, 0, 0, 254.0!)
|
||||||
|
Me.DetailData3_Odd.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
|
||||||
|
'
|
||||||
|
'PageInfo
|
||||||
|
'
|
||||||
|
Me.PageInfo.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
|
||||||
|
Me.PageInfo.ForeColor = System.Drawing.Color.FromArgb(CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer))
|
||||||
|
Me.PageInfo.Name = "PageInfo"
|
||||||
|
Me.PageInfo.Padding = New DevExpress.XtraPrinting.PaddingInfo(15, 15, 0, 0, 254.0!)
|
||||||
|
'
|
||||||
|
'rptEnvelopeHistory
|
||||||
|
'
|
||||||
|
Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.ReportHeader, Me.GroupHeader1, Me.Detail})
|
||||||
|
Me.ComponentStorage.AddRange(New System.ComponentModel.IComponent() {Me.ObjectDataSource1})
|
||||||
|
Me.DataSource = Me.ObjectDataSource1
|
||||||
|
Me.Dpi = 254.0!
|
||||||
|
Me.Font = New System.Drawing.Font("Arial", 9.75!)
|
||||||
|
Me.Margins = New System.Drawing.Printing.Margins(254, 254, 254, 254)
|
||||||
|
Me.PageHeight = 2970
|
||||||
|
Me.PageWidth = 2100
|
||||||
|
Me.PaperKind = System.Drawing.Printing.PaperKind.A4
|
||||||
|
Me.ReportUnit = DevExpress.XtraReports.UI.ReportUnit.TenthsOfAMillimeter
|
||||||
|
Me.SnapGridSize = 25.0!
|
||||||
|
Me.StyleSheet.AddRange(New DevExpress.XtraReports.UI.XRControlStyle() {Me.Title, Me.DetailCaption1, Me.DetailData1, Me.DetailData3_Odd, Me.PageInfo})
|
||||||
|
Me.Version = "21.2"
|
||||||
|
CType(Me.table1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||||
|
CType(Me.table2, System.ComponentModel.ISupportInitialize).EndInit()
|
||||||
|
CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||||
|
CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
|
||||||
|
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
Friend WithEvents TopMargin As DevExpress.XtraReports.UI.TopMarginBand
|
||||||
|
Friend WithEvents BottomMargin As DevExpress.XtraReports.UI.BottomMarginBand
|
||||||
|
Friend WithEvents pageInfo1 As DevExpress.XtraReports.UI.XRPageInfo
|
||||||
|
Friend WithEvents pageInfo2 As DevExpress.XtraReports.UI.XRPageInfo
|
||||||
|
Friend WithEvents ReportHeader As DevExpress.XtraReports.UI.ReportHeaderBand
|
||||||
|
Friend WithEvents label1 As DevExpress.XtraReports.UI.XRLabel
|
||||||
|
Friend WithEvents GroupHeader1 As DevExpress.XtraReports.UI.GroupHeaderBand
|
||||||
|
Friend WithEvents table1 As DevExpress.XtraReports.UI.XRTable
|
||||||
|
Friend WithEvents tableRow1 As DevExpress.XtraReports.UI.XRTableRow
|
||||||
|
Friend WithEvents tableCell1 As DevExpress.XtraReports.UI.XRTableCell
|
||||||
|
Friend WithEvents tableCell2 As DevExpress.XtraReports.UI.XRTableCell
|
||||||
|
Friend WithEvents tableCell3 As DevExpress.XtraReports.UI.XRTableCell
|
||||||
|
Friend WithEvents Detail As DevExpress.XtraReports.UI.DetailBand
|
||||||
|
Friend WithEvents table2 As DevExpress.XtraReports.UI.XRTable
|
||||||
|
Friend WithEvents tableRow2 As DevExpress.XtraReports.UI.XRTableRow
|
||||||
|
Friend WithEvents tableCell4 As DevExpress.XtraReports.UI.XRTableCell
|
||||||
|
Friend WithEvents tableCell5 As DevExpress.XtraReports.UI.XRTableCell
|
||||||
|
Friend WithEvents tableCell6 As DevExpress.XtraReports.UI.XRTableCell
|
||||||
|
Friend WithEvents ObjectDataSource1 As DevExpress.DataAccess.ObjectBinding.ObjectDataSource
|
||||||
|
Friend WithEvents Title As DevExpress.XtraReports.UI.XRControlStyle
|
||||||
|
Friend WithEvents DetailCaption1 As DevExpress.XtraReports.UI.XRControlStyle
|
||||||
|
Friend WithEvents DetailData1 As DevExpress.XtraReports.UI.XRControlStyle
|
||||||
|
Friend WithEvents DetailData3_Odd As DevExpress.XtraReports.UI.XRControlStyle
|
||||||
|
Friend WithEvents PageInfo As DevExpress.XtraReports.UI.XRControlStyle
|
||||||
|
End Class
|
||||||
123
EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.resx
Normal file
123
EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.resx
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<metadata name="ObjectDataSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
|
<value>17, 17</value>
|
||||||
|
</metadata>
|
||||||
|
</root>
|
||||||
3
EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.vb
Normal file
3
EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.vb
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Public Class rptEnvelopeHistory
|
||||||
|
|
||||||
|
End Class
|
||||||
@ -1,32 +1,52 @@
|
|||||||
Imports DigitalData.Modules.Base
|
Imports DevExpress.DataAccess.Native.Web
|
||||||
|
Imports DigitalData.Modules.Base
|
||||||
|
|
||||||
Public Class ActionService
|
Public Class ActionService
|
||||||
Inherits BaseClass
|
Inherits BaseClass
|
||||||
|
|
||||||
Private ReadOnly State As State
|
Private ReadOnly EmailService As EmailService
|
||||||
|
Private ReadOnly HistoryService As HistoryService
|
||||||
|
|
||||||
Private EmailService As EmailService
|
Private ReadOnly ReceiverModel As ReceiverModel
|
||||||
Private HistoryService As HistoryService
|
|
||||||
|
|
||||||
|
|
||||||
Public Sub New(pState As State)
|
Public Sub New(pState As State)
|
||||||
MyBase.New(pState.LogConfig)
|
MyBase.New(pState.LogConfig)
|
||||||
|
|
||||||
State = pState
|
|
||||||
EmailService = New EmailService(pState)
|
EmailService = New EmailService(pState)
|
||||||
HistoryService = New HistoryService(pState)
|
HistoryService = New HistoryService(pState)
|
||||||
|
|
||||||
|
ReceiverModel = New ReceiverModel(pState)
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Public Function DeleteEnvelope(pEnvelope As Envelope) As Boolean
|
Public Function DeleteEnvelope(pEnvelope As Envelope) As Boolean
|
||||||
|
|
||||||
HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.EnvelopeDeleted, pEnvelope.User.Email)
|
HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.EnvelopeDeleted, pEnvelope.User.Email)
|
||||||
|
|
||||||
For Each oReceiver As EnvelopeReceiver In pEnvelope.Receivers
|
For Each oReceiver As EnvelopeReceiver In pEnvelope.Receivers
|
||||||
EmailService.SendEnvelopeDeletedEmail(oReceiver.Id, pEnvelope.Id)
|
EmailService.SendEnvelopeDeletedEmail(oReceiver.Id, pEnvelope.Id)
|
||||||
Next
|
Next
|
||||||
|
|
||||||
|
|
||||||
Return True
|
Return True
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
|
Public Function OpenEnvelope(pEnvelope As Envelope, pReceiverId As Integer) As Boolean
|
||||||
|
Dim oReceiver As EnvelopeReceiver = ReceiverModel.GetById(pReceiverId)
|
||||||
|
Dim oUserReference = oReceiver.Email
|
||||||
|
|
||||||
|
Return HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.DocumentOpened, oUserReference)
|
||||||
|
End Function
|
||||||
|
|
||||||
|
Public Function SignEnvelope(pEnvelope As Envelope, pReceiverId As Integer) As Boolean
|
||||||
|
Dim oReceiver As EnvelopeReceiver = ReceiverModel.GetById(pReceiverId)
|
||||||
|
Dim oUserReference = oReceiver.Email
|
||||||
|
|
||||||
|
If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.DocumentSigned, oUserReference) = False Then
|
||||||
|
Return False
|
||||||
|
End If
|
||||||
|
|
||||||
|
Return EmailService.SendSignedEmail(oReceiver.Id, pEnvelope.Id)
|
||||||
|
End Function
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
@ -65,6 +65,10 @@
|
|||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
|
<HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="DigitalData.Modules.Config, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="DigitalData.Modules.Database">
|
<Reference Include="DigitalData.Modules.Database">
|
||||||
<HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
|
<HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
@ -117,6 +121,12 @@
|
|||||||
<Compile Include="frmFinalizePDF.vb">
|
<Compile Include="frmFinalizePDF.vb">
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="frmReportViewer.Designer.vb">
|
||||||
|
<DependentUpon>frmReportViewer.vb</DependentUpon>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="frmReportViewer.vb">
|
||||||
|
<SubType>Form</SubType>
|
||||||
|
</Compile>
|
||||||
<Compile Include="My Project\Application.Designer.vb">
|
<Compile Include="My Project\Application.Designer.vb">
|
||||||
<AutoGen>True</AutoGen>
|
<AutoGen>True</AutoGen>
|
||||||
<DependentUpon>Application.myapp</DependentUpon>
|
<DependentUpon>Application.myapp</DependentUpon>
|
||||||
@ -130,6 +140,9 @@
|
|||||||
<EmbeddedResource Include="frmFinalizePDF.resx">
|
<EmbeddedResource Include="frmFinalizePDF.resx">
|
||||||
<DependentUpon>frmFinalizePDF.vb</DependentUpon>
|
<DependentUpon>frmFinalizePDF.vb</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
|
<EmbeddedResource Include="frmReportViewer.resx">
|
||||||
|
<DependentUpon>frmReportViewer.vb</DependentUpon>
|
||||||
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="My Project\licenses.licx" />
|
<EmbeddedResource Include="My Project\licenses.licx" />
|
||||||
<EmbeddedResource Include="My Project\Resources.resx">
|
<EmbeddedResource Include="My Project\Resources.resx">
|
||||||
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
|
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
|
||||||
@ -159,6 +172,12 @@
|
|||||||
<LastGenOutput>Application.Designer.vb</LastGenOutput>
|
<LastGenOutput>Application.Designer.vb</LastGenOutput>
|
||||||
</None>
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\EnvelopeGenerator.Common\EnvelopeGenerator.Common.vbproj">
|
||||||
|
<Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
|
||||||
|
<Name>EnvelopeGenerator.Common</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|||||||
@ -32,7 +32,7 @@ Namespace My
|
|||||||
|
|
||||||
<Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
|
<Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
|
||||||
Protected Overrides Sub OnCreateMainForm()
|
Protected Overrides Sub OnCreateMainForm()
|
||||||
Me.MainForm = Global.EnvelopeGenerator.frmFinalizePDF
|
Me.MainForm = Global.EnvelopeGenerator.frmReportViewer
|
||||||
End Sub
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
End Namespace
|
End Namespace
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<MyApplicationData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
<MyApplicationData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
<MySubMain>true</MySubMain>
|
<MySubMain>true</MySubMain>
|
||||||
<MainForm>frmFinalizePDF</MainForm>
|
<MainForm>frmReportViewer</MainForm>
|
||||||
<SingleInstance>false</SingleInstance>
|
<SingleInstance>false</SingleInstance>
|
||||||
<ShutdownMode>0</ShutdownMode>
|
<ShutdownMode>0</ShutdownMode>
|
||||||
<EnableVisualStyles>true</EnableVisualStyles>
|
<EnableVisualStyles>true</EnableVisualStyles>
|
||||||
|
|||||||
91
EnvelopeGenerator.Test/frmReportViewer.Designer.vb
generated
Normal file
91
EnvelopeGenerator.Test/frmReportViewer.Designer.vb
generated
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
|
||||||
|
Partial Class frmReportViewer
|
||||||
|
Inherits DevExpress.XtraBars.Ribbon.RibbonForm
|
||||||
|
|
||||||
|
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
|
||||||
|
<System.Diagnostics.DebuggerNonUserCode()> _
|
||||||
|
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
|
||||||
|
Try
|
||||||
|
If disposing AndAlso components IsNot Nothing Then
|
||||||
|
components.Dispose()
|
||||||
|
End If
|
||||||
|
Finally
|
||||||
|
MyBase.Dispose(disposing)
|
||||||
|
End Try
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
'Wird vom Windows Form-Designer benötigt.
|
||||||
|
Private components As System.ComponentModel.IContainer
|
||||||
|
|
||||||
|
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
|
||||||
|
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
|
||||||
|
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
|
||||||
|
<System.Diagnostics.DebuggerStepThrough()> _
|
||||||
|
Private Sub InitializeComponent()
|
||||||
|
Me.PdfViewer1 = New DevExpress.XtraPdfViewer.PdfViewer()
|
||||||
|
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
|
||||||
|
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||||
|
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||||
|
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
|
||||||
|
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
|
Me.SuspendLayout()
|
||||||
|
'
|
||||||
|
'PdfViewer1
|
||||||
|
'
|
||||||
|
Me.PdfViewer1.Dock = System.Windows.Forms.DockStyle.Fill
|
||||||
|
Me.PdfViewer1.Location = New System.Drawing.Point(0, 158)
|
||||||
|
Me.PdfViewer1.MenuManager = Me.RibbonControl1
|
||||||
|
Me.PdfViewer1.Name = "PdfViewer1"
|
||||||
|
Me.PdfViewer1.Size = New System.Drawing.Size(965, 366)
|
||||||
|
Me.PdfViewer1.TabIndex = 0
|
||||||
|
'
|
||||||
|
'RibbonControl1
|
||||||
|
'
|
||||||
|
Me.RibbonControl1.ExpandCollapseItem.Id = 0
|
||||||
|
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1})
|
||||||
|
Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
|
||||||
|
Me.RibbonControl1.MaxItemId = 2
|
||||||
|
Me.RibbonControl1.Name = "RibbonControl1"
|
||||||
|
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
|
||||||
|
Me.RibbonControl1.Size = New System.Drawing.Size(965, 158)
|
||||||
|
'
|
||||||
|
'RibbonPage1
|
||||||
|
'
|
||||||
|
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
|
||||||
|
Me.RibbonPage1.Name = "RibbonPage1"
|
||||||
|
Me.RibbonPage1.Text = "RibbonPage1"
|
||||||
|
'
|
||||||
|
'RibbonPageGroup1
|
||||||
|
'
|
||||||
|
Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
|
||||||
|
Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
|
||||||
|
Me.RibbonPageGroup1.Text = "RibbonPageGroup1"
|
||||||
|
'
|
||||||
|
'BarButtonItem1
|
||||||
|
'
|
||||||
|
Me.BarButtonItem1.Caption = "BarButtonItem1"
|
||||||
|
Me.BarButtonItem1.Id = 1
|
||||||
|
Me.BarButtonItem1.Name = "BarButtonItem1"
|
||||||
|
'
|
||||||
|
'frmReportViewer
|
||||||
|
'
|
||||||
|
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||||
|
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||||
|
Me.ClientSize = New System.Drawing.Size(965, 524)
|
||||||
|
Me.Controls.Add(Me.PdfViewer1)
|
||||||
|
Me.Controls.Add(Me.RibbonControl1)
|
||||||
|
Me.Name = "frmReportViewer"
|
||||||
|
Me.Ribbon = Me.RibbonControl1
|
||||||
|
Me.Text = "frmReportViewer"
|
||||||
|
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||||
|
Me.ResumeLayout(False)
|
||||||
|
Me.PerformLayout()
|
||||||
|
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
Friend WithEvents PdfViewer1 As DevExpress.XtraPdfViewer.PdfViewer
|
||||||
|
Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
|
||||||
|
Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
|
||||||
|
Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
||||||
|
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
|
||||||
|
End Class
|
||||||
120
EnvelopeGenerator.Test/frmReportViewer.resx
Normal file
120
EnvelopeGenerator.Test/frmReportViewer.resx
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
</root>
|
||||||
45
EnvelopeGenerator.Test/frmReportViewer.vb
Normal file
45
EnvelopeGenerator.Test/frmReportViewer.vb
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
Imports DigitalData.Modules.Logging
|
||||||
|
Imports DigitalData.Modules.Database
|
||||||
|
Imports DigitalData.Modules.Config
|
||||||
|
Imports DigitalData.Modules.Base
|
||||||
|
Imports EnvelopeGenerator.Common
|
||||||
|
|
||||||
|
Public Class frmReportViewer
|
||||||
|
Private LogConfig As LogConfig
|
||||||
|
Private Logger As Logger
|
||||||
|
Private ConfigManager As ConfigManager(Of Config)
|
||||||
|
Private Database As MSSQLServer
|
||||||
|
|
||||||
|
Private Async Sub frmReportViewer_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||||
|
LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Application.StartupPath, CompanyName:="Digital Data", ProductName:="EnvelopeGenerator")
|
||||||
|
Logger = LogConfig.GetLogger()
|
||||||
|
ConfigManager = New ConfigManager(Of Config)(LogConfig, "C:\Users\JenneJ\AppData\Roaming\Digital Data\Envelope Generator\1.0.0.0")
|
||||||
|
|
||||||
|
Database = New MSSQLServer(LogConfig, MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString))
|
||||||
|
|
||||||
|
Dim oTable As DataTable = Database.GetDatatable("SELECT * FROM VWSIG_ENVELOPE_REPORT")
|
||||||
|
Dim oItems = GetReportSource(oTable)
|
||||||
|
|
||||||
|
Dim oBuffer = Await ReportCreator.CreateReport(oItems)
|
||||||
|
|
||||||
|
Using oStream As New IO.MemoryStream(oBuffer)
|
||||||
|
PdfViewer1.LoadDocument(oStream)
|
||||||
|
End Using
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
Private Function GetReportSource(pDataTable As DataTable) As List(Of ReportItem)
|
||||||
|
Return pDataTable.Rows.
|
||||||
|
Cast(Of DataRow).
|
||||||
|
Select(AddressOf ToReportItem).
|
||||||
|
OrderByDescending(Function(r) r.ItemDate).
|
||||||
|
ToList()
|
||||||
|
End Function
|
||||||
|
|
||||||
|
Private Function ToReportItem(pRow As DataRow) As ReportItem
|
||||||
|
Return New ReportItem() With {
|
||||||
|
.ItemDate = pRow.ItemEx(Of Date)("POS_WHEN", Nothing),
|
||||||
|
.ItemStatus = pRow.ItemEx("POS_STATUS", 0),
|
||||||
|
.ItemUserReference = pRow.ItemEx("POS_WHO", "")
|
||||||
|
}
|
||||||
|
End Function
|
||||||
|
End Class
|
||||||
@ -18,7 +18,7 @@ namespace EnvelopeGenerator.Web.Controllers
|
|||||||
this.database = database;
|
this.database = database;
|
||||||
this.logConfig = logging.LogConfig;
|
this.logConfig = logging.LogConfig;
|
||||||
this.logger = logging.LogConfig.GetLoggerFor(GetType().Name);
|
this.logger = logging.LogConfig.GetLoggerFor(GetType().Name);
|
||||||
this.state = GetState();
|
this.state = database.State;
|
||||||
}
|
}
|
||||||
|
|
||||||
internal ObjectResult ErrorResponse(Exception e)
|
internal ObjectResult ErrorResponse(Exception e)
|
||||||
@ -29,15 +29,5 @@ namespace EnvelopeGenerator.Web.Controllers
|
|||||||
detail: e.Message,
|
detail: e.Message,
|
||||||
type: ErrorType.ServerError.ToString());
|
type: ErrorType.ServerError.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
internal State GetState()
|
|
||||||
{
|
|
||||||
return new State
|
|
||||||
{
|
|
||||||
Database = database.MSSQL,
|
|
||||||
LogConfig = logConfig,
|
|
||||||
UserId = 2 // TODO
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,16 +1,19 @@
|
|||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using EnvelopeGenerator.Common;
|
using EnvelopeGenerator.Common;
|
||||||
using EnvelopeGenerator.Web.Services;
|
using EnvelopeGenerator.Web.Services;
|
||||||
|
using static EnvelopeGenerator.Common.Constants;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Web.Controllers
|
namespace EnvelopeGenerator.Web.Controllers
|
||||||
{
|
{
|
||||||
public class DocumentController : BaseController
|
public class DocumentController : BaseController
|
||||||
{
|
{
|
||||||
private readonly EnvelopeService envelopeService;
|
private readonly EnvelopeService envelopeService;
|
||||||
|
private readonly ActionService? actionService;
|
||||||
|
|
||||||
public DocumentController(DatabaseService database, LoggingService logging, EnvelopeService envelope) : base(database, logging)
|
public DocumentController(DatabaseService database, LoggingService logging, EnvelopeService envelope) : base(database, logging)
|
||||||
{
|
{
|
||||||
envelopeService = envelope;
|
envelopeService = envelope;
|
||||||
|
actionService = database.Services?.actionService;
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
@ -40,5 +43,28 @@ namespace EnvelopeGenerator.Web.Controllers
|
|||||||
return ErrorResponse(e);
|
return ErrorResponse(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpPost]
|
||||||
|
[Route("api/document/{envelopeKey}")]
|
||||||
|
public IActionResult Open(string envelopeKey)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
logger.Info("DocumentController/Open");
|
||||||
|
|
||||||
|
// Validate Envelope Key and load envelope
|
||||||
|
envelopeService.EnsureValidEnvelopeKey(envelopeKey);
|
||||||
|
EnvelopeResponse response = envelopeService.LoadEnvelope(envelopeKey);
|
||||||
|
|
||||||
|
actionService.OpenEnvelope(response.Envelope, response.Receiver.Id);
|
||||||
|
|
||||||
|
return Ok();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
return ErrorResponse(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,12 +7,12 @@ namespace EnvelopeGenerator.Web.Controllers
|
|||||||
public class EnvelopeController : BaseController
|
public class EnvelopeController : BaseController
|
||||||
{
|
{
|
||||||
private readonly EnvelopeService envelopeService;
|
private readonly EnvelopeService envelopeService;
|
||||||
private readonly EmailService emailService;
|
private readonly ActionService actionService;
|
||||||
|
|
||||||
public EnvelopeController(DatabaseService database, LoggingService logging, EnvelopeService envelope) : base(database, logging)
|
public EnvelopeController(DatabaseService database, LoggingService logging, EnvelopeService envelope) : base(database, logging)
|
||||||
{
|
{
|
||||||
envelopeService = envelope;
|
envelopeService = envelope;
|
||||||
emailService = new(state);
|
actionService = database.Services?.actionService;
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
@ -52,17 +52,19 @@ namespace EnvelopeGenerator.Web.Controllers
|
|||||||
|
|
||||||
string annotationData = await envelopeService.EnsureValidAnnotationData(Request);
|
string annotationData = await envelopeService.EnsureValidAnnotationData(Request);
|
||||||
|
|
||||||
envelopeService.InsertDocumentStatus(new DocumentStatus()
|
//envelopeService.InsertDocumentStatus(new DocumentStatus()
|
||||||
{
|
//{
|
||||||
EnvelopeId = response.Envelope.Id,
|
// EnvelopeId = response.Envelope.Id,
|
||||||
ReceiverId = response.Receiver.Id,
|
// ReceiverId = response.Receiver.Id,
|
||||||
Value = annotationData,
|
// Value = annotationData,
|
||||||
Status = Common.Constants.DocumentStatus.Signed
|
// Status = Common.Constants.DocumentStatus.Signed
|
||||||
});
|
//});
|
||||||
|
|
||||||
envelopeService.InsertHistoryEntrySigned(response);
|
//envelopeService.InsertHistoryEntrySigned(response);
|
||||||
|
|
||||||
emailService.SendSignedEmail(response.Receiver.Id, response.Envelope.Id);
|
//emailService.SendSignedEmail(response.Receiver.Id, response.Envelope.Id);
|
||||||
|
|
||||||
|
var signResult = actionService?.SignEnvelope(response.Envelope, response.Receiver.Id);
|
||||||
|
|
||||||
return Ok();
|
return Ok();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,45 +0,0 @@
|
|||||||
using EnvelopeGenerator.Common;
|
|
||||||
using EnvelopeGenerator.Web.Services;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
using static EnvelopeGenerator.Common.Constants;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Web.Controllers
|
|
||||||
{
|
|
||||||
public class HistoryController : BaseController
|
|
||||||
{
|
|
||||||
private readonly EnvelopeService envelopeService;
|
|
||||||
|
|
||||||
public HistoryController(DatabaseService database, LoggingService logging, EnvelopeService envelope) : base(database, logging)
|
|
||||||
{
|
|
||||||
envelopeService = envelope;
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpPost]
|
|
||||||
[Route("api/history/{envelopeKey}")]
|
|
||||||
public IActionResult Get(string envelopeKey)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
logger.Info("HistoryController/Post");
|
|
||||||
|
|
||||||
// Validate Envelope Key and load envelope
|
|
||||||
envelopeService.EnsureValidEnvelopeKey(envelopeKey);
|
|
||||||
EnvelopeResponse response = envelopeService.LoadEnvelope(envelopeKey);
|
|
||||||
|
|
||||||
envelopeService.InsertHistoryEntry(new EnvelopeHistoryEntry()
|
|
||||||
{
|
|
||||||
ActionDate = DateTime.Now,
|
|
||||||
Status = EnvelopeStatus.DocumentOpened,
|
|
||||||
EnvelopeId = response.Envelope.Id,
|
|
||||||
UserReference = response.Receiver.Email
|
|
||||||
});
|
|
||||||
|
|
||||||
return Ok();
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
return ErrorResponse(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -7,6 +7,18 @@ namespace EnvelopeGenerator.Web.Services
|
|||||||
{
|
{
|
||||||
public MSSQLServer MSSQL { get; set; }
|
public MSSQLServer MSSQL { get; set; }
|
||||||
|
|
||||||
|
public State State { get; set; }
|
||||||
|
|
||||||
|
public class ServiceContainer
|
||||||
|
{
|
||||||
|
public ActionService actionService;
|
||||||
|
|
||||||
|
public ServiceContainer(State state)
|
||||||
|
{
|
||||||
|
actionService = new(state);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public class ModelContainer
|
public class ModelContainer
|
||||||
{
|
{
|
||||||
public EnvelopeModel envelopeModel;
|
public EnvelopeModel envelopeModel;
|
||||||
@ -31,6 +43,7 @@ namespace EnvelopeGenerator.Web.Services
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
public readonly ModelContainer? Models;
|
public readonly ModelContainer? Models;
|
||||||
|
public readonly ServiceContainer? Services;
|
||||||
|
|
||||||
public DatabaseService(IConfiguration Config, LoggingService Logging) : base(Config, Logging)
|
public DatabaseService(IConfiguration Config, LoggingService Logging) : base(Config, Logging)
|
||||||
{
|
{
|
||||||
@ -41,19 +54,14 @@ namespace EnvelopeGenerator.Web.Services
|
|||||||
|
|
||||||
if (MSSQL.DBInitialized == true)
|
if (MSSQL.DBInitialized == true)
|
||||||
{
|
{
|
||||||
logger.Debug("MSSQL Connection: [{0}]", MSSQL.CurrentConnectionString);
|
logger.Debug("MSSQL Connection established: [{0}]", MSSQL.MaskedConnectionString);
|
||||||
|
|
||||||
// There is a circular dependency between state and models
|
|
||||||
// All models need a state object, including the config Model
|
|
||||||
// The state object needs to be filled with the DbConfig property,
|
|
||||||
// which is obtained by the config Model.
|
|
||||||
// So first, the config model is initialized with an incomplete state object,
|
|
||||||
// then all the other models with the DbConfig property filled.
|
|
||||||
var state = GetState();
|
var state = GetState();
|
||||||
var configModel = new ConfigModel(state);
|
|
||||||
state.DbConfig = configModel.LoadConfiguration();
|
|
||||||
|
|
||||||
Models = new(state);
|
Models = new(state);
|
||||||
|
Services = new(state);
|
||||||
|
|
||||||
|
State = state;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -61,13 +69,31 @@ namespace EnvelopeGenerator.Web.Services
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public State GetState()
|
/// <summary>
|
||||||
|
/// There is a circular dependency between state and models
|
||||||
|
/// All models need a state object, including the config Model
|
||||||
|
/// The state object needs to be filled with the DbConfig property,
|
||||||
|
/// which is obtained by the config Model.
|
||||||
|
/// So first, the config model is initialized with an incomplete state object,
|
||||||
|
/// then all the other models with the DbConfig property filled.
|
||||||
|
/// </summary>
|
||||||
|
private State GetState()
|
||||||
|
{
|
||||||
|
var state = GetInitialState();
|
||||||
|
var configModel = new ConfigModel(state);
|
||||||
|
state.DbConfig = configModel.LoadConfiguration();
|
||||||
|
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
private State GetInitialState()
|
||||||
{
|
{
|
||||||
return new State
|
return new State
|
||||||
{
|
{
|
||||||
Database = MSSQL,
|
Database = MSSQL,
|
||||||
LogConfig = logConfig,
|
LogConfig = logConfig,
|
||||||
UserId = 2 // TODO
|
UserId = 0,
|
||||||
|
DbConfig = null
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,11 +8,8 @@ namespace EnvelopeGenerator.Web.Services
|
|||||||
{
|
{
|
||||||
public class EnvelopeService : BaseService
|
public class EnvelopeService : BaseService
|
||||||
{
|
{
|
||||||
private ReceiverModel receiverModel;
|
private readonly ReceiverModel receiverModel;
|
||||||
private EnvelopeModel envelopeModel;
|
private readonly EnvelopeModel envelopeModel;
|
||||||
private HistoryModel historyModel;
|
|
||||||
private DocumentModel documentModel;
|
|
||||||
private DocumentStatusModel documentStatusModel;
|
|
||||||
|
|
||||||
public EnvelopeService(IConfiguration Config, LoggingService Logging, DatabaseService database) : base(Config, Logging)
|
public EnvelopeService(IConfiguration Config, LoggingService Logging, DatabaseService database) : base(Config, Logging)
|
||||||
{
|
{
|
||||||
@ -25,9 +22,6 @@ namespace EnvelopeGenerator.Web.Services
|
|||||||
|
|
||||||
receiverModel = database.Models.receiverModel;
|
receiverModel = database.Models.receiverModel;
|
||||||
envelopeModel = database.Models.envelopeModel;
|
envelopeModel = database.Models.envelopeModel;
|
||||||
historyModel = database.Models.historyModel;
|
|
||||||
documentModel = database.Models.documentModel;
|
|
||||||
documentStatusModel = database.Models.documentStatusModel;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void EnsureValidEnvelopeKey(string envelopeKey)
|
public void EnsureValidEnvelopeKey(string envelopeKey)
|
||||||
@ -48,7 +42,6 @@ namespace EnvelopeGenerator.Web.Services
|
|||||||
throw new ArgumentNullException("ReceiverSignature");
|
throw new ArgumentNullException("ReceiverSignature");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public EnvelopeResponse LoadEnvelope(string pEnvelopeKey)
|
public EnvelopeResponse LoadEnvelope(string pEnvelopeKey)
|
||||||
{
|
{
|
||||||
Tuple<string, string> result = Helpers.DecodeEnvelopeReceiverId(pEnvelopeKey);
|
Tuple<string, string> result = Helpers.DecodeEnvelopeReceiverId(pEnvelopeKey);
|
||||||
@ -101,27 +94,6 @@ namespace EnvelopeGenerator.Web.Services
|
|||||||
return (List<Envelope>)envelopeModel.List(pReceiverId);
|
return (List<Envelope>)envelopeModel.List(pReceiverId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool InsertHistoryEntry(EnvelopeHistoryEntry historyEntry)
|
|
||||||
{
|
|
||||||
return historyModel.Insert(historyEntry);
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool InsertHistoryEntrySigned(EnvelopeResponse response)
|
|
||||||
{
|
|
||||||
return historyModel.Insert(new EnvelopeHistoryEntry()
|
|
||||||
{
|
|
||||||
ActionDate = DateTime.Now,
|
|
||||||
Status = EnvelopeStatus.DocumentSigned,
|
|
||||||
EnvelopeId = response.Envelope.Id,
|
|
||||||
UserReference = response.Receiver.Email
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool InsertDocumentStatus(Common.DocumentStatus documentStatus)
|
|
||||||
{
|
|
||||||
return documentStatusModel.InsertOrUpdate(documentStatus);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<string?> EnsureValidAnnotationData(HttpRequest request)
|
public async Task<string?> EnsureValidAnnotationData(HttpRequest request)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@ -183,16 +155,6 @@ namespace EnvelopeGenerator.Web.Services
|
|||||||
return document;
|
return document;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task UpdateDocument(Stream fileStream, string filePath)
|
|
||||||
{
|
|
||||||
logger.Debug("Writing document to path [{0}]..", filePath);
|
|
||||||
|
|
||||||
using FileStream fs = new(filePath, FileMode.Open);
|
|
||||||
await fileStream.CopyToAsync(fs);
|
|
||||||
|
|
||||||
logger.Debug("Document written!");
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<byte[]> GetDocumentContents(EnvelopeDocument document)
|
public async Task<byte[]> GetDocumentContents(EnvelopeDocument document)
|
||||||
{
|
{
|
||||||
logger.Debug("Loading file [{0}]", document.Filepath);
|
logger.Debug("Loading file [{0}]", document.Filepath);
|
||||||
|
|||||||
@ -90,7 +90,7 @@ class App {
|
|||||||
)
|
)
|
||||||
const createdAnnotations = await this.Instance.create(annotations)
|
const createdAnnotations = await this.Instance.create(annotations)
|
||||||
|
|
||||||
await this.Network.postHistory(this.envelopeKey)
|
await this.Network.openDocument(this.envelopeKey)
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e)
|
console.error(e)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -32,8 +32,8 @@
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
postHistory(envelopeKey) {
|
openDocument(envelopeKey) {
|
||||||
const url = `/api/history/${envelopeKey}`
|
const url = `/api/document/${envelopeKey}`
|
||||||
|
|
||||||
const options = {
|
const options = {
|
||||||
credentials: 'include',
|
credentials: 'include',
|
||||||
@ -44,7 +44,7 @@
|
|||||||
body: JSON.stringify({}),
|
body: JSON.stringify({}),
|
||||||
}
|
}
|
||||||
|
|
||||||
console.debug('PostHistory/Calling url: ' + url)
|
console.debug('OpenDocument/Calling url: ' + url)
|
||||||
return fetch(url, this.withCSRFToken(options))
|
return fetch(url, this.withCSRFToken(options))
|
||||||
.then(this.handleResponse)
|
.then(this.handleResponse)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user