ASXX#53708 S(mld_rejected_is _open) functioneel werkend gemaakt en rechten voor wijzigen velden in afgewezen en S(mld_rejected_is _open) = 1 mode gelijk gesteld aan status = 2 (nieuw)

svn path=/Website/trunk/; revision=38953
2018-08-27 09:13:49 +00:00
parent b59981ea83
commit 5302a37b85
5 changed files with 52 additions and 18 deletions
--- a/APPL/MLD/mld.inc
+++ b/APPL/MLD/mld.inc
@@ -3558,7 +3558,7 @@ mld = {setmeldingstatus:
                               mresult.canUnlink       = mresult.canWrite("WEB_MLDFOF");
                               break;
                       case 1: // Afgewezen
-                               mresult.canUnlink       = mresult.canWrite("WEB_MLDFOF") && S("mld_rejected_is_open") == 1;
+                               mresult.canUnlink       = (S("mld_rejected_is_open") == 1 && mresult.canWrite("WEB_MLDFOF"));
                               break;
                       case 2: // Ingevoerd ('nieuw'), bo heeft er nog niet naar omgezien
                               mresult.canUnlink       = mresult.canWrite("WEB_MLDFOF");
@@ -3607,21 +3607,24 @@ mld = {setmeldingstatus:
                               mresult.canAddOpdr      = mresult.canWrite("WEB_ORDBOF");
                               break;
                       case 1: // Afgewezen
-                               mresult.canChange       = (mresult.canWrite("WEB_MLDFOF") && S("mld_rejected_is_open") == 1);
+                               mresult.canChange       = (S("mld_rejected_is_open") == 1 && mresult.canWrite("WEB_MLDFOF"));
                               mresult.canChangeUrole  = 'fo';
-                               mresult.canAccept       = (((mresult.canWrite("WEB_MLDBOF") && !activeMLDBO3) || mresult.canWrite("WEB_MLDBO3")) && !is_planned_action) && S("mld_rejected_is_open");
                               mresult.canContinue     = (mresult.canWrite("WEB_MLDFOF") || mresult.canWrite("WEB_MLDBOF")) && mresult_no_disc.canWrite("WEB_MLDFOF") && !is_planned_action && !S("mld_disable_continuation"); //mldfof_write;
                               mresult.canVakgChange   = mresult.canWrite("WEB_MLDFOF");
                               mresult.canStdmChange   = !is_wf_root;
-                               mresult.canKostChange   = (mresult.canWrite("WEB_MLDBOF") || mresult.canWrite("WEB_MLDBO3") || mresult.canFEwrite);
+                               mresult.canKostChange   = ((S("mld_rejected_is_open") == 1 && mresult.canWrite("WEB_MLDFOF")) || mresult.canWrite("WEB_MLDBOF") || mresult.canWrite("WEB_MLDBO3") || mresult.canFEwrite);
                               mresult.canFlexChange   = true;
                               mresult.canPlaatsChange = true;
                               mresult.canAflChange    = true;
+                               mresult.canPersChange   = (S("mld_rejected_is_open") == 1 && mresult.canWrite("WEB_MLDFOF"));
                               // Alleen FO kan melding aanpassen. FE toevoegen voor canPrioChange heeft geen zin.
                               mresult.canPrioChange   = (planbaar == 0 && mresult.canWrite("WEB_MLDFOF"));
                               mresult.canOmsChange    = mresult.canWrite("WEB_MLDFOF");
                               mresult.canAfhandChange = mresult.canWrite("WEB_MLDFOF");
                               mresult.canWriteDatums  = mresult.canWrite("WEB_MLDFOF");
+                               mresult.canSLAChange    = S("mld_rejected_is_open") == 1 &&
+                                                         ((S("mld_sla_indult_for_mldafr_only") == 0 && mresult.canWrite("WEB_MLDBOF")) ||
+                                                          (S("mld_sla_indult_for_mldafr_only") == 1 && mresult.canWrite("WEB_MLDAFR")));
                               break;
                       case 2: // Ingevoerd ('nieuw'), bo heeft er nog niet naar omgezien
                               mresult.canChange       = mresult.canWrite("WEB_MLDFOF") || mresult.canFEwrite;
--- a/APPL/MLD/mld_edit_melding.asp
+++ b/APPL/MLD/mld_edit_melding.asp
@@ -1241,7 +1241,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");

        var oms_readonly = !(this_mld.canOmsChange || mld_key < 0) || txtreado;
        if (S("mld_omschrijving_restrict_edit") == 1)
-            oms_readonly = oms_readonly || !(mld_melding.mld_status == 2 || mld_melding.mld_status == 3 || mld_melding.mld_status == -1);
+            oms_readonly = oms_readonly || !((S("mld_rejected_is_open") == 1 && mld_melding.mld_status == 1) || mld_melding.mld_status == 2 || mld_melding.mld_status == 3 || mld_melding.mld_status == -1);

        // Short subject
        if ((mld_melding.subject != 0) && !(oms_readonly && !mld_melding.mld_onderwerp))
--- a/APPL/MLD/mld_edit_melding_save.asp
+++ b/APPL/MLD/mld_edit_melding_save.asp
@@ -225,16 +225,19 @@ if (savemode)
  var directNaarFO = oRs("mld_directklaar").Value == 2;
  oRs.Close();

-  var old_ref_key = -1;
+  var old_ref_key     = -1;
+  var old_mld_status  = -1;
  if (mld_key > 0)
  {
    var sql_m = "SELECT m.mld_melding_kto_key"
              + "     , m.mld_melding_spoed"
+              + "     , m.mld_melding_status"
              + "  FROM mld_melding m"
              + " WHERE m.mld_melding_key = " + mld_key;
-    var oRs_m = Oracle.Execute(sql_m);
-    old_ref_key = oRs_m("mld_melding_kto_key").Value;
-    var old_prio = oRs_m("mld_melding_spoed").Value;
+    var oRs_m       = Oracle.Execute(sql_m);
+    old_ref_key     = oRs_m("mld_melding_kto_key").Value;
+    old_mld_status  = oRs_m("mld_melding_status").Value;
+    var old_prio    = oRs_m("mld_melding_spoed").Value;
    oRs_m.Close();
  }

@@ -473,7 +476,7 @@ if (savemode)
      mld.trackbehandelaar2(mld_key, sBehandel2_key);
    }

-    if (S("mld_rejected_is_open") && mldUpd.oldjsvals["mld_melding_status"] == 1) {
+    if (S("mld_rejected_is_open") && old_mld_status == 1) {
      // Aanpassen van een afgewezen melding werpt die weer opnieuw de molen in.
      mld.setmeldingstatus(mld_key, 2);
    }
--- a/APPL/MLD/mld_edit_note.inc
+++ b/APPL/MLD/mld_edit_note.inc
@@ -13,6 +13,8 @@
 function note_save(mld_key, note, params)
 {
    var mld_info = mld.mld_melding_info(mld_key);
+    var result = {};
+
    lcl.set_dialect(mld_info.srtdisc, "MLD_SRTDISCIPLINE_KEY");

    var mfe = mld.func_enabled_melding (mld_key);
@@ -155,11 +157,21 @@ function note_save(mld_key, note, params)
                          + ", mld.mldsprintf(" + safe.quoted_sql(oms) + ", " + mld_key + ")"
                          + ", NULL, NULL, NULL, NULL, 2, NULL); END;");
        }
+
+        if (S("mld_rejected_is_open") && mld_info.mld_status == 1)
+        {
+          // Aanpassen van een afgewezen melding werpt die weer opnieuw de molen in.
+          mld.setmeldingstatus(mld_key, 2);
+
+          result.verynewnote = true;
+        }
    }
-    return { "mld_key"  : mld_key,
-             "note_key" : note_key || params.note_key,
-             "canAccept": mfe.canAccept
-           };
+
+    result.mld_key    = mld_key;
+    result.note_key   = note_key || params.note_key;
+    result.canAccept  = mfe.canAccept;
+
+    return result;
 }

 function note_recently_changed(mld_key, lastdate)
--- a/APPL/MLD/mld_show_note2.asp
+++ b/APPL/MLD/mld_show_note2.asp
@@ -104,7 +104,17 @@ if (mld_key > 0)
          {
              window.noteediting = false;
          }
-          if (json.canAccept && window.parent.mldFrame.mld_accept)
+          if (json.verynewnote)
+          {
+              window.parent.mldFrame.FcltMgr.reload();
+              window.FcltMgr.reload({ "appendurl": "verynewnote=1" });
+              return;
+          }
+          promptAccept(json.canAccept);
+      }
+      function promptAccept(canAccept)
+      {
+          if (canAccept && window.parent.mldFrame.mld_accept)
          {
              FcltMgr.confirm(L("lcl_mld_accept_3"),
                  {
@@ -182,6 +192,12 @@ if (mld_key > 0)
          {
 %>
            window.parent.mldFrame.mld_accept("<%=stdm_info.doublecheck%>", 1);
+<%
+          }
+          if (getQParamInt("verynewnote",0)==1)
+          {
+%>
+            promptAccept(<%=(mfe.canAccept ? 1 : 0)%>);
 <%
          }
 %>
@@ -268,7 +284,7 @@ if (mld_key > 0)
        }

        var init          = 0;
-        var hasTracking  = <%=(((S("mld_merge_notes_and_tracking") & 1 || S("mld_merge_notes_and_tracking") & 2) && tracking) ? 1 : 0)%>;
+        var hasTracking   = <%=(((S("mld_merge_notes_and_tracking") & 1 || S("mld_merge_notes_and_tracking") & 2) && tracking) ? 1 : 0)%>;
        var hasNoteToggle = $("span.notetoggler").length ? 1 : 0;
        if (hasTracking || hasNoteToggle) // Anders valt er niets te togglen
        {
@@ -276,7 +292,7 @@ if (mld_key > 0)

            0: Geen extra details
            1: laat tracking notes zien indien tracking = 1
-            2: laat [... meer] zien
+            2: klap alle [... meer] uit

            */
            var detailLevel    = 0;
@@ -602,7 +618,7 @@ if (mld_key > 0)
        {
 %>
            <tr><td colspan='2'><div class='mldhandlinghead'><%=L("lcl_mld_note_new")%>:
-<%  if (afgehandeld) { %> <span class='hot'> <%=L("lcl_mld_edit_note_completed")%></span> <% } %>
+<%  if (afgehandeld && S("mld_rejected_is_open") == 0) { %> <span class='hot'> <%=L("lcl_mld_edit_note_completed")%></span> <% } %>
            <span class='mldgotop details' onclick='if (parent) parent.scrollTo(0,0)'>^Top</span></div></td></tr>
 <%
        }