Bug fix and cleanup

Remove unused files Fix issue with "Save & Stay" then "Save & Exit"
lsgs · Aug 25, 2024 · 8469aa4 · 8469aa4
1 parent b7c345c
commit 8469aa4
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 69 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/EM.code-workspace b/EM.code-workspace
diff --git a/InstanceTable.php b/InstanceTable.php
@@ -195,7 +195,7 @@ protected function setTaggedFields() {
                                         $recordData = REDCap::getData('array', $this->record, $matches[1], $this->event_id, null, false, false, false, null, false); // export raw
                                         $join_val  = $recordData[1]['repeat_instances'][$this->event_id][$this->instrument][$this->repeat_instance][$matches[1]];
                                         if (preg_match("/".self::ACTION_TAG_DST."='?((\w+_arm_\d+[a-z]?:)?\w+)'?\s?/", $fieldDetails['field_annotation'], $matches)) {
-                                               $filter  = "[" . $matches[1] ."]='" .$join_val."'";
+                                               $filter  = $this->escape("[" . $matches[1] ."]='" .$join_val."'");
                                         }
                                 }
 
@@ -891,6 +891,16 @@ protected function popupViewTweaks() {
                 window.opener.refreshTables();
                 dataEntrySubmit(this);
             });
+        $('#submit-btn-savecontinue') // Save & Stay - preserve &extmod_instance_table=1 in url when reload 
+            .attr('name', 'submit-btn-savecontinue')
+            .removeAttr('onclick')
+            .click(function(event) {
+                var redirectUrl = window.location.href.replace('&extmod_instance_table_add_new=1','');
+                event.preventDefault();
+                window.opener.refreshTables();
+                dataEntrySubmit(this);
+                window.setTimeout($.redirectUrl, 500, redirectUrl);
+            });
         $('#submit-btn-savenextinstance')// Save & Next Instance (not necessarily a new instance)
             .attr('name', 'submit-btn-savenextinstance')
             .removeAttr('onclick')
@@ -908,14 +918,14 @@ protected function popupViewTweaks() {
                 window.opener.refreshTables();
                 window.close();
             });
-                    <?php
-                    if ( isset($_GET['extmod_instance_table_add_new'])) {
-                    ?>
-            $('button[name=submit-btn-deleteform]').css("display", "none");
-                    <?php
-                    } else {
-                    ?>
-            $('button[name=submit-btn-deleteform]')
+            <?php
+            if ( isset($_GET['extmod_instance_table_add_new'])) {
+            ?>
+        $('button[name=submit-btn-deleteform]').css("display", "none");
+            <?php
+            } else {
+            ?>
+        $('button[name=submit-btn-deleteform]')
             .removeAttr('onclick')
             .click(function(event) {
                 $('#form').append('<input type="hidden" name="extmod_closerec_home" value="<?=$record?>">');
@@ -932,19 +942,19 @@ function(){
                 );
                 return false;
             });
-                    <?php
-                    }
-                    if (isset($_GET['__reqmsg'])) {
-                    ?>
-                setTimeout(function() {
+            <?php
+            }
+            if (isset($_GET['__reqmsg'])) {
+            ?>
+            setTimeout(function() {
                     $('div[aria-describedby="reqPopup"]').find('div.ui-dialog-buttonpane').find('button').not(':last').hide(); // .css('visibility', 'visible'); // required fields message show only "OK" button, not ignore & leave
                 }, 100);
-                    <?php
+            <?php
             }
-                    ?>
+            ?>
     });
 </script>
-                <?php
+            <?php
         }
 
         /**