diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java index 0e870a5..da786bb 100644 --- a/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java +++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java @@ -63,6 +63,10 @@ public class MainViewController private Main main; + private final int ectsThesis = 12; + + private final int ectsColloquium = 3; + /** * TODO Add method comment here * @@ -141,6 +145,10 @@ public class MainViewController gradeTable.getItems().addListener(( Change<? extends Grade> change) -> calculateEctsAndAverageGrade()); + thesisComboBox.valueProperty() + .addListener((change) -> calculateEctsAndAverageGrade()); + colloquiumComboBox.valueProperty() + .addListener((change) -> calculateEctsAndAverageGrade()); } /** @@ -309,6 +317,18 @@ public class MainViewController grade.getGrade().multiply(new BigDecimal(grade.getEcts()))); } } + if (thesisComboBox.getValue().compareTo(BigDecimal.ZERO) != 0) + { + sumEcts += ectsThesis; + gradesSumWeighted = gradesSumWeighted.add(thesisComboBox.getValue() + .multiply(new BigDecimal(ectsThesis))); + } + if (colloquiumComboBox.getValue().compareTo(BigDecimal.ZERO) != 0) + { + sumEcts += ectsColloquium; + gradesSumWeighted = gradesSumWeighted.add(colloquiumComboBox + .getValue().multiply(new BigDecimal(ectsColloquium))); + } if (sumEcts > 0) { ectsSumLabel.setText(String.valueOf(sumEcts)); |