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

svn path=/Website/branches/v2017.3/; revision=37467
2018-03-22 16:16:38 +00:00
parent cae11e35d9
commit f2d91b8cce
10 changed files with 130 additions and 21 deletions
--- a/APPL/ALG/alg_edit_gebouw.asp
+++ b/APPL/ALG/alg_edit_gebouw.asp
@@ -68,6 +68,7 @@ if (bld_key > 0)
  var verantw_key    = oRs("prs_perslid_key_verantw").Value;
  var verantw_key2   = oRs("prs_perslid_key_verantw2").Value;
  var vervaldatum = oRs("alg_gebouw_vervaldatum").Value != null ? new Date(oRs("alg_gebouw_vervaldatum").Value) : null;
+  var geb_score1 = oRs("alg_gebouw_mjb_score1").value;
  oRs.Close();
 }
 else
@@ -228,6 +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")
        BLOCK_END();

        generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,
--- a/APPL/ALG/alg_edit_locatie.asp
+++ b/APPL/ALG/alg_edit_locatie.asp
@@ -53,7 +53,8 @@ if (loc_key > 0)
    var pst_adres  = oRs("alg_locatie_post_adres").value;
    var pst_plaats = oRs("alg_locatie_post_plaats").value;
    var pst_land   = oRs("alg_locatie_post_land").value;
-  var dienstniveau  = oRs("mld_dienstniveau_key").value;
+    var dienstniveau  = oRs("mld_dienstniveau_key").value;
+    var loc_score1 = oRs("alg_locatie_mjb_score1").value;

    oRs.Close();
 }
@@ -138,6 +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")

 BLOCK_END();

--- a/APPL/ALG/alg_gebouw_list.inc
+++ b/APPL/ALG/alg_gebouw_list.inc
@@ -126,6 +126,8 @@ function gebouw_list(pautfunction, params)
  var srtgebouw_key = params.srtgebouw_key;
  var verantw_key = params.verantw_key;
  var expalgincl = params.expalgincl;
+  var fitness_score1_from = params.fitness_score1_from;
+  var fitness_score1_through = params.fitness_score1_through;

  var autparamsINSUSE = user.checkAutorisation("WEB_INSUSE", true);
  var autparamsINSMAN = user.checkAutorisation("WEB_INSMAN", true);
@@ -174,6 +176,7 @@ function gebouw_list(pautfunction, params)
           + "     , g.alg_gebouw_x"
           + "     , g.alg_gebouw_y"
           + "     , g.alg_gebouw_vervaldatum"
+           + "     , g.alg_gebouw_mjb_score1"
           + "     , (SELECT MAX(t.fac_tracking_datum)"
           + "          FROM fac_tracking t"
           + "             , fac_srtnotificatie sn"
@@ -220,6 +223,13 @@ function gebouw_list(pautfunction, params)
    if (!expalgincl)
      sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";

+    // Conditie score.
+    // Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
+    if (fitness_score1_from > 0)
+      sqln += " AND alg_locatie_mjb_score1 >= " + fitness_score1_from;
+    if (fitness_score1_through > 0)
+      sqln += " AND alg_locatie_mjb_score1 <= " + fitness_score1_through;
+
    sqln += " ORDER BY l.alg_locatie_upper ASC, "
          +  "          g.alg_gebouw_upper ASC  ";

@@ -263,6 +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.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});
--- a/APPL/ALG/alg_gebouw_search.asp
+++ b/APPL/ALG/alg_gebouw_search.asp
@@ -91,26 +91,60 @@ var this_alg = alg.func_enabled(gebouw_key);
                + "  FROM alg_srtgebouw"
                + " WHERE alg_srtgebouw_verwijder IS NULL"
                + " ORDER BY UPPER("+lcl.xsql('alg_srtgebouw_omschrijving', 'alg_srtgebouw_key')+")";
-            FCLTselector("srt",
-                         sql,
-                         { initKey: srtgebouw_key,
-                           label: L("lcl_estate_gebouw_srtgebouw"),
-                           trclass: "primsearch",
-                           emptyOption: ""
-                         });
+              FCLTselector("srt",
+                           sql,
+                           { initKey: srtgebouw_key,
+                             label: L("lcl_estate_gebouw_srtgebouw"),
+                             trclass: "primsearch",
+                             emptyOption: ""
+                           });
 %>
-            <!-- Gebouw verantwoordelijke -->
-<%          // Dit veld is alleen zichtbaar indien er minimaal <20><>n gebouwverantwoordelijke geconfigureerd is (suppressNoValues).
-            FCLTpersoonselector("verantw",
-                                "sgVerantw",
-                                { perslidKey: verantw_key,
-                                  label: L("lcl_alg_bld_verantw"),
-                                  filtercode: "GV", // Gebouw Verantwoordelijke
-                                  trclass: "primsearch",
-                                  suppressNoValues: true,
-                                  whenEmpty: L("lcl_search_generic")  // want filter
-                                });
+              <!-- Gebouw verantwoordelijke -->
+<%            // Dit veld is alleen zichtbaar indien er minimaal <20><>n gebouwverantwoordelijke geconfigureerd is (suppressNoValues).
+              FCLTpersoonselector("verantw",
+                                  "sgVerantw",
+                                  { perslidKey: verantw_key,
+                                    label: L("lcl_alg_bld_verantw"),
+                                    filtercode: "GV", // Gebouw Verantwoordelijke
+                                    trclass: "primsearch",
+                                    suppressNoValues: true,
+                                    whenEmpty: L("lcl_search_generic")  // want filter
+                                  });
 %>
+              <% // Conditie score %>
+              <tr class="primsearch fldfitness_score" id="fitness_score">
+                <td>
+                  <table width="100%">
+                    <tr>
+                      <td class="label">
+                        <label for="show_fitness_score_from"><%="Conditie score"%>:</label>  <% // L("lcl_mjb_fitness_score") %>
+                      </td>
+                      <td style="text-align: right">
+                        <%="van"%>  <% // L("lcl_mjb_from") %>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+                <td class="score">
+                  <input type="text"
+                         onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
+                         onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
+                         id="fitness_score1_from"
+                         name="fitness_score1_from"
+                         class="fldflexN  number "
+                         value=""
+                         maxlength="1">
+                  &nbsp;<%="t/m"%>&nbsp;  <% // L("lcl_mjb_through") %>
+                  <input type="text"
+                         onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
+                         onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
+                         id="fitness_score1_through"
+                         name="fitness_score1_through"
+                         class="fldflexN  number "
+                         value=""
+                         maxlength="1">
+                </td>
+              </tr>
            </table>
          </td><!-- end column 1 -->
        </tr>
--- a/APPL/ALG/alg_gebouw_search_list.asp
+++ b/APPL/ALG/alg_gebouw_search_list.asp
@@ -32,6 +32,8 @@ var srtgebouw_key = getQParamInt("srt", -1); // Gebouwfunctie
 var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
 var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
 var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen gebouwen
+var fitness_score1_from = getQParamInt("fitness_score1_from", -1);       // Conditie score van.
+var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.

 gebouw_list ( "*",
              { outputmode: outputmode,
@@ -45,6 +47,8 @@ gebouw_list ( "*",
                 bld_key: (bld_key != -1? bld_key : null),
                 bld_code: bld_code,
                 bld_name: bld_name,
+                 fitness_score1_from : fitness_score1_from,
+                 fitness_score1_through : fitness_score1_through,
                 noref: (noref != -1? noref : null),
                 expalgincl: expalgincl
              }
--- a/APPL/ALG/alg_locatie_list.inc
+++ b/APPL/ALG/alg_locatie_list.inc
@@ -120,6 +120,8 @@ function locatie_list(pautfunction, params)
  var reg_key = params.reg_key;
  var dis_key = params.dis_key;
  var loc_key = params.loc_key;
+  var fitness_score1_from = params.fitness_score1_from;
+  var fitness_score1_through = params.fitness_score1_through;

  function fnrowActionEnabler(oRs)
  {
@@ -161,6 +163,7 @@ function locatie_list(pautfunction, params)
             + "     , l.alg_locatie_verantw_tel"
             + "     , l.alg_locatie_x"
             + "     , l.alg_locatie_y"
+             + "     , l.alg_locatie_mjb_score1"
             + "     , (SELECT MAX(t.fac_tracking_datum)"
             + "          FROM fac_tracking t"
             + "             , fac_srtnotificatie sn"
@@ -168,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_v_aanweziglocatie l"
+             + "  FROM alg_locatie l"  // TODO: alg_v_aanweziglocatie gebruiken
             + "     , alg_district d "
             + " WHERE d.alg_district_key(+) = l.alg_district_key"
             + "   AND l.alg_locatie_verwijder IS NULL";
@@ -201,6 +204,13 @@ function locatie_list(pautfunction, params)
    if (params.loc_descr)
        sqln += " AND UPPER(l.alg_locatie_omschrijving) LIKE " + safe.quoted_sql_wild(params.loc_descr + "%");

+    // Conditie score.
+    // Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
+    if (fitness_score1_from > 0)
+      sqln += " AND alg_locatie_mjb_score1 >= " + fitness_score1_from;
+    if (fitness_score1_through > 0)
+      sqln += " AND alg_locatie_mjb_score1 <= " + fitness_score1_through;
+
    sqln += " ORDER BY UPPER(alg_district_omschrijving), UPPER(alg_locatie_code)";

    var addurl = "appl/alg/alg_locatie.asp";
@@ -233,6 +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")

    if (outputmode != 0)
    {
--- a/APPL/ALG/alg_locatie_search.asp
+++ b/APPL/ALG/alg_locatie_search.asp
@@ -68,8 +68,45 @@ var authparams = alg.checkAutorisation();
              </table>
            </td><!-- end column 1 -->

+            <!-- Second column -->
            <td class="searchkolom2">
-            </td><!-- end column 1 -->
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+                <% // Conditie score %>
+                <tr class="primsearch fldfitness_score" id="fitness_score">
+                  <td>
+                    <table width="100%">
+                      <tr>
+                        <td class="label">
+                          <label for="show_fitness_score_from"><%="Conditie score"%>:</label>  <% // L("lcl_mjb_fitness_score") %>
+                        </td>
+                        <td style="text-align: right">
+                          <%="van"%>  <% // L("lcl_mjb_from") %>
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                  <td class="score">
+                    <input type="text"
+                           onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
+                           onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
+                           id="fitness_score1_from"
+                           name="fitness_score1_from"
+                           class="fldflexN  number "
+                           value=""
+                           maxlength="1">
+                    &nbsp;<%="t/m"%>&nbsp;  <% // L("lcl_mjb_through") %>
+                    <input type="text"
+                           onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
+                           onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
+                           id="fitness_score1_through"
+                           name="fitness_score1_through"
+                           class="fldflexN  number "
+                           value=""
+                           maxlength="1">
+                  </td>
+                </tr>
+              </table>
+            </td><!-- end column 2 -->
          </tr>
 <%    BLOCK_END();

--- a/APPL/ALG/alg_locatie_search_list.asp
+++ b/APPL/ALG/alg_locatie_search_list.asp
@@ -27,6 +27,8 @@ var dis_key = getQParamInt("districtkey", -1); // District
 var loc_key = getQParamInt("locatiekey", -1); // Locatie
 var loc_code = getQParam("loc_code", ""); // Locatiecode
 var loc_descr = getQParam("loc_descr", ""); // Locatienaam
+var fitness_score1_from = getQParamInt("fitness_score1_from", -1);       // Conditie score van.
+var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.

 locatie_list ( "*",
              {  outputmode: outputmode,
@@ -36,6 +38,8 @@ locatie_list ( "*",
                 loc_key: (loc_key != -1? loc_key : null),
                 loc_code: loc_code,
                 loc_descr: loc_descr,
+                 fitness_score1_from : fitness_score1_from,
+                 fitness_score1_through : fitness_score1_through,
                 noref: (noref != -1? noref : null)
              }
             );
--- a/APPL/ALG/alg_show_gebouw.asp
+++ b/APPL/ALG/alg_show_gebouw.asp
@@ -60,6 +60,7 @@ var werkdagen  = oRs("alg_gebouw_werkdagen").Value;
 var verantw    = oRs("prs_perslid_key_verantw").Value;
 var verantw2    = oRs("prs_perslid_key_verantw2").Value;
 var vervaldatum = oRs("alg_gebouw_vervaldatum").Value;
+var geb_score1 = oRs("alg_gebouw_mjb_score1").value;
 oRs.Close();
 %>

@@ -222,6 +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")
        BLOCK_END();

        generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,
--- a/APPL/ALG/alg_show_locatie.asp
+++ b/APPL/ALG/alg_show_locatie.asp
@@ -40,6 +40,7 @@ var loc_vwtel  = oRs("alg_locatie_verantw_tel").value;
 var loc_x      = oRs("alg_locatie_x").value;
 var loc_y      = oRs("alg_locatie_y").value;
 var loc_mail   = oRs("alg_locatie_email").value;
+var loc_score1 = oRs("alg_locatie_mjb_score1").value;
 var pst_adres  = oRs("alg_locatie_post_adres").value;
 var pst_postc  = oRs("alg_locatie_post_postcode").value;
 var pst_adres  = oRs("alg_locatie_post_adres").value;
@@ -155,6 +156,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")

        BLOCK_END();