diff --git a/Frontend/main.py b/Frontend/main.py index 4d08a99cd7ca6981644da18fb1be8c3c02e64cfc..7268d1502e1cb127408dc5f78e020870f9a8e2c5 100644 --- a/Frontend/main.py +++ b/Frontend/main.py @@ -87,14 +87,9 @@ def case_id(filename): #temporary choice of cases until I figure out where the actual function from backend is. #give the list here in selection using functions from selection = elog.get_active_cases(filename) - previewid = request.args.get("selectpreview") - while request.args.get("selectpreview")!= None: - print(previewid) - previewid = request.args.get("selectpreview") - break - - preview = "../static/fish.jpg" + + # preview = "../static/fish.jpg" if previewid != None: result = int(previewid) @@ -104,21 +99,14 @@ def case_id(filename): print(rec) petrinet.decorate_petri_net(result, filename) - preview = os.path.join(app.config['STATIC_FOLDER'], 'preview_net.png') + # preview = os.path.join(app.config['STATIC_FOLDER'], 'preview_net.png') + # print(preview) else: print("else") - preview = "../static/fish.jpg" + # preview = "../static/fish.jpg" - ''' - if previewid == '1': - preview = os.path.join(app.config['STATIC_FOLDER'], 'fish.jpg') - elif previewid == '2': - preview = os.path.join(app.config['STATIC_FOLDER'], 'fish.jpg') - else: - preview = os.path.join(app.config['STATIC_FOLDER'], 'moyai.jpg') - ''' - - return render_template('case.html', selection=selection, preview=preview, filename=filename) + + return render_template('case.html', selection=selection, filename=filename) """ Route for sending the case id towards recommendation. This is linked to the 'Optimize now' button in the case ID page. @@ -142,7 +130,7 @@ def recommendation(result, filename): rec = int(rec) petrinet.decorate_petri_net_with_rec(result, rec, filename) - # time.sleep(15) + return render_template('result.html') """ diff --git a/Frontend/static/net.png b/Frontend/static/net.png index 4cf1306829b32d53e94e122f8c00e9baeace56a2..550fd2040f4fd2817d695bee882869302433c437 100644 Binary files a/Frontend/static/net.png and b/Frontend/static/net.png differ diff --git a/Frontend/static/preview_net.png b/Frontend/static/preview_net.png new file mode 100644 index 0000000000000000000000000000000000000000..a6eb889ac18405bf2c7ee6f0c823c01236d2dd9c Binary files /dev/null and b/Frontend/static/preview_net.png differ diff --git a/Frontend/templates/case.html b/Frontend/templates/case.html index f2e3f9be171c8a6e6766b2f77657fef6bc5b008c..a8081e3a249f732fadd4124f87542510c7285209 100644 --- a/Frontend/templates/case.html +++ b/Frontend/templates/case.html @@ -27,7 +27,7 @@ Preview it before optimizing! <!--The preview functionality. The dropdown menu is separate to avoid mixing the http requests between both button because I have skill issue and am incapable of coding this cleanly.--> <form id="previewCase" method="get" name="previewCase"> - <select name="selectpreview" id="selectcaseid" method="get" form="selectcaseid"> + <select name="selectpreview" id="previewCase" method="get" form="previewCase"> {% for id in selection %} <!--Dropdown selection--> <option value= "{{id}}"> {{id}} </option> @@ -36,7 +36,8 @@ <div style = "text-align: center;"> <!--The preview image--> - <img src="{{ preview }}"> + <img src="\static\preview_net.png" alt="Placeholder"> <br> + </div> <div style = "text-align: center;"> diff --git a/backend/__pycache__/dqn.cpython-311.pyc b/backend/__pycache__/dqn.cpython-311.pyc index 089a4e571840d4c9f139aef698c98bca7df52cbe..756a53987c966842d68a11df8eaf8d326555be0d 100644 Binary files a/backend/__pycache__/dqn.cpython-311.pyc and b/backend/__pycache__/dqn.cpython-311.pyc differ diff --git a/backend/__pycache__/eventlog.cpython-311.pyc b/backend/__pycache__/eventlog.cpython-311.pyc index 2d6febe6e8636c9f95540538da385a20b838660e..09275f638419c967b066a928ff3a03ec732b1479 100644 Binary files a/backend/__pycache__/eventlog.cpython-311.pyc and b/backend/__pycache__/eventlog.cpython-311.pyc differ diff --git a/backend/__pycache__/petrinet.cpython-311.pyc b/backend/__pycache__/petrinet.cpython-311.pyc index 4e816769a074371c0b68ac0602573f0181a57fef..14a2178dbda105be96a999effa8757bc2b1eafd4 100644 Binary files a/backend/__pycache__/petrinet.cpython-311.pyc and b/backend/__pycache__/petrinet.cpython-311.pyc differ diff --git a/backend/petrinet.py b/backend/petrinet.py index c1f71d5e6eee6eb32f8a6f10ea36854f760485e0..90b48424b740df9d42ff480407778faa7d27eb08 100644 --- a/backend/petrinet.py +++ b/backend/petrinet.py @@ -62,7 +62,7 @@ def decorate_petri_net(case, name): decoration[t].update({"label":t.label}) - pm4py.view_petri_net(net, initial_marking, final_marking, decorations = decoration) + # pm4py.view_petri_net(net, initial_marking, final_marking, decorations = decoration) pm4py.save_vis_petri_net(net, initial_marking, final_marking, decorations = decoration, file_path = r"static\preview_net.png") def decorate_petri_net_with_rec(case, rec, name):