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

PLAT#52238: Vervolg van PLAT#52094: nieuwe velden in de interface verwerken.

Browse Source 
svn path=/Website/trunk/; revision=37564
This commit is contained in:
Maykel Geerdink
2018-04-05 14:09:02 +00:00
parent 83624bfcd8
commit 49c94d3fe6
10 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/ALG/alg_edit_gebouw.asp
View File

@@ -229,7 +229,7 @@ else
);
if (this_alg.writeman)
CHECKBOXTR(L("lcl_estate_gebouw_werkdagen"), "fldalgwerk", "bld_werkdagen", werkdagen==1)
ROFIELDTR("fld", "Conditie score", geb_score1, {suppressEmpty: true}); // L("lcl_alg_locatie_mjb_score1")
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), geb_score1, {suppressEmpty: true});
BLOCK_END();
generateFlexKenmerkBlock ({ onrgoed_key : bld_key,

2
APPL/ALG/alg_edit_locatie.asp
View File

@@ -139,7 +139,7 @@ manRWFIELD("pst_land", "fld", L("lcl_prs_address_post_land"), p
manRWFIELD("loc_vw", "fld", L("lcl_estate_locatie_man_verantw"), loc_vw, {maxlength: 30});
manRWFIELD("loc_vwtel", "fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {maxlength: 15});
manRWFIELD("loc_mail", "fld", L("lcl_noti_email"), loc_mail, {maxlength: 200});
ROFIELDTR("fld", "Conditie score", loc_score1, {suppressEmpty: true}); // L("lcl_alg_locatie_mjb_score1")
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
BLOCK_END();

2
APPL/ALG/alg_gebouw_list.inc
View File

@@ -273,7 +273,7 @@ function gebouw_list(pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_geoxcoord"), content: "alg_gebouw_x"}));
rst.addColumn(new Column({caption: L("lcl_geoycoord"), content: "alg_gebouw_y"}));
}
rst.addColumn(new Column({caption: "Conditiescore", content: "alg_gebouw_mjb_score1"})); // L("lcl_alg_gebouw_mjb_score1")
rst.addColumn(new Column({caption: L("lcl_alg_gebouw_mjb_score1"), content: "alg_gebouw_mjb_score1"}));
rst.addAction({ action: "gebouwEdit", caption: L("lcl_edit"), isDefault: true});
rst.addAction({ action: "doDelete", caption: L("lcl_delete"), enabler: "eDelete", single:!noref, multi: true, multiOnce: true});

6
APPL/ALG/alg_gebouw_search.asp
View File

@@ -117,10 +117,10 @@ var this_alg = alg.func_enabled(gebouw_key);
<table width="100%">
<tr>
<td class="label">
<label for="show_fitness_score_from"><%="Conditie score"%>:</label> <% // L("lcl_mjb_fitness_score") %>
<label for="show_fitness_score_from"><%=L("lcl_mjb_fitness_score")%>:</label>
</td>
<td style="text-align: right">
<%="van"%> <% // L("lcl_mjb_from") %>
<%=L("lcl_mjb_from")%>
</td>
</tr>
</table>
@@ -134,7 +134,7 @@ var this_alg = alg.func_enabled(gebouw_key);
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% // L("lcl_mjb_through") %>
&nbsp;<%=L("lcl_mjb_through")%>&nbsp;
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"

4
APPL/ALG/alg_locatie_list.inc
View File

@@ -171,7 +171,7 @@ function locatie_list(pautfunction, params)
+ " AND t.fac_tracking_refkey = l.alg_locatie_key"
+ " AND sn.fac_srtnotificatie_xmlnode = 'locatie'"
+ " ) recentdatum"
+ " FROM alg_locatie l" // TODO: alg_v_aanweziglocatie gebruiken
+ " FROM alg_v_aanweziglocatie l"
+ " , alg_district d "
+ " WHERE d.alg_district_key(+) = l.alg_district_key"
+ " AND l.alg_locatie_verwijder IS NULL";
@@ -243,7 +243,7 @@ function locatie_list(pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_adres"), content: "alg_locatie_adres"}));
rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_postcode"), content: "alg_locatie_postcode"}));
rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_plaats"), content: "alg_locatie_plaats"}));
rst.addColumn(new Column({caption: "Conditiescore", content: "alg_locatie_mjb_score1"})); // L("lcl_alg_locatie_mjb_score1")
rst.addColumn(new Column({caption: L("lcl_alg_locatie_mjb_score1"), content: "alg_locatie_mjb_score1"}));
if (outputmode != 0)
{

6
APPL/ALG/alg_locatie_search.asp
View File

@@ -77,10 +77,10 @@ var authparams = alg.checkAutorisation();
<table width="100%">
<tr>
<td class="label">
<label for="show_fitness_score_from"><%="Conditie score"%>:</label> <% // L("lcl_mjb_fitness_score") %>
<label for="show_fitness_score_from"><%=L("lcl_mjb_fitness_score")%>:</label>
</td>
<td style="text-align: right">
<%="van"%> <% // L("lcl_mjb_from") %>
<%=L("lcl_mjb_from")%>
</td>
</tr>
</table>
@@ -94,7 +94,7 @@ var authparams = alg.checkAutorisation();
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% // L("lcl_mjb_through") %>
&nbsp;<%=L("lcl_mjb_through")%>&nbsp;
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"

2
APPL/ALG/alg_show_gebouw.asp
View File

@@ -223,7 +223,7 @@ oRs.Close();
ROFIELDTR("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(beginuur), {suppressEmpty:true} );
ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"), toTimeString(einduur), {suppressEmpty:true} );
ROCHECKBOXTR("fldalgwerk", L("lcl_estate_gebouw_werkdagen"), werkdagen==1);
ROFIELDTR("fld", "Conditie score", geb_score1, {suppressEmpty: true}); // L("lcl_alg_locatie_mjb_score1")
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), geb_score1, {suppressEmpty: true});
BLOCK_END();
generateFlexKenmerkBlock ({ onrgoed_key : bld_key,

2
APPL/ALG/alg_show_locatie.asp
View File

@@ -157,7 +157,7 @@ oRs.Close();
ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw"), loc_vw, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {suppressEmpty: true});
AFIELDTR('fldmailto details', L("lcl_noti_email"), "mailto:" + loc_mail, loc_mail, { suppressEmpty: true });
ROFIELDTR("fld", "Conditie score", loc_score1, {suppressEmpty: true}); // L("lcl_alg_locatie_mjb_score1")
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
BLOCK_END();

24
APPL/MJB/mjb_search.asp
View File

@@ -248,10 +248,10 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
<table>
<tr>
<td class="label">
<label for="show_fitness_score_from"><%="Conditie score"%>:</label> <% // L("lcl_mjb_fitness_score") %>
<label for="show_fitness_score_from"><%=L("lcl_mjb_fitness_score")%>:</label>
</td>
<td style="text-align: right">
<%="van"%> <% // L("lcl_mjb_from") %>
<%=L("lcl_mjb_from")%>
</td>
</tr>
</table>
@@ -265,7 +265,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% // L("lcl_mjb_through") %>
&nbsp;<%=L("lcl_mjb_through")%>&nbsp;
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
@@ -283,10 +283,10 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
<table>
<tr>
<td class="label">
&nbsp;&nbsp;<3B> <%="Negatieve afwijking"%> <% // L("lcl_mbj_negative_dev") %>
&nbsp;&nbsp;<3B> <%=L("lcl_mbj_negative_dev")%>
</td>
<td style="text-align: right">
<%="van"%> <% // L("lcl_mjb_from") %>
<%=L("lcl_mjb_from")%>
</td>
</tr>
</table>
@@ -300,7 +300,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% // L("lcl_mjb_through") %>
&nbsp;<%=L("lcl_mjb_through")%>&nbsp;
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 5)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 5)"
@@ -318,10 +318,10 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
<table>
<tr>
<td class="label">
&nbsp;&nbsp;<3B> <%="Positieve afwijking"%> <% // L("lcl_mjb_positive_dev") %>
&nbsp;&nbsp;<3B> <%=L("lcl_mjb_positive_dev")%>
</td>
<td style="text-align: right">
<%="van"%> <% // L("lcl_mjb_from") %>
<%=L("lcl_mjb_from")%>
</td>
</tr>
</table>
@@ -335,7 +335,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp <% // L("lcl_mjb_through") %>
&nbsp;<%=L("lcl_mjb_through")%>&nbsp
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 5)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 5)"
@@ -351,10 +351,10 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
<table>
<tr>
<td class="label">
<label for="show_priority_score_from"><%="Prioriteitsscore"%>:</label> <% // L("lcl_mjb_priority_score") %>
<label for="show_priority_score_from"><%=L("lcl_mjb_priority_score")%>:</label>
</td>
<td style="text-align: right">
<%="van"%> <% // L("lcl_mjb_from") %>
<%=L("lcl_mjb_from")%>
</td>
</tr>
</table>
@@ -368,7 +368,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp <% // L("lcl_mjb_through") %>
&nbsp;<%=L("lcl_mjb_through")%>&nbsp
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 9)"

4
APPL/MJB/mjb_search_list.asp
View File

@@ -824,9 +824,9 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
if (groupby >= 6) rst.addColumn(new Column({caption: L("lcl_obj_sort"), content: "ins_srtdeel_omschrijving"}));
}
if (groupby == 2)
rst.addColumn(new Column({caption: "Conditiescore", content: "alg_locatie_mjb_score1", align: "center"})); // L("lcl_alg_locatie_mjb_score1")
rst.addColumn(new Column({caption: L("lcl_alg_locatie_mjb_score1"), content: "alg_locatie_mjb_score1", align: "center"}));
if (groupby == 3)
rst.addColumn(new Column({caption: "Conditiescore", content: "alg_gebouw_mjb_score1", align: "center"})); // L("lcl_alg_gebouw_mjb_score1")
rst.addColumn(new Column({caption: L("lcl_alg_gebouw_mjb_score1"), content: "alg_gebouw_mjb_score1", align: "center"}));
if (groupby >= 7)
{
rst.addColumn(new Column({caption: L("lcl_ins_object"), content: fnDeel}));