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

FSN#36536 Mobile opdrachten verbeteringen

Browse Source 
svn path=/Website/trunk/; revision=30295
This commit is contained in:
Erik Groener
2016-08-15 11:49:15 +00:00
parent f0f6cfd41d
commit 90d9465aad
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
APPL/PDA/order.asp
View File

@@ -21,7 +21,7 @@ FCLTHeader.Requires({ js: ["./modernizr-3.3.0.custom.min.js"] });
FCLTHeader.Requires({ plugins: ["suggest"]
, js: ["../mld/mld_edit_opdr.js", "num2curr.js", "jquery.timepicker-table.js"],
css: ["timePicker-table.css"]});
var opdr_key = getQParamInt("opdr_key", -1);
var mld_key = getQParamInt("mld_key", -1);
var copy = false;
@@ -85,7 +85,7 @@ else
+ " NVL2(g.alg_verdieping_code,'-'||g.alg_verdieping_code,'') ||"
+ " NVL2(g.alg_ruimte_nr,'-'||g.alg_ruimte_nr,'')||"
+ " NVL2(g.alg_terreinsector_code,'-'||g.alg_terreinsector_code,'') plaatscode,"
+ " alg_onroerendgoed_omschrijving plaats "
+ " alg_onroerendgoed_omschrijving plaats "
+ sqlCount
+ " FROM mld_melding m"
+ " , alg_v_allonrgoed_gegevens g"
@@ -282,7 +282,7 @@ else
<input type="hidden" name="t_opdr" value="<%=opdr_type%>"/>
<input type="hidden" name="uitvoerende" value="<%=uitv_key%>"/>
<input type="hidden" name="uitvkeystr" value="<%=uitv_key%>"/>
<input type="hidden" name="behandelaar" value="<%=user_key%>"/>
<input type="hidden" name="behandelaar" value="<%=mld_opdr.contactpers_key%>"/>
<%
BLOCK_START({collapsed: true, title: mld_opdr.opdr_type_omschr});
FCLTuitvoerendeselector("uitvoerende",
@@ -291,9 +291,9 @@ else
label: mld_opdr.srtdiscbes ? L("lcl_bes_Supplier") : L("lcl_ord_company_uit"),
readonly: true
});
if (opdr_key > -1)
{
{
FCLTcontactpersoonselector("contactpers",
"sgCntPersUitv",
{ contactpersoonKey: mld_opdr.contactpersuitv_key,
@@ -302,20 +302,20 @@ else
suppressEmpty: true,
readonly: true
});
if (this_opdr.canRead("WEB_ORDBOF"))
{
params = { suppressEmpty: true };
var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true);
var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true);
if (mld_opdr.contract_key && mld_opdr.contract_key>0 && (authparamsCNTUSE || authparamsCNTMAN))
params.moreinfo = "./contract.asp?cnt_key="+mld_opdr.contract_key;
ROFIELD("fld", L("lcl_contract"), mld_opdr.contract_naam, params);
}
}
}
}
ROFIELD("fld", L("lcl_mld_meldingsoort") ,mld_melding.ins_discipline_omschrijving + "-" + mld_melding.mld_stdmelding_omschrijving) ;
var vOrderdate = (opdr_key > 0 ? mld_opdr.mld_opdr_datumbegin : new Date());
ROFIELD("fld", L("lcl_orderdate"), toDateTimeString(vOrderdate)
@@ -338,7 +338,7 @@ else
required: true,
mobile: true
} );
FCLTcalendar("date_plan",
{ datum: mld_opdr.mld_opdr_plandatum,
readonly: (opdr_key < 0), // we weten ook dat klare opdrachten niet mobile zichtbaar zijn
@@ -348,12 +348,12 @@ else
timeStep: 15,
startTime: 8,
endTime: 18,
calendars: 1,
initEmpty: !mld_opdr.mld_opdr_plandatum,
calendars: 1,
initEmpty: !mld_opdr.mld_opdr_plandatum,
initTimeEmpty: !mld_opdr.mld_opdr_plandatum,
mobile: true
} );
} );
if (opdr_key > -1)
ROFIELD("fld", L("lcl_txt"), mld_opdr.opdr_omschr, {multi: true});
@@ -381,7 +381,7 @@ else
if (opdr_key > -1)
{
if ((mld_melding.mld_status == 7 || mld_melding.mld_status == 5) && this_opdr.canOpmChange)
if (this_opdr.canOpmChange)
{
RWFIELD("opdr_opm" , L("lcl_mld_final_remark"), mld_opdr.opdr_opmerking, {multi: true});
@@ -450,11 +450,11 @@ else
BUTTON(L("lcl_history"), {linkid: "#opdr-2-"+opdr_key, dataicon: "bullets", transition: "pop", datarel: "dialog"});
}
if (this_opdr.canShowOpdrNote) // Heb ik rechten om notities te zien
{
{
var tsql = "SELECT COUNT(*) FROM mld_opdr_note n WHERE n.mld_opdr_key = " + opdr_key;
toRs = Oracle.Execute(tsql);
BUTTON(L("lcl_mld_frame_notes")+" ("+toRs(0).value+")", {linkid: "./notitie.asp?node=opdracht&key="+opdr_key, dataicon: "comment", dataajax: 'false'});
}
}
var this_mld = mld.func_enabled_melding(mld_key); // Wat heb ik zoal aan rechten op deze specifieke melding
if (this_mld.canReadAny)
{