AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://agonzalez@192.168.10.111:8383/SIG.git

Browse Source
This commit is contained in:
Antonio Gonzalez
2020-08-31 14:57:54 -07:00
parent a038b4d6e0 1d95b42925
commit 98ca712342
7 changed files with 369 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
App_Code/ClsPaginas.vb
View File

@@ -4851,7 +4851,6 @@ Public Class ClsPaginas
PaginaDict.Add("/Ventas/CatImpuestosLocales.aspx".ToUpper(), 394)
PaginaDict.Add("/Ventas/ActualizarPrecios.aspx".ToUpper(), 397)
PaginaDict.Add("/Ventas/ClientesAbonar.aspx".ToUpper(), 321)
PaginaDict.Add("/Ventas/Reportes.aspx".ToUpper(), 567)
PaginaDict.Add("/Ventas/DiseñadorReportes.aspx".ToUpper(), 569)
PaginaDict.Add("/Ventas/ReporteDetalle.aspx".ToUpper(), 576)
PaginaDict.Add("/Ventas/PopUpBuscarPs.aspx".ToUpper(), 13)
@@ -4912,7 +4911,7 @@ Public Class ClsPaginas
PaginaDict.Add("/Ventas/RepVentasMensualesDetalle.aspx".ToUpper(), 721)
PaginaDict.Add("/Ventas/MetasVendedores.aspx".ToUpper(), 722)
PaginaDict.Add("/Ventas/CatMetasVendedores.aspx".ToUpper(), 723)
PaginaDict.Add("/Ventas/RepAuxiliarFacturas.aspx".ToUpper(), 704)
PaginaDict.Add("/Ventas/RepAuxiliarFacturas.aspx".ToUpper(), 567)
#End Region

4
Bancos/RepEgresosSinComprobante.aspx
View File

@@ -157,7 +157,7 @@
<asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<asp:GridView ID="GvESC" runat="server" DataKeyNames="CveIE, Saldo, CveMoneda, CveConceptoContable, CveProveedor, CvePersonal" AutoGenerateColumns="False" EmptyDataText="No se encontraron registros de Egresos sin Comprobar de Proveedores" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" Style="text-align: center;" GridLines="None">
<asp:GridView ID="GvESC" runat="server" DataKeyNames="CveIE, Saldo, CveMoneda, CveConceptoContable, CveProveedor, CvePersonal,CveSubProyecto" AutoGenerateColumns="False" EmptyDataText="No se encontraron registros de Egresos sin Comprobar de Proveedores" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" Style="text-align: center;" GridLines="None">
<Columns>
<asp:TemplateField ItemStyle-Width="10%">
<ItemTemplate>
@@ -219,7 +219,7 @@
<asp:UpdatePanel ID="upDatosPersonal" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<asp:GridView ID="GvPersonal" runat="server" AutoGenerateColumns="False" DataKeyNames="CveIE, Saldo, CveMoneda, CveConceptoContable, CveProveedor, CvePersonal"
<asp:GridView ID="GvPersonal" runat="server" AutoGenerateColumns="False" DataKeyNames="CveIE, Saldo, CveMoneda, CveConceptoContable, CveProveedor, CvePersonal,CveSubProyecto"
EmptyDataText="No se encontraron registros de Egresos sin Comprobar de Funcionarios Empleados" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" data-sort="true" GridLines="None">
<Columns>
<asp:TemplateField ItemStyle-Width="10%">

2
Bancos/RepEgresosSinComprobante.aspx.vb
View File

@@ -248,7 +248,7 @@ Partial Class Bancos_RepEgresosSinComprobante
End If
If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, TipoMovtoOtIngresos, gr.DataKey("Saldo").ToDecimal, "", 78, "Saldo de ExC por Sistema", Now, -1, -1, gr.DataKey("CveIE").ToEntero,
ImporteMX:=gr.DataKey("Saldo").ToDecimal, CveCuenta:=CveCuenta) Then
ImporteMX:=gr.DataKey("Saldo").ToDecimal, CveSubProyecto:=gr.DataKey("CveSubProyecto").ToEntero, CveCuenta:=CveCuenta) Then
MsgError = "Ocurrio un error al saldar el movimiento"
Exit For
End If

18
OI/Proyecto.aspx
View File

@@ -31,6 +31,7 @@
padding-left: 10px;
line-height: 25px;
}
.gantt-samples-banner_controls_bar.controls_bar, .gantt_scale_line .gantt_scale_cell, .gantt_grid_scale .gantt_grid_head_cell, .gantt_grid_scale .gantt_grid_head_cell a, .gantt_grid_scale .gantt_grid_head_cell a:hover {
background-color: #95a5a6 !important;
color: #FFF !important;
@@ -331,6 +332,7 @@
var datosGant = [];
function loadGant() {
gantt.config.date_format = "%Y-%m-%d %H:%i";
gantt.config.order_branch = true;
gantt.i18n.setLocale("es");
gantt.init("gantt_here");
gantt.config.columns = [
@@ -376,7 +378,23 @@
]*/
});
}
gantt.attachEvent("onBeforeTaskMove", function (id, parent, tindex) {
console.log(tindex)
var task = gantt.getTask(id);
if (task.parent != parent)
return false;
return true;
});
gantt.attachEvent("onRowDragEnd", function (id, target,tindex) {
console.log(tindex)
debugger;
drag_id = null;
gantt.render();
});
loadGant();
</script>
<%--<script>

64
OI/TableroDetalle.aspx
View File

@@ -5,17 +5,17 @@
<asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
<style>
.sortableList h4 {
background-color: #EEE;
background-color: #ccc;
margin: 0px;
padding-top: 10px;
padding-bottom: 10px;
text-align: center;
font-weight: 500;
font-weight: 600;
}
.sortableList {
border: 1px solid #eee;
width: 250px;
width: 258px;
margin-right: 10px;
}
@@ -31,7 +31,9 @@
min-height: 20px;
width: 250px;
padding: 5px 0 0 0;
margin: 0;
background-color: #eee;
border: dotted #ccc;
margin: 4px;
}
.sortableList ul li {
@@ -56,6 +58,11 @@
right: 5px;
top: 4px;
}
.bootomadd {
padding: 4px;
padding-bottom: 8px;
}
</style>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">
@@ -99,7 +106,7 @@
</ItemTemplate>
</asp:Repeater>
</ul>
<div class="text-center">
<div class="text-center bootomadd">
<%# String.Format("<a class=\"btn btn-default\" onclick=\"OpenModalNewTareaUserControl(1,-1,{{CveTableroLista:{0}}});\"> <i class=\"fa fa-plus\"'></i> </a>",Eval("CveTableroLista")) %>
</div>
@@ -170,15 +177,42 @@
<asp:UpdatePanel runat="server" ID="Uppositionevento" UpdateMode="Conditional">
<ContentTemplate>
<asp:Button ID="BtnUpPosition" OnClick="BtnUpPosition_Click" runat="server" Text="Agregar" CssClass="btn btn-primary hidden BtnUpPosition" UseSubmitBehavior="false" ValidationGroup="VGMTablzxczxc" />
<asp:TextBox ID="Txtcvetablerolista" CssClass=" hidden Txtcvetablerolista" runat="server"></asp:TextBox><asp:TextBox ID="txtCveEvento" CssClass="txtCveEvento hidden" runat="server"></asp:TextBox>
<asp:TextBox ID="TxtCveOrdeList" CssClass=" hidden TxtCveOrdeList" runat="server"></asp:TextBox>
<asp:Button ID="BtnOrderList" runat="server" OnClick="BtnOrderList_Click" CssClass="btn btn-primary hidden BtnOrderList" UseSubmitBehavior="false" ValidationGroup="VGMTablzxczxzc" />
<asp:TextBox ID="Txtcvetablerolista" CssClass=" hidden Txtcvetablerolista" runat="server"></asp:TextBox>
<asp:TextBox ID="txtCveEvento" CssClass="txtCveEvento hidden" runat="server"></asp:TextBox>
</ContentTemplate>
</asp:UpdatePanel>
</asp:Content>
<asp:Content ID="Content8" ContentPlaceHolderID="JS" runat="Server">
<script>
let CurrentorderList = ''
function GetOrderList() {
let OrdeList = '';
let separator = '';
let Orden = 1;
$('.ListSorter > li').each(function () {
OrdeList = OrdeList + separator + Orden + ':' + $(this).data('cvetablerolista');
separator = ',';
Orden = Orden + 1;
});
return OrdeList;
}
function GetOrderListEvento(ulelement) {
let OrdeList = '';
let separator = '';
let Orden = 1;
ulelement.find(' li').each(function () {
OrdeList = OrdeList + separator + Orden + ':' + $(this).data('cveevento');
separator = ',';
Orden = Orden + 1;
});
return OrdeList;
}
function ADSReady() {
CurrentorderList = GetOrderList();
var cvetablerolistaold = 0;
var cvetablerolistanew = 0;
@@ -190,7 +224,16 @@
setTimeout(function () {
cvetablerolistanew = $(event.srcElement).data('cvetablerolista');
//let cveevento = $(event.srcElement).data('cveevento');
//$('.Txtcvetablerolista').val(cvetablerolistanew);
setTimeout(function () {
let OrdeList = GetOrderList();
$('.TxtCveOrdeList').val(OrdeList);
console.log(OrdeList);
if (CurrentorderList != OrdeList) {
$('.BtnOrderList').click();
}
CurrentorderList = OrdeList;
}, 20);
//$('.txtCveEvento').val(cveevento);
//$('.BtnUpPosition').click();
}, 20);
@@ -202,8 +245,11 @@
start: function (event, ui) { cvetablerolistaold = $(event.srcElement).closest('ul').data('cvetablerolista'); },
stop: function (event, ui) {
setTimeout(function () {
cvetablerolistanew = $(event.srcElement).closest('ul').data('cvetablerolista');
let ulelement = $(event.srcElement).closest('ul');
cvetablerolistanew = ulelement.data('cvetablerolista');
let cveevento = $(event.srcElement).data('cveevento');
let OrdeList = GetOrderListEvento(ulelement);
$('.TxtCveOrdeList').val(OrdeList);
$('.Txtcvetablerolista').val(cvetablerolistanew);
$('.txtCveEvento').val(cveevento);
$('.BtnUpPosition').click();

35
OI/TableroDetalle.aspx.cs
View File

@@ -164,9 +164,42 @@ public partial class OI_TableroDetalle : ClsPaginas
protected void BtnUpPosition_Click(object sender, EventArgs e)
{
bool continuar = false;
using (ClsOIEventos eveobj = new ClsOIEventos())
{
eveobj.UpEventoLista(Txtcvetablerolista.Text.ToEntero(), txtCveEvento.Text.ToEntero());
eveobj.IniciaTransacSQL();
continuar =eveobj.UpEventoLista(Txtcvetablerolista.Text.ToEntero(), txtCveEvento.Text.ToEntero());
if (continuar)
{
List<string> orderlist = TxtCveOrdeList.Text.Split(',').ToList<string>();
continuar = eveobj.OrdenaTareas(orderlist, UsuarioActual.CveEmpresa, UsuarioActual.CveUsuario);
}
if (continuar)
{
eveobj.Commit();
}
else
{
eveobj.RollBack();
}
}
}
protected void BtnOrderList_Click(object sender, EventArgs e)
{
List<string> orderlist = TxtCveOrdeList.Text.Split(',').ToList<string>();
using (ClsOIEventos eveobj = new ClsOIEventos())
{
eveobj.IniciaTransacSQL();
if(eveobj.OrdenaListas(orderlist,UsuarioActual.CveEmpresa,UsuarioActual.CveUsuario))
{
eveobj.Commit();
}
else
{
eveobj.RollBack();
}
}
}
}

6
vwd.webinfo
View File

@@ -94,6 +94,12 @@