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

ARAI#38181: Opdracht-uitvoeringsconsole.

Browse Source 
svn path=/Website/trunk/; revision=33741
This commit is contained in:
Maykel Geerdink
2017-05-09 07:32:34 +00:00
parent 2f209fa381
commit c41e6fe40d
4 changed files with 46 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
APPL/MLD/mld.css
View File

@@ -136,17 +136,6 @@ div.cardnotmoved {
div.selectedcard {
background-color: #DAA520;
}
div.disable-sort-item, span.disable-sort-item {
background-color: #F5F5F5;
/* Maak alle tekst unselectable */
-webkit-touch-callout: none; /* iOS Safari */
-webkit-user-select: none; /* Safari */
-khtml-user-select: none; /* Konqueror HTML */
-moz-user-select: none; /* Firefox */
-ms-user-select: none; /* Internet Explorer/Edge */
user-select: none; /* Non-prefixed version, currently
supported by Chrome and Opera */
}
.cardopdrnochange {
/*font-size: 1em; */
/*vertical-align: top; */
@@ -165,6 +154,17 @@ div.activecard.halt {
background-color: #FFE57A; / *#E8FFE8;* /
border-color: #333;
} */
div.disable-sort-item, div.disable-sort-item.halt, span.disable-sort-item {
background-color: #F5F5F5;
/* Maak alle tekst unselectable */
-webkit-touch-callout: none; /* iOS Safari */
-webkit-user-select: none; /* Safari */
-khtml-user-select: none; /* Konqueror HTML */
-moz-user-select: none; /* Firefox */
-ms-user-select: none; /* Internet Explorer/Edge */
user-select: none; /* Non-prefixed version, currently
supported by Chrome and Opera */
}
div.legendaright {
float: right;
padding-left: 8px;

33
APPL/MLD/mld.inc
View File

@@ -163,6 +163,39 @@ mld = {setmeldingstatus:
shared.trackaction("MLDAFR", mld_key, ptxt);
},
opdr_hltrsm:
function (opdr_key, params)
{
if (params.resume)
{ // Als er al een opdracht actief is en sequentieel is aangevinkt, dan moet de actieve opdracht onderbroken worden.
// Als de opdrachten niet sequentieel uitgevoerd moeten worden, dan wordt er ook geen actieve opdracht gevonden.
var activeopdr = mld.getactiveopdracht(opdr_key);
if (activeopdr.opdr_key > 0)
{ // De actieve opdracht onderbreken.
shared.trackaction("ORDHLT", activeopdr.opdr_key);
Oracle.Execute("UPDATE mld_opdr SET mld_opdr_halted = 1 WHERE mld_opdr_key = " + activeopdr.opdr_key);
}
}
var sql = "SELECT mld_opdr_halted"
+ " FROM mld_opdr"
+ " WHERE mld_opdr_key = " + opdr_key;
var oRs = Oracle.Execute(sql);
var halted = oRs("mld_opdr_halted").Value == 1;
oRs.Close();
if (params.halt && !halted)
{
shared.trackaction("ORDHLT", opdr_key);
Oracle.Execute("UPDATE mld_opdr SET mld_opdr_halted = 1 WHERE mld_opdr_key = " + opdr_key);
}
if (params.resume && halted)
{
shared.trackaction("ORDRSM", opdr_key);
Oracle.Execute("UPDATE mld_opdr SET mld_opdr_halted = 0 WHERE mld_opdr_key = " + opdr_key);
}
},
saveobjects:
function (mld_key, obj_arr)
{ // Objecten die worden verwijderd bepalen i.v.m. tracking.

27
APPL/MLD/opdr_hltrsm.asp
View File

@@ -23,32 +23,7 @@ var halt = getFParamInt("hlt", 0) == 1;
var resume = getFParamInt("rsm", 0) == 1;
user.anything_todo_or_abort(this_opdr.canChange && (halt || resume));
if (resume)
{ // Als er al een opdracht actief is en sequentieel is aangevinkt, dan moet de actieve opdracht onderbroken worden.
// Als de opdrachten niet sequentieel uitgevoerd moeten worden, dan wordt er ook geen actieve opdracht gevonden.
var activeopdr = mld.getactiveopdracht(opdr_key);
if (activeopdr.opdr_key > 0)
// De actieve opdracht onderbreken.
shared.trackaction("ORDHLT", activeopdr.opdr_key);
}
var sql = "SELECT mld_opdr_halted"
+ " FROM mld_opdr"
+ " WHERE mld_opdr_key = " + opdr_key;
var oRs = Oracle.Execute(sql);
var halted = oRs("mld_opdr_halted").Value == 1;
oRs.Close();
if (halt && !halted)
{
shared.trackaction("ORDHLT", opdr_key);
Oracle.Execute("UPDATE mld_opdr SET mld_opdr_halted = 1 WHERE mld_opdr_key = " + opdr_key);
}
if (resume && halted)
{
shared.trackaction("ORDRSM", opdr_key);
Oracle.Execute("UPDATE mld_opdr SET mld_opdr_halted = 0 WHERE mld_opdr_key = " + opdr_key);
}
mld.opdr_hltrsm(opdr_key, { halt: halt, resume: resume });
var result = { message: "", success: true };

15
APPL/PDA/order.asp
View File

@@ -47,20 +47,7 @@ else
{
var halt = getQParamInt("hlt", 0) == 1;
var resume = getQParamInt("rsm", 0) == 1;
if (halt || resume)
{
var sql = "SELECT fac.gettrackingdate ('ORDHLT', " + opdr_key + ") trackdatehlt"
+ " , fac.gettrackingdate ('ORDRSM', " + opdr_key + ") trackdatersm"
+ " FROM DUAL";
var oRs = Oracle.Execute(sql);
var trackdateHLT = oRs("trackdatehlt").Value != null? new Date(oRs("trackdatehlt").Value) : null;
var trackdateRSM = oRs("trackdatersm").Value != null? new Date(oRs("trackdatersm").Value) : null;
oRs.Close();
if (halt && (trackdateHLT == null || (trackdateRSM != null && trackdateHLT < trackdateRSM)))
shared.trackaction("ORDHLT", opdr_key);
if (resume && trackdateHLT != null && (trackdateRSM == null || trackdateHLT > trackdateRSM))
shared.trackaction("ORDRSM", opdr_key);
}
mld.opdr_hltrsm(opdr_key, { halt: halt, resume: resume });
}
if (opdr_key > -1)