This commit is contained in:
jnunez 2018-08-20 23:00:16 +00:00
parent 3583987abd
commit 643884c50f
28 changed files with 186 additions and 110 deletions

View file

@ -83,7 +83,6 @@
<Content Include="Global.asax" />
<Content Include="Properties\DataSources\System.Data.DataSet.datasource" />
<None Include="Properties\PublishProfiles\AYA.SlnSinort.WCF.pubxml" />
<None Include="Service References\ServiciosUsuariosWCF\ServicioUsuarios.disco" />
<None Include="Service References\ServiciosUsuariosWCF\configuration91.svcinfo" />
<None Include="Service References\ServiciosUsuariosWCF\configuration.svcinfo" />
<None Include="Service References\ServiciosUsuariosWCF\Reference.svcmap">
@ -118,17 +117,17 @@
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
<None Include="Service References\ServiciosUsuariosWCF\ServicioUsuarios.wsdl" />
<None Include="Service References\ServiciosUsuariosWCF\ServicioUsuarios.xsd">
<None Include="Service References\ServiciosUsuariosWCF\ServicioUsuarios1.wsdl" />
<None Include="Service References\ServiciosUsuariosWCF\ServicioUsuarios4.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Service References\ServiciosUsuariosWCF\ServicioUsuarios1.xsd">
<None Include="Service References\ServiciosUsuariosWCF\ServicioUsuarios41.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Service References\ServiciosUsuariosWCF\ServicioUsuarios2.xsd">
<None Include="Service References\ServiciosUsuariosWCF\ServicioUsuarios42.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Service References\ServiciosUsuariosWCF\ServicioUsuarios3.xsd">
<None Include="Service References\ServiciosUsuariosWCF\ServicioUsuarios43.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Web.Debug.config">

View file

@ -19,15 +19,14 @@
<ServiceContractMappings />
</ClientOptions>
<MetadataSources>
<MetadataSource Address="http://10.50.1.123:2075/ServicioUsuarios.svc" Protocol="http" SourceId="1" />
<MetadataSource Address="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc?wsdl" Protocol="http" SourceId="1" />
</MetadataSources>
<Metadata>
<MetadataFile FileName="ServicioUsuarios.wsdl" MetadataType="Wsdl" ID="ea1817e0-3a48-436d-894b-4c8bfa384ad5" SourceId="1" SourceUrl="http://10.50.1.123:2075/ServicioUsuarios.svc?wsdl" />
<MetadataFile FileName="ServicioUsuarios.xsd" MetadataType="Schema" ID="69c25ff0-3888-480c-b38d-000f2f26087a" SourceId="1" SourceUrl="http://10.50.1.123:2075/ServicioUsuarios.svc?xsd=xsd0" />
<MetadataFile FileName="ServicioUsuarios1.xsd" MetadataType="Schema" ID="24bc664b-10af-4fd4-906a-ca9a925a857f" SourceId="1" SourceUrl="http://10.50.1.123:2075/ServicioUsuarios.svc?xsd=xsd1" />
<MetadataFile FileName="ServicioUsuarios2.xsd" MetadataType="Schema" ID="6b48b625-b372-46c0-8a48-739e6d6a08d2" SourceId="1" SourceUrl="http://10.50.1.123:2075/ServicioUsuarios.svc?xsd=xsd2" />
<MetadataFile FileName="ServicioUsuarios3.xsd" MetadataType="Schema" ID="bff806b8-094e-4433-ada8-6d1e32e4d71c" SourceId="1" SourceUrl="http://10.50.1.123:2075/ServicioUsuarios.svc?xsd=xsd3" />
<MetadataFile FileName="ServicioUsuarios.disco" MetadataType="Disco" ID="9ad09ac5-8db4-4789-8af3-4a816fb15d5d" SourceId="1" SourceUrl="http://10.50.1.123:2075/ServicioUsuarios.svc?disco" />
<MetadataFile FileName="ServicioUsuarios4.xsd" MetadataType="Schema" ID="e1fdb6c8-fcf0-4cf5-b1d1-013ee30ea022" SourceId="1" SourceUrl="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc?xsd=xsd0" />
<MetadataFile FileName="ServicioUsuarios1.wsdl" MetadataType="Wsdl" ID="575ffb98-d87c-469c-807d-e158df36389b" SourceId="1" SourceUrl="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc?wsdl" />
<MetadataFile FileName="ServicioUsuarios41.xsd" MetadataType="Schema" ID="4dc01389-cf57-4472-a065-9348213ed584" SourceId="1" SourceUrl="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc?xsd=xsd1" />
<MetadataFile FileName="ServicioUsuarios42.xsd" MetadataType="Schema" ID="bd1189c0-261b-40e5-b952-18d4af80ca09" SourceId="1" SourceUrl="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc?xsd=xsd2" />
<MetadataFile FileName="ServicioUsuarios43.xsd" MetadataType="Schema" ID="bbf9e252-2a24-4661-aa19-66c6b05de8da" SourceId="1" SourceUrl="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc?xsd=xsd3" />
</Metadata>
<Extensions>
<ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />

View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
<contractRef ref="http://10.50.1.123:2075/ServicioUsuarios.svc?wsdl" docRef="http://10.50.1.123:2075/ServicioUsuarios.svc" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
</discovery>

View file

@ -2,10 +2,10 @@
<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ServicioUsuarios" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xsd:schema targetNamespace="http://tempuri.org/Imports">
<xsd:import schemaLocation="http://10.50.1.123:2075/ServicioUsuarios.svc?xsd=xsd0" namespace="http://tempuri.org/" />
<xsd:import schemaLocation="http://10.50.1.123:2075/ServicioUsuarios.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
<xsd:import schemaLocation="http://10.50.1.123:2075/ServicioUsuarios.svc?xsd=xsd2" />
<xsd:import schemaLocation="http://10.50.1.123:2075/ServicioUsuarios.svc?xsd=xsd3" namespace="http://schemas.datacontract.org/2004/07/AyAEL.Tran" />
<xsd:import schemaLocation="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc?xsd=xsd0" namespace="http://tempuri.org/" />
<xsd:import schemaLocation="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
<xsd:import schemaLocation="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc?xsd=xsd2" />
<xsd:import schemaLocation="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc?xsd=xsd3" namespace="http://schemas.datacontract.org/2004/07/AyAEL.Tran" />
</xsd:schema>
</wsdl:types>
<wsdl:message name="IServicioUsuarios_obtenerUsuariosActiveDirectory_InputMessage">
@ -53,7 +53,7 @@
</wsdl:binding>
<wsdl:service name="ServicioUsuarios">
<wsdl:port name="BasicHttpBinding_IServicioUsuarios" binding="tns:BasicHttpBinding_IServicioUsuarios">
<soap:address location="http://10.50.1.123:2075/ServicioUsuarios.svc" />
<soap:address location="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:tns="http://tempuri.org/" elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:import schemaLocation="http://10.50.1.123:2075/ServicioUsuarios.svc?xsd=xsd3" namespace="http://schemas.datacontract.org/2004/07/AyAEL.Tran" />
<xs:import schemaLocation="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc?xsd=xsd3" namespace="http://schemas.datacontract.org/2004/07/AyAEL.Tran" />
<xs:element name="obtenerUsuariosActiveDirectory">
<xs:complexType>
<xs:sequence />

View file

@ -5,6 +5,6 @@
<binding digest="System.ServiceModel.Configuration.BasicHttpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data name=&quot;BasicHttpBinding_IServicioUsuarios&quot; /&gt;" bindingType="basicHttpBinding" name="BasicHttpBinding_IServicioUsuarios" />
</bindings>
<endpoints>
<endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://10.50.1.123:2075/ServicioUsuarios.svc&quot; binding=&quot;basicHttpBinding&quot; bindingConfiguration=&quot;BasicHttpBinding_IServicioUsuarios&quot; contract=&quot;ServiciosUsuariosWCF.IServicioUsuarios&quot; name=&quot;BasicHttpBinding_IServicioUsuarios&quot; /&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://10.50.1.123:2075/ServicioUsuarios.svc&quot; binding=&quot;basicHttpBinding&quot; bindingConfiguration=&quot;BasicHttpBinding_IServicioUsuarios&quot; contract=&quot;ServiciosUsuariosWCF.IServicioUsuarios&quot; name=&quot;BasicHttpBinding_IServicioUsuarios&quot; /&gt;" contractName="ServiciosUsuariosWCF.IServicioUsuarios" name="BasicHttpBinding_IServicioUsuarios" />
<endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://aya-vsrv-wstt:2010/ServicioUsuarios.svc&quot; binding=&quot;basicHttpBinding&quot; bindingConfiguration=&quot;BasicHttpBinding_IServicioUsuarios&quot; contract=&quot;ServiciosUsuariosWCF.IServicioUsuarios&quot; name=&quot;BasicHttpBinding_IServicioUsuarios&quot; /&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://aya-vsrv-wstt:2010/ServicioUsuarios.svc&quot; binding=&quot;basicHttpBinding&quot; bindingConfiguration=&quot;BasicHttpBinding_IServicioUsuarios&quot; contract=&quot;ServiciosUsuariosWCF.IServicioUsuarios&quot; name=&quot;BasicHttpBinding_IServicioUsuarios&quot; /&gt;" contractName="ServiciosUsuariosWCF.IServicioUsuarios" name="BasicHttpBinding_IServicioUsuarios" />
</endpoints>
</configurationSnapshot>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="lm/iPvTn7Cyfl1EfY5tm7xAQF60=">
<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="cvdt2QvLa4/z7MZK6GtGpd5dEgE=">
<bindingConfigurations>
<bindingConfiguration bindingType="basicHttpBinding" name="BasicHttpBinding_IServicioUsuarios">
<properties>
@ -112,10 +112,10 @@
</bindingConfiguration>
</bindingConfigurations>
<endpoints>
<endpoint name="BasicHttpBinding_IServicioUsuarios" contract="ServiciosUsuariosWCF.IServicioUsuarios" bindingType="basicHttpBinding" address="http://10.50.1.123:2075/ServicioUsuarios.svc" bindingConfiguration="BasicHttpBinding_IServicioUsuarios">
<endpoint name="BasicHttpBinding_IServicioUsuarios" contract="ServiciosUsuariosWCF.IServicioUsuarios" bindingType="basicHttpBinding" address="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc" bindingConfiguration="BasicHttpBinding_IServicioUsuarios">
<properties>
<property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>http://10.50.1.123:2075/ServicioUsuarios.svc</serializedValue>
<serializedValue>http://aya-vsrv-wstt:2010/ServicioUsuarios.svc</serializedValue>
</property>
<property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />

View file

@ -12,8 +12,8 @@
</system.web>
<system.serviceModel>
<client>
<endpoint address="http://10.50.1.123:2075/ServicioUsuarios.svc"
binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IServicioUsuarios"
<endpoint address="http://aya-vsrv-wstt:2010/ServicioUsuarios.svc"
binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IServicioUsuarios"
contract="ServiciosUsuariosWCF.IServicioUsuarios" name="BasicHttpBinding_IServicioUsuarios" />
</client>
<behaviors>
@ -44,7 +44,8 @@
</protocolMapping>
<bindings>
<basicHttpBinding>
<binding name="BasicHttpBinding_IServicioUsuarios" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647"/>
<binding name="BasicHttpBinding_IServicioUsuarios" maxBufferPoolSize="2147483647"
maxReceivedMessageSize="2147483647" />
</basicHttpBinding>
<wsHttpBinding>
<binding name="SOAPBinding" closeTimeout="00:50:00" openTimeout="00:50:00"
@ -59,10 +60,11 @@
</binding>
</wsHttpBinding>
<webHttpBinding>
<binding name="JSONBinding" closeTimeout="00:50:00" openTimeout="00:50:00" crossDomainScriptAccessEnabled="true"
<binding name="JSONBinding" closeTimeout="00:50:00" openTimeout="00:50:00"
receiveTimeout="00:50:00" sendTimeout="00:50:00" allowCookies="false"
bypassProxyOnLocal="false" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647"
useDefaultWebProxy="true" contentTypeMapper="Atesa.Utilitarios.NewtonsoftJsonContentTypeMapper,Atesa.Utilitarios">
useDefaultWebProxy="true" contentTypeMapper="Atesa.Utilitarios.NewtonsoftJsonContentTypeMapper,Atesa.Utilitarios"
crossDomainScriptAccessEnabled="true">
<readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647"
maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
<security mode="None">

View file

@ -5,10 +5,11 @@ var RepositorioVirtual = $("#hiddenRepositorioVirtual").val();
var RepositorioLocal = $("#hiddenRepositorioLocal").val();
var UsuarioSistema = $("#hiddenUsuarioSistema").val();
var NombreUsuario = $("#hiddenNombreUsuario").val();
//aya-vsrv-apptt:252
var server = window.location.protocol + "//" + "localhost" + "/" + (window.location.pathname.split('/')[1]) + "/";
var SinorLoginWCF = "http://localhost/AYA.SlnSinort.WCF/Sinort.svc";
var string_empty = "";
var ultima_ruta = "http://localhost/AYA.SlnSinort/Catalogos/Mantenimiento#no-back-button";
var Atesa = {};
var StarterTemplateVisible = true;
var LoadMessageThreadCounter = 0;
@ -72,7 +73,7 @@ var Roles = {
}
var Pantallas = {
SuperUser: { Codigo: 27, Descripcion: "Super Usuario" },
SuperUser: { Codigo: 27, Descripcion: "Administrador Funcional" },
}
var RutaLogoSINORT = $("#hiddenRutaLogoSINORT").val();
@ -1881,7 +1882,7 @@ this.DibujarGotitasPendientes = function (data) {
this.ValidarPermisos = function (opcion) {
var validar;
validar = $.grep(localStorage['ListaOpciones'].split(","), function (data) {
return data == 'Super Usuario';
return data == 'Administrador Funcional';
});
if (validar.length == 0) {
validar = $.grep(localStorage['ListaOpciones'].split(","), function (data) {
@ -2008,6 +2009,10 @@ this.ExportarAMsWord = function (html, filename) {
}
this.VolverRuta = function () {
var a = document.referrer;
window.history.back();
}
this.EntrarPantallaSolicitud = function (codigo) {
url = $("#hiddenHrefS").val();
url = url.replace("View", "Solicitud");
@ -2068,4 +2073,11 @@ this.StartSelectControlRequest = function (_selectId) {
listItems = "<option value='-1' ><i class=\"fa fa-spinner fa-spin\"></i>Cargando catalogos, Por favor Espere...</option>";
$(_selectId).append(listItems);
};
};
function nobackbutton() {
window.location.hash = "no-back-button";
window.location.hash = "Again-No-back-button" //chrome
window.onhashchange = function () { window.location.hash = "no-back-button"; }
}

View file

@ -18,7 +18,7 @@ this.getDataModel = function () {
$("#btnAgregarNuevaGotita").unbind("click");
$("#btnAgregarNuevaGotita").click(function () {
if (ValidarPermisos('Generar gotitas normativas').length <= 0) {
if (ValidarPermisos('Super Usuario').length <= 0) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
toastr.warning(Message_NoGrants, Message_Warning);
return;
}

View file

@ -143,7 +143,7 @@ $('#tableSitios').on('click', 'button', function () {
if (ValidarPermisos('Búsqueda rápida').length <= 0) {
if (ValidarPermisos('Super Usuario').length <= 0) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
toastr.warning(Message_NoGrants, Message_Warning);
return;
}

View file

@ -87,7 +87,7 @@ $('#tableFichas').on('click', 'button', function () {
var data = $('#tableFichas').DataTable().row($(this).parents('tr')).data();
if (ValidarPermisos('Búsqueda predeterminada').length <= 0) {
if (ValidarPermisos('Super Usuario').length <= 0) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
toastr.warning(Message_NoGrants, Message_Warning);
return;
}

View file

@ -232,7 +232,7 @@ this.getDataModel = function () {
$("#btnDivulgar").click(function () {
if (ValidarPermisos('Divulgar').length <= 0) {
if (ValidarPermisos('Super Usuario').length <= 0) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
toastr.warning(Message_NoGrants, Message_Warning);
return;
}
@ -275,7 +275,7 @@ this.getDataModel = function () {
$("#btnEliminar").unbind("click");
$("#btnEliminar").click(function () {
if (ValidarPermisos('Eliminar ficha técnica').length <= 0) {
if (ValidarPermisos('Super Usuario').length <= 0) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
toastr.warning(Message_NoGrants, Message_Warning);
return;
}

View file

@ -91,7 +91,7 @@ jQuery(document).ready(function () {
}
if (ValidarPermisos('Accesar expediente de foro').length <= 0 || Estado != Estados.Contruccion.Codigo) {
if (ValidarPermisos('Super Usuario').length <= 0 || Estado != Estados.Contruccion.Codigo) {
if (ValidarPermisos('Administrador Funcional').length <= 0 || Estado != Estados.Contruccion.Codigo) {
$("#tabs").tabs({
disabled: [3]
});
@ -105,7 +105,7 @@ jQuery(document).ready(function () {
if (EsPromotor == false) {
if (ValidarPermisos('Ingreso y actualización de área de proyecto').length <= 0 || Estado != Estados.Activo.Codigo || Estado != Estados.Inicial.Codigo) {
if (ValidarPermisos('Super Usuario').length <= 0) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
$("#tabs").tabs({
disabled: [2]
});
@ -114,7 +114,7 @@ jQuery(document).ready(function () {
}
if (ValidarPermisos('Accesar expediente de propuesta normativa').length <= 0 || Estado != Estados.Contruccion.Codigo) {
if (ValidarPermisos('Super Usuario').length <= 0 || Estado != Estados.Contruccion.Codigo) {
if (ValidarPermisos('Administrador Funcional').length <= 0 || Estado != Estados.Contruccion.Codigo) {
$("#tabs").tabs({
disabled: [3]
});
@ -125,7 +125,7 @@ jQuery(document).ready(function () {
}
}
});
@ -209,7 +209,7 @@ this.getDataModel = function () {
$("#btnMostrarCalendario").click(function () {
Calendario(model.EventosJSON);
});
//Calendario(model.EventosJSON);
$("#btnGuardarEvento").unbind("click");
$("#btnGuardarEvento").click(function () {
GuardarEvento();
@ -230,6 +230,9 @@ this.getDataModel = function () {
CargarUsuarios();
}
@ -1360,11 +1363,11 @@ this.GuardarAdjuntos = function (nombre) {
model.Adjuntos = AdjuntosDocumentosAuxiliar;
AjaxPostData(uri, model, true, false, CargarGridComentario, null, null);
AjaxPostData(uri, model, true, true, CargarGridComentario, null, null);
$("#txtDescripcionDocAux").val('');
$("#txtComentarioDocAux").val('');
}
this.CargarGridComentario = function (data) {
@ -1423,6 +1426,9 @@ this.CargarGridComentario = function (data) {
$('#btnVerAdjuntosForo').prop("disabled", true);
break;
case "4":
CargarDocumentosExpediente();
break;
case "5":
var tableDocEvento = $('#tableDocEvento').DataTable();
tableDocEvento.clear().draw();
@ -1450,6 +1456,10 @@ function ActualizarUpload() {
add: function (e, data) {
if ($('#txtDescripcionDocAux').val() == '') {
toastr.warning("El nombre del documento es requerido", Message_Warning);
return;
}
data.submit();
},
progress: function (e, data) {
@ -1474,7 +1484,9 @@ function ActualizarUpload() {
$('#progress .progress-bar').css(
'width', '0%');
ENDREQUEST();
$('#modalDocumentosAuxiliares').modal('hide');
toastr.success("Acción completada con exito", Message_Success);
},
error: function (error) {
@ -1587,7 +1599,7 @@ this.ModalEventoPopUp = function (evento) {
$("#btnVerAdjuntosEvento").disable();
$("#btnGuardarEvento").disable();
CargarDocumentosEventos(evento.id);
CargarDocumentosEventos(miEvento[0].IdDocumento);
}
@ -1602,10 +1614,34 @@ this.LimpiarModalevento = function () {
$("#txtUbicacion").val($("#txtNombreProyecto").val());
}
this.CargarCalendario = function (data) {
$('#calendar').fullCalendar({
eventClick: function (event) {
ModalEventoPopUp(event);
},
selectable: true,
eventLimit: true,
events: data,
select: function (startDate, endDate) {
ModalEvento(startDate.format(), endDate.format());
}
});
$('#calendar').fullCalendar('render');
}
this.Calendario = function (data) {
$('#modalCalendario').modal('show');
//$('#modalCalendario').modal('show');
$('#calendar').fullCalendar({
eventClick: function (event) {
@ -1622,21 +1658,18 @@ this.Calendario = function (data) {
}
});
$('#calendar').fullCalendar('render');
$('#modalCalendario').on('loaded.bs.modal', function (e) {
$('#calendar').fullCalendar('render');
})
var container = document.getElementById('divCalendarioRef');
var refreshContent = container.innerHTML;
container.innerHTML = refreshContent;
//$('#modalCalendario').on('loaded.bs.modal', function (e) {
// $('#calendar').fullCalendar('render');
//})
}
$('#tableDocEvento').on('click', 'button', function () {
var data = $('#tableDocEvento').DataTable().row($(this).parents('tr')).data();
window.open(data[4]);
});
this.Export2Doc = function (element, filename) {

View file

@ -5,6 +5,9 @@ var IdPropuestaNormativa;
jQuery(document).ready(function () {
window.location.hash = "no-back-button";
window.location.hash = "Again-No-back-button" //chrome
window.onhashchange = function () { window.location.hash = "no-back-button"; }
getDataModel();

View file

@ -54,7 +54,7 @@ $('#tableSitios').on('click', 'button', function () {
if (data.PromotorProyecto != UsuarioSistema) {
if (ValidarPermisos('Accesar expediente de propuesta normativa').length <= 0 || data.IdEstado == Estados.Contruccion.Codigo) {
if (ValidarPermisos('Super Usuario').length <= 0 ) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
toastr.warning(Message_NoGrants, Message_Warning);
return;
}

View file

@ -198,7 +198,7 @@ $('#tableTareasPendientes').on('click', 'button', function () {
else {
if (Solicitud.DescripcionTipoSolicitud == "Consulta") {
if (ValidarPermisos('Responder solicitud de consulta al administrador').length <= 0) {
if (ValidarPermisos('Super Usuario').length <= 0) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
toastr.warning(Message_NoGrants, Message_Warning);
return;
}
@ -206,7 +206,7 @@ $('#tableTareasPendientes').on('click', 'button', function () {
}
if (Solicitud.DescripcionTipoSolicitud == "Modificación") {
if (ValidarPermisos('Responder solicitud de modificación al administrador').length <= 0) {
if (ValidarPermisos('Super Usuario').length <= 0) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
toastr.warning(Message_NoGrants, Message_Warning);
return;
}
@ -409,7 +409,7 @@ this.GuardarRespuestaSolicitudCompra = function () {
if (EstadoConfirmacion) {
if (ValidarPermisos('Autorización de compra de documento técnico').length <= 0) {
if (ValidarPermisos('Super Usuario').length <= 0) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
toastr.warning(Message_NoGrants, Message_Warning);
return;
}
@ -419,7 +419,7 @@ this.GuardarRespuestaSolicitudCompra = function () {
}
else {
if (ValidarPermisos('Rechazo o traslado de solicitud de compra a usuario especializado para que la autorice').length <= 0) {
if (ValidarPermisos('Super Usuario').length <= 0) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
toastr.warning(Message_NoGrants, Message_Warning);
return;
}
@ -442,7 +442,7 @@ this.GuardarRespuestaSolicitudCompra = function () {
}
else {
if (ValidarPermisos('Rechazo o traslado de solicitud de compra a usuario especializado para que la autorice').length <= 0) {
if (ValidarPermisos('Super Usuario').length <= 0) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
toastr.warning(Message_NoGrants, Message_Warning);
return;
}
@ -462,7 +462,7 @@ this.GuardarRespuestaSolicitudCompra = function () {
}
this.GuardarAutorizacionSolicitudCompra = function () {
if (ValidarPermisos('Confirmar solicitud de compra una vez autorizada').length <= 0) {
if (ValidarPermisos('Super Usuario').length <= 0) {
if (ValidarPermisos('Administrador Funcional').length <= 0) {
toastr.warning(Message_NoGrants, Message_Warning);
return;
}

View file

@ -4,10 +4,11 @@
Layout = "~/Views/Shared/_Layout.cshtml";
}
<input type="hidden" id="hiddenHref" value="@string.Concat(Url.Action("View", "Controller", null), ViewBag.QueryEncripted)">
<form id="formCatalogo" class="form-horizontal" role="form">
<div class="panel-body"> <h3>&nbsp;<i class="fa fa-briefcase"></i>&nbsp; Mantenimientos </h3> </div>
<div class="panel-body"> <h3>&nbsp;<i class="fa fa-briefcase"></i>&nbsp; Catálogos </h3> </div>
<div style="background-color: #fff">

View file

@ -3,18 +3,17 @@
}
<form id="formPrincipal" class="form-horizontal" role="form">
<img class="img-responsive" src="~/dist/img/SinortBanner1.png">
<div class="row">
@*<div class="col-sm-4"><a href="#"> <img class="img-responsive" src="~/dist/img/imgNormReg1.png"></div>*@
<div class="col-sm-4"><a href="javascript: EntrarVerEstadoFicha('1');"> <img class="img-responsive" src="~/dist/img/imgNormReg1.png"></div>
<div class="col-sm-4"><a href="#"> <img class="img-responsive" src="~/dist/img/imgNormReg1.png"></div>
@*<div class="col-sm-4"><a href="javascript: EntrarVerEstadoFicha('1');"> <img class="img-responsive" src="~/dist/img/imgNormReg1.png"></div>*@
<div class="col-sm-4"><a href="javascript: ValidarAcceder('Proyecto_Normativo','Home','Ver proyectos y foros');"> <img class="img-responsive" src="~/dist/img/imgProyeNorm1.png"></div>
<div class="col-sm-4"><a href="javascript: ValidarAcceder('Reporte','Reportes','Ver Reporte');"> <img class="img-responsive" src="~/dist/img/imgEst1.png"></div>
@*<div class="col-sm-4"><a href="#"> <img class="img-responsive" src="~/dist/img/imgEst1.png"></div>*@
@*<div class="col-sm-4"><a href="javascript: ValidarAcceder('Reporte','Reportes','Ver Reporte');"> <img class="img-responsive" src="~/dist/img/imgEst1.png"></div>*@
<div class="col-sm-4"><a href="#"> <img class="img-responsive" src="~/dist/img/imgEst1.png"></div>
</div>

View file

@ -4,6 +4,8 @@
Layout = "~/Views/Shared/_Layout.cshtml";
}
<input type="hidden" id="hiddenHref" value="@string.Concat(Url.Action("View", "Controller", null), ViewBag.QueryEncripted)?propuesta=[$ID]&tipo=[$TIPO]&promotor=[$Promotor]&estado=[$Estado]">
<form id="formSitios" class="form-horizontal" role="form">

View file

@ -3,6 +3,13 @@
Layout = "~/Views/Shared/_Layout.cshtml";
}
<script type="text/javascript">
$(document).ready(function () {
window.location.hash = "no-back-button";
window.location.hash = "Again-No-back-button" //chrome
window.onhashchange = function () { window.location.hash = "no-back-button"; }
});
</script>
<form id="formTareasPendientes" class="form-horizontal" role="form">
<div class="panel-body"> <h3>&nbsp;<i class="fa fa-list-ul"></i>&nbsp; Mis tareas pendientes </h3> </div>

View file

@ -3,6 +3,7 @@
Layout = "~/Views/Shared/_Layout.cshtml";
}
<form id="formDetallePropuesta" class="form-horizontal" role="form">
@*<div class="panel-body" id="divDescripcion"> <h3>&nbsp;<i class="fa fa-briefcase"></i>&nbsp; [$Propuesta] </h3> </div>*@
<div style="background-color: #fff">
@ -198,13 +199,13 @@
@* Documentos *@
<div class="col-md-4">
<div class="panel panel-success">
<div class="panel panel-success" >
<div class="panel-heading">
<h4 class="panel-title">
<i class="fa fa fa-folder-open-o"></i>&nbsp;<label id="lbTituloAccion">Documentos Auxliares</label>
</h4>
</div>
<div class="panel-body" style="height: 300px;">
<div class="panel-body">
<div class="form-group " id="divAbrirDocAux">
<label class="col-sm-4 control-label ControlsForms">Adjuntar</label>
@ -216,7 +217,7 @@
</div>
<div class="col-sm-12">
<div class="col-sm-12" style="height:200px; overflow-y:auto;">
<table id="tableDocAuxiliares" class="display">
<thead>
<tr>
@ -277,6 +278,7 @@
</h4>
</div>
<div class="panel-body">
<div class="form-group " id="divCalendario">
<label class="col-sm-4 control-label ControlsForms">Eventos</label>
<div class="col-sm-8">
@ -285,6 +287,13 @@
</button>
</div>
</div>
<div id="divCalendarioRef" style="width:75%; height: 75%;">
<div class="col-md-12">
<div id='calendar' style="height: 300px;"></div>
</div>
</div>
</div>
</div>
</div>
@ -454,7 +463,7 @@
<div class="col-md-12">
@*---------------------Descripción ---------------------------------------------------------*@
<div class="form-group">
<label class="col-sm-4 control-label ControlsForms" id="lblDescDocAux">Descripción</label>
<label class="col-sm-4 control-label ControlsForms" id="lblDescDocAux">Nombre</label>
<div class="input-group input-group-sm col-lg-8 col-md-8 col-sm-8 col-xs-8">
<input type="text" id="txtDescripcionDocAux" name="txtDescripcionDocAux" class="form-control imput-xs" required="required" />
</div>
@ -477,7 +486,7 @@
<div class="form-group">
<label class="col-sm-4 control-label ControlsForms">Adjuntar Documento</label>
<div class="input-group input-group-sm col-lg-6 col-md-6 col-sm-6 col-xs-6">
<span class="btn btn-success fileinput-button" title="Adjuntar Documento">
<span class="btn btn-success fileinput-button" >
<i class="fa fa-paperclip"></i>
<input type="file" id="fileupload" name="file" />
</span>
@ -655,7 +664,7 @@
<div class="form-group " id="divAsuntoMatriz">
<label class="col-sm-4 control-label ControlsForms" id="lblAsunto">Asunto</label>
<div class="input-group input-group-sm col-lg-8 col-md-8 col-sm-8 col-xs-8">
<input name="txtAsuntoMatriz" class="form-control imput-xs" id="txtAsuntoMatriz" type="text" />
<input name="txtAsuntoMatriz" class="form-control imput-xs" id="txtAsuntoMatriz" type="text" required />
</div>
</div>
@ -663,7 +672,7 @@
<div class="form-group " id="divCapituloMatriz">
<label class="col-sm-4 control-label ControlsForms" id="lblAsunto">Capítulo</label>
<div class="input-group input-group-sm col-lg-8 col-md-8 col-sm-8 col-xs-8">
<input name="txtCapituloMatriz" class="form-control imput-xs" id="txtCapituloMatriz" type="text" />
<input name="txtCapituloMatriz" class="form-control imput-xs" id="txtCapituloMatriz" type="text" required />
</div>
</div>
@ -671,7 +680,7 @@
<div class="form-group " id="divApartadoMatriz">
<label class="col-sm-4 control-label ControlsForms" id="lblAsunto">Apartado</label>
<div class="input-group input-group-sm col-lg-8 col-md-8 col-sm-8 col-xs-8">
<input name="txtApartadoMatriz" class="form-control imput-xs" id="txtApartadoMatriz" type="text" />
<input name="txtApartadoMatriz" class="form-control imput-xs" id="txtApartadoMatriz" type="text" required />
</div>
</div>
@ -683,7 +692,7 @@
<div class="form-group " id="divTextoOriginal">
<label class="col-sm-4 control-label ControlsForms" id="lblcomentario">Texto Original</label>
<div class="input-group input-group-sm col-lg-6 col-md-6 col-sm-6 col-xs-6">
<textarea name="txtTextoOriginal" rows="5" cols="45" id="txtTextoOriginal" style="resize: none"></textarea>
<textarea name="txtTextoOriginal" rows="5" cols="45" id="txtTextoOriginal" style="resize: none" required> </textarea>
</div>
</div>
@ -699,7 +708,7 @@
<div class="form-group " id="divComentarioMatriz">
<label class="col-sm-4 control-label ControlsForms" id="lblComentarioMatriz">Comentario</label>
<div class="input-group input-group-sm col-lg-6 col-md-6 col-sm-6 col-xs-6">
<textarea name="txtComentarioMatriz" rows="5" cols="45" id="txtComentarioMatriz" style="resize: none"></textarea>
<textarea name="txtComentarioMatriz" rows="5" cols="45" id="txtComentarioMatriz" style="resize: none" required></textarea>
</div>
</div>
@ -731,7 +740,7 @@
</div>
<div class="modal-footer" id="modalElemento-footer">
<button type="button" id="btnGuardarComentarioMatriz" class="btn btn-success btn-sm" data-dismiss="modal">Aceptar</button>
<button type="button" id="btnGuardarComentarioMatriz" class="btn btn-success btn-sm" >Aceptar</button>
<button type="button" class="btn btn-danger btn-sm" data-dismiss="modal">Cerrar</button>
</div>

View file

@ -23,6 +23,8 @@
<script src="~/dist/js/adminlte.min.js"></script>
<link rel="stylesheet" href="~/Content/themes/base/jquery-ui.css">
<!-- Google Font -->
<link rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
@ -52,11 +54,11 @@
</style>
</head>
<body class="hold-transition skin-blue sidebar-mini">
<body class="hold-transition skin-blue sidebar-mini" onload="noback()">
<div id="toast-container" class="toast-top-right"></div>
@RenderSection("Modals", required: false)
<div class="wrapper" >
<div class="wrapper">
<!-- Main Header -->
<header class="main-header">
@ -77,6 +79,14 @@
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<li class="dropdown messages-menu">
<a href="javascript: VolverRuta();" class="button">
<i class="glyphicon glyphicon-arrow-left"></i>
</a>
</li>
<li class="dropdown messages-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@ -99,7 +109,7 @@
</a>
<ul class="dropdown-menu">
<li class="header" id="numTareasPendientesHeader">[$0]</li>
<li class="footer"><a href="@Url.Action("TareasPendientes", "Home")"> Ver tareas pendientes </a></li>
</ul>
</li>
@ -108,12 +118,12 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="glyphicon glyphicon-question-sign"></i>
</a>
<ul class="dropdown-menu">
<li class="header" id="wiki">Videos informativos SINORT</li>
<li class="footer"><a href="@Url.Action("Wiki", "Home")">Ver wiki </a></li>
<li class="footer"><a href="#">Ver wiki </a></li>
</ul>
</li>
@ -134,19 +144,19 @@
<p id="nombreusuario">
[$NombreUsuario]
</p>
</li>
<li class="user-footer">
<div align="center">
<a class="btn btn-default btn-flat" onclick="CerrarSesion()">Cerrar sesión</a>
<a class="btn btn-default btn-flat" onclick="CerrarSesion()">Cerrar sesión</a>
</div>
</li>
</ul>
</li>
</ul>
</div>
</nav>
@ -176,7 +186,7 @@
<li><a href="javascript: ValidarAcceder('MisSolicitudesCompra','NormativaReglamentacionTecnica','Ver mis solicitudes de compra autorizadas');"> Ver mis solicitudes</br>de compra autorizadas </a></li>
<span><i class="fa fa-circle text-success"> Sitios</i> </span>
<li><a href="javascript: ValidarAcceder('CrearEncuesta','NormativaReglamentacionTecnica','Super Usuario');"> Crear encuesta </a></li>
<li><a href="javascript: ValidarAcceder('CrearEncuesta','NormativaReglamentacionTecnica','Administrador Funcional');"> Crear encuesta </a></li>
<li><a href="@Url.Action("ResponderMisEncuestas", "NormativaReglamentacionTecnica")"> Responder mis encuestas </a></li>
<li><a href="javascript: ValidarAcceder('VerEncuestas','NormativaReglamentacionTecnica','Ver mis encuestas');"> Ver encuestas </a></li>
<span><i class="fa fa-circle text-success"> Administar</i> </span>
@ -273,11 +283,11 @@
<div id="ucTareasPendientes" style="display:none;">
<span>
[$0]
[$0]
</span>
</div>
<div id="ucTareasPendientesHeader" style="display:none;">
<span>
<span>
[$0]
</span>
</div>
@ -289,7 +299,7 @@
<div id="ucNombreUsuario" style="display:none;">
<span>
[$NombreUsuario]
</span>
</div>
</body>
@ -300,17 +310,20 @@
@RenderSection("scripts", required: false)
@*<script type="text/javascript">
$(document).ready(function () {
ObtenerPantallas();
});
</script>*@
<script type="text/javascript">
function noback() {
window.location.hash = "no-back-button";
window.location.hash = "Again-No-back-button"
window.onhashchange = function () { window.location.hash = "no-back-button"; }
}
</script>
<script type="text/javascript">
$(document).ready(function () {
ObtenerDatosUsuario();
ObtenerCantidadTareasPendientes();
ObtenerCantidadGotitasPendientes();
});
</script>

View file

@ -26,18 +26,18 @@
<add key="HttpRepository" value="http://10.50.1.97:6075/DocumentosSinort/" />
<add key="FileUploadHandler" value="http://10.50.1.97:6075/FileUploadHandler" />
<add key="RutaLogoSINORT" value="http://10.50.1.97:6075/dist/img/" />
<add key="RutaImagenes" value="http://10.50.1.97:6075/bower_components/Ionicons/png/512/" />
<add key="RutaImagenes" value="http://10.50.1.97:6075/bower_components/Ionicons/png/512/" /> -->
<add key="SinortWCF" value="http://aya-vsrv-wstt:2005/Sinort.svc" />
<!--<add key="SinortWCF" value="http://aya-vsrv-wstt:2005/Sinort.svc" />
<add key="SinortCatalogosWCF" value="http://aya-vsrv-wstt:2005/SinortCatalogos.svc" />
<add key="FileRepository" value="D:\Aplicaciones\SINORT\Raiz\DocumentosSinort\" />
<add key="HttpRepository" value="http://AYA-VSRV-APPTT:2525/DocumentosSINORT/" />
<add key="FileUploadHandler" value="http://AYA-VSRV-APPTT:2525/FileUploadHandler" />
<add key="RutaLogoSINORT" value="http://AYA-VSRV-APPTT:2525/dist/img/" />
<add key="RutaImagenes" value="http://AYA-VSRV-APPTT:2525/bower_components/Ionicons/png/512/" />-->
<add key="MaxSizeFileLoadKB" value="5120" />
<add key="MaxSizeFileLoadKB" value="5120" />
<add key="MaxCountFileLoad" value="3" />
<add key="SinortWCF" value="http://localhost/AYA.SlnSinort.WCF/Sinort.svc" />
<add key="SinortCatalogosWCF" value="http://localhost/AYA.SlnSinort.WCF/SinortCatalogos.svc" />
@ -48,7 +48,7 @@
<add key="RutaImagenes" value="http://localhost/AYA.SlnSinort/bower_components/Ionicons/png/512/" />
</appSettings>
<system.web>
<sessionState timeout="10">
<sessionState timeout="20">
</sessionState>
<authentication mode="None" />
<compilation debug="true" targetFramework="4.5">

View file

@ -26,6 +26,7 @@ namespace AYA.SlnSinortModel.DAL.Sinort
int? Next_id = Conn.DocumentosAdjuntos.Max(t => (int?)t.IdDocumentoAdjunto);
model.Adjuntos.IdDocumentoAdjunto = (Next_id == null) ? 1 : Next_id.Value + 1;
model.Adjuntos.FechaCreacion = DateTime.Now;
model.Adjuntos.UsuarioCreacion = model.UserName;
model.Adjuntos.RutaDescarga = model.Adjuntos.RutaDescarga.Replace("\\", "/");
Conn.DocumentosAdjuntos.Add(model.Adjuntos);