admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#31581 API2/ model intern ook gebruiken

Browse Source 
svn path=/Website/trunk/; revision=24065
This commit is contained in:
Jos Groot Lipman
2015-02-05 14:02:56 +00:00
parent a156864467
commit a23d66a8bd
5 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/ALG/alg_edit_regio.asp
View File

@@ -23,10 +23,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: []})
var regio_key = getQParamInt("regio_key");
var params = api2.createParams( model_regions
, { id: regio_key
}
);
var params = { filter: { id: regio_key }};
var regio_array = model_regions.REST_GET(params); // Roep de API2 GET aan
var regio_data = (regio_array[0] ? regio_array[0] : {id: -1}); // GET kan meerdere records opleveren, maar we verwachten hier maar 1.
var this_alg = params.func_enabled; // params bevat nu ook waarden die in API2 zijn bepaald.
@@ -40,10 +37,10 @@ var this_alg = params.func_enabled; // params bevat n
<script>
function alg_submit()
{
document.activeElement.blur(); // trigger laatste onChanges
if (!validateForm("u2"))
return false;
document.forms.u2.submit();
$.post($("form[name=u2]")[0].action, $("[name=u2]").serialize(), FcltCallbackClose, "json");
return true;
}
function alg_cancel()
{
@@ -62,7 +59,6 @@ var this_alg = params.func_enabled; // params bevat n
<form name="u2"
action="alg_edit_regio_save.asp?regio_key=<%=regio_data.id%>"
method="post"
target="hidFrameSubmit"
onSubmit="alg_submit();">
<%
if (this_alg.writeman)
@@ -77,7 +73,6 @@ BLOCK_END();
IFACE.FORM_END();
%>
</form>
<iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
</div>
</body>
</html>

44
APPL/ALG/alg_edit_regio_save.asp
View File

@@ -5,52 +5,38 @@
SUBMIT-form
*/ %>
<%
var JSON_Result = true;
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../API2/api2.inc" -->
<!-- #include file="../API2/model_regions.inc" -->
<% FCLTHeader.Requires({ plugins:["jQuery"], js: [] }) %>
<!-- #include file="../Shared/json2.js" -->
<%
var regio_key = getQParamInt( "regio_key" );
var warning = "";
var formfields = [ {name: "name", frm: "reg_oms" }];
if (regio_key > 0)
{ // UPDATE
var formfields = [ {name: "name", frm: "reg_oms" }];
var params = api2.createParams( model_regions
, { "id": regio_key
}
);
var params = { filter: { "id": regio_key }};
var jsondata = api2.createJSONdata(model_regions, params, formfields);
var regio_array = model_regions.REST_PUT(params, jsondata, params.filter.id); // Roep de API2 PUT aan
warning = regio_array.warning;
}
else
{ // INSERT
var formfields = [ {name: "name", frm: "reg_oms" }];
var params = api2.createParams( model_regions
, {}
);
var params = {};
var jsondata = api2.createJSONdata(model_regions, params, formfields);
var regio_array = model_regions.REST_POST(params, jsondata); // Roep de API2 POST aan
warning = regio_array.warning;
regio_key = regio_array.key;
}
%>
warning = regio_array.warning;
<html>
<head>
<% FCLTHeader.Generate() %>
<script>
$(document).ready(function () {
FcltMgr.closeDetail(window, { regio_key: <%=regio_key%>,
warning: "<%=safe.jsstring(warning)%>",
keepForm: <%=warning?"true":"false"%>
});
} );
</script>
</head>
<body>
</body>
</html>
var result = { regio_key: regio_key,
warning: warning,
keepForm: !!warning,
success: true };
Response.Write(JSON.stringify(result));
%>

4
APPL/ALG/alg_regio.asp
View File

@@ -40,10 +40,6 @@ var reg_key = getQParamInt("key", -1);
if (!params.keepForm)
window.location.href = "alg_regio.asp?verynew=1&key=" + params.regio_key;
<% } else { /* Bestaande regio bewerkt, switch naar show-mode */ %>
if (params.close)
{
FcltMgr.closeDetail(window, { close: true})
}
if (!params.keepForm)
$("#algFrame")[0].src = "alg_show_regio.asp?regio_key=<%=reg_key%>";
<% } %>

2
APPL/ALG/alg_regio_list.inc
View File

@@ -99,7 +99,7 @@ function regio_list(pautfunction, params)
var filter = {};
if (regio_key > -1)
var filter = {id: regio_key};
var params = api2.createParams(model_regions, filter); // Alle regio`s ophalen, behalve de verwijderde.
var params = { filter: filter }; // Alle regio`s ophalen, behalve de verwijderde.
var regio_array = model_regions.REST_GET(params); // Roep de API2 GET aan
//

8
APPL/ALG/alg_show_regio.asp
View File

@@ -26,11 +26,9 @@ FCLTHeader.Requires({plugins:["jQuery"], js: []})
var regio_key = getQParamInt("regio_key");
var params = api2.createParams( model_regions
, { id: regio_key
, show_deleted: false // Ook indien verwijderd ophalen.
}
);
var params = { filter: { id: regio_key
, show_deleted: false // Ook indien verwijderd ophalen.
}};
var regio_array = model_regions.REST_GET(params); // Roep de API2 GET aan
var regio_data = regio_array[0]; // GET kan meerdere records opleveren, maar we verwachten hier maar 1.
var this_alg = params.func_enabled; // params bevat nu ook waarden die in API2 zijn bepaald.