git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C129
This commit is contained in:
mumana
parent
1e48f2b854
commit
5146ee4b8b
8 changed files with 12 additions and 215 deletions
|
|
@ -6866,7 +6866,6 @@
|
|||
<Content Include="Scripts\DataTables-1.10.0\dataTables.tableTools.min.js" />
|
||||
<Content Include="Scripts\DataTables-1.10.0\jquery.dataTables.js" />
|
||||
<Content Include="Scripts\DataTables-1.10.0\jquery.dataTables.min.js" />
|
||||
<Content Include="Scripts\easyloader.js" />
|
||||
<Content Include="Scripts\esm\popper-utils.js" />
|
||||
<Content Include="Scripts\esm\popper-utils.min.js" />
|
||||
<Content Include="Scripts\esm\popper-utils.min.js.map" />
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ namespace AYA.SlnSinort
|
|||
bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include("~/Scripts/bootstrap.min.js"));
|
||||
bundles.Add(new ScriptBundle("~/bundles/moment").Include("~/Scripts/moment.js").Include("~/Scripts/moment-with-langs.js"));
|
||||
bundles.Add(new ScriptBundle("~/bundles/toastr").Include("~/Scripts/toastr.js"));
|
||||
bundles.Add(new ScriptBundle("~/bundles/jquery-dataTables").Include("~/Scripts/DataTables-1.10.0/jquery.dataTables.js"));
|
||||
bundles.Add(new ScriptBundle("~/bundles/jquery-dataTables").Include("~/Scripts/DataTables-1.10.0/jquery.dataTables.min.js"));
|
||||
bundles.Add(new ScriptBundle("~/bundles/timepicki").Include("~/Scripts/timepicki.js"));
|
||||
|
||||
bundles.Add(new StyleBundle("~/Content/css")
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,190 +0,0 @@
|
|||
/**
|
||||
* EasyUI for jQuery 1.5.5.2
|
||||
*
|
||||
* Copyright (c) 2009-2018 www.jeasyui.com. All rights reserved.
|
||||
*
|
||||
* Licensed under the freeware license: http://www.jeasyui.com/license_freeware.php
|
||||
* To use it on other terms please contact us: info@jeasyui.com
|
||||
*
|
||||
*/
|
||||
(function(){
|
||||
var _1={draggable:{js:"jquery.draggable.js"},droppable:{js:"jquery.droppable.js"},resizable:{js:"jquery.resizable.js"},linkbutton:{js:"jquery.linkbutton.js",css:"linkbutton.css"},progressbar:{js:"jquery.progressbar.js",css:"progressbar.css"},tooltip:{js:"jquery.tooltip.js",css:"tooltip.css"},pagination:{js:"jquery.pagination.js",css:"pagination.css",dependencies:["linkbutton"]},datagrid:{js:"jquery.datagrid.js",css:"datagrid.css",dependencies:["panel","resizable","linkbutton","pagination"]},treegrid:{js:"jquery.treegrid.js",css:"tree.css",dependencies:["datagrid"]},propertygrid:{js:"jquery.propertygrid.js",css:"propertygrid.css",dependencies:["datagrid"]},datalist:{js:"jquery.datalist.js",css:"datalist.css",dependencies:["datagrid"]},panel:{js:"jquery.panel.js",css:"panel.css"},window:{js:"jquery.window.js",css:"window.css",dependencies:["resizable","draggable","panel"]},dialog:{js:"jquery.dialog.js",css:"dialog.css",dependencies:["linkbutton","window"]},messager:{js:"jquery.messager.js",css:"messager.css",dependencies:["linkbutton","dialog","progressbar"]},layout:{js:"jquery.layout.js",css:"layout.css",dependencies:["resizable","panel"]},form:{js:"jquery.form.js"},menu:{js:"jquery.menu.js",css:"menu.css"},tabs:{js:"jquery.tabs.js",css:"tabs.css",dependencies:["panel","linkbutton"]},menubutton:{js:"jquery.menubutton.js",css:"menubutton.css",dependencies:["linkbutton","menu"]},splitbutton:{js:"jquery.splitbutton.js",css:"splitbutton.css",dependencies:["menubutton"]},switchbutton:{js:"jquery.switchbutton.js",css:"switchbutton.css"},accordion:{js:"jquery.accordion.js",css:"accordion.css",dependencies:["panel"]},calendar:{js:"jquery.calendar.js",css:"calendar.css"},textbox:{js:"jquery.textbox.js",css:"textbox.css",dependencies:["validatebox","linkbutton"]},passwordbox:{js:"jquery.passwordbox.js",css:"passwordbox.css",dependencies:["textbox"]},filebox:{js:"jquery.filebox.js",css:"filebox.css",dependencies:["textbox"]},combo:{js:"jquery.combo.js",css:"combo.css",dependencies:["panel","textbox"]},combobox:{js:"jquery.combobox.js",css:"combobox.css",dependencies:["combo"]},combotree:{js:"jquery.combotree.js",dependencies:["combo","tree"]},combogrid:{js:"jquery.combogrid.js",dependencies:["combo","datagrid"]},combotreegrid:{js:"jquery.combotreegrid.js",dependencies:["combo","treegrid"]},tagbox:{js:"jquery.tagbox.js",dependencies:["combobox"]},validatebox:{js:"jquery.validatebox.js",css:"validatebox.css",dependencies:["tooltip"]},numberbox:{js:"jquery.numberbox.js",dependencies:["textbox"]},searchbox:{js:"jquery.searchbox.js",css:"searchbox.css",dependencies:["menubutton","textbox"]},spinner:{js:"jquery.spinner.js",css:"spinner.css",dependencies:["textbox"]},numberspinner:{js:"jquery.numberspinner.js",dependencies:["spinner","numberbox"]},timespinner:{js:"jquery.timespinner.js",dependencies:["spinner"]},tree:{js:"jquery.tree.js",css:"tree.css",dependencies:["draggable","droppable"]},datebox:{js:"jquery.datebox.js",css:"datebox.css",dependencies:["calendar","combo"]},datetimebox:{js:"jquery.datetimebox.js",dependencies:["datebox","timespinner"]},slider:{js:"jquery.slider.js",dependencies:["draggable"]},parser:{js:"jquery.parser.js"},mobile:{js:"jquery.mobile.js"}};
|
||||
var _2={"af":"easyui-lang-af.js","ar":"easyui-lang-ar.js","bg":"easyui-lang-bg.js","ca":"easyui-lang-ca.js","cs":"easyui-lang-cs.js","cz":"easyui-lang-cz.js","da":"easyui-lang-da.js","de":"easyui-lang-de.js","el":"easyui-lang-el.js","en":"easyui-lang-en.js","es":"easyui-lang-es.js","fr":"easyui-lang-fr.js","it":"easyui-lang-it.js","jp":"easyui-lang-jp.js","nl":"easyui-lang-nl.js","pl":"easyui-lang-pl.js","pt_BR":"easyui-lang-pt_BR.js","ru":"easyui-lang-ru.js","sv_SE":"easyui-lang-sv_SE.js","tr":"easyui-lang-tr.js","zh_CN":"easyui-lang-zh_CN.js","zh_TW":"easyui-lang-zh_TW.js"};
|
||||
var _3={};
|
||||
function _4(_5,_6){
|
||||
var _7=false;
|
||||
var _8=document.createElement("script");
|
||||
_8.type="text/javascript";
|
||||
_8.language="javascript";
|
||||
_8.src=_5;
|
||||
_8.onload=_8.onreadystatechange=function(){
|
||||
if(!_7&&(!_8.readyState||_8.readyState=="loaded"||_8.readyState=="complete")){
|
||||
_7=true;
|
||||
_8.onload=_8.onreadystatechange=null;
|
||||
if(_6){
|
||||
_6.call(_8);
|
||||
}
|
||||
}
|
||||
};
|
||||
document.getElementsByTagName("head")[0].appendChild(_8);
|
||||
};
|
||||
function _9(_a,_b){
|
||||
_4(_a,function(){
|
||||
document.getElementsByTagName("head")[0].removeChild(this);
|
||||
if(_b){
|
||||
_b();
|
||||
}
|
||||
});
|
||||
};
|
||||
function _c(_d,_e){
|
||||
var _f=document.createElement("link");
|
||||
_f.rel="stylesheet";
|
||||
_f.type="text/css";
|
||||
_f.media="screen";
|
||||
_f.href=_d;
|
||||
document.getElementsByTagName("head")[0].appendChild(_f);
|
||||
if(_e){
|
||||
_e.call(_f);
|
||||
}
|
||||
};
|
||||
function _10(_11,_12){
|
||||
_3[_11]="loading";
|
||||
var _13=_1[_11];
|
||||
var _14="loading";
|
||||
var _15=(easyloader.css&&_13["css"])?"loading":"loaded";
|
||||
if(easyloader.css&&_13["css"]){
|
||||
if(/^http/i.test(_13["css"])){
|
||||
var url=_13["css"];
|
||||
}else{
|
||||
var url=easyloader.base+"themes/"+easyloader.theme+"/"+_13["css"];
|
||||
}
|
||||
_c(url,function(){
|
||||
_15="loaded";
|
||||
if(_14=="loaded"&&_15=="loaded"){
|
||||
_16();
|
||||
}
|
||||
});
|
||||
}
|
||||
if(/^http/i.test(_13["js"])){
|
||||
var url=_13["js"];
|
||||
}else{
|
||||
var url=easyloader.base+"plugins/"+_13["js"];
|
||||
}
|
||||
_4(url,function(){
|
||||
_14="loaded";
|
||||
if(_14=="loaded"&&_15=="loaded"){
|
||||
_16();
|
||||
}
|
||||
});
|
||||
function _16(){
|
||||
_3[_11]="loaded";
|
||||
easyloader.onProgress(_11);
|
||||
if(_12){
|
||||
_12();
|
||||
}
|
||||
};
|
||||
};
|
||||
function _17(_18,_19){
|
||||
var mm=[];
|
||||
var _1a=false;
|
||||
if(typeof _18=="string"){
|
||||
add(_18);
|
||||
}else{
|
||||
for(var i=0;i<_18.length;i++){
|
||||
add(_18[i]);
|
||||
}
|
||||
}
|
||||
function add(_1b){
|
||||
if(!_1[_1b]){
|
||||
return;
|
||||
}
|
||||
var d=_1[_1b]["dependencies"];
|
||||
if(d){
|
||||
for(var i=0;i<d.length;i++){
|
||||
add(d[i]);
|
||||
}
|
||||
}
|
||||
mm.push(_1b);
|
||||
};
|
||||
function _1c(){
|
||||
if(_19){
|
||||
_19();
|
||||
}
|
||||
easyloader.onLoad(_18);
|
||||
};
|
||||
var _1d=0;
|
||||
function _1e(){
|
||||
if(mm.length){
|
||||
var m=mm[0];
|
||||
if(!_3[m]){
|
||||
_1a=true;
|
||||
_10(m,function(){
|
||||
mm.shift();
|
||||
_1e();
|
||||
});
|
||||
}else{
|
||||
if(_3[m]=="loaded"){
|
||||
mm.shift();
|
||||
_1e();
|
||||
}else{
|
||||
if(_1d<easyloader.timeout){
|
||||
_1d+=10;
|
||||
setTimeout(arguments.callee,10);
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
if(easyloader.locale&&_1a==true&&_2[easyloader.locale]){
|
||||
var url=easyloader.base+"locale/"+_2[easyloader.locale];
|
||||
_9(url,function(){
|
||||
_1c();
|
||||
});
|
||||
}else{
|
||||
_1c();
|
||||
}
|
||||
}
|
||||
};
|
||||
_1e();
|
||||
};
|
||||
easyloader={modules:_1,locales:_2,base:".",theme:"default",css:true,locale:null,timeout:2000,load:function(_1f,_20){
|
||||
if(/\.css$/i.test(_1f)){
|
||||
if(/^http/i.test(_1f)){
|
||||
_c(_1f,_20);
|
||||
}else{
|
||||
_c(easyloader.base+_1f,_20);
|
||||
}
|
||||
}else{
|
||||
if(/\.js$/i.test(_1f)){
|
||||
if(/^http/i.test(_1f)){
|
||||
_4(_1f,_20);
|
||||
}else{
|
||||
_4(easyloader.base+_1f,_20);
|
||||
}
|
||||
}else{
|
||||
_17(_1f,_20);
|
||||
}
|
||||
}
|
||||
},onProgress:function(_21){
|
||||
},onLoad:function(_22){
|
||||
}};
|
||||
var _23=document.getElementsByTagName("script");
|
||||
for(var i=0;i<_23.length;i++){
|
||||
var src=_23[i].src;
|
||||
if(!src){
|
||||
continue;
|
||||
}
|
||||
var m=src.match(/easyloader\.js(\W|$)/i);
|
||||
if(m){
|
||||
easyloader.base=src.substring(0,m.index);
|
||||
}
|
||||
}
|
||||
window.using=easyloader.load;
|
||||
if(window.jQuery){
|
||||
jQuery(function(){
|
||||
easyloader.load("parser",function(){
|
||||
jQuery.parser.parse();
|
||||
});
|
||||
});
|
||||
}
|
||||
})();
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ var Proyectos = {
|
|||
};
|
||||
var Comentarios = {
|
||||
Foro: { Codigo: 1, Descripcion: "Comentario Foro" },
|
||||
Matriz: { codigo: 2, Descripcion: "Comentario Matriz" }
|
||||
Matriz: { Codigo: 2, Descripcion: "Comentario Matriz" }
|
||||
};
|
||||
//
|
||||
|
||||
|
|
@ -758,8 +758,6 @@ this.SeleccionarOpcion = function (id, description, controlID, controlDescriptio
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region ULTIMUS PROPERTIES AND EXTENTION
|
||||
|
||||
//#region General Control extentions
|
||||
|
||||
$.fn.disable = function () {
|
||||
|
|
@ -792,13 +790,11 @@ $.fn.readOnly = function () {
|
|||
this.css('cursor', 'not-allowed');
|
||||
}
|
||||
|
||||
|
||||
$.fn.noReadOnly = function () {
|
||||
this.attr('readonly', false);
|
||||
this.css('cursor', 'default');
|
||||
}
|
||||
|
||||
|
||||
$.fn.TableInit = function (columnOrder, order, bPaginate, bFilter, bInfo, columnDefinition, data) {
|
||||
|
||||
var ES = {
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ this.getDataModel = function () {
|
|||
$("#btnGuardarComentarioMatriz").click(function () {
|
||||
GuardarComentarioMatriz();
|
||||
});
|
||||
|
||||
|
||||
Datepicker("#txtFechaInicio");
|
||||
$("#txtNombreProyecto").readOnly();
|
||||
$("#txtPromotorProyecto").readOnly();
|
||||
|
|
@ -114,10 +114,6 @@ this.CargarFormulario = function (data) {
|
|||
|
||||
model = data;
|
||||
|
||||
//var titulo = $("#divDescripcion").html();
|
||||
//titulo = replaceAll("[$Propuesta]", model.ProyectoNormativo.NombreProyectoNormativo, titulo);
|
||||
//$("#divDescripcion").html(titulo);
|
||||
|
||||
//INFORMACION GENERAL
|
||||
$("#txtNombreProyecto").val(model.ProyectoNormativo.NombreProyectoNormativo);
|
||||
$("#txtPromotorProyecto").val(model.ProyectoNormativo.PromotorProyecto);
|
||||
|
|
@ -151,14 +147,14 @@ this.CargarFormulario = function (data) {
|
|||
CargarForo();
|
||||
|
||||
if (EsForo) {
|
||||
$("#txtEmisor").css("display", "none");
|
||||
$("#txtAplicacion").css("display", "none");
|
||||
$("#divEmisor").css("display", "none");
|
||||
$("#divAplicacion").css("display", "none");
|
||||
$("#divMatriz").css("display", "none");
|
||||
$("#divMatrizCambios").css("display", "none");
|
||||
$("#divComentarios").css("height", "450px");
|
||||
} else
|
||||
} else {
|
||||
CargarMatriz();
|
||||
|
||||
}
|
||||
|
||||
ENDREQUEST();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,12 +107,7 @@
|
|||
<button type="button" id="btnEliminar" class="btn btn-danger btn-medium" data-dismiss="modal">
|
||||
<i class="fa fa-trash"></i> Eliminar propuesta
|
||||
</button>
|
||||
<button type="button" id="btnDiscucion" class="btn btn-success btn-medium" data-dismiss="modal">
|
||||
<i class="fa fa-plus"></i> Discución focalizada
|
||||
</button>
|
||||
<button type="button" id="btnEliminarDiscucion" class="btn btn-danger btn-medium" data-dismiss="modal">
|
||||
<i class="fa fa-trash"></i> Eliminar Discusión focalizada
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div id="tabs-2">
|
||||
|
|
@ -431,7 +426,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="8" cols="45" id="txtTextoOriginal" style="resize: none"></textarea>
|
||||
<textarea name="txtTextoOriginal" rows="5" cols="45" id="txtTextoOriginal" style="resize: none"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -439,7 +434,7 @@
|
|||
<div class="form-group " id="divTextoPropuesto">
|
||||
<label class="col-sm-4 control-label ControlsForms" id="lblcomentario">Texto Propuesto</label>
|
||||
<div class="input-group input-group-sm col-lg-6 col-md-6 col-sm-6 col-xs-6">
|
||||
<textarea name="txtTextoPropuesto" rows="8" cols="45" id="txtTextoPropuesto" style="resize: none"></textarea>
|
||||
<textarea name="txtTextoPropuesto" rows="5" cols="45" id="txtTextoPropuesto" style="resize: none"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -447,7 +442,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="8" cols="45" id="txtComentarioMatriz" style="resize: none"></textarea>
|
||||
<textarea name="txtComentarioMatriz" rows="5" cols="45" id="txtComentarioMatriz" style="resize: none"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
@Scripts.Render("~/bundles/moment")
|
||||
@Scripts.Render("~/bundles/toastr")
|
||||
@Scripts.Render("~/bundles/jquery-dataTables")
|
||||
@Scripts.Render("~/bundles/bootstrap-switch")
|
||||
|
||||
@* Seccion futuros scripts *@
|
||||
<style>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue