danamir/asuinventory
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed table

Browse Source
This commit is contained in:
Alex Danamir
2024-05-22 15:58:16 +03:00
parent 43ab114e1a
commit 1c33775f92
3 changed files with 100 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app.py
View File

@@ -16,7 +16,7 @@ from xlutils.copy import copy
app = Flask(__name__) 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.jinja_env.auto_reload = True
app.config['TEMPLATES_AUTO_RELOAD'] = True app.config['TEMPLATES_AUTO_RELOAD'] = True

57
static/css/index.css
View File

@@ -8,7 +8,7 @@ body {
min-width: 580px; min-width: 580px;
} }
.row{ .row {
text-align: center; text-align: center;
@@ -35,7 +35,7 @@ a:hover {
color: #041322; color: #041322;
} }
a{ a {
color: #041322; color: #041322;
@@ -67,64 +67,62 @@ h5 {
} }
.hidden-column {
.hidden-column{ display: none;
display: none;
} }
nav{ nav {
width:100%; width: 100%;
} }
table{ table {
word-break: break-all; word-break: break-all;
border-collapse: separate!important; border-collapse: separate !important;
} }
.table td{ .table td {
font-size: 14px; font-size: 14px;
padding: 0; padding: 0;
max-width: 10rem; max-width: 10rem;
word-break: break-all; word-break: break-all;
border-collapse: separate!important; border-collapse: separate !important;
} }
.aud{ .aud {
width: 110px; width: 110px;
} }
.inv{ .inv {
width: 400px; width: 400px;
} }
.rasp{ .rasp {
width: 200px; width: 200px;
word-break: break-word; word-break: break-word;
white-space: nowrap; white-space: nowrap;
} }
#modal_matcenn{ #modal_matcenn {
margin-left: 20px; margin-left: 20px;
} }
.datatable{ .datatable {
background-color: whitesmoke; background-color: whitesmoke;
} }
.datatable th:nth-child(7) { .datatable th:nth-child(7) {
width: 200px; width: 200px;
} }
@media print { @media print {
*{ * {
font-family: "Times New Roman", Times, serif; font-family: "Times New Roman", Times, serif;
} }
@@ -152,29 +150,30 @@ table{
width: 100%; width: 100%;
} }
.no-print { .no-print {
display: none; display: none;
} }
table.rs-table-bordered{ table.rs-table-bordered {
border:1px solid #000000; border: 1px solid #000000;
margin-top:20px; margin-top: 20px;
font-size: 14pt; 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; padding: 2px;
font-size: 14pt; 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; padding: 10px;
font-size: 14pt; font-size: 14pt;
} }
} }

114
templates/searchonaud.html
View File

@@ -3,47 +3,49 @@
{% block content %} {% block content %}
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="getmodal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true"> <div class="modal fade" id="getmodal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle"
<div class="modal-dialog modal-dialog-centered" role="document"> aria-hidden="true">
<div class="modal-content"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-body" id="textarea"> <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="Номер из веломости"> <div class="row">
<input type="text" class="form-control" id ='rapolog' placeholder="Введите расположение"> <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> </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>
</div>
<div class="row no-print"> <div class="row no-print">
@@ -51,48 +53,48 @@
<div class="card-body"> <div class="card-body">
<select name="auditory" id="auditory"> <select name="auditory" id="auditory">
{% for item in aud: %} {% for item in aud: %}
<option name="optauditory" value="{{item.id}}">{{ item.audnazvanie }}</option> <option name="optauditory" value="{{ item.id }}">{{ item.audnazvanie }}</option>
{% endfor %} {% endfor %}
</select> </select>
<button id="searchbutton"> Найти </button> <button id="searchbutton"> Найти</button>
<button id="printbutton"> Печать </button> <button id="printbutton"> Печать</button>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="card col-md-10 col-10"> <div class="card col-md-10 col-10">
<div class="card-body"> <div class="card-body">
<h3 class="card-title no-print"> Поаудиторно </h3> <h3 class="card-title no-print"> Поаудиторно </h3>
<table class="table " id="datatable" > <table class="table " id="datatable">
<th >Номер в Инв. вед</th> <th>Номер в Инв. вед</th>
<th >Инв. номер</th> <th>Инв. номер</th>
<th >Название</th> <th>Название</th>
<th class="no-print">Аудитория</th> <th class="no-print">Аудитория</th>
<th >Расположение</th> <th>Расположение</th>
{% for item in res: %} {% for item in res %}
<td> <input type="hidden" name="invnomer" value="{{ item[0] }}"> {{ item[0] }} </td> <td><input type="hidden" name="invnomer" value="{{ item[0] }}"> {{ item[0] }} </td>
<td> {{ item[1] }} </td> <td> {{ item[1] }} </td>
<td class="no-print"> {{item[2]}} </td> <td class="no-print"> {{ item[2] }} </td>
<td id="proverka"> Проверено </td> <td id="proverka"> Проверено</td>
{% endfor %} {% endfor %}
</table> </table>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
{%endblock%} {% endblock %}