Skip to content

Commit 874ec18

Browse files
Fix requirement checking after merge
1 parent cac1f4e commit 874ec18

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

app/javascript/packs/myjs.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ function checkMissingReqs() {
153153
}
154154
}
155155
if (reqsMissing == 0) {
156-
$("#requirments").html("Requirements Met!");
156+
$("#requirements").html("Requirements Met!");
157157
} else {
158-
$("#requirments").html("Requirments missing: " + reqsMissing);
158+
$("#requirements").html("Requirements missing: " + reqsMissing);
159159
}
160160
}
161161

@@ -200,7 +200,6 @@ window.dragFromPlan = function(event){
200200
draggedPlanOrigin = event.target;
201201
draggedCatOrigin = null;
202202
draggedPlanOrigin = event.target;
203-
checkMissingReqs();
204203
}
205204

206205
// indicate valid drop when hovering over plan
@@ -321,7 +320,8 @@ window.dropInTrash = function(event){
321320
$("#hrsFuture").html("Remaining Hours: " + currPlan.hrsFuture);
322321
$("#hrsTotal").html("Total Hours Planned: " + currPlan.hrsTotal);
323322

324-
addToRequirements(draggedCourse.designator);
323+
addToRequirements(draggedCourse.designator);
324+
checkMissingReqs();
325325
}
326326
draggedCourse = null;
327327
}

app/views/plans/show.html.erb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@
4747
<header class="panelHeader">Hours</header> <div class="container">
4848
<p id="hrsCompleted">Hours Completed: </p>
4949
<p id="hrsCurrent">Current Hours: </p>
50-
<p id="hrsFuture">Remaining Hours: </p>
50+
<p id="hrsFuture">Remaining Hours: </p>
5151
<p id="hrsTotal">Total Hours Planned: </p>
52+
<p id="requirements">Requirements </p>
5253
</div>
5354
</div>
5455

0 commit comments

Comments
 (0)