Merge branch 'master' of http://192.168.10.111:8383/SIG
This commit is contained in:
@@ -70,14 +70,15 @@ Partial Class Acumuladores_RepEntradasUsados
|
||||
Dim Mes As String = {"enero", "febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"}(Month(Today) - 1)
|
||||
|
||||
Dim FechaConFormato As String = String.Format("{0}, {1} de {2} de {3}", Dia, Day(Today), Mes, Year(Today))
|
||||
|
||||
Dim Direccion As String = String.Format("{0} {1}", UsuarioActual.Empresa.Direccion.ToString, UsuarioActual.Empresa.NoExt.ToString)
|
||||
Dim params As New List(Of ReportParameter)
|
||||
|
||||
params.Add(New ReportParameter("Direccion", "dirección"))
|
||||
params.Add(New ReportParameter("FechaConFormato", FechaConFormato))
|
||||
params.Add(New ReportParameter("Direccion", Direccion))
|
||||
params.Add(New ReportParameter("FechaConFormato", Date.Now.ToString))
|
||||
params.Add(New ReportParameter("FechaInicial", txtFechaI.Text))
|
||||
params.Add(New ReportParameter("FechaFinal", txtFechaF.Text))
|
||||
params.Add(New ReportParameter("Sucursal", "Sucursal"))
|
||||
params.Add(New ReportParameter("Almacen", DdlAlmacenes.SelectedItem.ToString))
|
||||
|
||||
Dim rds As New ReportDataSource With {.Name = "DataSet1", .Value = DatosEntradasUsados}
|
||||
|
||||
|
||||
@@ -6617,7 +6617,7 @@ Public Class ClsPaginas
|
||||
|
||||
|
||||
'CLIENTE
|
||||
If Vta.CveCliente.ToEntero > 0 Then
|
||||
If Vta.CveCliente.ToEntero > 0 Or Vta.CveEmpresaCRM.ToEntero > 0 Then
|
||||
params.Add(New ReportParameter("ClienteCodigo", Vta.Cliente.Codigo))
|
||||
params.Add(New ReportParameter("ClienteNombre", If(Vta.ClienteSucursal.ImprimeNombreSucursal = "True", If(Vta.CveClienteSucursal > 0, Vta.ClienteSucursal.Sucursal, Vta.Cliente.Nombre), If(Vta.AtencionA <> "" AndAlso Vta.TipoDocto.Contiene("Ing", "Rem") AndAlso Vta.Cliente.RFC = "XAXX010101000", $"{Vta.Cliente.Nombre}({Vta.AtencionA})", Vta.Cliente.Nombre))))
|
||||
params.Add(New ReportParameter("ClienteDireccion", ClienteDireccion))
|
||||
|
||||
@@ -1,27 +1,81 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2008/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
|
||||
<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2010/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
|
||||
<AutoRefresh>0</AutoRefresh>
|
||||
<DataSources>
|
||||
<DataSource Name="DataSet">
|
||||
<ConnectionProperties>
|
||||
<DataProvider>System.Data.DataSet</DataProvider>
|
||||
<ConnectString>/* Local Connection */</ConnectString>
|
||||
</ConnectionProperties>
|
||||
<rd:DataSourceID>db271139-498f-42f1-b0bc-9c6d57014da7</rd:DataSourceID>
|
||||
</DataSource>
|
||||
</DataSources>
|
||||
<DataSets>
|
||||
<DataSet Name="DataSet1">
|
||||
<Query>
|
||||
<DataSourceName>DataSet</DataSourceName>
|
||||
<CommandText>/* Local Query */</CommandText>
|
||||
</Query>
|
||||
<Fields>
|
||||
<Field Name="CodigoPS">
|
||||
<DataField>CodigoPS</DataField>
|
||||
<rd:TypeName>System.String</rd:TypeName>
|
||||
</Field>
|
||||
<Field Name="E_Almacen">
|
||||
<DataField>E_Almacen</DataField>
|
||||
<rd:TypeName>System.String</rd:TypeName>
|
||||
</Field>
|
||||
<Field Name="E_Traspaso">
|
||||
<DataField>E_Traspaso</DataField>
|
||||
<rd:TypeName>System.String</rd:TypeName>
|
||||
</Field>
|
||||
<Field Name="E_Compra">
|
||||
<DataField>E_Compra</DataField>
|
||||
<rd:TypeName>System.String</rd:TypeName>
|
||||
</Field>
|
||||
<Field Name="S_Almacen">
|
||||
<DataField>S_Almacen</DataField>
|
||||
<rd:TypeName>System.String</rd:TypeName>
|
||||
</Field>
|
||||
<Field Name="S_Traspaso">
|
||||
<DataField>S_Traspaso</DataField>
|
||||
<rd:TypeName>System.String</rd:TypeName>
|
||||
</Field>
|
||||
</Fields>
|
||||
<rd:DataSetInfo>
|
||||
<rd:DataSetName>DataSet</rd:DataSetName>
|
||||
<rd:SchemaPath>C:\Users\Janeth\documents\visual studio 2015\WebSites\Reporteweb\App_Code\DataSet1.xsd</rd:SchemaPath>
|
||||
<rd:TableName>DataTable4</rd:TableName>
|
||||
<rd:TableAdapterFillMethod />
|
||||
<rd:TableAdapterGetDataMethod />
|
||||
<rd:TableAdapterName />
|
||||
</rd:DataSetInfo>
|
||||
</DataSet>
|
||||
</DataSets>
|
||||
<ReportSections>
|
||||
<ReportSection>
|
||||
<Body>
|
||||
<ReportItems>
|
||||
<Tablix Name="Tablix1">
|
||||
<TablixBody>
|
||||
<TablixColumns>
|
||||
<TablixColumn>
|
||||
<Width>2.6528cm</Width>
|
||||
<Width>4.26476cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>1.31753cm</Width>
|
||||
<Width>1.53801cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>2.31753cm</Width>
|
||||
<Width>1.53371cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>1.58961cm</Width>
|
||||
<Width>1.23763cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>1.60315cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>2.31753cm</Width>
|
||||
<Width>2.1657cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>1.37304cm</Width>
|
||||
@@ -33,7 +87,7 @@
|
||||
<Width>2.05295cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>1.49732cm</Width>
|
||||
<Width>1.13771cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>2.31753cm</Width>
|
||||
@@ -435,14 +489,14 @@
|
||||
<TablixCells>
|
||||
<TablixCell>
|
||||
<CellContents>
|
||||
<Textbox Name="Codigo">
|
||||
<Textbox Name="CodigoPS">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>=Fields!Codigo.Value</Value>
|
||||
<Value>=Fields!CodigoPS.Value</Value>
|
||||
<Style>
|
||||
<FontSize>7pt</FontSize>
|
||||
</Style>
|
||||
@@ -453,7 +507,7 @@
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Codigo</rd:DefaultName>
|
||||
<rd:DefaultName>CodigoPS</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Color>White</Color>
|
||||
@@ -844,86 +898,18 @@
|
||||
</TablixMembers>
|
||||
</TablixRowHierarchy>
|
||||
<DataSetName>DataSet1</DataSetName>
|
||||
<Top>0.95278cm</Top>
|
||||
<Top>0.10583cm</Top>
|
||||
<Left>0.08377cm</Left>
|
||||
<Height>1.2148cm</Height>
|
||||
<Width>20.61569cm</Width>
|
||||
<Width>20.80089cm</Width>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
</Border>
|
||||
</Style>
|
||||
</Tablix>
|
||||
<Textbox Name="Textbox37">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>Entradas</Value>
|
||||
<Style>
|
||||
<FontWeight>Bold</FontWeight>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style>
|
||||
<TextAlign>Center</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox37</rd:DefaultName>
|
||||
<Top>0.17639cm</Top>
|
||||
<Left>3.02491cm</Left>
|
||||
<Height>0.6cm</Height>
|
||||
<Width>10.33589cm</Width>
|
||||
<ZIndex>1</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>Solid</Style>
|
||||
</Border>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<Textbox Name="Textbox38">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>Salidas</Value>
|
||||
<Style>
|
||||
<FontWeight>Bold</FontWeight>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style>
|
||||
<TextAlign>Center</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox38</rd:DefaultName>
|
||||
<Top>0.17639cm</Top>
|
||||
<Left>13.43136cm</Left>
|
||||
<Height>0.6cm</Height>
|
||||
<Width>7.2681cm</Width>
|
||||
<ZIndex>2</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>Solid</Style>
|
||||
</Border>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
</ReportItems>
|
||||
<Height>0.9799in</Height>
|
||||
<Height>0.51993in</Height>
|
||||
<Style>
|
||||
<Border>
|
||||
<Color>White</Color>
|
||||
@@ -934,7 +920,7 @@
|
||||
<Width>8.2362in</Width>
|
||||
<Page>
|
||||
<PageHeader>
|
||||
<Height>3.1764cm</Height>
|
||||
<Height>3.54682cm</Height>
|
||||
<PrintOnFirstPage>true</PrintOnFirstPage>
|
||||
<PrintOnLastPage>true</PrintOnLastPage>
|
||||
<ReportItems>
|
||||
@@ -953,7 +939,6 @@
|
||||
</Style>
|
||||
</Image>
|
||||
<Textbox Name="Textbox2">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
@@ -978,21 +963,12 @@
|
||||
</TextRuns>
|
||||
<Style />
|
||||
</Paragraph>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>=Parameters!Direccion.Value</Value>
|
||||
<Style />
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style />
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox2</rd:DefaultName>
|
||||
<Top>0.25214cm</Top>
|
||||
<Left>4.45435cm</Left>
|
||||
<Height>1.92292cm</Height>
|
||||
<Width>11.8589cm</Width>
|
||||
<Height>0.94396cm</Height>
|
||||
<Width>6.51432cm</Width>
|
||||
<ZIndex>1</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
@@ -1037,12 +1013,14 @@
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style />
|
||||
<Style>
|
||||
<TextAlign>Center</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox4</rd:DefaultName>
|
||||
<Top>2.35145cm</Top>
|
||||
<Left>6.20715cm</Left>
|
||||
<Top>2.84098cm</Top>
|
||||
<Left>5.75736cm</Left>
|
||||
<Height>0.6cm</Height>
|
||||
<Width>10.1061cm</Width>
|
||||
<ZIndex>2</ZIndex>
|
||||
@@ -1072,9 +1050,9 @@
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>FechaConFormato</rd:DefaultName>
|
||||
<Top>0.28742cm</Top>
|
||||
<Left>16.48964cm</Left>
|
||||
<Left>16.26915cm</Left>
|
||||
<Height>0.6cm</Height>
|
||||
<Width>3.64648cm</Width>
|
||||
<Width>4.61551cm</Width>
|
||||
<ZIndex>3</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
@@ -1101,10 +1079,10 @@
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>PageNumber</rd:DefaultName>
|
||||
<Top>1.02853cm</Top>
|
||||
<Left>16.48964cm</Left>
|
||||
<Top>0.99325cm</Top>
|
||||
<Left>18.22962cm</Left>
|
||||
<Height>0.6cm</Height>
|
||||
<Width>2.94608cm</Width>
|
||||
<Width>2.65504cm</Width>
|
||||
<ZIndex>4</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
@@ -1116,6 +1094,72 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<Textbox Name="Textbox6">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>=Parameters!Almacen.Value</Value>
|
||||
<Style>
|
||||
<FontWeight>Bold</FontWeight>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style>
|
||||
<TextAlign>Center</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox4</rd:DefaultName>
|
||||
<Top>2.09987cm</Top>
|
||||
<Left>5.75736cm</Left>
|
||||
<Height>0.6cm</Height>
|
||||
<Width>10.1061cm</Width>
|
||||
<ZIndex>5</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
</Border>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<Textbox Name="Textbox3">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>=Parameters!Direccion.Value</Value>
|
||||
<Style>
|
||||
<FontWeight>Bold</FontWeight>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style />
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox2</rd:DefaultName>
|
||||
<Top>1.30143cm</Top>
|
||||
<Left>4.45435cm</Left>
|
||||
<Height>0.54708cm</Height>
|
||||
<Width>6.51432cm</Width>
|
||||
<ZIndex>6</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
</Border>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
</ReportItems>
|
||||
<Style>
|
||||
<Border>
|
||||
@@ -1129,7 +1173,7 @@
|
||||
<PrintOnLastPage>true</PrintOnLastPage>
|
||||
<ReportItems>
|
||||
<Line Name="Line2">
|
||||
<Top>0.127cm</Top>
|
||||
<Top>0.12697cm</Top>
|
||||
<Left>0.01325cm</Left>
|
||||
<Height>0cm</Height>
|
||||
<Width>20.90669cm</Width>
|
||||
@@ -1155,58 +1199,8 @@
|
||||
<ColumnSpacing>0.13cm</ColumnSpacing>
|
||||
<Style />
|
||||
</Page>
|
||||
<AutoRefresh>0</AutoRefresh>
|
||||
<DataSources>
|
||||
<DataSource Name="DataSet">
|
||||
<ConnectionProperties>
|
||||
<DataProvider>System.Data.DataSet</DataProvider>
|
||||
<ConnectString>/* Local Connection */</ConnectString>
|
||||
</ConnectionProperties>
|
||||
<rd:DataSourceID>db271139-498f-42f1-b0bc-9c6d57014da7</rd:DataSourceID>
|
||||
</DataSource>
|
||||
</DataSources>
|
||||
<DataSets>
|
||||
<DataSet Name="DataSet1">
|
||||
<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="E_Almacen">
|
||||
<DataField>E_Almacen</DataField>
|
||||
<rd:TypeName>System.String</rd:TypeName>
|
||||
</Field>
|
||||
<Field Name="E_Traspaso">
|
||||
<DataField>E_Traspaso</DataField>
|
||||
<rd:TypeName>System.String</rd:TypeName>
|
||||
</Field>
|
||||
<Field Name="E_Compra">
|
||||
<DataField>E_Compra</DataField>
|
||||
<rd:TypeName>System.String</rd:TypeName>
|
||||
</Field>
|
||||
<Field Name="S_Almacen">
|
||||
<DataField>S_Almacen</DataField>
|
||||
<rd:TypeName>System.String</rd:TypeName>
|
||||
</Field>
|
||||
<Field Name="S_Traspaso">
|
||||
<DataField>S_Traspaso</DataField>
|
||||
<rd:TypeName>System.String</rd:TypeName>
|
||||
</Field>
|
||||
</Fields>
|
||||
<rd:DataSetInfo>
|
||||
<rd:DataSetName>DataSet</rd:DataSetName>
|
||||
<rd:SchemaPath>C:\Users\Janeth\documents\visual studio 2015\WebSites\Reporteweb\App_Code\DataSet1.xsd</rd:SchemaPath>
|
||||
<rd:TableName>DataTable4</rd:TableName>
|
||||
<rd:TableAdapterFillMethod />
|
||||
<rd:TableAdapterGetDataMethod />
|
||||
<rd:TableAdapterName />
|
||||
</rd:DataSetInfo>
|
||||
</DataSet>
|
||||
</DataSets>
|
||||
</ReportSection>
|
||||
</ReportSections>
|
||||
<ReportParameters>
|
||||
<ReportParameter Name="FechaInicial">
|
||||
<DataType>DateTime</DataType>
|
||||
@@ -1234,6 +1228,12 @@
|
||||
<AllowBlank>true</AllowBlank>
|
||||
<Prompt>ReportParameter1</Prompt>
|
||||
</ReportParameter>
|
||||
<ReportParameter Name="Almacen">
|
||||
<DataType>String</DataType>
|
||||
<Nullable>true</Nullable>
|
||||
<AllowBlank>true</AllowBlank>
|
||||
<Prompt>ReportParameter1</Prompt>
|
||||
</ReportParameter>
|
||||
</ReportParameters>
|
||||
<EmbeddedImages>
|
||||
<EmbeddedImage Name="Logo">
|
||||
|
||||
@@ -120,7 +120,7 @@
|
||||
<TablixBody>
|
||||
<TablixColumns>
|
||||
<TablixColumn>
|
||||
<Width>4.91744cm</Width>
|
||||
<Width>3.06478cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>4.73895cm</Width>
|
||||
@@ -790,7 +790,7 @@
|
||||
<Top>0.82931cm</Top>
|
||||
<Left>0.06614cm</Left>
|
||||
<Height>0.93542cm</Height>
|
||||
<Width>23.14606cm</Width>
|
||||
<Width>21.2934cm</Width>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -837,7 +837,7 @@
|
||||
<Height>0.79506in</Height>
|
||||
<Style />
|
||||
</Body>
|
||||
<Width>9.13866in</Width>
|
||||
<Width>8.41991in</Width>
|
||||
<Page>
|
||||
<PageHeader>
|
||||
<Height>2.22362cm</Height>
|
||||
@@ -1209,6 +1209,7 @@
|
||||
<Prompt>ReportParameter1</Prompt>
|
||||
</ReportParameter>
|
||||
</ReportParameters>
|
||||
|
||||
<Language>es-MX</Language>
|
||||
<rd:ReportUnitType>Cm</rd:ReportUnitType>
|
||||
<rd:ReportID>40c94aad-a12a-44fb-ab0d-ea36a9656792</rd:ReportID>
|
||||
|
||||
@@ -483,7 +483,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4 col-sm-4">
|
||||
<%--<div class="col-md-4 col-sm-4">
|
||||
<asp:UpdatePanel ID="UPPTareas" runat="server" RenderMode="Inline" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
|
||||
@@ -534,7 +534,7 @@
|
||||
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</div>
|
||||
</div>--%>
|
||||
<%-- <div class="col-md-2 col-sm-2">
|
||||
<div class="portlet light ">
|
||||
<div class="portlet-title">
|
||||
|
||||
@@ -178,7 +178,7 @@ Partial Class Inicio
|
||||
CargaGraficas()
|
||||
End If
|
||||
|
||||
CargaTareas()
|
||||
'CargaTareas()
|
||||
If UsuarioActual.CveRol = 1 Then
|
||||
divInd.Visible = True
|
||||
CargaSubProyectos()
|
||||
@@ -463,39 +463,39 @@ Partial Class Inicio
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub CargaTareas()
|
||||
Dim ObjProspectos As New ClsOIEventos
|
||||
'Private Sub CargaTareas()
|
||||
' Dim ObjProspectos As New ClsOIEventos
|
||||
|
||||
Dim FechaI, FechaF As DateTime
|
||||
Dim CveEventoEstatus As Integer = -1
|
||||
FechaI = Now.AddDays(-180)
|
||||
FechaF = Now
|
||||
If ObjProspectos.GetRepEventos(-1, 1, -1, "-1", "-1", -1, -1, -1, 1, -1, -1, "-1", -1, -1, -1, -1, -1, -1, -1, -1, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, FechaI, FechaF) Then
|
||||
' Dim FechaI, FechaF As DateTime
|
||||
' Dim CveEventoEstatus As Integer = -1
|
||||
' FechaI = Now.AddDays(-180)
|
||||
' FechaF = Now
|
||||
' If ObjProspectos.GetRepEventos(-1, 1, -1, "-1", "-1", -1, -1, -1, 1, -1, -1, "-1", -1, -1, -1, -1, -1, -1, -1, -1, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, FechaI, FechaF) Then
|
||||
|
||||
Dim DT As DataTable = ObjProspectos.DtResultados.Clone
|
||||
' Dim DT As DataTable = ObjProspectos.DtResultados.Clone
|
||||
|
||||
If ChkOIPorHacer.Checked Then DT.Merge(ObjProspectos.DtResultados.FiltraParametros(String.Format("CveUsuarioPara = {0} ", UsuarioActual.CveUsuario)))
|
||||
If ChkOIAsigne.Checked Then DT.Merge(ObjProspectos.DtResultados.FiltraParametros(String.Format("CveUsuarioDe = {0} ", UsuarioActual.CveUsuario)))
|
||||
' If ChkOIPorHacer.Checked Then DT.Merge(ObjProspectos.DtResultados.FiltraParametros(String.Format("CveUsuarioPara = {0} ", UsuarioActual.CveUsuario)))
|
||||
' If ChkOIAsigne.Checked Then DT.Merge(ObjProspectos.DtResultados.FiltraParametros(String.Format("CveUsuarioDe = {0} ", UsuarioActual.CveUsuario)))
|
||||
|
||||
GvT.DataSource = DT
|
||||
End If
|
||||
' GvT.DataSource = DT
|
||||
' End If
|
||||
|
||||
ObjProspectos.Dispose()
|
||||
GvT.DataBind()
|
||||
End Sub
|
||||
Protected Sub GvT_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvT.RowDataBound
|
||||
If e.Row.RowType = DataControlRowType.DataRow Then
|
||||
Select Case UsuarioActual.CveUsuario.ToString
|
||||
Case e.Row.DBCampo("CveUsuarioPara")
|
||||
'etiqueta de 'asignado'
|
||||
e.Row.FCLabel("LblTipo").CssClass = "label label-sm label-warning "
|
||||
e.Row.FCLabel("LblTipo").Text = "por hacer <i class='fa fa-share'></i>"
|
||||
Case e.Row.DBCampo("CveUsuarioDe")
|
||||
e.Row.FCLabel("LblTipo").CssClass = "label label-sm label-success"
|
||||
e.Row.FCLabel("LblTipo").Text = "Asigné"
|
||||
End Select
|
||||
End If
|
||||
End Sub
|
||||
' ObjProspectos.Dispose()
|
||||
' GvT.DataBind()
|
||||
'End Sub
|
||||
'Protected Sub GvT_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvT.RowDataBound
|
||||
' If e.Row.RowType = DataControlRowType.DataRow Then
|
||||
' Select Case UsuarioActual.CveUsuario.ToString
|
||||
' Case e.Row.DBCampo("CveUsuarioPara")
|
||||
' 'etiqueta de 'asignado'
|
||||
' e.Row.FCLabel("LblTipo").CssClass = "label label-sm label-warning "
|
||||
' e.Row.FCLabel("LblTipo").Text = "por hacer <i class='fa fa-share'></i>"
|
||||
' Case e.Row.DBCampo("CveUsuarioDe")
|
||||
' e.Row.FCLabel("LblTipo").CssClass = "label label-sm label-success"
|
||||
' e.Row.FCLabel("LblTipo").Text = "Asigné"
|
||||
' End Select
|
||||
' End If
|
||||
'End Sub
|
||||
Private Sub MuestraIndicador(DIV As HtmlGenericControl, Color As String, Icono As String, Titulo As String, Comentario As String, Link As String, TitleComentario As String)
|
||||
Dim htmldiv As New StringBuilder
|
||||
htmldiv.AppendFormat("{0}<div class='col-lg-4 col-md-4 col-sm-6 col-xs-12'><div class='dashboard-stat {1}'><div class='visual'><i class='{2}' '=''></i></div>", DIV.InnerHtml, Color, Icono)
|
||||
@@ -844,9 +844,9 @@ Partial Class Inicio
|
||||
End Sub
|
||||
#End Region
|
||||
|
||||
Protected Sub ChkOIAsigne_CheckedChanged(sender As Object, e As EventArgs) Handles ChkOIAsigne.CheckedChanged, ChkOIPorHacer.CheckedChanged
|
||||
CargaTareas()
|
||||
End Sub
|
||||
'Protected Sub ChkOIAsigne_CheckedChanged(sender As Object, e As EventArgs) Handles ChkOIAsigne.CheckedChanged, ChkOIPorHacer.CheckedChanged
|
||||
' CargaTareas()
|
||||
'End Sub
|
||||
Protected Sub DdlFiltroIndicador_SelectedIndexChanged(sender As Object, e As EventArgs)
|
||||
|
||||
End Sub
|
||||
|
||||
@@ -178,7 +178,7 @@ public partial class OC_RepSolicitudesAnticipo : ClsPaginas
|
||||
para.Add(new ReportParameter("UsuarioImprimio", UsuarioActual.Nombre));
|
||||
para.Add(new ReportParameter("Estatus", DdlEstatus.SelectedValue));
|
||||
String Agrupadores = $"{Proveedor}{FechaI}{FechaF}{Estatus}{Usuario}{SubProyectos}";
|
||||
para.Add(new ReportParameter("AgrupadoPor", (Agrupadores == "" ? "": $"<b>Agrupado Por:</b> {Agrupadores}")));
|
||||
para.Add(new ReportParameter("AgrupadoPor", (Agrupadores == "" ? "": $"<b></b> {Agrupadores}")));
|
||||
if (Imagen.Exists)
|
||||
{
|
||||
para.Add(new ReportParameter("LogoPath", logouri));
|
||||
|
||||
Reference in New Issue
Block a user