AAGN#36504 Rapport filter met meerdere waardes opslaan

svn path=/Website/trunk/; revision=29705
This commit is contained in:
Erik Groener
2016-06-14 09:05:55 +00:00
parent ddab215e44
commit e585a1969d
3 changed files with 17 additions and 3 deletions

View File

@@ -18,7 +18,15 @@ function toggleInputSelect()
else // het is een DIV die er door de multiSelectToggle omheen is gezet
{
var inp = $(this).prev().find("select")[0];
$(this).prev().replaceWith('<input class="fld" id="' + inp.name +'" name="' + inp.name +'">');
if ($(inp).hasClass("pinned"))
{
$(inp).empty(); // De gepinde waarden verwijderen zodat de hele lijst met waarden weer wordt opgehaald.
$.getJSON("fac_report_worker.asp", $("[name=u2]").serialize() + "&distinct=" + inp.name, process_worker_info);
$(inp).show().val(L("lcl_rap_please_wait"));
$(inp).prop('disabled', true);
}
else
$(this).prev().replaceWith('<input class="fld" id="' + inp.name +'" name="' + inp.name +'">');
}
}
@@ -48,4 +56,9 @@ $(function ()
.attr('title', L("lcl_usrrap_beware"))
.click(toggleInputSelect)
);
$("select.pinned").after($("<img class='autoreport' src='../Pictures/comment.png'>")
.attr('title', L("lcl_usrrap_beware"))
.click(toggleInputSelect)
);
});

View File

@@ -436,7 +436,8 @@ function scf_RWFIELDTR(model, fld, val, key, params)
initKey: params.search?"":(val?val.id:null),
emptyOption: emptyOption,
emptyKey: (field.typ=="key"?-1:""),
required: params.required
required: params.required,
extraclass: params.extraclass
});
}
else if (field.typ == "check" || field.typ == "check0")

View File

@@ -201,7 +201,7 @@ function scaffolding_search(model, scf_params)
}
field.LOV = LOVval;
field.emptyoption = null;
scf_RWFIELDTR(xmodel, fld, defs.vmin, null, {readonly: true});
scf_RWFIELDTR(xmodel, fld, defs.vmin, null, {readonly: true, extraclass: "pinned"});
}
else
{