Fix the ChangeACE edit form to not remove the text from locked outcomes and reinforcements.

application/modules/courses/views/scripts/view/change-ace.phtml

@@ -6,54 +6,50 @@ $currentAceOutcomes = $this->course->getAceOutcomes();
 $currentAceReinforcements = $this->course->getAceReinforcements();
 
 
-foreach ($previousAceOutcomes as &$previousAceOutcome) {
-	$previousAceOutcome['state'] = 'deleted';
+foreach ($previousAceOutcomes as $index => $previousAceOutcome) {
+	$previousAceOutcomes[$index]['state'] = 'deleted';
 	foreach ($currentAceOutcomes as $currentAceOutcome) {
-		if ($previousAceOutcome['slo'] == $currentAceOutcome['slo']) {
-			$previousAceOutcome['state'] = 'changed';
-            $previousAceOutcome['justification'] = $this->HtmlDiff($previousAceOutcome['justification'], $currentAceOutcome['justification']);
-            $previousAceOutcome['studentWork'] =   $this->HtmlDiff($previousAceOutcome['studentWork'],   $currentAceOutcome['studentWork']);
-            $previousAceOutcome['assesmentPlan'] = $this->HtmlDiff($previousAceOutcome['assesmentPlan'], $currentAceOutcome['assesmentPlan']);
+		if ($previousAceOutcomes[$index]['slo'] == $currentAceOutcome['slo']) {
+			$previousAceOutcomes[$index]['state'] = 'changed';
+            $previousAceOutcomes[$index]['justification'] = $this->HtmlDiff($previousAceOutcome['justification'], $currentAceOutcome['justification']);
+            $previousAceOutcomes[$index]['studentWork'] =   $this->HtmlDiff($previousAceOutcome['studentWork'],   $currentAceOutcome['studentWork']);
+            $previousAceOutcomes[$index]['assesmentPlan'] = $this->HtmlDiff($previousAceOutcome['assesmentPlan'], $currentAceOutcome['assesmentPlan']);
 		} 
 	}
 }
-unset($previousAceOutcome);
 
-foreach ($currentAceOutcomes as &$currentAceOutcome) {
-	$currentAceOutcome['state'] = 'new';
+foreach ($currentAceOutcomes as $index => $currentAceOutcome) {
+	$currentAceOutcomes[$index]['state'] = 'new';
 	foreach ($previousAceOutcomes as $previousAceOutcome) {
-		if ($currentAceOutcome['slo'] == $previousAceOutcome['slo']) {
-			$currentAceOutcome['state'] = 'changed';
-            $currentAceOutcome['justification'] = $previousAceOutcome['justification'];
-            $currentAceOutcome['studentWork'] =   $previousAceOutcome['studentWork'];
-            $currentAceOutcome['assesmentPlan'] = $previousAceOutcome['assesmentPlan'];
+		if ($currentAceOutcomes[$index]['slo'] == $previousAceOutcome['slo']) {
+			$currentAceOutcomes[$index]['state'] = 'changed';
+            $currentAceOutcomes[$index]['justification'] = $previousAceOutcome['justification'];
+            $currentAceOutcomes[$index]['studentWork'] =   $previousAceOutcome['studentWork'];
+            $currentAceOutcomes[$index]['assesmentPlan'] = $previousAceOutcome['assesmentPlan'];
         }
 	}
 }
-unset($currentAceOutcome);
 
-foreach ($previousAceReinforcements as &$previousAceReinforcement) {
-    $previousAceReinforcement['state'] = 'deleted';
+foreach ($previousAceReinforcements as $index => $previousAceReinforcement) {
+    $previousAceReinforcements[$index]['state'] = 'deleted';
     foreach ($currentAceReinforcements as $currentAceReinforcement) {
-        if ($previousAceReinforcement['name'] == $currentAceReinforcement['name']) {
-            $previousAceReinforcement['state'] = 'changed';
-            $previousAceReinforcement['description'] = $this->HtmlDiff($previousAceReinforcement['description'], $currentAceReinforcement['description']);
+        if ($previousAceReinforcements[$index]['name'] == $currentAceReinforcement['name']) {
+            $previousAceReinforcements[$index]['state'] = 'changed';
+            $previousAceReinforcements[$index]['description'] = $this->HtmlDiff($previousAceReinforcement['description'], $currentAceReinforcement['description']);
         }
     }
 }
-unset($previousAceReinforcement);
 
 
-foreach ($currentAceReinforcements as &$currentAceReinforcement) {
-    $currentAceReinforcement['state'] = 'new';
+foreach ($currentAceReinforcements as $index => $currentAceReinforcement) {
+    $currentAceReinforcements[$index]['state'] = 'new';
     foreach ($previousAceReinforcements as $previousAceReinforcement) {
-        if ($currentAceReinforcement['name'] == $previousAceReinforcement['name']) {
-            $currentAceReinforcement['state'] = 'changed';
-            $currentAceReinforcement['description'] = $previousAceReinforcement['description'];
+        if ($currentAceReinforcements[$index]['name'] == $previousAceReinforcement['name']) {
+            $currentAceReinforcements[$index]['state'] = 'changed';
+            $currentAceReinforcements[$index]['description'] = $previousAceReinforcement['description'];
         }
     }
 }
-unset($currentAceReinforcement);
 
 
 

document_root/javascript/courses/edit.js

@@ -9,18 +9,20 @@ $(document).ready(function() {
 
     if (document.getElementById('aceOutcomeList')) {
         var outcomesChecked = 0;
-        var aceOutcomeItems = document.getElementById('aceOutcomeList').getElementsByTagName('input');
-        for (var i = 0; i < aceOutcomeItems.length; i++) {
-            aceOutcomeItems[i].onchange = handleOutcomeToggled;
-            aceOutcomeItems[i].onclick = handleOutcomeClicked;
-            if (aceOutcomeItems[i].checked) {
+
+    	WDN.jQuery('#aceOutcomeList input[type=checkbox]').each(function(index) {
+    		WDN.jQuery(this).change(handleOutcomeToggled);
+    		WDN.jQuery(this).click(handleOutcomeClicked);
+    		if (this.checked) {
     			outcomesChecked++;
     		}
-        }
+    	});
+    	
     	if (outcomesChecked >= 2) {
-            for (var i = 0; i < aceOutcomeItems.length; i++) {
-                aceOutcomeItems[i].disabled = !aceOutcomeItems[i].checked;
-            }
+    		WDN.jQuery('#aceOutcomeList input[type=checkbox]').each(function(index) {
+    			this.disabled = !this.checked;
+    			console.log(this.type);
+    		});
     	}
     }
 
@@ -646,13 +648,13 @@ function handleReinforcementClicked()
 
 function handleOutcomeToggled()
 {
-    var aceOutcomeItems = document.getElementById('aceOutcomeList').getElementsByTagName('input');
+    var aceOutcomeItems = WDN.jQuery('#aceOutcomeList input[type=checkbox]');
     enforceMaximumSelectionCount(aceOutcomeItems, this, 2, true);
 }
 
 function handleReinforcementToggled()
 {
-    var aceReinforcementItems = document.getElementById('aceReinforcementList').getElementsByTagName('input');
+    var aceReinforcementItems = WDN.jQuery('#aceReinforcementList input[type=checkbox]');
     enforceMaximumSelectionCount(aceReinforcementItems, this, 100, true);
 }