Flask calculator

Author: Drishti-jain21

FLASK PROJECTS/FlaskSimpleCalculator/app.py

@@ -1,22 +1,33 @@
-from flask import Flask, render_template, request
-from handle_calculation import calculate
+from flask import Flask, render_template, request, jsonify
+# from handle_calculation import calculate
 
 app = Flask(__name__)
-app.config.from_object(__name__)
 
 
-@app.route('/')
-def welcome():
+@app.route("/")
+def home():
     return render_template('form.html')
 
-@app.route('/result', methods=['POST'])
-def result():
-    operand_1 = request.form.get("operand_1", type=int)
-    operand_2 = request.form.get("operand_2", type=int)
-    operator = request.form.get("operator")
-    result = calculate(operand_1, operand_2, operator)
-    entry = result
-    return render_template('result.html', entry=entry)
+@app.route("/results", methods=['POST','GET'])
+def predict():
+    if request.method == 'POST' and 'operand_1' in request.form and 'operand_2' in request.form and 'operator' in request.form:
+        operand_1 = float(request.form.get('operand_1'))
+        operand_2 = float(request.form.get('operand_2'))
+        operator = request.form.get('operator')
+        if(operand_2 == 0 and operator=='Division'):
+            result='Invalid_operation'
+        elif(operator == 'Addition'):
+            result = operand_1 + operand_2
+        elif(operator == 'Subtraction'):
+            result = operand_1 - operand_2
+        elif(operator == 'Multiplication'):
+            result = operand_1 * operand_2
+        elif(operator == 'Division'):
+            result = operand_1 / operand_2
+        else:
+            result = 'Invalid_Choice'
+    # result = calculate(operand_1, operand_2, operator)
+    return render_template("form.html",prediction_text=str(result))
 
 if __name__ == '__main__':
     app.run(debug=True)

FLASK PROJECTS/FlaskSimpleCalculator/handle_calculation.py

@@ -15,23 +15,23 @@
 			<div class="row">
 			<div class="col-md-4"></div>
 			<div class="col-md-4">
-				<form class="form-horizontal" action={{ url_for('result') }}  method="post">
+				<form class="form-horizontal" action="/results"  method="post">
 					<div class="form-group">
 						<label class="control-label col-xs-3" for="operand_1">OPERAND 1:</label>
 						<div class="col-xs-7">
-							<input type="number" class="form-control" name="operand_1" placeholder="&nbsp;0&nbsp;">
+							<input type="number" class="form-control" name="operand_1" placeholder="&nbsp;0&nbsp;" required="required">
 						</div>
 					</div>
 					<div class="form-group">
 						<label class="control-label col-xs-3" for="operand_1">OPERAND 2:</label>
 						<div class="col-xs-7">
-							<input type="number" class="form-control" name="operand_2" placeholder="&nbsp;0&nbsp;">
+							<input type="number" class="form-control" name="operand_2" placeholder="&nbsp;0&nbsp;" required="required">
 						</div>
 					</div>
 					<div class="form-group">
 						<label class="control-label col-xs-3">OPERATOR:</label>
 						<div class="col-xs-5">
-							<select class="form-control" name="operator">
+							<select class="form-control" name="operator" required="required">
 								<option>Addition</option>
 								<option>Subtraction</option>
 								<option>Multiplication</option>
@@ -46,6 +46,9 @@
 						</div>
 					</div>
 				</form>
+				<br>
+				<br>
+				{{prediction_text}}
 			</div>
 			<div class="col-md-4"></div></div>
 		</div>