Last coommit before refactoring

.gitignore

@@ -2,16 +2,10 @@
 .vscode
 instance
 venv/
-
 123
 *.csv
-project.db
+*.db
 c*.txt
-migrations/__pycache__/*
+migrations
-migrations/versions/__pycache__/*   
 __pycache__
-migrations/versions/__pycache__
+.idea
-migrations/__pycache__
-migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc
-migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc
-migrations/versions/__pycache__/885bdd7b5161_.cpython-312.pyc

app.py

@@ -8,7 +8,6 @@ import csv
 import random
 from urllib.parse import unquote
 
-
 app = Flask(__name__)
 
 app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///project.db"
@@ -22,6 +21,12 @@ db.init_app(app)
 migrate = Migrate(app, db)
 
 
+
+@app.route("/login", methods=['GET', 'POST'])
+def login():
+    return render_template('login.html')
+
+
 @app.route("/", methods=['GET', 'POST'])
 def index():
     results = []
@@ -122,7 +127,7 @@ def getall():
     oborud = db.session.query(Oboruds).order_by(Oboruds.invNumber).all()
 
     results = []
-    for oboruds in oborud :
+    for oboruds in oborud:
         if oboruds.aud_id is None:
             results.append({
                 'invNumber': oboruds.invNumber,
@@ -132,7 +137,7 @@ def getall():
                 'kolichestvo': oboruds.kolichestvo,
                 'numberppasu': oboruds.numberppasu,
                 'numberved': oboruds.numberved,
-            'aud': ""   })
+                'aud': ""})
         else:
             aud = db.session.query(Auditory).filter_by(id=oboruds.aud_id).first()
             results.append({
@@ -143,9 +148,7 @@ def getall():
                 'kolichestvo': oboruds.kolichestvo,
                 'numberppasu': oboruds.numberppasu,
                 'numberved': oboruds.numberved,
-            'aud': aud.audnazvanie   })
+                'aud': aud.audnazvanie})
- 
-    
 
     return jsonify(results)
 
@@ -158,7 +161,7 @@ def vneaud():
     ak = db.session.query(Oboruds).all()
 
     for dt in data:
-        res.append([dt.invNumber, dt.nazvanie, dt.typeBalanse])
+        res.append([dt.invNumber, dt.nazvanie])
 
     return render_template('vneaud.html', res=res, kolvo=len(data), all_kol=len(ak))
 
@@ -201,38 +204,33 @@ def zamsearch():
 @app.route('/addraspved', methods=['GET', 'POST'])
 def addraspved():
     if request.method == 'POST':
-
         query_string = request.data.decode()
 
         un_query_string = unquote(unquote(query_string)).split(',')
 
-
         ob = db.session.query(Oboruds).filter_by(invNumber=un_query_string[0]).first()
 
-        ob.numberved=un_query_string[1]
+        ob.numberved = un_query_string[1]
         ob.kolichestvo = un_query_string[2]
         ob.balancenumber = un_query_string[3]
-        ob.raspologenie=un_query_string[4]
+        ob.raspologenie = un_query_string[4]
-        
 
         db.session.commit()
         db.session.close()
 
-
         return jsonify({'success': True}, 200, {'ContentType': 'application/json'})
 
 
 @app.route('/addoborudasu', methods=['GET', 'POST'])
 def addoborud():
     if request.method == 'POST':
-
         query_string = request.data.decode()
 
         un_query_string = unquote(unquote(query_string)).split(',')
         db.session.add(
             Oboruds(invNumber=un_query_string[0],
                     nazvanie=un_query_string[5],
-                            raspologenie= un_query_string[4],
+                    raspologenie=un_query_string[4],
                     numberved=un_query_string[1],
                     kolichestvo=un_query_string[2],
                     balancenumber=un_query_string[3]
@@ -241,17 +239,17 @@ def addoborud():
 
         db.session.commit()
 
-
         return jsonify({'success': True}, 200, {'ContentType': 'application/json'})
 
+
 # ==================================================================================
 
 
 def ranomraspr():
     with app.app_context():
-            while len(db.session.query(Oboruds).filter(Oboruds.aud_id == None).all()) > 0:
+        while len(db.session.query(Oboruds).filter(Oboruds.aud_id is None).all()) > 0:
             audid = random.choice(db.session.query(Auditory).all())
-                oborud = random.choice(db.session.query(Oboruds).filter(Oboruds.aud_id == None).all())
+            oborud = random.choice(db.session.query(Oboruds).filter(Oboruds.aud_id is None).all())
             oborud.aud_id = audid.id
             db.session.commit()
 
@@ -299,9 +297,48 @@ def createdb():
         db.session.commit()
 
 
+def write2excell():
+    wb = xlrd.open_workbook("VedIsh.xls")
+    sheet = wb.sheet_by_index(0)
+
+    newFile = copy(wb)
+    newSheet = newFile.get_sheet(0)
+    invNomerColum = 6
+
+    column_index = 1
+    for row_idx in range(sheet.nrows):
+        cell_value = sheet.cell(row_idx, column_index)
+
+        if cell_value:
+
+            tmp_inv_number = str(cell_value).split(':')[1]
+
+            try:
+                a = tmp_inv_number[1:-1]
+
+                inv_number = int(tmp_inv_number[1:-1])
+
+                with app.app_context():
+                    auditory_obj = db.session.query(Auditory).join(Oboruds, Oboruds.aud_id == Auditory.id).filter(
+                        Oboruds.invNumber == inv_number).first()
+
+                    print(auditory_obj.audnazvanie)
+
+                # cur.execute("SELECT aud.audnazvanie FROM oboruds AS ob JOIN auditory AS aud ON ob.aud_id = aud.id WHERE ob.invNumber = ?", (inv_number,))
+
+
+            except:
+                pass
+
+    """
+        else:
+            #newSheet.write(row_idx, invNomerColum, "Нет инв номера")
+            pass
+    newFile.save("Ved31.xls")
+    """
+
 
 if __name__ == '__main__':
+    #write2excell()
 
-        #ranomraspr()
-        #createdb()
     app.run(debug=True, host='0.0.0.0', port='3800')

migrations/versions/8e5efc4de919_.py

@@ -0,0 +1,54 @@
+"""empty message
+
+Revision ID: 8e5efc4de919
+Revises: c208cbc25232
+Create Date: 2024-04-03 22:36:46.208266
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '8e5efc4de919'
+down_revision = 'c208cbc25232'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('oboruds', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('numberved', sa.String(length=100), nullable=True))
+        batch_op.add_column(sa.Column('numberppasu', sa.String(length=100), nullable=True))
+        batch_op.add_column(sa.Column('balancenumber', sa.Integer(), nullable=True))
+        batch_op.alter_column('nazvanie',
+               existing_type=sa.TEXT(length=500),
+               type_=sa.String(length=500),
+               existing_nullable=True)
+        batch_op.alter_column('raspologenie',
+               existing_type=sa.TEXT(length=200),
+               type_=sa.String(length=200),
+               existing_nullable=True)
+        batch_op.drop_column('buhnumberpp')
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('oboruds', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('buhnumberpp', sa.TEXT(length=100), nullable=True))
+        batch_op.alter_column('raspologenie',
+               existing_type=sa.String(length=200),
+               type_=sa.TEXT(length=200),
+               existing_nullable=True)
+        batch_op.alter_column('nazvanie',
+               existing_type=sa.String(length=500),
+               type_=sa.TEXT(length=500),
+               existing_nullable=True)
+        batch_op.drop_column('balancenumber')
+        batch_op.drop_column('numberppasu')
+        batch_op.drop_column('numberved')
+
+    # ### end Alembic commands ###

migrations/versions/d4a8e4c9e65a_.py

@@ -0,0 +1,24 @@
+"""empty message
+
+Revision ID: d4a8e4c9e65a
+Revises: 10da3140ab2e, 8e5efc4de919
+Create Date: 2024-05-06 08:27:39.088982
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'd4a8e4c9e65a'
+down_revision = ('10da3140ab2e', '8e5efc4de919')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass

static/css/index.css

@@ -8,7 +8,7 @@ body {
     min-width: 580px;
 }
 
-.row{
+.row {
 
 
     text-align: center;
@@ -35,7 +35,7 @@ a:hover {
     color: #041322;
 }
 
-a{
+a {
 
     color: #041322;
 
@@ -54,7 +54,7 @@ button {
 
 .card {
 
-    width: 200px;
+    /*width: 200px; */
     margin: 10px;
     border-radius: 15px;
     border-color: #E07D54;
@@ -67,54 +67,62 @@ h5 {
 }
 
 
-
+.hidden-column {
-.hidden-column{
     display: none;
 }
 
-nav{
+nav {
 
-    width:100%;
+    width: 100%;
 
 }
 
-table{
+table {
     word-break: break-all;
-    border-collapse: separate!important; 
+    border-collapse: separate !important;
 }
-td{
+
+.table td {
+    font-size: 14px;
     padding: 0;
+    max-width: 10rem;
+    word-break: break-all;
+    border-collapse: separate !important;
 }
-.aud{
+
+.aud {
     width: 110px;
 }
 
-.inv{
+.inv {
     width: 400px;
 }
 
-.rasp{
+.rasp {
-    max-width: 200px;
+    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;
 
-
+}
 
 
 @media print {
 
-    *{
+    * {
         font-family: "Times New Roman", Times, serif;
     }
 
@@ -142,29 +150,30 @@ td{
         width: 100%;
 
     }
+
     .no-print {
         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;
 
     }
-    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;
 
     }
 
 
-
-
 }

static/js/allmatc.js

@@ -9,14 +9,14 @@ function clearTable() {
 }
 
 
-function getAllData(){
+function getAllData() {
-  console.log('12321321')
+
     clearTable();
 
     let tableBody = document.getElementById('alldatatable').getElementsByTagName("tbody")[0];
     i = 0;
-  $.getJSON("/getall", function(data) {
+    $.getJSON("/getall", function (data) {
-    $.each(data, function(index, item) {
+        $.each(data, function (index, item) {
             let newRow = tableBody.insertRow(tableBody.rows.length);
             let cell1 = newRow.insertCell(0);
             let cell2 = newRow.insertCell(1);
@@ -35,14 +35,14 @@ function getAllData(){
             cell4.innerText = item.nazvanie;
             cell5.innerText = item.kolichestvo;
             cell6.innerText = item.balancenumber;
-      cell7.innerText=  item.aud; 
+            cell7.innerText = item.aud;
             cell8.innerText = item.raspologenie;
 
 
             $(newRow).data('itemData', i);
 
 
-      $(newRow).on("click", function() {
+            $(newRow).on("click", function () {
 
                 let vednumbertxt = newRow.cells[1].innerText;
                 let invnomertxt = newRow.cells[2].innerText;
@@ -63,21 +63,21 @@ function getAllData(){
                 let rasp = document.getElementById('modal_rapolog')
 
                 invnom.innerText = invnomertxt
-        matcen.innerText = nazvanietxt.substring(0,20)
+                matcen.innerText = nazvanietxt.substring(0, 20)
 
-        if (vednumbertxt.length>0){
+                if (vednumbertxt.length > 0) {
                     vedomost.value = vednumbertxt;
                 }
 
-        if (kolvotxt.length>0){
+                if (kolvotxt.length > 0) {
                     kolvo.value = kolvotxt;
                 }
 
-        if (schettxt.length>0){
+                if (schettxt.length > 0) {
                     balancenumber.value = schettxt;
                 }
 
-        if (raspologtxt.length>0){
+                if (raspologtxt.length > 0) {
                     rasp.value = raspologtxt;
                 }
 
@@ -88,14 +88,14 @@ function getAllData(){
 
 }
 
-$( document ).ready(function() {
+$(document).ready(function () {
 
     getAllData();
 
-  });
+});
 
 
-$('#modalclose').click(function(){
+$('#modalclose').click(function () {
 
 
     let vednumber = document.getElementById('modal_vednumber')
@@ -105,7 +105,6 @@ $('#modalclose').click(function(){
     let rasp = document.getElementById('modal_rapolog')
 
 
-
     vednumber.value = '';
     kolvo.value = '';
     balancenumber.value = '';
@@ -114,10 +113,9 @@ $('#modalclose').click(function(){
     $('#getmodal').modal('hide')
 
 
+})
 
-} )
+$('#modalsavetodb').click(function () {
-
-$('#modalsavetodb').click(function(){
 
     let invnom = document.getElementById('modal_invnom')
     let vednumber = document.getElementById('modal_vednumber')
@@ -128,8 +126,6 @@ $('#modalsavetodb').click(function(){
     let nazv = document.getElementById('modal_nazvanie')
 
 
-
-
     let changeddata = new Array()
 
     changeddata[0] = invnom.text;
@@ -139,7 +135,6 @@ $('#modalsavetodb').click(function(){
     changeddata[4] = rasp.value;
 
 
-
     let sendData = changeddata.join(',')
     console.log(sendData)
 
@@ -151,7 +146,7 @@ $('#modalsavetodb').click(function(){
         dataType: "json",
         data: sendData,
 
-    success: function(){
+        success: function () {
             $('#getmodal').modal('hide')
 
             vednumber.value = '';
@@ -168,13 +163,13 @@ $('#modalsavetodb').click(function(){
 })
 
 
-$('#addoborud').click(function(){
+$('#addoborud').click(function () {
 
     $('#addmodal').modal('show');
 
 })
 
-$('#modal2savetodb').click(function(){
+$('#modal2savetodb').click(function () {
 
     let invnomer = document.getElementById('modal2_invnom')
     let vednumber = document.getElementById('modal2_vednumber')
@@ -185,8 +180,6 @@ $('#modal2savetodb').click(function(){
     let nazv = document.getElementById('modal2_nazvanie')
 
 
-
-
     let changeddata = new Array()
 
     changeddata[0] = invnomer.value;
@@ -197,7 +190,6 @@ $('#modal2savetodb').click(function(){
     changeddata[5] = nazv.value;
 
 
-
     let sendData = changeddata.join(',')
     console.log(sendData)
 
@@ -209,10 +201,10 @@ $('#modal2savetodb').click(function(){
         dataType: "json",
         data: sendData,
 
-    success: function(){
+        success: function () {
             vednumber.value = '';
-      invnomer.value= '';
+            invnomer.value = '';
-      nazvanie.value='';
+            nazvanie.value = '';
             kolvo.value = '';
             balancenumber.value = '';
             matcen.value = '';
@@ -228,7 +220,7 @@ $('#modal2savetodb').click(function(){
 
 })
 
-$('#modal2close').click(function(){
+$('#modal2close').click(function () {
 
 
     let vednumber = document.getElementById('modal2_vednumber')
@@ -240,10 +232,9 @@ $('#modal2close').click(function(){
     let rasp = document.getElementById('modal2_rapolog')
 
 
-
     vednumber.value = '';
-  invnomer.value= '';
+    invnomer.value = '';
-  nazvanie.value='';
+    nazvanie.value = '';
     kolvo.value = '';
     balancenumber.value = '';
     matcen.value = '';
@@ -252,9 +243,40 @@ $('#modal2close').click(function(){
     $('#addmodal').modal('hide')
 
 
-
+})
-} )
 
 $('#modal2').on('hidden.bs.modal', function () {
     location.reload();
- })
+})
+
+$(document).ready(function () {
+    // Слушаем событие клика по заголовкам таблицы
+    $('#alldatatable thead th').on('click', function () {
+        var columnIndex = $(this).index(); // Индекс колонки
+        var sortColumn = $(this).text().toLowerCase(); // Текст заголовка колонки
+
+        // Сортируем таблицу по выбранной колонке
+        $('#alldatatable tbody tr').sort(function (a, b) {
+            var valA;
+            var valB;
+
+            if (isNaN(parseFloat($(a).find('td:eq(' + columnIndex + ')').text()))) {
+                // если это текстовая колонка, то сортируем по алфавиту
+                valA = $(a).find('td:eq(' + columnIndex + ')').text().toLowerCase();
+                valB = $(b).find('td:eq(' + columnIndex + ')').text().toLowerCase();
+            } else {
+                // если это числовая колонка, то сортируем по числовому значению
+                valA = parseFloat($(a).find('td:eq(' + columnIndex + ')').text());
+                valB = parseFloat($(b).find('td:eq(' + columnIndex + ')').text());
+            }
+
+            if (valA < valB) return -1;
+            if (valA > valB) return 1;
+            return 0;
+        }).appendTo('#alldatatable tbody');
+
+        // Обновляем классы для активной колонки
+        $('#alldatatable thead th').removeClass('active');
+        $(this).addClass('active');
+    });
+});

templates/all.html

@@ -103,21 +103,21 @@
 
 
 
-    <div class="row col-12">
+    <div class="row">
-        <div class=" card col-11">
+
                     <h3 id ='123' class=" no-print"> Все мат. ценности </h3>
 
-        </div> 
+
     </div>
 
     <div class="row col-12">
         <button  class="button" id="printallbutton"> Печать </button>
     </div>
+
     <div class="row col-12">
         <button  class="button" id="addoborud"> Добавить </button>
     </div>
 
-    </div>
     <div class="row">
         <div class="card col-md-11 table-responsive">
         <table id="alldatatable" class="alldatable table pagebreak" >

templates/login.html

@@ -0,0 +1,62 @@
+{% extends 'base.html' %}
+
+
+{% block content %}
+
+
+<div class="row">
+    <div class="card col-4" >
+        <div class="card-body">
+            
+
+            <form class="form-horizontal">
+                <fieldset>
+                
+                <!-- Form Name -->
+                <legend>Авторизация</legend>
+            
+                <!-- Text input-->
+                <div class="form-group">
+                    <label  control-label" for="logininput">Логин</label>  
+                    <div>
+                    <input id="logininput" name="logininput" type="text" placeholder="Введите логин" class="form-control input-md">
+                        
+                    </div>
+                </div>
+            
+                <!-- Password input-->
+                <div class="form-group">
+                  <label class="control-label" for="passwordinput">Пароль</label>
+                    <input id="passwordinput" name="passwordinput" type="password" placeholder="Введите пароль" class="form-control input-md">
+                    
+                  </div>
+                </div>
+                                                
+                <div class="row">
+
+                    <button id="btn_login" name="btn_login" class="btn btn-primary">Войти</button>
+
+                </div>
+            
+
+                </fieldset>
+                </form>
+
+
+
+
+
+
+        </div>
+    </div>
+</div>
+
+
+
+
+
+
+
+    
+    {% endblock %}
+    

templates/searchonaud.html

@@ -4,15 +4,14 @@
 
 
     <!-- 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"
+         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 ='vednumber' placeholder="Номер из веломости">      
+                    <input type="text" class="form-control" id='rapolog' placeholder="Введите расположение">
-          <input type="text" class="form-control" id ='rapolog' placeholder="Введите расположение">
-                
 
 
                     <div class="row">
@@ -23,19 +22,22 @@
                     <form method="POST" action="/addraspved">
                         <div class="row">
                             № из ведомости
-              <input type="text" class="form-control" name="modal_vednumber" id ='modal_vednumber' placeholder="Номер из ведомости"> 
+                            <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="Введите расположение">
+                            <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-secondary" data-dismiss="modal" id="modalclose">Закрыть
-            <button type="button" class="btn btn-primary" id="modalsavetodb" >Сохранить изменения</button>
+                        </button>
+                        <button type="button" class="btn btn-primary" id="modalsavetodb">Сохранить изменения</button>
                     </div>
 
                 </div>
@@ -54,12 +56,12 @@
                 <select name="auditory" id="auditory">
 
                     {% for item in aud: %}
-                        <option name="optauditory"  value="{{item.id}}">{{ item.audnazvanie }}</option>
+                        <option name="optauditory" value="{{ item.id }}">{{ item.audnazvanie }}</option>
                     {% endfor %}
                 </select>
 
-                    <button id="searchbutton"> Найти </button>
+                <button id="searchbutton"> Найти</button>
-                    <button id="printbutton"> Печать </button>
+                <button id="printbutton"> Печать</button>
             </div>
         </div>
     </div>
@@ -69,21 +71,21 @@
             <div class="card-body">
                 <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 >Расположение</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 class="no-print"> {{item[2]}} </td>
+                        <td class="no-print"> {{ item[2] }} </td>
-                                    <td id="proverka"> Проверено </td>
+                        <td id="proverka"> Проверено</td>
 
                     {% endfor %}
                 </table>
@@ -95,4 +97,4 @@
 
 
 
-{%endblock%}
+{% endblock %}