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

FCLT#63646 Graphics 2022 savepoint QA (Aiai) include volgorde

Browse Source 
svn path=/Website/trunk/; revision=53388
This commit is contained in:
Peter Feij
2021-10-14 10:28:29 +00:00
parent 8c3fe90b52
commit 02219a914c
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/CAD/req_move.asp
View File

@@ -16,10 +16,10 @@
Note:
*/ %>
<!--#include file="fgii.inc"-->
<!--#include file="../Shared/common.inc"-->
<!--#include file="../Shared/WPFunctions.inc" -->
<!--#include file="../Shared/iface.inc" -->
<!--#include file="FGII.inc"-->
<html>
<head>
<%
@@ -130,8 +130,7 @@ MODAL_BLOCK_START("req_move", L("lcl_workplace"), { icon: "fa-briefcase" });
+ " FROM prs_perslidwerkplek pwp, prs_werkplek pw"
+ " WHERE pw.prs_werkplek_key = pwp.prs_werkplek_key(+)"
+ " AND pw.prs_alg_ruimte_key = " + room_key
+ " GROUP BY pw.prs_werkplek_key, prs_werkplek_omschrijving "
// Dit staan we tegenwoordig toe + "HAVING SUM(NVL(prs_perslidwerkplek_bezetting,0)) + " + bez + " <= 100"
+ " GROUP BY pw.prs_werkplek_key, prs_werkplek_omschrijving";
oRs = Oracle.Execute(sql);
%>

4
APPL/CAD/req_move2.asp
View File

@@ -18,9 +18,9 @@
Note: Zie req_move3.asp
*/ %>
<!--#include file="fgii.inc"-->
<!--#include file="../Shared/common.inc"-->
<!--#include file="../Shared/iface.inc"-->
<!--#include file="FGII.inc"-->
<%
FCLTHeader.Requires({plugins:["jQuery"], js: []})
@@ -52,7 +52,7 @@ else
var TransitParams = "prswp_key="+prswp_key+"&room_key="+room_key;
// Mag ik schijven in de doelruimte?
// Mag ik schrijven in de doelruimte?
if (authparams.ALGwritelevel > -1)
{
var sql = "SELECT alg_ruimte_key"

12
APPL/CAD/req_move3.asp
View File

@@ -15,10 +15,10 @@
Note: Zie req_move2.asp
*/ %>
<!--#include file="fgii.inc"-->
<!--#include file="../Shared/common.inc"-->
<!--#include file="../Shared/WPFunctions.inc"-->
<!--#include file="../Shared/iface.inc"-->
<!--#include file="FGII.inc"-->
<%
FCLTHeader.Requires({plugins:["jQuery"], js: []})
@@ -32,7 +32,7 @@ var prs_key = getQParamInt("prs_key"); // perslidwerkplek_key
var room_key = getQParamInt( "room_key"); // Nieuwe ruimte
var TransitParams = "prs_key="+prs_key+"&room_key="+room_key;
// Mag ik schijven in de doelruimte?
// Mag ik schrijven in de doelruimte?
if (authparams.ALGwritelevel>-1)
{
var sql = "SELECT alg_ruimte_key FROM fac_v_my_rooms"
@@ -73,7 +73,7 @@ if (authparams.ALGwritelevel>-1)
var sql = "SELECT " + S("prs_pers_string") + " naam, ar.alg_ruimte_nr"
+ " FROM prs_v_perslid_gegevens p, alg_ruimte ar"
+ " WHERE p.prs_perslid_key = " + prs_key
+ " AND ar.alg_ruimte_key = " + room_key
+ " AND ar.alg_ruimte_key = " + room_key;
oRs = Oracle.Execute(sql);
%>
@@ -83,10 +83,12 @@ if (authparams.ALGwritelevel>-1)
%>
<tr><td class='label'><label><%=L("lcl_fg_domove")%></label></td><td><%=safe.html(oRs("naam").Value)%></td></tr>
<tr><td class='label'><label><%=L("lcl_fg_domovedest")%></label></td><td><%=safe.html(oRs("alg_ruimte_nr").Value)%></td></tr>
<% MODAL_BLOCK_END();
<%
MODAL_BLOCK_END();
SIMPLE_BLOCK_START();
CreateButtons([ { title: L("lcl_fg_verhuizing"), action: "moveWPtoRoom()", singlepress: true, id:"btn_res_submit", icon: "fa-fclt-save" },
{ title: L("lcl_cancel"), action: "FcltMgr.closeDetail(window, { cancel: true } )", icon: "fa-fclt-cancel"} ]);
{ title: L("lcl_cancel"), action: "FcltMgr.closeDetail(window, { cancel: true } )", icon: "fa-fclt-cancel"}
]);
SIMPLE_BLOCK_END();
%>
</form>