change export logic

moevm · Dec 22, 2024 · 4b81824 · 4b81824
1 parent 4f4f85a
commit 4b81824
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 33 deletions.
diff --git a/server/static/js/export.js b/server/static/js/export.js
@@ -0,0 +1,26 @@
+let exportButton = document.getElementById('export');
+exportButton.addEventListener('click', exportDB);
+async function exportDB() {
+    await fetch(new URL('/export_db', 'http://localhost:8000').href, {
+                method: "POST",
+                headers: {
+                'Accept': 'application/json',
+                "Content-type": "application/json; charset=UTF-8"
+    }})
+    .then(res => res.json())
+    .then(content => {
+        const jsonString = JSON.stringify(content, null, 2);
+        const blob = new Blob([jsonString], { type: "application/json" });
+
+        const url = URL.createObjectURL(blob);
+        const a = document.createElement("a");
+        a.href = url;
+        a.download = "data.json";
+
+        document.body.appendChild(a);
+        a.click();
+
+        document.body.removeChild(a);
+        URL.revokeObjectURL(url);
+    })
+}
diff --git a/server/static/js/org_table.js b/server/static/js/org_table.js
@@ -1,7 +1,6 @@
 let wDialog = document.getElementById("WDialog");
 const Button = document.getElementById("close");
 const Button1 = document.getElementById("close1");
-const exportButton = document.getElementById('export');
 
 Button.addEventListener('click', () => {
     wDialog.close();
@@ -11,7 +10,6 @@ Button1.addEventListener('click', () => {
     wDialog.close();
 })
 
-exportButton.addEventListener('click', exportToJSON);
 
 async function init() {
     console.log(game_id);
@@ -121,32 +119,6 @@ async function saveUsers(event) {
     })
 }
 
-async function exportToJSON() {
-    await fetch(new URL('/get_list_people', 'http://localhost:8000').href, {
-                method: "GET",
-                headers: {
-                'Accept': 'application/json',
-                "Content-type": "application/json; charset=UTF-8"
-    }})
-    .then(res => res.json())
-    .then(content => {
-        const jsonString = JSON.stringify(content, null, 2);
-        const blob = new Blob([jsonString], { type: "application/json" });
-
-        const url = URL.createObjectURL(blob);
-        const a = document.createElement("a");
-        a.href = url;
-        a.download = "data.json";
-
-        document.body.appendChild(a);
-        a.click();
-
-        document.body.removeChild(a);
-        URL.revokeObjectURL(url);
-    })
-
-
-}
 
 
 init()
diff --git a/server/templates/host.html b/server/templates/host.html
@@ -42,5 +42,6 @@
             </div>
         </div>
         <script src="{{ url_for('static', filename='js/org_table.js') }}"></script>
+        <script  src="{{ url_for('static', filename='js/export.js') }}"></script>
     </body>
 </html>
diff --git a/server/templates/page_org_statictics.html b/server/templates/page_org_statictics.html
@@ -16,7 +16,7 @@
             <div style="width: 525px; justify-content:first baseline; align-items: center; display: flex; flex-direction: column;">
                 <img  src="../static/img/Frame 2.png/">
                 <div class="groupButton">
-                    <button class="buttonP">Экспортировать данные</button>
+                    <button class="buttonP" id="export">Экспортировать данные</button>
                     <button class="buttonPD" disabled>Статистика команды</button>
                     <button class="buttonP" onclick="window.location.href=`/host/${game_id}`">Данные об игроках</button>
                 </div>
@@ -32,5 +32,6 @@
             </div>
         </div>
         <script src="{{ url_for('static', filename='js/org_page.js') }}"></script>
+        <script  src="{{ url_for('static', filename='js/export.js') }}"></script>
     </body>
 </html>
diff --git a/server/templates/player_page.html b/server/templates/player_page.html
@@ -12,7 +12,7 @@
             <div style="width: 525px; justify-content:first baseline; align-items: center; display: flex; flex-direction: column;">
                 <img  src="../static/img/Frame 2.png/">
                 <div class="groupButton">
-                    <button class="buttonP">Экспортировать данные</button>
+                    <button class="buttonP" id="export">Экспортировать данные</button>
                     <button class="buttonP" onclick="window.location.href='/profile'">Анкета</button>
                     <button class="buttonP" onclick="window.location.href='/status'">Текущее состояние</button>
                 </div>
@@ -22,5 +22,6 @@
             </div>
         </div>
         <script src="{{ url_for('static', filename='js/player_page.js') }}"></script>
+        <script  src="{{ url_for('static', filename='js/export.js') }}"></script>
     </body>
 </html>
diff --git a/server/templates/profile.html b/server/templates/profile.html
@@ -12,7 +12,7 @@
             <div style="width: 525px; justify-content:first baseline; align-items: center; display: flex; flex-direction: column;">
                 <img  src="../static/img/Frame 2.png/">
                 <div class="groupButton">
-                    <button class="buttonP">Экспортировать данные</button>
+                    <button class="buttonP" id="export">Экспортировать данные</button>
                     <button class="buttonPD" disabled>Анкета</button>
                     <button class="buttonP" onclick="window.location.href='/status'">Текущее состояние</button>
                 </div>
@@ -35,5 +35,6 @@
                 </form>
             </div>
         </div>
+        <script  src="{{ url_for('static', filename='js/export.js') }}"></script>
     </body>
 </html>
diff --git a/server/templates/status.html b/server/templates/status.html
@@ -12,7 +12,7 @@
             <div style="width: 525px; justify-content:space-between; align-items: center; display: flex; flex-direction: column;">
                 <img  src="../static/img/Frame 2.png/">
                 <div class="groupButton">
-                    <button class="buttonP">Экспортировать данные</button>
+                    <button class="buttonP" id="export">Экспортировать данные</button>
                     <button class="buttonP" onclick="window.location.href='/profile'">Анкета</button>
                     <button class="buttonPD" disabled>Текущее состояние</button>
                     <button class="confirm">Подтвердить получение подарка</button>
@@ -76,5 +76,6 @@
             </div>
         </div>
         <script src="{{ url_for('static', filename='js/player_page.js') }}"></script>
+        <script  src="{{ url_for('static', filename='js/export.js') }}"></script>
     </body>
 </html>
diff --git a/server/web_server.py b/server/web_server.py
@@ -280,7 +280,7 @@ def get_actions_statistics():
     #запрос на получение всех событий
     actions = []
     # actions = [{'player_id': 2, 'type': 2, 'date': datetime.datetime(2024, 11, 21, 0, 0)},
-    #            {'player_id': 1, 'type': 1, 'date': datetime.datetime(2024, 12, 12, 0, 0)}]
+    #             {'player_id': 1, 'type': 1, 'date': datetime.datetime(2024, 12, 12, 0, 0)}]
     for action in actions:
         statistics[action['type']] += 1
     return statistics
@@ -530,6 +530,8 @@ def export_db():
     # вместо filename - название файла для экспорта. если всё норм, то export_db вернёт True
     if not db.export_db("filename"):
         export_status = 500
+    # в return можно прокинуть данные как словарик (пример ниже) и они сохранятся в json
+    # return {'abc': 'abc', 'dfd': 5, 'dsas': 6}
     return app.response_class(status=export_status)
 
 # @app.route('/import_db', methods=['POST'])
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,5 +42,6 @@ @@
                 </div>
             </div>
             <script src="{{ url_for('static', filename='js/org_table.js') }}"></script>
+            <script  src="{{ url_for('static', filename='js/export.js') }}"></script>
         </body>
     </html>