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

Merge 2025.2 Gold C patches

Browse Source 
svn path=/Website/trunk/; revision=70336
This commit is contained in:
Jos Groot Lipman
2025-09-16 12:31:54 +00:00
parent 45f8afa355
commit c528bb633d
13 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/CAD/default.asp
View File

@@ -1296,7 +1296,7 @@ if (scenario_key != 0)
{id:"", alt:"", label: L("lcl_slnk_properties"), onClick: "parent.showSymbol()", icon: "fa-info-square", button: 0, menu: 1 }
];
%>
<body>
<body id="searchbody">
<div id="dragSymbol" class="fgdragsymbol" style="display:none;position:absolute;z-index:1;">Hier komt dragsymbool</div>
<div id="datumfilter" class="fgdatumfilter" style="display:none;position:absolute;z-index:1;left:240px;top:1px"><select onchange='myRefresh()'></select></div>
<div id="PickcontextMenu" class="slnkmenu" style="display:none">

19
APPL/EXP/base27.asp
View File

@@ -165,16 +165,9 @@ ANONYMOUS_Allowed = 1;
function request_result(p_request)
{
var result = {};
result.status = p_request.status;
var status_ok = "200,201,204,206";
if (status_ok.indexOf(status) == -1)
{
result.success = false;
result.message = "Base27 error. Status: " + p_request.status;
result.data = {};
}
else
var result = {status: p_request.status};
var status_ok = [200,201,204,206];
if (inArray(result.status, status_ok))
{
result.success = true;
result.message = "";
@@ -183,6 +176,12 @@ ANONYMOUS_Allowed = 1;
: {}
);
}
else
{
result.success = false;
result.message = "Base27 error. Status: " + p_request.status;
result.data = {};
}
obj_log( {"RequestResult": result});
return result;
}

2
APPL/FAC/job.asp
View File

@@ -91,7 +91,7 @@ if (job_key > -1)
user.auth_required_or_abort(buttons.length);
if (buttons.length === 1) {
jobFrameSrc = "job_edit_job.asp?template=1&rtable=" + buttons[0].rtable;
jobFrameSrc = "job_edit_job.asp?template=" + template + "&rtable=" + buttons[0].rtable;
} else {
%> <script>
FcltMgr.startEdit(window);

2
APPL/INS/ins_list.inc
View File

@@ -1157,7 +1157,7 @@ function ins_list (pautfunction, params)
{
if (S("ins_deel_flags") > 0)
{
rst.addColumn(new Column({caption: (outputmode == 0 ? I("fa-fclt-flag0") : L("lcl_ins_flags")), content: fncolFlags, colName: "fncolFlags", align: "center"}));
rst.addColumn(new Column({caption: (outputmode == 0 ? I("fa-fclt-flag0") : L("lcl_ins_flags")), content: fncolFlags, colName: "fncolFlags", colText: L("lcl_ins_flags"), align: "center"}));
}
if (inspect && ctrdisc_key_arr.length != 1)
rst.addColumn(new Column({caption: L("ctr_discipline"), content: "ctr_disc_oms"}));

2
APPL/MGT/fac_task.asp
View File

@@ -14,6 +14,8 @@
// Voorkennis:
model.fields["fac_cust_key"].typ = "key";
model.fields["fac_cust_key"].foreign = { tbl: "fac_cust", key: "fac_cust_key", desc: "fac_cust_customerid"};
model.fields["fac_cust_key"].insertonly = true;
model.fields["name"].insertonly = true;
model.fields["fac_task_nextrun"].multiedit = true;
model.fields["fac_task_flags"].multiedit = true;
model.fields["fac_task_flags"].label = "flags (+1=enabled)"; // in de lijst

3
APPL/MGT/mgt_generic.asp
View File

@@ -168,6 +168,9 @@
},
"ins_srtkenmerk": { "track": null,
"fields": ["ins_srtkenmerk_kenmerktype"]
},
"cnt_kenmerk": { "track": null,
"fields": ["cnt_kenmerk_niveau"]
}
}

2
APPL/PDA/default.css
View File

@@ -103,7 +103,7 @@ footer {
.fclt-content {
margin: var(--fclt-content-margin);
overflow-x: hidden;
overflow-x: clip;
}
.fclt-sticky-nav {

21
APPL/PDA/res_plattegrond.asp
View File

@@ -265,24 +265,17 @@ PDA_PAGE_END(); %>
}
function setTransform() {
// Get container and image sizes
var cw = container.clientWidth;
var ch = container.clientHeight;
var iw = img.naturalWidth * scale;
var ih = img.naturalHeight * scale;
// Calculate min/max pan so image stays within container
var minX = Math.min(0, cw - iw);
var maxX = Math.max(0, cw - iw) / 2;
var minY = Math.min(0, ch - ih);
var maxY = Math.max(0, ch - ih) / 2;
// Compute pan bounds based on container size & scale
var minX = -(cw * scale - cw) / 2;
var maxX = (cw * scale - cw) / 2;
var minY = -(ch * scale - ch) / 2;
var maxY = (ch * scale - ch) / 2;
// If image is smaller than container, center it
if (iw < cw) posX = (cw - iw) / 2;
else posX = clamp(posX, minX, 0);
if (ih < ch) posY = (ch - ih) / 2;
else posY = clamp(posY, minY, 0);
posX = clamp(posX, minX, maxX);
posY = clamp(posY, minY, maxY);
lastX = posX;
lastY = posY;

1
APPL/Shared/default.css
View File

@@ -6020,7 +6020,6 @@ td.selectable {
height: 6px;
}
/* Enkele 'vieze' overrules, te verfijnen */
#navigationCell label,
#navigationCell .fld
{
width: 225px;

2
APPL/Shared/default.inc
View File

@@ -8,7 +8,7 @@
Context: Vanuit ELK asp bestand
*/
var FCLTVersion="2025.2b";
var FCLTVersion="2025.2c";
var FCLTMinDatabaseSchema="51"; // Alleen de cijfers
var custpath = rooturl + "/cust/" + customerId; // path to customer files

1
UTILS/PutOrders/puo_send2address.js
View File

@@ -107,6 +107,7 @@ function send2address( bedrijfadres_key
if (bedrijfadres.loglevel > S("puo_loglevel"))
{
settings.overrule_setting("puo_loglevel", bedrijfadres.loglevel); // caller must reset it!
Log2File(1, "puo_loglevel overruled by prs_bedrijfadres_loglevel: " + bedrijfadres.loglevel);
}
puo_hook.initialize(bedrijfadres);

1
UTILS/PutOrders/puo_sendapp.js
View File

@@ -78,6 +78,7 @@ function sendAPP( p_perslid_key
if (bedrijfadres.loglevel > S("puo_loglevel"))
{
settings.overrule_setting("puo_loglevel", bedrijfadres.loglevel);
Log2File(1, "puo_loglevel overruled by prs_bedrijfadres_loglevel: " + bedrijfadres.loglevel);
}
// Dit zou ik het liefst doen met een stylesheet achtige oplossing en dan een XML2JSON

1
UTILS/gen_scheduler/gen_cleanup.js
View File

@@ -305,6 +305,7 @@ function cleanup_temp()
, { expr_folder: "", max_checklevel: 9, expr_file: "^(?:(putorders.*_"+CustId+"))\\S+\\\.log$", keep: "m1" } // Alle putordersI_CustId_*.log en putorders_CustId_*.log verwijderen van voor de 1-ste van 1 maand geleden.
, { expr_folder: "", max_checklevel: 9, expr_file: "^(?:(tasker.*_"+CustId+"))\\S+\\\.log$", keep: "m1" } // Alle putordersI_CustId_*.log en putorders_CustId_*.log verwijderen van voor de 1-ste van 1 maand geleden.
, { expr_folder: "^(putorders)$", max_checklevel: 9, expr_file: "^\\S+\.\\S+$", keep: "d30"} // Alles in TEMP\CustId\putorders van meer dan 30 dagen oud verwijderen.
, { expr_folder: "^(exchange)$", max_checklevel: 9, expr_file: "^\\S+\\.data$", keep: "d10"} // Alle .data in TEMP\CustId\exchange van meer dan 10 dagen oud verwijderen.
, { expr_folder: "^(ALG|BES|CNT|FIN|INS|MRK|MLD|RES|FAQ|.__NEW__)", max_checklevel: 2, expr_file: "^\\S+", keep: "d2" } // In mappen TEMP\CustId\Module\*__NEW__* bestanden die ouder zijn dan 2 dagen verwijderen, en als deze map dan leeg is de map ook verwijderen.
];