This commit is contained in:
2024-04-12 20:05:01 -07:00
7 changed files with 1049 additions and 114 deletions

View File

@@ -404,6 +404,25 @@ Public Class ClsPuntoVenta
OnError("Ocurrió un error al obtener los Movimientos de Caja del Cortes del Punto de Venta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) OnError("Ocurrió un error al obtener los Movimientos de Caja del Cortes del Punto de Venta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
End Try End Try
Return Retorno
End Function
Public Function GetVta_MovimientosCajasReporte(CveCorte As Integer, TipoMovimiento As Integer) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_Vta_MovimientosCajasRepGet")
With SqlAdapter.SelectCommand.Parameters
.Add("@CveCorte", SqlDbType.Int).Value = CveCorte
.Add("@TipoMovimiento", SqlDbType.Int).Value = TipoMovimiento
End With
Try
SqlAdapter.Fill(Data)
Retorno = True
Catch ex As Exception
OnError("Ocurrió un error al obtener el reporte de caja del cortes del punto de venta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
End Try
Return Retorno Return Retorno
End Function End Function

View File

@@ -427,35 +427,54 @@
</div> </div>
</div> </div>
<asp:GridView ID="GvD" runat="server" AutoGenerateColumns="False" EmptyDataText="No se encontró ningun corte" DataKeyNames="CveVenta" ToolTip="Reporte de Cortes" CssClass="table table-striped table-advance table-hover Widthall" Style="position: static" UseAccessibleHeader="false" GridLines="None"> <div class="row">
<Columns> <div class="col-md-12">
<asp:TemplateField ItemStyle-HorizontalAlign="Left"> <br />
<HeaderTemplate> <b>Movimientos del día</b>
Serie - Folio <asp:GridView ID="GvD" runat="server" AutoGenerateColumns="False" EmptyDataText="No se encontró ningun corte" DataKeyNames="CveVenta" ToolTip="Reporte de Cortes" CssClass="table table-striped table-advance table-hover Widthall" Style="position: static" UseAccessibleHeader="false" GridLines="None">
<Columns>
<asp:TemplateField ItemStyle-HorizontalAlign="Left">
<HeaderTemplate>
Serie - Folio
</HeaderTemplate> </HeaderTemplate>
<ItemTemplate> <ItemTemplate>
<asp:HyperLink ID="LBDescripcion" runat="server" Text='<%# Eval("SerieFolio") %>' NavigateUrl='<%# Eval("CveVenta", "/Ventas/Ventas.aspx?CveVenta={0}")%>'></asp:HyperLink> <asp:HyperLink ID="LBDescripcion" runat="server" Text='<%# Eval("SerieFolio") %>' NavigateUrl='<%# Eval("CveVenta", "/Ventas/Ventas.aspx?CveVenta={0}")%>'></asp:HyperLink>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:BoundField HeaderText="Cliente" DataField="NombreComercial" ItemStyle-HorizontalAlign="Left" /> <asp:BoundField HeaderText="Cliente" DataField="NombreComercial" ItemStyle-HorizontalAlign="Left" />
<asp:TemplateField HeaderText="Fac.Rem.Anterior" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center"> <asp:TemplateField HeaderText="Fac.Rem.Anterior" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center">
<ItemTemplate> <ItemTemplate>
<asp:Literal ID="LtlFacRemisionAnterior" runat="server" Text='<%# Eval("FacturaRemisionAnteriorTexto") %>'></asp:Literal> <asp:Literal ID="LtlFacRemisionAnterior" runat="server" Text='<%# Eval("FacturaRemisionAnteriorTexto") %>'></asp:Literal>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Total" ItemStyle-HorizontalAlign="Right"> <asp:TemplateField HeaderText="Total" ItemStyle-HorizontalAlign="Right">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="LblTotal" Text='<%# Eval("ImportePagado", "{0:N2}") %>' runat="server"></asp:Label> <asp:Label ID="LblTotal" Text='<%# Eval("ImportePagado", "{0:N2}") %>' runat="server"></asp:Label>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<%--<asp:BoundField HeaderText="Total" DataField="ImportePagado" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />--%> <%--<asp:BoundField HeaderText="Total" DataField="ImportePagado" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />--%>
<asp:BoundField HeaderText="Método Pago" DataField="MetodoPago" ItemStyle-HorizontalAlign="Left" /> <asp:BoundField HeaderText="Método Pago" DataField="MetodoPago" ItemStyle-HorizontalAlign="Left" />
</Columns> </Columns>
<HeaderStyle CssClass="Titulos" /> <HeaderStyle CssClass="Titulos" />
<RowStyle CssClass="Texto" /> <RowStyle CssClass="Texto" />
<AlternatingRowStyle CssClass="TextoAlterno" /> <AlternatingRowStyle CssClass="TextoAlterno" />
</asp:GridView> </asp:GridView>
</div>
</div>
<div class="row">
<div class="col-md-6">
<br />
<b>Movimientos de caja</b>
<asp:GridView ID="GvIngresosRetiros" runat="server" AutoGenerateColumns="False" GridLines="None" CssClass="table table-striped table-advance table-hover" Width="100%">
<Columns>
<asp:BoundField HeaderText="Tipo" DataField="TipoMovimiento" />
<asp:BoundField HeaderText="Descripción" DataField="Descripcion" />
<asp:BoundField HeaderText="Total" DataField="Importe" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
</Columns>
</asp:GridView>
</div>
</div>
</div> </div>
</ContentTemplate> </ContentTemplate>
</asp:UpdatePanel> </asp:UpdatePanel>

View File

@@ -125,6 +125,13 @@ Partial Class Bancos_RepCortes
End If End If
End Sub End Sub
Protected Sub GvIngresosRetiros_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GvIngresosRetiros.RowDataBound
If e.Row.RowType = DataControlRowType.DataRow Then
If e.Row.DBCampo("CveMovimiento").ToString = "" Then
e.Row.CssClass = "Totales"
End If
End If
End Sub
@@ -167,31 +174,39 @@ Partial Class Bancos_RepCortes
Dim Finalizado As Integer = gvr.DataKey("Finalizado").ToString.ToEntero Dim Finalizado As Integer = gvr.DataKey("Finalizado").ToString.ToEntero
Fecha = gvr.DataKey("FechaInicial").ToString Fecha = gvr.DataKey("FechaInicial").ToString
Nombre = gvr.DataKey("Nombre").ToString Nombre = gvr.DataKey("Nombre").ToString
Dim Vent As New ClsPuntoVenta Dim ObjPuntoVenta As New ClsPuntoVenta
Dim Vn As New ClsVentas Dim ObjVentas As New ClsVentas
If Vn.GetCortesDetalleVentasResumen(CveCorte, DdlSubProyectos.SelectedValue.ToEntero, UsuarioActual.CveEmpresa) Then
GvP.DataSource = Vn.DtResultados If ObjVentas.GetCortesDetalleVentasResumen(CveCorte, DdlSubProyectos.SelectedValue.ToEntero, UsuarioActual.CveEmpresa) Then
DtCortesVentasResumen = Vn.DtResultados GvP.DataSource = ObjVentas.DtResultados
DtCortesVentasResumen = ObjVentas.DtResultados
End If End If
If UsuarioActual.CveEmpresa.Contiene(190, 192) Then If UsuarioActual.CveEmpresa.Contiene(190, 192) Then
DivIVA.Visible = True DivIVA.Visible = True
If Vn.GetCortesDetalleVentasResumenIVA(CveCorte, DdlSubProyectos.SelectedValue.ToEntero, UsuarioActual.CveEmpresa) Then If ObjVentas.GetCortesDetalleVentasResumenIVA(CveCorte, DdlSubProyectos.SelectedValue.ToEntero, UsuarioActual.CveEmpresa) Then
GvPorIVA.DataSource = Vn.DtResultados GvPorIVA.DataSource = ObjVentas.DtResultados
End If End If
End If End If
If Not UsuarioActual.CveEmpresa.Contiene(140, 141) AndAlso Vn.GetCortesDetalleDepositosCaja(CveCorte, DdlSubProyectos.SelectedValue.ToEntero, UsuarioActual.CveEmpresa) Then If Not UsuarioActual.CveEmpresa.Contiene(140, 141) AndAlso ObjVentas.GetCortesDetalleDepositosCaja(CveCorte, DdlSubProyectos.SelectedValue.ToEntero, UsuarioActual.CveEmpresa) Then
GvDep.DataSource = Vn.DtResultados GvDep.DataSource = ObjVentas.DtResultados
If Vn.DtResultados.Rows.Count > 0 Then If ObjVentas.DtResultados.Rows.Count > 0 Then
DivDep.Visible = True DivDep.Visible = True
End If End If
End If End If
If Vent.GetCortesDetalleVentas(CveCorte, DdlSubProyectos.SelectedValue.ToEntero, UsuarioActual.CveEmpresa, 2) Then If ObjPuntoVenta.GetCortesDetalleVentas(CveCorte, DdlSubProyectos.SelectedValue.ToEntero, UsuarioActual.CveEmpresa, 2) Then
GvD.DataSource = Vent.DtResultados DtCortesVentas = ObjPuntoVenta.DtResultados.Copy()
DtCortesVentas = Vent.DtResultados GvD.DataSource = DtCortesVentas
divDetalle.Visible = True divDetalle.Visible = True
End If End If
If ObjPuntoVenta.GetVta_MovimientosCajasReporte(CveCorte, -1) Then
GvIngresosRetiros.DataSource = ObjPuntoVenta.DtResultados.Copy()
End If
If (DtCortesVentasResumen IsNot Nothing AndAlso DtCortesVentasResumen.Rows.Count > 0) Or (DtCortesVentas IsNot Nothing AndAlso DtCortesVentas.Rows.Count > 0) Then If (DtCortesVentasResumen IsNot Nothing AndAlso DtCortesVentasResumen.Rows.Count > 0) Or (DtCortesVentas IsNot Nothing AndAlso DtCortesVentas.Rows.Count > 0) Then
HplDownPDF.Visible = True HplDownPDF.Visible = True
HplDownEXCEL.Visible = True HplDownEXCEL.Visible = True
@@ -201,8 +216,15 @@ Partial Class Bancos_RepCortes
HplDownPDF.Visible = False HplDownPDF.Visible = False
HplDownEXCEL.Visible = False HplDownEXCEL.Visible = False
End If End If
Vn.Dispose() ObjVentas.Dispose()
Vent.Dispose() ObjPuntoVenta.Dispose()
GvD.DataBind()
GvP.DataBind()
GvDep.DataBind()
GvPorIVA.DataBind()
GvIngresosRetiros.DataBind()
GvD.DataBind() GvD.DataBind()

View File

@@ -1570,6 +1570,7 @@ Partial Class PopUpVerFactura
Dim DtCortesVentas As DataTable = Nothing Dim DtCortesVentas As DataTable = Nothing
Dim DtReporteCorte As DataTable = Nothing Dim DtReporteCorte As DataTable = Nothing
Dim DtIngresosRetiros As DataTable = Nothing Dim DtIngresosRetiros As DataTable = Nothing
Dim DtDepositos As DataTable = Nothing
Dim Fecha As String = "", Nombre As String = "" Dim Fecha As String = "", Nombre As String = ""
Dim OpcionDetallado As Integer = 1 Dim OpcionDetallado As Integer = 1
@@ -1600,6 +1601,10 @@ Partial Class PopUpVerFactura
If ObjPuntoVenta.GetVta_MovimientosCajas(CveCorte, -1) Then If ObjPuntoVenta.GetVta_MovimientosCajas(CveCorte, -1) Then
DtIngresosRetiros = ObjPuntoVenta.DtResultados.Copy() DtIngresosRetiros = ObjPuntoVenta.DtResultados.Copy()
End If End If
If Not UsuarioActual.CveEmpresa.Contiene(140, 141) AndAlso ObjVenta.GetCortesDetalleDepositosCaja(CveCorte, -1, UsuarioActual.CveEmpresa) Then
DtDepositos = ObjVenta.DtResultados.Copy()
End If
End If End If
ObjVenta.Dispose() ObjVenta.Dispose()
@@ -1625,7 +1630,7 @@ Partial Class PopUpVerFactura
Dim params As New List(Of ReportParameter) Dim params As New List(Of ReportParameter)
params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa)) params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre)) params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
params.Add(New ReportParameter("FechaImpresion", NowADS().ToDateTime.ToShortDateString)) params.Add(New ReportParameter("FechaImpresion", ClsPaginas.NowADS().ToString("dd/MM/yyyy hh:mm:ss tt")))
params.Add(New ReportParameter("AgrupoPor", $"{FechaCorte}{Usuario}")) params.Add(New ReportParameter("AgrupoPor", $"{FechaCorte}{Usuario}"))
params.Add(New ReportParameter("LogoPath", RutaImagenLogo)) params.Add(New ReportParameter("LogoPath", RutaImagenLogo))
@@ -1748,6 +1753,24 @@ Partial Class PopUpVerFactura
Dim rds5 As New ReportDataSource With {.Name = "DataSet5", .Value = DtIngresosRetiros} Dim rds5 As New ReportDataSource With {.Name = "DataSet5", .Value = DtIngresosRetiros}
lrds.Add(rds5) lrds.Add(rds5)
If UsuarioActual.CveEmpresa = 193 Then
Dim CveCuenta As Integer = 186367
Using ObjConta As New ClsContabilidad
If ObjConta.GetAnexoCatalogo(CveCuenta, Fecha.ToDate(), Fecha.ToDate(), -1, -1, -1, UsuarioActual.CveEmpresa, 1) Then
Dim rdsConta As New ReportDataSource With {.Name = "DsContabilidad", .Value = ObjConta.DtResultados}
lrds.Add(rdsConta)
End If
End Using
If DtDepositos IsNot Nothing Then
Dim rdsDepositos As New ReportDataSource With {.Name = "DsDepositos", .Value = DtDepositos}
lrds.Add(rdsDepositos)
End If
End If
'params.Add(New ReportParameter("VentasCorte", RowCorte("VentasCorte").ToString())) 'params.Add(New ReportParameter("VentasCorte", RowCorte("VentasCorte").ToString()))
'params.Add(New ReportParameter("NotasCredito", RowCorte("NotasCredito").ToString())) 'params.Add(New ReportParameter("NotasCredito", RowCorte("NotasCredito").ToString()))
'params.Add(New ReportParameter("NotasCredito", RowCorte("NotasCredito").ToString())) 'params.Add(New ReportParameter("NotasCredito", RowCorte("NotasCredito").ToString()))

View File

@@ -196,7 +196,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>Detalles de Pagos</Value> <Value>Detalles de pago</Value>
<Style> <Style>
<FontSize>12pt</FontSize> <FontSize>12pt</FontSize>
<FontWeight>Bold</FontWeight> <FontWeight>Bold</FontWeight>
@@ -545,7 +545,7 @@
</TablixMembers> </TablixMembers>
</TablixRowHierarchy> </TablixRowHierarchy>
<DataSetName>DataSet2</DataSetName> <DataSetName>DataSet2</DataSetName>
<Top>1.77603cm</Top> <Top>3.94244cm</Top>
<Left>0.06614cm</Left> <Left>0.06614cm</Left>
<Height>0.93113cm</Height> <Height>0.93113cm</Height>
<Width>18.57619cm</Width> <Width>18.57619cm</Width>
@@ -939,7 +939,19 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>Ventas</Value> <Value>Resumen de transacciones</Value>
<Style>
<FontSize>12pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
<Paragraph>
<TextRuns>
<TextRun>
<Value />
<Style> <Style>
<FontSize>12pt</FontSize> <FontSize>12pt</FontSize>
<FontWeight>Bold</FontWeight> <FontWeight>Bold</FontWeight>
@@ -953,7 +965,7 @@
<Top>0.08792cm</Top> <Top>0.08792cm</Top>
<Left>7.21681cm</Left> <Left>7.21681cm</Left>
<Height>0.56472cm</Height> <Height>0.56472cm</Height>
<Width>4.82833cm</Width> <Width>5.79283cm</Width>
<ZIndex>5</ZIndex> <ZIndex>5</ZIndex>
<Style> <Style>
<Border> <Border>
@@ -972,7 +984,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>Cajas</Value> <Value>Estado de la caja</Value>
<Style> <Style>
<FontSize>12pt</FontSize> <FontSize>12pt</FontSize>
<FontWeight>Bold</FontWeight> <FontWeight>Bold</FontWeight>
@@ -1260,7 +1272,7 @@
</TablixMembers> </TablixMembers>
</TablixRowHierarchy> </TablixRowHierarchy>
<DataSetName>DataSet5</DataSetName> <DataSetName>DataSet5</DataSetName>
<Top>3.41299cm</Top> <Top>5.5794cm</Top>
<Left>0.06614cm</Left> <Left>0.06614cm</Left>
<Height>0.93113cm</Height> <Height>0.93113cm</Height>
<Width>12.81065cm</Width> <Width>12.81065cm</Width>
@@ -1278,7 +1290,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>Ingresos/Retiros</Value> <Value>Movimientos de caja</Value>
<Style> <Style>
<FontSize>12pt</FontSize> <FontSize>12pt</FontSize>
<FontWeight>Bold</FontWeight> <FontWeight>Bold</FontWeight>
@@ -1289,7 +1301,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox3</rd:DefaultName> <rd:DefaultName>Textbox3</rd:DefaultName>
<Top>2.70716cm</Top> <Top>4.87357cm</Top>
<Left>0.06614cm</Left> <Left>0.06614cm</Left>
<Height>0.6cm</Height> <Height>0.6cm</Height>
<Width>4.82833cm</Width> <Width>4.82833cm</Width>
@@ -1304,8 +1316,777 @@
<PaddingBottom>2pt</PaddingBottom> <PaddingBottom>2pt</PaddingBottom>
</Style> </Style>
</Textbox> </Textbox>
<Textbox Name="Textbox26">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Movimientos del día</Value>
<Style>
<FontSize>12pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox3</rd:DefaultName>
<Top>3.30716cm</Top>
<Left>0.06614cm</Left>
<Height>0.6cm</Height>
<Width>4.82833cm</Width>
<ZIndex>9</ZIndex>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Tablix Name="Tablix6">
<TablixBody>
<TablixColumns>
<TablixColumn>
<Width>2.73022cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.09811cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.28714cm</Width>
</TablixColumn>
</TablixColumns>
<TablixRows>
<TablixRow>
<Height>0.47879cm</Height>
<TablixCells>
<TablixCell>
<CellContents>
<Textbox Name="Textbox27">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Tipo de deposito</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox4</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Silver</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Textbox28">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Folio</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox16</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Silver</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Textbox29">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Total</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox18</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Silver</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
</TablixCells>
</TablixRow>
<TablixRow>
<Height>0.45234cm</Height>
<TablixCells>
<TablixCell>
<CellContents>
<Textbox Name="MetodoPago6">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!TipoTransaccion.Value</Value>
<Style>
<FontSize>8pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>MetodoPago</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Importe6">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!FolioPago.Value</Value>
<Style>
<FontSize>8pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Importe</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="ImportePagado3">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Importe.Value</Value>
<Style>
<FontSize>8pt</FontSize>
<Format>#,0.00</Format>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>ImportePagado</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
</TablixCells>
</TablixRow>
</TablixRows>
</TablixBody>
<TablixColumnHierarchy>
<TablixMembers>
<TablixMember />
<TablixMember />
<TablixMember />
</TablixMembers>
</TablixColumnHierarchy>
<TablixRowHierarchy>
<TablixMembers>
<TablixMember>
<KeepWithGroup>After</KeepWithGroup>
</TablixMember>
<TablixMember>
<Group Name="Detalles6" />
</TablixMember>
</TablixMembers>
</TablixRowHierarchy>
<DataSetName>DsDepositos</DataSetName>
<Top>2.30548cm</Top>
<Left>0.06614cm</Left>
<Height>0.93113cm</Height>
<Width>7.11547cm</Width>
<ZIndex>10</ZIndex>
<Style>
<Border>
<Style>None</Style>
</Border>
</Style>
</Tablix>
<Textbox Name="Textbox31">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Depositos de caja</Value>
<Style>
<FontSize>12pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox3</rd:DefaultName>
<Top>1.6702cm</Top>
<Left>0.06614cm</Left>
<Height>0.6cm</Height>
<Width>4.82833cm</Width>
<ZIndex>11</ZIndex>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Tablix Name="Tablix7">
<TablixBody>
<TablixColumns>
<TablixColumn>
<Width>2.06748cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.51199cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.28714cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.40196cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.15604cm</Width>
</TablixColumn>
</TablixColumns>
<TablixRows>
<TablixRow>
<Height>0.47879cm</Height>
<TablixCells>
<TablixCell>
<CellContents>
<Textbox Name="Textbox30">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Código</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox4</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Silver</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Textbox32">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Nombre</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox16</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Silver</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Textbox33">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Cargos</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox18</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Silver</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Textbox43">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Abonos</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox43</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Silver</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Textbox47">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Saldo</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox47</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Silver</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
</TablixCells>
</TablixRow>
<TablixRow>
<Height>0.45234cm</Height>
<TablixCells>
<TablixCell>
<CellContents>
<Textbox Name="MetodoPago7">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Codigo.Value</Value>
<Style>
<FontSize>8pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>MetodoPago</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Importe7">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Nombre.Value</Value>
<Style>
<FontSize>8pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Importe</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="ImportePagado4">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Cargos.Value</Value>
<Style>
<FontSize>8pt</FontSize>
<Format>#,0.00</Format>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>ImportePagado</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Abonos">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Abonos.Value</Value>
<Style>
<FontSize>8pt</FontSize>
<Format>#,0.00;(#,0.00)</Format>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Abonos</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Abonos1">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=(Fields!Cargos.Value - Fields!Abonos.Value)</Value>
<Style>
<FontSize>8pt</FontSize>
<Format>#,0.00;(#,0.00)</Format>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Abonos1</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
</TablixCells>
</TablixRow>
</TablixRows>
</TablixBody>
<TablixColumnHierarchy>
<TablixMembers>
<TablixMember />
<TablixMember />
<TablixMember />
<TablixMember />
<TablixMember />
</TablixMembers>
</TablixColumnHierarchy>
<TablixRowHierarchy>
<TablixMembers>
<TablixMember>
<KeepWithGroup>After</KeepWithGroup>
</TablixMember>
<TablixMember>
<Group Name="Detalles7" />
</TablixMember>
</TablixMembers>
</TablixRowHierarchy>
<DataSetName>DsContabilidad</DataSetName>
<Top>2.30548cm</Top>
<Left>7.358cm</Left>
<Height>0.93113cm</Height>
<Width>11.42461cm</Width>
<ZIndex>12</ZIndex>
<Style>
<Border>
<Style>None</Style>
</Border>
</Style>
</Tablix>
<Textbox Name="Textbox34">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Estado contable de la caja</Value>
<Style>
<FontSize>12pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox3</rd:DefaultName>
<Top>1.6702cm</Top>
<Left>7.358cm</Left>
<Height>0.6cm</Height>
<Width>6.33646cm</Width>
<ZIndex>13</ZIndex>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</ReportItems> </ReportItems>
<Height>1.71028in</Height> <Height>2.5632in</Height>
<Style /> <Style />
</Body> </Body>
<Width>7.44383in</Width> <Width>7.44383in</Width>
@@ -1459,7 +2240,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox3</rd:DefaultName> <rd:DefaultName>Textbox3</rd:DefaultName>
<Top>0.0829cm</Top> <Top>0.08289cm</Top>
<Left>15.43789cm</Left> <Left>15.43789cm</Left>
<Height>0.38981cm</Height> <Height>0.38981cm</Height>
<Width>3.20444cm</Width> <Width>3.20444cm</Width>
@@ -1491,7 +2272,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox8</rd:DefaultName> <rd:DefaultName>Textbox8</rd:DefaultName>
<Top>0.0829cm</Top> <Top>0.08289cm</Top>
<Left>0.06614cm</Left> <Left>0.06614cm</Left>
<Height>0.38981cm</Height> <Height>0.38981cm</Height>
<Width>1.60042cm</Width> <Width>1.60042cm</Width>
@@ -1523,7 +2304,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox9</rd:DefaultName> <rd:DefaultName>Textbox9</rd:DefaultName>
<Top>0.0829cm</Top> <Top>0.08289cm</Top>
<Left>1.61047cm</Left> <Left>1.61047cm</Left>
<Height>0.38981cm</Height> <Height>0.38981cm</Height>
<Width>5.14936cm</Width> <Width>5.14936cm</Width>
@@ -1556,7 +2337,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox10</rd:DefaultName> <rd:DefaultName>Textbox10</rd:DefaultName>
<Top>0.0829cm</Top> <Top>0.08289cm</Top>
<Left>6.98794cm</Left> <Left>6.98794cm</Left>
<Height>0.38981cm</Height> <Height>0.38981cm</Height>
<Width>2.92333cm</Width> <Width>2.92333cm</Width>
@@ -1589,7 +2370,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox11</rd:DefaultName> <rd:DefaultName>Textbox11</rd:DefaultName>
<Top>0.0829cm</Top> <Top>0.08289cm</Top>
<Left>9.89716cm</Left> <Left>9.89716cm</Left>
<Height>0.38981cm</Height> <Height>0.38981cm</Height>
<Width>4.32745cm</Width> <Width>4.32745cm</Width>
@@ -1770,6 +2551,66 @@
<rd:TableAdapterName /> <rd:TableAdapterName />
</rd:DataSetInfo> </rd:DataSetInfo>
</DataSet> </DataSet>
<DataSet Name="DsDepositos">
<Query>
<DataSourceName>DataSet</DataSourceName>
<CommandText>/* Local Query */</CommandText>
</Query>
<Fields>
<Field Name="TipoTransaccion">
<DataField>TipoTransaccion</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="FolioPago">
<DataField>FolioPago</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="Importe">
<DataField>Importe</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DataSet</rd:DataSetName>
<rd:SchemaPath>C:\Users\Caudillo\Documents\Visual Studio 2013\WebSites\WebSite9\App_Code\DataSet.xsd</rd:SchemaPath>
<rd:TableName>DataTable1</rd:TableName>
<rd:TableAdapterFillMethod />
<rd:TableAdapterGetDataMethod />
<rd:TableAdapterName />
</rd:DataSetInfo>
</DataSet>
<DataSet Name="DsContabilidad">
<Query>
<DataSourceName>DataSet</DataSourceName>
<CommandText>/* Local Query */</CommandText>
</Query>
<Fields>
<Field Name="Codigo">
<DataField>Codigo</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="Nombre">
<DataField>Nombre</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="Cargos">
<DataField>Cargos</DataField>
<rd:TypeName>System.Decimal</rd:TypeName>
</Field>
<Field Name="Abonos">
<DataField>Abonos</DataField>
<rd:TypeName>System.Decimal</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DataSet</rd:DataSetName>
<rd:SchemaPath>C:\Users\Caudillo\Documents\Visual Studio 2013\WebSites\WebSite9\App_Code\DataSet.xsd</rd:SchemaPath>
<rd:TableName>DataTable1</rd:TableName>
<rd:TableAdapterFillMethod />
<rd:TableAdapterGetDataMethod />
<rd:TableAdapterName />
</rd:DataSetInfo>
</DataSet>
</DataSets> </DataSets>
<ReportParameters> <ReportParameters>
<ReportParameter Name="NombreEmpresa"> <ReportParameter Name="NombreEmpresa">

View File

@@ -485,51 +485,50 @@
<script src="https://cdn.amcharts.com/lib/5/xy.js"></script> <script src="https://cdn.amcharts.com/lib/5/xy.js"></script>
<script src="https://cdn.amcharts.com/lib/5/themes/Animated.js"></script> <script src="https://cdn.amcharts.com/lib/5/themes/Animated.js"></script>
<script> <script>
// Create root element
// https://www.amcharts.com/docs/v5/getting-started/#Root_element
var root = am5.Root.new("chartdiv");
var am5locales_es_ES = {
"Jan": "Enero",
"Feb": "Febrero",
"Mar": "Marzo",
"Apr": "Abril",
"May": "Mayo",
"Jun": "Junio",
"Jul": "Julio",
"Aug": "Agosto",
"Sep": "Septiembre",
"Oct": "Octubre",
"Nov": "Noviembre",
"Dec": "Diciembre",
"January": "Enero",
"February": "Febrero",
"March": "Marzo",
"April": "Abril",
"May": "Mayo",
"June": "Junio",
"July": "Julio",
"August": "Agosto",
"September": "Septiembre",
"October": "Octubre",
"November": "Noviembre",
"December": "Diciembre",
};
function cargaDiagramaGrant(data, categorias) { function cargaDiagramaGrant(data, categorias) {
am5.ready(function () { am5.ready(function () {
// Create root element //SI YA HAY GRAFICA, QUITA LA ACTUAL PARA HACER UNA NUEVA
// https://www.amcharts.com/docs/v5/getting-started/#Root_element root.container.children.clear();
var root = am5.Root.new("chartdiv");
root.dateFormatter.setAll({ root.dateFormatter.setAll({
dateFormat: "dd/MM/yyyy HH:mm", dateFormat: "dd/MM/yyyy HH:mm",
dateFields: ["valueX", "openValueX"] dateFields: ["valueX", "openValueX"]
}); });
var am5locales_es_ES = {
"Jan": "Enero",
"Feb": "Febrero",
"Mar": "Marzo",
"Apr": "Abril",
"May": "Mayo",
"Jun": "Junio",
"Jul": "Julio",
"Aug": "Agosto",
"Sep": "Septiembre",
"Oct": "Octubre",
"Nov": "Noviembre",
"Dec": "Diciembre",
"January": "Enero",
"February": "Febrero",
"March": "Marzo",
"April": "Abril",
"May": "Mayo",
"June": "Junio",
"July": "Julio",
"August": "Agosto",
"September": "Septiembre",
"October": "Octubre",
"November": "Noviembre",
"December": "Diciembre",
}
//root.language.setTranslationsAny({
// "January!": "¡Hola!",
// "Bye": "Adios"
//});
root.locale = am5locales_es_ES; root.locale = am5locales_es_ES;
// Set themes // Set themes
@@ -549,7 +548,6 @@
paddingLeft: 0 paddingLeft: 0
})); }));
// Add legend // Add legend
// https://www.amcharts.com/docs/v5/charts/xy-chart/legend-xy-series/ // https://www.amcharts.com/docs/v5/charts/xy-chart/legend-xy-series/
var legend = chart.children.push(am5.Legend.new(root, { var legend = chart.children.push(am5.Legend.new(root, {
@@ -577,16 +575,20 @@
yAxis.data.setAll(categorias); yAxis.data.setAll(categorias);
var dateAxis = am5xy.DateAxis.new(root, {
baseInterval: { timeUnit: "minute", count: 1 },
renderer: am5xy.AxisRendererX.new(root, {
minorGridEnabled: true,
minGridDistance: 90
})
});
var xAxis = chart.xAxes.push( var xAxis = chart.xAxes.push(
am5xy.DateAxis.new(root, { dateAxis
baseInterval: { timeUnit: "minute", count: 1 },
renderer: am5xy.AxisRendererX.new(root, {
minorGridEnabled: true,
minGridDistance: 90
})
})
); );
chart.topAxesContainer.children.push(dateAxis);
// Add series // Add series
// https://www.amcharts.com/docs/v5/charts/xy-chart/series/ // https://www.amcharts.com/docs/v5/charts/xy-chart/series/
var series = chart.series.push(am5xy.ColumnSeries.new(root, { var series = chart.series.push(am5xy.ColumnSeries.new(root, {
@@ -611,9 +613,17 @@
series.data.setAll(data); series.data.setAll(data);
// Add scrollbars // Add scrollbars
chart.set("scrollbarX", am5.Scrollbar.new(root, { //chart.set("scrollbarX", am5.Scrollbar.new(root, {
// orientation: "horizontal"
//}));
// Scrollbar X
var scrollbarX = am5.Scrollbar.new(root, {
orientation: "horizontal" orientation: "horizontal"
})); });
chart.set("scrollbarX", scrollbarX);
chart.bottomAxesContainer.children.push(scrollbarX);
// Make stuff animate on load // Make stuff animate on load
// https://www.amcharts.com/docs/v5/concepts/animations/ // https://www.amcharts.com/docs/v5/concepts/animations/

View File

@@ -62,9 +62,9 @@ Partial Class RepContratosCalendario
Private Sub CargaCronograma() Private Sub CargaCronograma()
If DtAvance IsNot Nothing Then If DtAvance IsNot Nothing Then
For Each Row As DataRow In DtAvance.FiltraParametros("CveAF > 0").Rows For Each Row As DataRow In DtAvance.Rows
If String.IsNullOrEmpty(Row("NombreAF").ToString()) Then If String.IsNullOrEmpty(Row("NoSerie").ToString()) Then
Row("NombreAF") = "Unidad no asignada" Row("NoSerie") = "Unidad no asignada"
End If End If
Next Next
@@ -74,22 +74,23 @@ Partial Class RepContratosCalendario
Dim random = New Random() Dim random = New Random()
'DATOS 'DATOS
For Each Row As DataRow In DtAvance.FiltraParametros("NombreAF <> ''").Rows For Each Row As DataRow In DtAvance.FiltraParametros("NoSerie <> ''").Rows
Dim obj As New JObject( Dim obj As New JObject(
New JProperty("category", Row("NombreAF")), New JProperty("category", Row("NoSerie")),
New JProperty("fromDate", Row("FechaInicial").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm").ToDateTime()), New JProperty("fromDate", Row("FechaInicial").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm").ToDateTime()),
New JProperty("toDate", Row("FechaFinal").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm").ToDateTime()), New JProperty("toDate", Row("FechaFinal").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm").ToDateTime()),
New JProperty("columnSettings", New JObject( New JProperty("columnSettings", New JObject(
New JProperty("fill", String.Format("#{0:X6}", random.Next(16777216))) New JProperty("fill", String.Format("#{0:X6}", random.Next(16777216)))
)) )),
) New JProperty("task", Row("NombreAF"))
)
jsonData.Add(obj) jsonData.Add(obj)
Next Next
'CATEGORIAS 'CATEGORIAS
For Each Row As DataRow In DtAvance.FiltraParametros("NombreAF <> ''", "", {"NombreAF"}).Rows For Each Row As DataRow In DtAvance.FiltraParametros("NoSerie <> ''", "", {"NoSerie"}).Rows
Dim obj As New JObject( Dim obj As New JObject(
New JProperty("category", Row("NombreAF")) New JProperty("category", Row("NoSerie"))
) )
jsonCategorias.Add(obj) jsonCategorias.Add(obj)
Next Next