git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C440
This commit is contained in:
jnunez
parent
7607db4c11
commit
3157d4c45e
5 changed files with 169 additions and 35 deletions
|
|
@ -107,7 +107,7 @@
|
|||
|
||||
<connectionStrings>
|
||||
<!--<add name="Contex" connectionString="data source=192.168.1.37;initial catalog=SinortAyA;persist security info=True;user id=sinort;password=sinort2018;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
|
||||
<!--<add name="Contex" connectionString="data source=10.50.1.98;initial catalog=SINORT;persist security info=True;user id=usersinort;password=usersinort;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
|
||||
<add name="Contex" connectionString="data source=AYA-VSRV-BDTT;initial catalog=SINORT;persist security info=True;user id=usersinort;password=us3rsinort;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
|
||||
<add name="Contex" connectionString="data source=10.50.1.98;initial catalog=SINORT;persist security info=True;user id=usersinort;password=usersinort;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
|
||||
<!-- <add name="Contex" connectionString="data source=AYA-VSRV-BDTT;initial catalog=SINORT;persist security info=True;user id=usersinort;password=us3rsinort;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
|
||||
</connectionStrings>
|
||||
</configuration>
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ var RepositorioLocal = $("#hiddenRepositorioLocal").val();
|
|||
var UsuarioSistema = $("#hiddenUsuarioSistema").val();
|
||||
var NombreUsuario = $("#hiddenNombreUsuario").val();
|
||||
//aya-vsrv-apptt:2525
|
||||
var server = window.location.protocol + "//" + "aya-vsrv-apptt:2525" + "/" + (window.location.pathname.split('/')[1]) + "/";
|
||||
var SinorLoginWCF = "http://aya-vsrv-wstt:2005/Sinort.svc";
|
||||
var server = window.location.protocol + "//" + "localhost" + "/" + (window.location.pathname.split('/')[1]) + "/";
|
||||
var SinorLoginWCF = "http://localhost/AYA.SlnSinort.WCF/Sinort.svc";
|
||||
var string_empty = "";
|
||||
var Atesa = {};
|
||||
var StarterTemplateVisible = true;
|
||||
|
|
|
|||
|
|
@ -77,7 +77,10 @@ jQuery(document).ready(function () {
|
|||
if ($("#txtPromotorProyecto").val() == UsuarioSistema) {
|
||||
$("#txtFechaFinalizacion").noReadOnly();
|
||||
$('#btnModificar').enable();
|
||||
$('#btnEliminar').enable();
|
||||
EsPromotor = true;
|
||||
if (Estado == "3")
|
||||
$('#btnDiscusion').enable();
|
||||
}
|
||||
|
||||
if (EsForo) {
|
||||
|
|
@ -143,6 +146,11 @@ this.getDataModel = function () {
|
|||
ActualizarItem(false);
|
||||
});
|
||||
|
||||
$("#btnDiscusion").unbind("click");
|
||||
$("#btnDiscusion").click(function () {
|
||||
DiscusionFocalizada();
|
||||
});
|
||||
|
||||
|
||||
|
||||
$("#btnBuscarUsuario").unbind("click");
|
||||
|
|
@ -238,15 +246,17 @@ this.getDataModel = function () {
|
|||
$("#txtFechaMaxima").readOnly();
|
||||
$("#txtEstado").readOnly();
|
||||
$('#btnModificar').disable();
|
||||
|
||||
|
||||
$('#btnEliminar').disable();
|
||||
$('#btnDiscusion').disable();
|
||||
|
||||
CargarUsuarios();
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
this.DiscusionFocalizada = function () {
|
||||
$('#modalBuscarUsuarioDiscusion').modal('show');
|
||||
}
|
||||
|
||||
this.ActualizarItem = function (accion) {
|
||||
|
||||
|
|
@ -439,6 +449,8 @@ this.CargarForo = function () {
|
|||
this.BuscarUsuario = function () {
|
||||
SelectedCatalog = 'Usuarios';
|
||||
|
||||
|
||||
if (EsPromotor == true) {
|
||||
if ($.fn.DataTable.isDataTable('#tableUsuarios')) {
|
||||
|
||||
LoadMessage();
|
||||
|
|
@ -447,12 +459,20 @@ this.BuscarUsuario = function () {
|
|||
ENDREQUEST();
|
||||
|
||||
}
|
||||
} else {
|
||||
toastr.warning(Message_NoGrants, Message_Warning);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
this.AgregarUsuario = function () {
|
||||
|
||||
if ($("#txtUsuario").val() != "") {
|
||||
|
||||
if (!confirm("¿Desea convocar a un nuevo usuario?")) return;
|
||||
|
||||
|
||||
var tableParticipantes = $('#tableParticipantes').DataTable();
|
||||
var option = $("#ucbtnRemoverParticipante").html();
|
||||
var participanteConfirmado = $("#ucItemsIcon").html();
|
||||
|
|
@ -474,7 +494,9 @@ this.AgregarUsuario = function () {
|
|||
|
||||
AjaxPostData(uri, model, false, true, GuardarTareasPendientes, null, null);
|
||||
|
||||
|
||||
} else {
|
||||
toastr.warning("Debe seleccionar un usuario", Message_Warning);
|
||||
}
|
||||
|
||||
|
||||
//participanteConfirmado = replaceAll("[$icon]", "fa-check-circle", participanteConfirmado);
|
||||
|
|
|
|||
|
|
@ -103,13 +103,15 @@
|
|||
|
||||
</div>
|
||||
<div class="modal-footer" id="modalGeneral-footer">
|
||||
<button type="button" id="btnDiscusion" class="btn btn-instagram btn-medium" title="Discusión Focalizada">
|
||||
<i class="fa fa-users"></i> Discusión Focalizada
|
||||
</button>
|
||||
<button type="button" id="btnModificar" class="btn btn-success btn-medium" title="Actualizar Información">
|
||||
<i class="fa fa-floppy-o"></i> Guardar
|
||||
</button>
|
||||
<button type="button" id="btnEliminar" class="btn btn-danger btn-medium" title="Enviar Histórico">
|
||||
<i class="fa fa-trash"></i> Histórico
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div id="tabs-2">
|
||||
|
|
@ -945,6 +947,116 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@*---------------------Roles Usuarios---------------------------------------------------------*@
|
||||
<div class="modal fade" id="modalBuscarUsuarioDiscusion" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" style="display: none;">
|
||||
<div class="modal-dialog modal-lg" style="max-height:90%;overflow-y: auto;">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4><i class="fa fa-bars"></i> Usuarios discusión focalizada</h4>
|
||||
|
||||
</div>
|
||||
<div class="form-group" id="divUsuario">
|
||||
|
||||
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-2 control-label ControlsForms" id="lblUsuario" for="txtBuscarUsuarioDiscusion">Buscar</label>
|
||||
<div class="input-group input-group-sm col-md-6">
|
||||
<input id="hiddenUsuarioDiscusion" type="hidden">
|
||||
<input name="txtUsuarioDiscusion" title="" class="form-control TextBoxCatalogo" id="txtUsuarioDiscusion" type="text" readonly>
|
||||
|
||||
<span class="input-group-btn">
|
||||
<button class="btn btn-default btn-medium" id="btn_eliminarUsuarioDiscusion" type="button" onclick="javascript: LimpiarUsuarioDiscusion()">
|
||||
<i class="fa fa-close"></i>
|
||||
</button>
|
||||
<button class="btn btn-info btn-medium btn-margin-catalogo" id="btnBuscarUsuarioDiscusion" type="button">
|
||||
<i class="fa fa-search"></i>
|
||||
</button>
|
||||
<button class="btn btn-success btn-medium btn-margin-catalogo" id="btnAgregarUsuarioDiscusion" type="button">
|
||||
<i class="fa fa-plus"></i>
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<br />
|
||||
|
||||
<div class="modal-body">
|
||||
<table id="GridUsuariosDiscusion" class="table table-striped dataTable no-footer">
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th class="col-sm-1"></th>
|
||||
<th class="col-sm-4">Usuario</th>
|
||||
<th class="col-sm-4">Nombre</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
<div id="ucItemsIconUsuario" style="display:none;">
|
||||
<div class="text-[$state_color]">
|
||||
<i class="fa [$icon] fa-2x"></i>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="ucItemsHabiliar" style="display:none;">
|
||||
|
||||
<div class="btn-group">
|
||||
<button type="button" class="btn btn-info dropdown-toggle btn-xs" data-toggle="dropdown">
|
||||
<i class="fa fa-wrench"></i> Opciones <span class="caret"></span>
|
||||
</button>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li><a href="javascript: EliminarUsuario([$CodItem]);"><i class="fa fa-trash"></i> Eliminar</a></li>
|
||||
<li><a href="javascript: HabilitarUsuario([$CodItem],[$value]);"><i class="fa [$icon]"></i> [$opcion]</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@*<div id="ucItemsHabiliar" style="display:none;">
|
||||
<button type="button" id="btnhabilitar" class="btn btn-default btn-xs" onclick="javascript: HabilitarUsuario([$CodItem], [$value])">
|
||||
<i class=" fa [$icon]"></i> [$opcion]
|
||||
</button>
|
||||
</div>*@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-success btn-sm" onclick="javascript: GuardarRolesUsuarios()">Guardar</button>
|
||||
<button type="button" id="btnEliminarDiscusion" class="btn btn-danger btn-sm">Eliminar Discusión Focalizada</button>
|
||||
<button type="button" class="btn btn-danger btn-sm" data-dismiss="modal">Cerrar</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@*---------------------Usuarios---------------------------------------------------------*@
|
||||
<div class="modal fade" id="modalUsuarioDiscusion" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
<h4 class="modal-title">Catálogo Usuarios</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-12">
|
||||
|
||||
<table id="tableUsuariosDiscusion" class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="col-sm-2">Usuario</th>
|
||||
<th class="col-sm-4">Nombre</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@Scripts.Render("~/Sinort-Scripts/PropuestaNormativa/DetallePropuestaNormativa.js")
|
||||
|
|
|
|||
|
|
@ -29,23 +29,23 @@
|
|||
<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="RutaImagenes" value="http://AYA-VSRV-APPTT:2525/bower_components/Ionicons/png/512/" /> -->
|
||||
|
||||
<add key="MaxSizeFileLoadKB" value="5120" />
|
||||
<add key="MaxCountFileLoad" value="3" />
|
||||
<!--<add key="SinortWCF" value="http://localhost/AYA.SlnSinort.WCF/Sinort.svc" />
|
||||
<add key="SinortWCF" value="http://localhost/AYA.SlnSinort.WCF/Sinort.svc" />
|
||||
<add key="SinortCatalogosWCF" value="http://localhost/AYA.SlnSinort.WCF/SinortCatalogos.svc" />
|
||||
<add key="FileRepository" value="C:\DocumentosSinort\" />
|
||||
<add key="HttpRepository" value="http://localhost/AYA.SlnSinort/DocumentosSINORT/" />
|
||||
<add key="FileUploadHandler" value="http://localhost/AYA.SlnSinort/FileUploadHandler" />
|
||||
<add key="RutaLogoSINORT" value="http://localhost/AYA.SlnSinort/dist/img/" />
|
||||
<add key="RutaImagenes" value="http://localhost/AYA.SlnSinort/bower_components/Ionicons/png/512/" /> -->
|
||||
<add key="RutaImagenes" value="http://localhost/AYA.SlnSinort/bower_components/Ionicons/png/512/" />
|
||||
</appSettings>
|
||||
<system.web>
|
||||
<sessionState timeout="20">
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue