Skip to content
Snippets Groups Projects
Commit 31da8fd3 authored by Eugénie Laugier's avatar Eugénie Laugier
Browse files

fix problem

parents c2cf4351 52f40791
No related branches found
No related tags found
No related merge requests found
...@@ -78,6 +78,5 @@ def display_dashboard(): ...@@ -78,6 +78,5 @@ def display_dashboard():
def display_admin(): def display_admin():
return flask.render_template('editBdd.html.jinja2') return flask.render_template('editBdd.html.jinja2')
if __name__ == '__main__': if __name__ == '__main__':
app.run() app.run()
...@@ -49,9 +49,13 @@ ...@@ -49,9 +49,13 @@
<div class="d-flex justify-content-between align-items-center experience"><span class="fw-bold">Current position</span></div> <div class="d-flex justify-content-between align-items-center experience"><span class="fw-bold">Current position</span></div>
<div class="flex-column col-md-6"> <div class="flex-column col-md-6">
<label>Company:</label> <label>Company:</label>
<<<<<<< HEAD
<select name="company_pfe" class="selectpicker border rounded selectCompany" data-live-search="true" data-size="5"> <select name="company_pfe" class="selectpicker border rounded selectCompany" data-live-search="true" data-size="5">
=======
<select name="company" class="selectpicker border rounded selectCompany" data-live-search="true" data-size="5" multiple>
>>>>>>> 52f407919b81674dc53f4b8a9e8517434755129f
{% for organisation in organisations %} {% for organisation in organisations %}
<option >{{organisation.nom_organisation}}</option> <option >{{organisation.nom_organisation}}</option>
{% endfor %} {% endfor %}
...@@ -69,7 +73,11 @@ ...@@ -69,7 +73,11 @@
<div class="col-md-12 mt-3"><label class="labels">Summary</label><input type="text" class="form-control" placeholder="short summary of your internship" name="summary" value=""></div> <div class="col-md-12 mt-3"><label class="labels">Summary</label><input type="text" class="form-control" placeholder="short summary of your internship" name="summary" value=""></div>
<div class="flex-column mt-3"> <div class="flex-column mt-3">
<label>Company:</label> <label>Company:</label>
<<<<<<< HEAD
<select name="company_position" class="selectpicker border rounded selectCompany" data-size="5"> <select name="company_position" class="selectpicker border rounded selectCompany" data-size="5">
=======
<select name="company" class="selectpicker border rounded selectCompany" data-size="5" multiple>
>>>>>>> 52f407919b81674dc53f4b8a9e8517434755129f
{% for organisation in organisations %} {% for organisation in organisations %}
<option >{{organisation.nom_organisation}}</option> <option >{{organisation.nom_organisation}}</option>
{% endfor %} {% endfor %}
...@@ -98,6 +106,7 @@ ...@@ -98,6 +106,7 @@
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<<<<<<< HEAD
<form id="newCompanyForm"> <form id="newCompanyForm">
<div class="mb-3"> <div class="mb-3">
<label for="companyName" class="form-label">Company name</label> <label for="companyName" class="form-label">Company name</label>
...@@ -111,7 +120,11 @@ ...@@ -111,7 +120,11 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
<<<<<<< HEAD
<button type="submit" class="btn btn-primary companyCreate">Save changes</button> <button type="submit" class="btn btn-primary companyCreate">Save changes</button>
=======
<button type="button" class="btn btn-primary">Save changes</button>
>>>>>>> 52f407919b81674dc53f4b8a9e8517434755129f
</div> </div>
</div> </div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment