From 1c33775f920365f5b17795a9cdb7cf9665fad984 Mon Sep 17 00:00:00 2001
From: Alex Danamir <alexandr.salny@yandex.ru>
Date: Wed, 22 May 2024 15:58:16 +0300
Subject: [PATCH] fixed table

---
 app.py                     |   2 +-
 static/css/index.css       |  65 +++++++++---------
 templates/searchonaud.html | 132 +++++++++++++++++++------------------
 3 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/app.py b/app.py
index 79f99ba..0c5ef9f 100644
--- a/app.py
+++ b/app.py
@@ -16,7 +16,7 @@ from xlutils.copy import copy
 
 app = Flask(__name__)
 
-app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///PRODproject.db"
+app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///project.db"
 app.jinja_env.auto_reload = True
 app.config['TEMPLATES_AUTO_RELOAD'] = True
 
diff --git a/static/css/index.css b/static/css/index.css
index 9a5b0ea..c445320 100644
--- a/static/css/index.css
+++ b/static/css/index.css
@@ -8,7 +8,7 @@ body {
     min-width: 580px;
 }
 
-.row{
+.row {
 
 
     text-align: center;
@@ -24,7 +24,7 @@ body {
 header {
 
     text-align: center;
-    
+
     background-color: #6A90B6;
     padding: 2px;
 }
@@ -35,7 +35,7 @@ a:hover {
     color: #041322;
 }
 
-a{
+a {
 
     color: #041322;
 
@@ -67,64 +67,62 @@ h5 {
 }
 
 
-
-.hidden-column{
- display: none;       
+.hidden-column {
+    display: none;
 }
 
-nav{
+nav {
 
-    width:100%;
+    width: 100%;
 
 }
 
-table{
+table {
     word-break: break-all;
-    border-collapse: separate!important; 
+    border-collapse: separate !important;
 }
 
-.table td{
+.table td {
     font-size: 14px;
     padding: 0;
     max-width: 10rem;
     word-break: break-all;
-    border-collapse: separate!important;
+    border-collapse: separate !important;
 }
 
-.aud{
+.aud {
     width: 110px;
 }
 
-.inv{
+.inv {
     width: 400px;
 }
 
-.rasp{
+.rasp {
     width: 200px;
     word-break: break-word;
     white-space: nowrap;
 }
 
-#modal_matcenn{
+#modal_matcenn {
 
     margin-left: 20px;
 }
 
-.datatable{
+.datatable {
     background-color: whitesmoke;
 }
 
 
 .datatable th:nth-child(7) {
-  width: 200px;
+    width: 200px;
 
 }
 
 
-
 @media print {
 
-    *{
+    * {
         font-family: "Times New Roman", Times, serif;
     }
 
@@ -132,7 +130,7 @@ table{
         margin: 0;
         padding: 0;
         background-color: transparent;
-       
+
 
     }
 
@@ -152,29 +150,30 @@ table{
         width: 100%;
 
     }
+
     .no-print {
         display: none;
-    }  
+    }
 
-    table.rs-table-bordered{
-        border:1px solid #000000;
-        margin-top:20px;
+    table.rs-table-bordered {
+        border: 1px solid #000000;
+        margin-top: 20px;
         font-size: 14pt;
-       
-      }
-    table.rs-table-bordered > thead > tr > th{
-        border:1px solid #000000;
+
+    }
+
+    table.rs-table-bordered > thead > tr > th {
+        border: 1px solid #000000;
         padding: 2px;
         font-size: 14pt;
     }
-    table.rs-table-bordered > tbody > tr > td{
-        border:1px solid #000000;
+
+    table.rs-table-bordered > tbody > tr > td {
+        border: 1px solid #000000;
         padding: 10px;
         font-size: 14pt;
 
     }
 
- 
-
 
 }
\ No newline at end of file
diff --git a/templates/searchonaud.html b/templates/searchonaud.html
index ff0d394..5f03253 100644
--- a/templates/searchonaud.html
+++ b/templates/searchonaud.html
@@ -3,96 +3,98 @@
 {% block content %}
 
 
-  <!-- Modal -->
-  <div class="modal fade" id="getmodal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered" role="document">
-      <div class="modal-content">
-        <div class="modal-body" id="textarea">
+    <!-- Modal -->
+    <div class="modal fade" id="getmodal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle"
+         aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered" role="document">
+            <div class="modal-content">
+                <div class="modal-body" id="textarea">
 
-        
-          <input type="text" class="form-control" id ='vednumber' placeholder="Номер из веломости">      
-          <input type="text" class="form-control" id ='rapolog' placeholder="Введите расположение">
-                
+                    <input type="text" class="form-control" id='vednumber' placeholder="Номер из веломости">
+                    <input type="text" class="form-control" id='rapolog' placeholder="Введите расположение">
+
+
+                    <div class="row">
+                        <a id="modal_invnom"> </a><a id="modal_matcenn"></a>
+
+                    </div>
+
+                    <form method="POST" action="/addraspved">
+                        <div class="row">
+                            № из ведомости
+                            <input type="text" class="form-control" name="modal_vednumber" id='modal_vednumber'
+                                   placeholder="Номер из ведомости">
+                        </div>
+
+                        <div class="row">
+                            Расположение
+                            <input type="text" class="form-control" name="modal_rapolog" id='modal_rapolog'
+                                   placeholder="Введите расположение">
+                        </div>
+
+
+                    </form>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal" id="modalclose">Закрыть
+                        </button>
+                        <button type="button" class="btn btn-primary" id="modalsavetodb">Сохранить изменения</button>
+                    </div>
+
+                </div>
 
 
-          <div class="row">
-            <a id="modal_invnom"> </a><a id="modal_matcenn"></a>
-            
             </div>
-
-          <form method="POST" action="/addraspved"> 
-            <div class="row">
-              № из ведомости
-              <input type="text" class="form-control" name="modal_vednumber" id ='modal_vednumber' placeholder="Номер из ведомости"> 
-            </div>
-          
-            <div class="row">
-              Расположение
-              <input type="text" class="form-control" name="modal_rapolog" id ='modal_rapolog' placeholder="Введите расположение">
-            </div>
-
-
-          </form>
-          <div class="modal-footer">
-            <button type="button" class="btn btn-secondary" data-dismiss="modal" id="modalclose">Закрыть</button>
-            <button type="button" class="btn btn-primary" id="modalsavetodb" >Сохранить изменения</button>
-          </div>
-  
         </div>
-        
-        
-      </div>
     </div>
-  </div>
 
 
     <div class="row no-print">
         <div class="card col-md-10 col-10">
             <div class="card-body">
 
-                    
-                    <select name="auditory" id="auditory">
 
-                        {% for item in aud: %}
-                        <option name="optauditory"  value="{{item.id}}">{{ item.audnazvanie }}</option>
-                        {% endfor %}
-                    </select>
+                <select name="auditory" id="auditory">
 
-                    <button id="searchbutton"> Найти </button>
-                    <button id="printbutton"> Печать </button>
+                    {% for item in aud: %}
+                        <option name="optauditory" value="{{ item.id }}">{{ item.audnazvanie }}</option>
+                    {% endfor %}
+                </select>
+
+                <button id="searchbutton"> Найти</button>
+                <button id="printbutton"> Печать</button>
             </div>
         </div>
     </div>
 
     <div class="row">
         <div class="card col-md-10 col-10">
-                <div class="card-body">
-                    <h3 class="card-title no-print"> Поаудиторно </h3>
-                
-                        <table class="table " id="datatable" > 
-                            
-                                    <th >Номер в Инв. вед</th>
-                                    <th >Инв. номер</th>
-                                    <th >Название</th>
-                                    <th class="no-print">Аудитория</th>
-                                    <th >Расположение</th>
+            <div class="card-body">
+                <h3 class="card-title no-print"> Поаудиторно </h3>
 
-                                    
-                                {% for item in res: %}
-                                
-                                    <td> <input type="hidden" name="invnomer" value="{{ item[0] }}"> {{ item[0] }} </td>
-                                    <td> {{ item[1] }} </td>
-                                    <td class="no-print"> {{item[2]}} </td>
-                                    <td id="proverka"> Проверено </td>
-                                                      
-                                {% endfor %}
-                        </table>  
-                     </div>
+                <table class="table " id="datatable">
+
+                    <th>Номер в Инв. вед</th>
+                    <th>Инв. номер</th>
+                    <th>Название</th>
+                    <th class="no-print">Аудитория</th>
+                    <th>Расположение</th>
+
+
+                    {% for item in res %}
+
+                        <td><input type="hidden" name="invnomer" value="{{ item[0] }}"> {{ item[0] }} </td>
+                        <td> {{ item[1] }} </td>
+                        <td class="no-print"> {{ item[2] }} </td>
+                        <td id="proverka"> Проверено</td>
+
+                    {% endfor %}
+                </table>
             </div>
         </div>
     </div>
+    </div>
 
 
 
 
-{%endblock%}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file