diff --git a/src/service/calculation_service.py b/src/service/calculation_service.py index 4b3e905..c8e4576 100644 --- a/src/service/calculation_service.py +++ b/src/service/calculation_service.py @@ -1,6 +1,7 @@ """Module for the CalculationService class""" from tkinter import StringVar import divide_service as divide_service +import multiply_service as multiply_service class CalculationService: @@ -29,10 +30,13 @@ def equalpress(self): try: # evaluate the expression/calculation - if "/" not in self.expression: - total = str(eval(self.expression)) - else: + if "/" in self.expression: total = str(divide_service.divide(self.expression)) + if "*" in self.expression: + total = str(multiply_service.multiply(self.expression)) + else: + total = str(eval(self.expression)) + if float(total) > 10: total = total + " <:o)" diff --git a/src/service/multiply_service.py b/src/service/multiply_service.py new file mode 100644 index 0000000..bea6a94 --- /dev/null +++ b/src/service/multiply_service.py @@ -0,0 +1,4 @@ +def multiply(string): + arguments = string.split("*") + result = int(arguments[0]) * int(arguments[1]) + return result