MAJ

diff --git a/testFlask/mdm.py b/testFlask/mdm.py
index 5fd67d99583af96630d5c9e9f51dd7cb3213344c..bb54b54ff8983622e3c19c672d627a1b603718d3 100755 (executable)
--- a/testFlask/mdm.py
+++ b/testFlask/mdm.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 #!/usr/bin/env python3
 import sys
-sys.path.append('/home/eric/FLASK/eficas.eecj.git/testFlask')
+sys.path.append('/home/eric/FLASK/eficas.eecj.git/testFlask') #TODO : supprimer
 from connectEficas import accasConnecteur
 
 code='Essai'
@@ -38,7 +38,7 @@ app = Flask(__name__)
 
 # configure_uploads(app, catalogs)
 
-app.config['SECRET_KEY']         = 'hard to guess string'
+app.config['SECRET_KEY']         = os.urandom(24)
 app.config['UPLOAD_FOLDER']      = 'data/'
 app.config['THUMBNAIL_FOLDER']   = 'data/thumbnail/'
 app.config['MAX_CONTENT_LENGTH'] = 50 * 1024 * 1024
@@ -46,6 +46,9 @@ app.config['MAX_CONTENT_LENGTH'] = 50 * 1024 * 1024
 ALLOWED_EXTENSIONS = set(['py','comm','txt', 'gif', 'png', 'jpg', 'jpeg', 'bmp', 'rar', 'zip', '7zip', 'doc', 'docx'])
 IGNORED_FILES = set(['.gitignore'])
 
+#TODO: 
+#from fileManagement import *
+
 def allowed_file(filename):
     return '.' in filename and \
         filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS

diff --git a/testFlask/templates/base.html b/testFlask/templates/base.html
index 58569be598df50183138e8c99865b264016c13c8..9e7b4e085756e79cc9a9516248e6cfeea7512300 100644 (file)
--- a/testFlask/templates/base.html
+++ b/testFlask/templates/base.html
@@ -37,7 +37,7 @@
 
     <!-- Bootstrap 4 : Latest compiled and minified CSS -->
     <!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css"> -->
-    <!-- Latest compiled JavaScript -->
+    <!-- Latest compiled bootstrap javaScript -->
     <!-- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script> -->
 
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='jquery.fancytree/dist/skin-bootstrap/ui.fancytree.css') }}">
@@ -47,11 +47,20 @@
     
     <link rel="stylesheet" href="{{ url_for('static', filename= 'css/style.css') }}">
 
+    <!-- jQuery-File-Upload stuff -->
     <!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
     <link rel="stylesheet" href="{{ url_for('static', filename='jQuery-File-Upload/css/jquery.fileupload.css') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='jQuery-File-Upload/css/jquery.fileupload-ui.css') }}">
     <script src={{ url_for('static', filename='jQuery-File-Upload/js/jquery.iframe-transport.js')}}></script>
     <script src={{ url_for('static', filename='jQuery-File-Upload/js/jquery.fileupload.js')}}></script>
+
+
+    <!-- Bootstrap-select stuff -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/css/bootstrap-select.min.css">
+    <!-- Latest compiled and minified JavaScript -->
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/bootstrap-select.min.js"></script>
+    <!-- (Optional) Latest compiled and minified JavaScript translation files -->
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/i18n/defaults-*.min.js"></script>
     
     <meta name="description" content={{description}}>
     <!-- <link rel="shortcut icon" href="../images/favicon-32x32.png"> -->
@@ -157,6 +166,8 @@
 
     {% block file_management %} {% endblock  %}
 
+    {% block available_catalogs %} {% endblock  %}
+
     {% block content %} {% endblock %}
 
   </div> <!-- container-fluid -->

diff --git a/testFlask/templates/commandes_2.html b/testFlask/templates/commandes_2.html
index 258d73a8197ebdde774e4c8d76bdde2d7c9c88a7..4fa42f62a19d2cd93b81153e1ceec19871f50d42 100644 (file)
--- a/testFlask/templates/commandes_2.html
+++ b/testFlask/templates/commandes_2.html
@@ -1,4 +1,4 @@
-{% extends 'file_management.html' %}
+{% extends 'available_catalogs.html' %}
 
 {% block content %}
 

diff --git a/testFlask/templates/main_menu.html b/testFlask/templates/main_menu.html
index 4458abd7ca935445fea5f6aed59c094a8321057e..d80fc019a19db45b7c897e445edb72382276fe7d 100644 (file)
--- a/testFlask/templates/main_menu.html
+++ b/testFlask/templates/main_menu.html
@@ -24,7 +24,9 @@
              <li class="dropdown-item">
 
                <button type="button" class="btn btn-success" data-toggle="modal" data-target="#file_management">File Management</button>
-       
+               <button type="button" class="btn btn-success" data-toggle="modal" data-target="#available_catalogs">Available Catalogs</button>
+               <button type="button" class="btn btn-success" data-toggle="modal" data-target="#user_dataset">User dataset</button>
+               
              </li> <!-- dropdown-item -->
              <li role="presentation" class="divider"></li>
              <li class="dropdown-header">Local Side</li>