6.2.3

vanderbilt-redcap · Nov 22, 2023 · 04814f2 · 04814f2
1 parent e2cd510
commit 04814f2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/Application.php b/Application.php
@@ -304,6 +304,15 @@ public static function log($mssg, $pid = FALSE) {
 		CareerDev::log($mssg, $pid);
 	}
 
+    public static function getBase64($relativeURL) {
+        $relativeURL = preg_replace("/^\//", "", $relativeURL);
+        $filename = __DIR__."/".$relativeURL;
+        if (file_exists($filename)) {
+            return FileManagement::getBase64OfFile($filename, mime_content_type($filename));
+        }
+        return "";
+    }
+
 	public static function getInstitutions($pid = NULL, $searchOnly = TRUE) {
 		return CareerDev::getInstitutions($pid, $searchOnly);
 	}

diff --git a/CareerDev.php b/CareerDev.php
@@ -22,7 +22,7 @@ class CareerDev {
 	public static $passedModule = NULL;
 
 	public static function getVersion() {
-		return "6.2.2";
+		return "6.2.3";
 	}
 
 	public static function getLockFile($pid) {

diff --git a/hooks/surveyHook.php b/hooks/surveyHook.php
@@ -76,9 +76,9 @@
 echo "<script src='".Application::link("js/jquery.sweet-modal.min.js")."&".CareerDev::getVersion()."'></script>\n";
 ?>
 <script>
-const checkedImg = "<?= Application::link("wrangler/checked.png") ?>";
-const uncheckedImg = "<?= Application::link("wrangler/unchecked.png") ?>";
-const omittedImg = "<?= Application::link("wrangler/omitted.png") ?>";
+const checkedImg = "<?= Application::getBase64("wrangler/checked.png") ?>";
+const uncheckedImg = "<?= Application::getBase64("wrangler/unchecked.png") ?>";
+const omittedImg = "<?= Application::getBase64("wrangler/omitted.png") ?>";
 const surveyPrefix = "<?= $prefix ?>";
 
 // in case of multiple surveys
@@ -103,9 +103,9 @@ function getLoadingImageUrlOverride() {
 	$('#publications_wrangler').html(html);
 	$('#publications_wrangler').show();
 	if ($('#surveyinstructions').length > 0) {
-		$('#surveyinstructions').prepend('<img align="right" src="<?= Application::link("img/flight_tracker_logo_small.png") ?>">');
+		$('#surveyinstructions').prepend('<img align="right" src="<?= Application::getBase64("img/flight_tracker_logo_small.png") ?>">');
 	} else {
-		$('#surveytitlelogo').append('<img src="<?= Application::link("img/flight_tracker_logo_small.png") ?>"><br>');
+		$('#surveytitlelogo').append('<img src="<?= Application::getBase64("img/flight_tracker_logo_small.png") ?>"><br>');
 	}
 });
 </script>
@@ -119,7 +119,7 @@ function makeCheckboxes($coll, $img, $divId, $style = "") {
 	$html = "";
 	$html .= "<div id='$divId'$styleFiller>\n";
     $certifyPubURL = Application::link("wrangler/certifyPub.php")."&NOAUTH";
-    $imgURL = Application::link("/wrangler/".$img.".png");
+    $imgURL = Application::getBase64("/wrangler/".$img.".png");
     foreach ($coll->getCitations() as $citationObj) {
         $pmid = $citationObj->getPMID();
         $citationLink = $citationObj->getCitationWithLink(FALSE, TRUE);

diff --git a/js/base.js b/js/base.js
@@ -1124,7 +1124,7 @@ function changeCheckboxValue(ob, url) {
 	const state = $(ob).attr('alt')
 	const pmid = $(ob).parent().attr('id').replace(/^PMID/, "")
 	const recordId = $("[name=record_id]").val()
-	const originatingDiv = $(ob).attr('data-original');
+	// const originatingDiv = $(ob).attr('data-original');
 
 	const params = getUrlVars()
 	const hash = params['s']
@@ -1167,9 +1167,7 @@ function changeCheckboxValue(ob, url) {
 		$(obDiv).show()
 		$('#'+newDiv+'Count').html(parseInt($('#'+newDiv+'Count').html(), 10) + 1)
 	}
-	if (originatingDiv) {
-		$("#"+originatingDiv+"Count").html(parseInt($('#'+originatingDiv+'Count').html(), 10) - 1)
-	} else if (oldDiv) {
+	if (oldDiv) {
 		$("#"+oldDiv+"Count").html(parseInt($('#'+oldDiv+'Count').html(), 10) - 1)
 	}
 	// enqueue();