AAIT#36874 Status nieuw voor facturen layout iets aangepast

svn path=/Website/trunk/; revision=30318
This commit is contained in:
Ruud Lipper
2016-08-16 11:38:55 +00:00
parent 3cdb40ab93
commit b944f08464
2 changed files with 31 additions and 23 deletions

View File

@@ -243,9 +243,7 @@ var isContactpersoon = user.isContactpersoon();
</tr>
<!-- Actuele en verwijderde facturen -->
<% RWCHECKBOXTR("fin_actual", "fldfinactual", L("lcl_fin_show_actual"), fin_actual, { trclass: "primsearch", html: "onClick='checkboxStatus();'" });
RWCHECKBOXTR("fin_deleted", "fldfindeleted", L("lcl_fin_show_deleted"), fin_deleted, { trclass: "primsearch", html: "onClick='checkboxStatus();'" });
<%
sql = "SELECT 0, " + safe.quoted_sql(L("lcl_fin_source_manual")) + " FROM DUAL"
+ " UNION SELECT 1, " + safe.quoted_sql(L("lcl_fin_source_excel")) + " FROM DUAL"
+ " UNION SELECT 2, " + safe.quoted_sql(L("lcl_fin_source_mail")) + " FROM DUAL";
@@ -256,7 +254,33 @@ var isContactpersoon = user.isContactpersoon();
trclass: "primsearch",
emptyOption: ""
});
%> </table>
<!-- status -->
sql = "SELECT 1, " + safe.quoted_sql(fin.getfinstatustext(1)) + " FROM DUAL"
+ " UNION SELECT 2, " + safe.quoted_sql(fin.getfinstatustext(2)) + " FROM DUAL"
+ " UNION SELECT 3, " + safe.quoted_sql(fin.getfinstatustext(3)) + " FROM DUAL"
+ " UNION SELECT 5, " + safe.quoted_sql(fin.getfinstatustext(5)) + " FROM DUAL"
+ " UNION SELECT 6, " + safe.quoted_sql(fin.getfinstatustext(6)) + " FROM DUAL"
+ " UNION SELECT 7, " + safe.quoted_sql(fin.getfinstatustext(7)) + " FROM DUAL"
+ " ORDER BY 1";
FCLTselector("finstatus",
sql,
{ initKey: finstatus,
label: L("lcl_fin_fin_status"),
trclass: "primsearch",
emptyOption: ""
});
%>
<tr class="primsearch">
<td class="label"><label><%=L("lcl_show")%>:</label></td>
<td>
<input type="checkbox" class="fldfinactual" name="fin_actual" id="fin_actual" onClick="checkboxStatus()" value="1" <%=fin_actual? "checked" : ""%>>
<label for=fin_actual><%=L("lcl_fin_show_actual")%></label>
<input type="checkbox" class="fldfindeleted" name="fin_deleted" id="fin_deleted" onClick="checkboxStatus()" value="1" <%=fin_deleted? "checked" : ""%>>
<label for=fin_deleted><%=L("lcl_fin_show_deleted")%></label>
</td>
</tr>
</table>
</td><!-- end column 1 -->
<!-- Second column -->
@@ -317,23 +341,7 @@ var isContactpersoon = user.isContactpersoon();
<input type="text" class="fldopdrnr" name="opdrnr" <%=(opdrnr != -1) ? "value='" + opdrnr + "'" : ""%>>
</td>
</tr>
<!-- Status -->
<% sql = "SELECT 1, " + safe.quoted_sql(fin.getfinstatustext(1)) + " FROM DUAL"
+ " UNION SELECT 2, " + safe.quoted_sql(fin.getfinstatustext(2)) + " FROM DUAL"
+ " UNION SELECT 3, " + safe.quoted_sql(fin.getfinstatustext(3)) + " FROM DUAL"
+ " UNION SELECT 5, " + safe.quoted_sql(fin.getfinstatustext(5)) + " FROM DUAL"
+ " UNION SELECT 6, " + safe.quoted_sql(fin.getfinstatustext(6)) + " FROM DUAL"
+ " UNION SELECT 7, " + safe.quoted_sql(fin.getfinstatustext(7)) + " FROM DUAL"
+ " ORDER BY 1";
FCLTselector("finstatus",
sql,
{ initKey: finstatus,
label: L("lcl_fin_fin_status"),
trclass: "primsearch",
emptyOption: ""
})
<%
// Persoon
FCLTpersoonselector("budh_key", // budgethouders
"sgPerson",

View File

@@ -58,8 +58,8 @@ else
var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
// FORM checkboxes
var fin_actual = (getQParam("fin_actual", "off") == "on"); // Actuele facturen
var fin_deleted = (getQParam("fin_deleted", "off") == "on"); // Verwijderde facturen
var fin_actual = (getQParam("fin_actual", 0) == 1); // Actuele facturen
var fin_deleted = (getQParam("fin_deleted", 0) == 1); // Verwijderde facturen
/***** End get webform parameters *****/
params.datefrom = findate_from;