FSN#39258 Nog missende plaatjes in 2016.3

svn path=/Website/branches/v2016.3/; revision=32698
This commit is contained in:
Erik Groener
2017-02-06 08:52:34 +00:00
parent c0c085a094
commit 8fc3e81242
4 changed files with 57 additions and 24 deletions

View File

@@ -68,7 +68,9 @@ function clear_item_details()
window.stock_info = {}; // even onbekend.
var imgObj = $("#photo")[0];
imgObj.src = "../Pictures/no_photo.gif";
imgObj.style = "display: block";
imgObj.onclick = null;
$("#photo").prev().removeClass("fa-file-pdf-o").addClass("fa-question").css("display", "none");
$("#srtgroep_text,#srtdeel_omschrijving,#srtdeel_opmerking").html("");
$("#opmerking_tr").hide();
@@ -95,20 +97,28 @@ function show_item_details(bes_item_info)
if (bes_item_info.srtdeel_image)
{
var im_file = bes_item_info.srtdeel_image;
imgObj.src = im_file;
im_file_upper = im_file.toUpperCase();
extension = im_file_upper.substr(im_file_upper.length - 3, 3);
if (extension == "PDF")
{
imgObj.src = "../Pictures/pdf.jpg";
imgObj.style = "display: none";
$("#photo").prev().removeClass("fa-question").addClass("fa-file-pdf-o").css("display", "inline-block");
bes_supAddress = im_file;
}
else
{
$("#photo").prev().removeClass("fa-file-pdf-o").addClass("fa-question").css("display", "none");
imgObj.src = im_file;
imgObj.style = "display: block";
bes_supAddress = bes_item_info.prs_bedrijf_details_loc;
}
imgObj.onclick = navigateToSupplier;
}
else {
else
{
$("#photo").prev().toggleClass("fa-question fa-file-pdf-o").css("display", "none");
imgObj.src = "../Pictures/no_photo.gif";
imgObj.style = "display: block";
imgObj.onclick = null;
}

View File

@@ -861,13 +861,22 @@ else // nieuwe bestelling. Defaults bepalen
});
// Het informatieblok van een geselecteerd artikel
%>
<tr><td class="label">
<label><img class="besphoto"
src="../Pictures/no_photo.gif"
id="photo"
onload="FcltMgr.resized()"
onClick=""></label></td>
<tr>
<td class="label">
<label>
<span id="fa_img" onclick="">
<i class="fa fa-fw fa-question fa-4x"
onload="FcltMgr.resized()"
style="display: none">
</i>
<img class="besphoto"
src="../Pictures/no_photo.gif"
id="photo"
onload="FcltMgr.resized()"
onClick="">
</span>
</label>
</td>
<td class="besdetailtd">
<table class="besdetailtable">
<tr><td colspan="2" class="iteminfo2" title="<%= L("lcl_bes_srtgroup") %>" id="srtgroep_text"></td></tr>

View File

@@ -111,6 +111,7 @@ sql += " ORDER BY sg.bes_srtgroep_volgnr"
var oRs = Oracle.Execute(sql)
var last_groep = -1;
var isFA = false;
while (!oRs.Eof)
{
if (last_groep != oRs("bes_srtgroep_key").Value)
@@ -130,10 +131,14 @@ while (!oRs.Eof)
icon = S("bes_image_path") + oRs("disc_key").Value + "/" + icon;
l_icon = icon;
l_index = l_icon.lastIndexOf('.');
if (l_index != -1){
if (l_index != -1)
{
l_icon=l_icon.substr(l_index+1);
if (l_icon.toUpperCase() == 'PDF'){
icon="../Pictures/pdf.jpg";
isFA = false;
if (l_icon.toUpperCase() == 'PDF')
{
icon="fa-file-pdf-o";
isFA = true;
}
}
var url = icon;
@@ -145,14 +150,23 @@ while (!oRs.Eof)
}
%><td class='iconmenu' width='<%=Math.floor(100/maxcol)%>%'
onclick='run_create_bes (<%=oRs("disc_key").Value%>,<%=oRs("product_key").Value%>);'>
<%if (url)
{ %>
<img theSrc='<%=safe.htmlattr(url)%>'>
<%}
else
{
<%
if (url)
{
if (isFA) // gebruik een font-awesome icon
{
%> &nbsp;<i class='fa fa-5x <%=icon%>'>&nbsp;</i> <%
}
else
{
%> <img theSrc='<%=safe.htmlattr(url)%>'> <%
}
}
else
{
%>&nbsp;<i class='fa fa-5x fa-question'>&nbsp;</i><%
}%>
}
%>
<div class="iconlabel">
<%="<span class='iprd'>"+safe.html(oRs("product").value) + "</span><br>" +(safe.curr(oRs("prijs").value) != 0 ? "<span class='iprs'>"+S("currency_pref") + safe.curr(oRs("prijs").value)+"</span>" : "") + (oRs("eenheid").value ? ("<span class='ieenh'>&nbsp;/&nbsp;" + safe.html(oRs("eenheid").value)+"</span>") : "") + (oRs("opmerking").value ? ("<br><span class='iopm'>" + safe.html(oRs("opmerking").value)+"</span>") : "") %>
</div>

View File

@@ -239,7 +239,7 @@ function fncolAction(oRs)
if (icon.match(/\.pdf$/i))
{
icon="../Pictures/pdf.jpg";
icon="fa-file-pdf-o";
}
}
hint = L("lcl_do_bestelling_hint");