From a6eea28071472b057e5e55bc75771649637403ee Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 26 Mar 2024 23:02:37 +0300 Subject: [PATCH 01/32] add funce --- __pycache__/app.cpython-312.pyc | Bin 15045 -> 16039 bytes __pycache__/models.cpython-312.pyc | Bin 2363 -> 2363 bytes app.py | 38 +++---- migrations/__pycache__/env.cpython-312.pyc | Bin 4531 -> 4531 bytes .../__pycache__/256c3a3e91a2_.cpython-312.pyc | Bin 1319 -> 1319 bytes .../__pycache__/4f95d12a8352_.cpython-312.pyc | Bin 1317 -> 1317 bytes .../__pycache__/50f85881169e_.cpython-312.pyc | Bin 687 -> 687 bytes .../__pycache__/873defe09f22_.cpython-312.pyc | Bin 1324 -> 1324 bytes .../__pycache__/8e838956713f_.cpython-312.pyc | Bin 1321 -> 1321 bytes .../__pycache__/b24baa0d98e6_.cpython-312.pyc | Bin 717 -> 717 bytes .../__pycache__/b2a61aef79e9_.cpython-312.pyc | Bin 687 -> 687 bytes .../__pycache__/ec6bbcd361bd_.cpython-312.pyc | Bin 2058 -> 2058 bytes static/css/index.css | 23 ++++ static/js/searchonaud.js | 98 ++++++++++-------- templates/searchonaud.html | 28 +++-- 15 files changed, 110 insertions(+), 77 deletions(-) diff --git a/__pycache__/app.cpython-312.pyc b/__pycache__/app.cpython-312.pyc index 6618befc868f0a68928363ce10fae0b859e708e3..18d2bc281950e860c1d94224d7808b208d6fba18 100644 GIT binary patch delta 1057 zcmZ8fO>7%Q7@gT4d%dxpHnAQ5G_Dgv?5z_g1zAZ3y zzW2?({dRwvyHj%i>~hI~o=kMRgQT8K(Q;J z+N9ugABtZAr(;N=7+3eBLl@!zV6WP7evOablgm#}O%(NaXY*7!U%M(F?}96}?ViUxT&r!p{1*qmsC^&*j)PUQkhtNR zZyU@agtJ=VvWmz_rw``IB_&E0!ghF_eC`eNC18+<-$!UL&KYrzhMKR#QosV zR&eO6&U!FaZl{XRUzT?~(T9L@yi`866X?Db{4{8e-8}fgiSpR0cPAVzpIFsCJlPPb zp&AQu&Q9WNKTz}cM+Na?n*G<>>q9Qlwn{0kkjd1txIyXfwck>2LU@P_4!`aFlJ%}r zu%t{TpPf-N8N5nv4Zq)Zjdj>9c!MNHdgXhRvj1JXT6=5cHiR;XjQU7NdP!;c04J^l lmILLZW@@9)99#<2;Vb`eemDXD! diff --git a/app.py b/app.py index 1aa53ca..8b652cc 100644 --- a/app.py +++ b/app.py @@ -6,6 +6,7 @@ from flask_migrate import Migrate from datetime import * import csv import random +from urllib.parse import unquote app = Flask(__name__) @@ -77,11 +78,14 @@ def searchonaud(): results = [] for auditory, oboruds in q: results.append({ + 'num_ved': oboruds.numberved, 'auditory_id': auditory.id, 'auditory_name': auditory.audnazvanie, 'inv_number': oboruds.invNumber, 'oboruds_id': oboruds.nazvanie, + 'raspolog': oboruds.raspologenie, }) + print(results) return jsonify(results) else: @@ -183,25 +187,21 @@ def zamsearch(): @app.route('/addraspved', methods=['GET', 'POST']) def addraspved(): if request.method == 'POST': - query_string = request.data - # Convert the bytes object to a string - query_string_str = query_string.decode("utf-8") + #b'rasp=asndhaslkj&ved=1111111&inv=18124' + query_string = request.get_data().decode() + un_query_string = unquote(unquote(query_string)) - # Split the query string by '&' to get individual key-value pairs - key_value_pairs = query_string_str.split("&") - - # Create a dictionary to store the key-value pairs + print(un_query_string.split('&')) query_dict = {} - for pair in key_value_pairs: + for pair in un_query_string.split('&'): key, value = pair.split("=") query_dict[key] = value - # Retrieve the values for specific keys - rasp_value = query_dict.get("rasp") - ved_value = query_dict.get("ved") - - print(f"Value for 'rasp': {rasp_value}") - print(f"Value for 'ved': {ved_value}") + ob = db.session.query(Oboruds).filter_by(invNumber=query_dict['inv']).first() + print(ob) + ob.raspologenie=query_dict['rasp'] + ob.numberved = query_dict['ved'] + db.session.commit() @@ -262,16 +262,6 @@ def createdb(): db.session.commit() - """ - with open('zabalans.csv', encoding='utf-8') as csv_file: - csv_reader = csv.reader(csv_file, delimiter=';') - for row in csv_reader: - print(row) - db.session.add( - Oboruds(invNumber=row[0], nazvanie=row[1], typeBalanse="забаланс")) - - db.session.commit() - """ if __name__ == '__main__': diff --git a/migrations/__pycache__/env.cpython-312.pyc b/migrations/__pycache__/env.cpython-312.pyc index d40e79f400bb16ed92d574bacba9859fc929731d..26bd5f43025677793ecc3a3f32f9f3c9b03e87ad 100644 GIT binary patch delta 33 ocmdn2yjhw1G%qg~0}woY|7RojM delta 33 ncmdn2yjhw1G%qg~0}wb?|J=y^k%`e|@?R!##`Mji%=7pFrmYFs diff --git a/migrations/versions/__pycache__/256c3a3e91a2_.cpython-312.pyc b/migrations/versions/__pycache__/256c3a3e91a2_.cpython-312.pyc index 77081c020d0561fcf0bae39f174e7f1634cd7da5..280709a1ee6a6bff249d19d258745785f406cb45 100644 GIT binary patch delta 50 zcmZ3^wVaFlG%qg~0}woY|7Roj9Y#rKtC)bI{Pd#4+}zB(^q7Fkl8pR3ph(sxCUs^2 DvBD9O delta 50 zcmZ3^wVaFlG%qg~0}wb?|J=xZhf&hSDkh*PKfNe1H#ajcJtm;CBqKi$B(jM~of!a$ CV-R%! diff --git a/migrations/versions/__pycache__/4f95d12a8352_.cpython-312.pyc b/migrations/versions/__pycache__/4f95d12a8352_.cpython-312.pyc index 2889172c48bcc637f0802a4cc60643c47ee508aa..a22fbdba7d14976b081fd4de951dc714d7f8fb34 100644 GIT binary patch delta 51 zcmZ3=wUmqdG%qg~0}woY|7Rn2Jd>oeRZKupetJ=2Zf<5?dQ3oNNk)DiP$X+}Gt(j_ E0JUin5C8xG delta 51 zcmZ3=wUmqdG%qg~0}wb?|J=wO&m`$$6%$aDpI(%ho12-J9urVml98VW64~6$w1^1+ Di|r8e diff --git a/migrations/versions/__pycache__/50f85881169e_.cpython-312.pyc b/migrations/versions/__pycache__/50f85881169e_.cpython-312.pyc index aee53e012d4bd8c8629af841795a6c4383eced9d..09660f0669e349e2275b93619a0d0111d9f51a66 100644 GIT binary patch delta 51 zcmZ3_x}KH$G%qg~0}woY|7Rn&6r-fGRZKupetJ=2Zf<5?dQ3oNNk)DiP$X-!9b+LQ E0IcW{TmS$7 delta 51 zcmZ3_x}KH$G%qg~0}wb?|J=we#VF}w6%$aDpI(%ho12-J9urVml98VW64`9WSjY$f DgKQ8# diff --git a/migrations/versions/__pycache__/873defe09f22_.cpython-312.pyc b/migrations/versions/__pycache__/873defe09f22_.cpython-312.pyc index fd851b545b20ef076a3b75ffd03cc99fa5620d02..6f099d51484d56605be5ccf068b24509e6ecdd5b 100644 GIT binary patch delta 33 ncmZ3(wT6rPG%qg~0}woY|7Rn2DifpgFKkvD;f(PeTTlQ?7g<~F9qOaQ9&3A6wJ diff --git a/migrations/versions/__pycache__/b24baa0d98e6_.cpython-312.pyc b/migrations/versions/__pycache__/b24baa0d98e6_.cpython-312.pyc index 69a74a07e7bccc54efa3b14042dc9461a8150d5f..43d15762a7818a8c00bc305dac1f09aca20e1b12 100644 GIT binary patch delta 51 zcmX@hdX|;@G%qg~0}woY|7Rn&1*4?1RZKupetJ=2Zf<5?dQ3oNNk)DiP$X+}3}Yc9 E0KE1Q)Bpeg delta 51 zcmX@hdX|;@G%qg~0}wb?|J=xJ!6@ls6%$aDpI(%ho12-J9urVml98VW64@NXSjY$f DlX?)h diff --git a/migrations/versions/__pycache__/b2a61aef79e9_.cpython-312.pyc b/migrations/versions/__pycache__/b2a61aef79e9_.cpython-312.pyc index 6f573f09a6017ca70e230698ea78f77387fc7300..a7e9152bb66bea3a82a0e44bde5e09775d76a7e2 100644 GIT binary patch delta 51 zcmZ3_x}KH$G%qg~0}woY|7Rn&6r-fGRZKupetJ=2Zf<5?dQ3oNNk)DiP$X-!9b+LQ E0IcW{TmS$7 delta 51 zcmZ3_x}KH$G%qg~0}wb?|J=we#VF}w6%$aDpI(%ho12-J9urVml98VW64`9WSjY$f DgKQ8# diff --git a/migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc b/migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc index 1d027b0c3daaddba27d7e21b2e3b7083749d8fec..e5f76bc43be7407a1fc729ddd056775d7ae128ae 100644 GIT binary patch delta 33 ncmeAY=n~*Q&CAQh00d9p|JlgR%*^OKnV(slF>A9r^J5kOmmCQ2 delta 33 ncmeAY=n~*Q&CAQh00fTJKR0qSGc&qO=4TdXOy8`|{Fns*fpiDc diff --git a/static/css/index.css b/static/css/index.css index c47c1a0..6bc3fb1 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -18,6 +18,7 @@ body { border: 1px; + } header { @@ -77,6 +78,28 @@ nav{ } +.table{ + word-break: break-all; +} + +.aud{ + width: 110px; +} + +.inv{ + width: 400px; +} + +.rasp{ + max-width: 200px; + word-break: break-word; +} + +#modal_matcenn{ + + margin-left: 20px; +} + @media print { *{ diff --git a/static/js/searchonaud.js b/static/js/searchonaud.js index 1e1b6e4..abfe949 100644 --- a/static/js/searchonaud.js +++ b/static/js/searchonaud.js @@ -13,20 +13,22 @@ function getData(){ }, success: function(response){ + console.log(response) var data = response; const table = document.getElementById('datatable') table.innerHTML = '' - var headTable = ' Номер в Инв. вед Инв. номерНазваниеАудитория Расположение Проверено ' + var headTable = ' Номер в Инв. вед Инв. номерНазваниеАудитория Расположение Проверено ' table.innerHTML += headTable var tr ="" + data.forEach(element => { tr += '' - tr += ' ' - tr += '' + element.inv_number + '' + tr += '' + element.num_ved + '' + tr += '' + element.inv_number + '' tr += '' + element.oboruds_id + '' tr += '' + element.auditory_name + '' - tr += ' ' + tr += '' +element.raspolog + '' tr += '' + '\n' + '' tr += '' @@ -40,58 +42,64 @@ $("#searchbutton").click(function(){ getData(); }) - function tableclick(x){ - let roww = x.rowIndex - let data = document.getElementById(x.rowIndex) +function tableclick(x){ + let data = document.getElementById(x.rowIndex) - let datas = x.innerText.split('\t') + let datas = x.innerText.split('\t') - console.log(datas) + - $('#getmodal').modal('show') - let rasp = document.getElementById('rapolog') - let vedomost = document.getElementById('vednumber') + $('#getmodal').modal('show') - if (datas[0].length>0){ - rasp.value=datas[0]; - } + let rasp = document.getElementById('rapolog') + let vedomost = document.getElementById('vednumber') + let invnom = document.getElementById('modal_invnom') + let matcen = document.getElementById('modal_matcenn') + + invnom.innerText=datas[1]+"\t" + matcen.innerText=datas[2].substring(0,15) - if (datas[4].length>0){ - vedomost.value=datas[4] - } - $('#modalclose').click(function(){ + if (datas[4].length>0){ + rasp.value=datas[4]; + } + + if (datas[0].length>0){ + vedomost.value=datas[0] + } + + $('#modalclose').click(function(){ + + $('#getmodal').modal('hide'); + + } ) + + $('#modalsavetodb').click(function(){ - $('#getmodal').modal('hide'); - } ) - $('#modalsavetodb').click(function(){ + $.ajax({ - console.log(datas) + url: "/addraspved", + type: "POST", + contentType: "application/json;charset=utf-8", + dataType: "json", + data: { + rasp: rasp.value, + ved: vedomost.value, + inv: datas[1] + }, - $.ajax({ + }) + rasp.value = ''; + vedomost.value= ''; + + datas = []; + + $('#getmodal').modal('hide'); - url: "/addraspved", - type: "post", - contentType: 'application/json', - dataType: 'json', - data: { - rasp: rasp.value, - ved: vedomost.value - }, - - }) - - rasp.value=''; - - vedomost.value=''; - - - - $('#getmodal').modal('hide'); - - // getData(); - }) + getData(); +}) + } diff --git a/templates/searchonaud.html b/templates/searchonaud.html index 3d811af..67bf3ff 100644 --- a/templates/searchonaud.html +++ b/templates/searchonaud.html @@ -8,9 +8,21 @@
+
+ 111 2222 +
- - +
+ № из ведомости + +
+ +
+ Расположение + +
+ +
@@ -45,13 +57,13 @@

Поаудиторно

- +
- - - - - + + + + + {% for item in res: %} From 5259dc52921d99d28e95e44775b570c5862d1cc2 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 26 Mar 2024 23:03:26 +0300 Subject: [PATCH 02/32] sss From b47e9391ba23c89123b04a14ecf6e6a8c794160e Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 27 Mar 2024 09:45:57 +0300 Subject: [PATCH 03/32] add bug --- app.py | 14 ++++++-------- static/js/searchonaud.js | 28 +++++++++++----------------- templates/searchonaud.html | 2 +- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/app.py b/app.py index 8b652cc..dd04fc7 100644 --- a/app.py +++ b/app.py @@ -189,23 +189,21 @@ def addraspved(): if request.method == 'POST': #b'rasp=asndhaslkj&ved=1111111&inv=18124' query_string = request.get_data().decode() - un_query_string = unquote(unquote(query_string)) + un_query_string = unquote(unquote(query_string)).split('&') - print(un_query_string.split('&')) query_dict = {} - for pair in un_query_string.split('&'): + for pair in un_query_string: key, value = pair.split("=") query_dict[key] = value + print(query_dict) ob = db.session.query(Oboruds).filter_by(invNumber=query_dict['inv']).first() - print(ob) ob.raspologenie=query_dict['rasp'] ob.numberved = query_dict['ved'] db.session.commit() - - - - return jsonify({'success': True}, 200, {'ContentType': 'application/json'}) + db.session.close() + + return jsonify({'success': True}, 200, {'ContentType': 'application/json'}) # ================================================================================== diff --git a/static/js/searchonaud.js b/static/js/searchonaud.js index abfe949..f5c6fea 100644 --- a/static/js/searchonaud.js +++ b/static/js/searchonaud.js @@ -47,15 +47,12 @@ function tableclick(x){ let datas = x.innerText.split('\t') - - - $('#getmodal').modal('show') - let rasp = document.getElementById('rapolog') - let vedomost = document.getElementById('vednumber') + //let rasp = document.getElementById('rapolog') + //let vedomost = document.getElementById('vednumber') let invnom = document.getElementById('modal_invnom') - let matcen = document.getElementById('modal_matcenn') + //let matcen = document.getElementById('modal_matcenn') invnom.innerText=datas[1]+"\t" matcen.innerText=datas[2].substring(0,15) @@ -76,8 +73,6 @@ function tableclick(x){ } ) $('#modalsavetodb').click(function(){ - - $.ajax({ url: "/addraspved", @@ -89,16 +84,15 @@ function tableclick(x){ ved: vedomost.value, inv: datas[1] }, - + success:function() { + rasp.value = ''; + vedomost.value= ''; + data=[]; + rasp + $('#getmodal').modal('hide'); + getData(); + } }) - rasp.value = ''; - vedomost.value= ''; - - datas = []; - - $('#getmodal').modal('hide'); - - getData(); }) } diff --git a/templates/searchonaud.html b/templates/searchonaud.html index 67bf3ff..97fa8ce 100644 --- a/templates/searchonaud.html +++ b/templates/searchonaud.html @@ -9,7 +9,7 @@
- 111 2222 +
From 965695a6936eaf44348f73ca898f98c76b663157 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 31 Mar 2024 23:33:26 +0300 Subject: [PATCH 04/32] add raspologenie and vde numbers --- __pycache__/models.cpython-311.pyc | Bin 0 -> 2602 bytes addoborudtodb | 0 app.py | 25 ++++--- static/js/searchonaud.js | 106 ++++++++++++++++++----------- static/js/tmp.js | 47 +++++++++++++ templates/searchonaud.html | 44 ++++++------ 6 files changed, 150 insertions(+), 72 deletions(-) create mode 100644 __pycache__/models.cpython-311.pyc create mode 100644 addoborudtodb create mode 100644 static/js/tmp.js diff --git a/__pycache__/models.cpython-311.pyc b/__pycache__/models.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..266eac303dcbe2db5c0bf4a11b66b54db93ccbe3 GIT binary patch literal 2602 zcmcIm%}*Og6yIHcd$DnGNkc1DN+5)dA`U1QqCyowq?AC@z{MLYtA!n4VL!<1E{!=v zTPX*GB0&+74YGvQ18GDKIrPx}2koWmN_#+iiqsP~A~@yLH*0LLDHINQ^Mr*s-z#BA4hlOkE6c@-tUPDxS7! zh#Q`=@DN8SR_UGmmI8H_aVZE{#3_-hI3@MusPh-Qw7+1jhuR(=zqG$lt%uqk&tBSJxYk2$ zk8e2J-*L)U!1lbI;qWzkcDg_PDJ*PNLUM^xA`@m7^p9)+BT#$qufZR&i9S%{I|4B~r z#t&AFPbg4dNHD&j_^e-tNoSTY$(J|5I!c~L{Hm{7Qu7HZ1T+qN5grPHIVT@cId#)7 zmJta}iI!rHa>)zOxXj(K`OI7tRWCXqnrK{Bkr$OfGl>?q%t=lE!E1o31Y?pwX1pL) zC9|HYZ4e_S@Hsq&32+grvWb=M)X|CCq3+@hk<~VmFtfk_L|FHvj<2kvx*#pi+ZUkMKtCFNJ#XVf^qvCjBe= E7vLHM$^ZZW literal 0 HcmV?d00001 diff --git a/addoborudtodb b/addoborudtodb new file mode 100644 index 0000000..e69de29 diff --git a/app.py b/app.py index dd04fc7..75793c3 100644 --- a/app.py +++ b/app.py @@ -85,7 +85,6 @@ def searchonaud(): 'oboruds_id': oboruds.nazvanie, 'raspolog': oboruds.raspologenie, }) - print(results) return jsonify(results) else: @@ -187,24 +186,24 @@ def zamsearch(): @app.route('/addraspved', methods=['GET', 'POST']) def addraspved(): if request.method == 'POST': - #b'rasp=asndhaslkj&ved=1111111&inv=18124' - query_string = request.get_data().decode() - un_query_string = unquote(unquote(query_string)).split('&') - query_dict = {} - for pair in un_query_string: - key, value = pair.split("=") - query_dict[key] = value + query_string = request.data.decode() - print(query_dict) - ob = db.session.query(Oboruds).filter_by(invNumber=query_dict['inv']).first() - ob.raspologenie=query_dict['rasp'] - ob.numberved = query_dict['ved'] + print(query_string) + un_query_string = unquote(unquote(query_string)).split(',') + + print(un_query_string) + + + + ob = db.session.query(Oboruds).filter_by(invNumber=un_query_string[0]).first() + ob.raspologenie=un_query_string[2] + ob.numberved = un_query_string[1] db.session.commit() db.session.close() return jsonify({'success': True}, 200, {'ContentType': 'application/json'}) - + # ================================================================================== diff --git a/static/js/searchonaud.js b/static/js/searchonaud.js index f5c6fea..ac233b4 100644 --- a/static/js/searchonaud.js +++ b/static/js/searchonaud.js @@ -13,7 +13,7 @@ function getData(){ }, success: function(response){ - console.log(response) + var data = response; const table = document.getElementById('datatable') table.innerHTML = '' @@ -29,7 +29,7 @@ function getData(){ tr += '
' tr += '' tr += '' - tr += '' + tr += '' tr += '' }); @@ -42,58 +42,84 @@ $("#searchbutton").click(function(){ getData(); }) -function tableclick(x){ - let data = document.getElementById(x.rowIndex) +$('#modalsavetodb').click(function(){ - let datas = x.innerText.split('\t') + let rasp = document.getElementById('modal_rapolog') + let vedomost = document.getElementById('modal_vednumber') + let invnom = document.getElementById('modal_invnom') + let matcen = document.getElementById('modal_matcenn') + + let changeddata = new Array() + + changeddata[0] = invnom.text + changeddata[1] = vedomost.value + changeddata[2] = rasp.value + + let sendData = changeddata.join(',') + + changeddata = [] + $.ajax({ + + url: "/addraspved", + type: "POST", + contentType: "application/json;charset=utf-8", + dataType: "json", + data: sendData, + + success: function(){ + /* + rasp='', + vedomost = '', + invnom = '', + matcen = '', + + changeddata = [] + */ + $('#getmodal').modal('hide').data( 'bs.modal', null ); + getData(); + } + }) + + +}) + + +function tableclick(tableRow){ + + let nomved = tableRow.childNodes[0].innerHTML; + let invnomer = tableRow.childNodes[1].innerHTML; + let nazvanie = tableRow.childNodes[2].innerHTML; + let raspolog = tableRow.childNodes[4].innerHTML; $('#getmodal').modal('show') - //let rasp = document.getElementById('rapolog') - //let vedomost = document.getElementById('vednumber') + let rasp = document.getElementById('modal_rapolog') + let vedomost = document.getElementById('modal_vednumber') let invnom = document.getElementById('modal_invnom') - //let matcen = document.getElementById('modal_matcenn') - - invnom.innerText=datas[1]+"\t" - matcen.innerText=datas[2].substring(0,15) + let matcen = document.getElementById('modal_matcenn') + invnom.innerText = invnomer + matcen.innerText = nazvanie.substring(0,15) - if (datas[4].length>0){ - rasp.value=datas[4]; + if (nomved.length >0){ + + vedomost.value = nomved } - if (datas[0].length>0){ - vedomost.value=datas[0] + if(raspolog.length>0){ + rasp.value = raspolog } + + $("#mimodal").on('hidden.bs.modal', function () { + $(this).data('bs.modal', null); + }); + $('#modalclose').click(function(){ - $('#getmodal').modal('hide'); + $('#getmodal').modal('hide').data( 'bs.modal', null ); } ) - $('#modalsavetodb').click(function(){ - $.ajax({ - - url: "/addraspved", - type: "POST", - contentType: "application/json;charset=utf-8", - dataType: "json", - data: { - rasp: rasp.value, - ved: vedomost.value, - inv: datas[1] - }, - success:function() { - rasp.value = ''; - vedomost.value= ''; - data=[]; - rasp - $('#getmodal').modal('hide'); - getData(); - } - }) -}) - -} +} \ No newline at end of file diff --git a/static/js/tmp.js b/static/js/tmp.js new file mode 100644 index 0000000..da3063e --- /dev/null +++ b/static/js/tmp.js @@ -0,0 +1,47 @@ +function tableclick(x){ + // let data = document.getElementById(x.rowIndex) + + let datas = x.innerText.split('\t') + + + + invnom.innerText=datas[1]+"\t" + matcen.innerText=datas[2] + + + if (datas[4].length>0){ + rasp.value=datas[4]; + } + + if (datas[0].length>0){ + vedomost.value=datas[0] + } + + $('#modalclose').click(function(){ + + $('#getmodal').modal('hide'); + + } ) + + $('#modalsavetodb').click(function(){ + $.ajax({ + + url: "/addraspved", + type: "POST", + contentType: "application/json;charset=utf-8", + dataType: "json", + data: { + rasp: rasp.value, + ved: vedomost.value, + inv: invnomer + }, + success:function() { + rasp.value = ''; + vedomost.value= ''; + data=[]; + rasp + $('#getmodal').modal('hide'); + getData(); + } + }) + })} \ No newline at end of file diff --git a/templates/searchonaud.html b/templates/searchonaud.html index 97fa8ce..5214d5d 100644 --- a/templates/searchonaud.html +++ b/templates/searchonaud.html @@ -8,27 +8,33 @@
-
- -
- -
- № из ведомости - -
- -
- Расположение - -
- - +
+ + +
+ +
+
+ № из ведомости + +
+ +
+ Расположение + +
+ + + +
+ + +
+
-
- - -
+ +
From 027b1dc85546e2f1b2e9c1456d5187d70403ca3c Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 1 Apr 2024 22:35:26 +0300 Subject: [PATCH 05/32] 1111 --- __pycache__/app.cpython-312.pyc | Bin 16039 -> 16318 bytes __pycache__/models.cpython-312.pyc | Bin 2363 -> 2363 bytes migrations/__pycache__/env.cpython-312.pyc | Bin 4531 -> 4531 bytes .../__pycache__/256c3a3e91a2_.cpython-312.pyc | Bin 1319 -> 1319 bytes .../__pycache__/4f95d12a8352_.cpython-312.pyc | Bin 1317 -> 1317 bytes .../__pycache__/50f85881169e_.cpython-312.pyc | Bin 687 -> 687 bytes .../__pycache__/873defe09f22_.cpython-312.pyc | Bin 1324 -> 1324 bytes .../__pycache__/8e838956713f_.cpython-312.pyc | Bin 1321 -> 1321 bytes .../__pycache__/b24baa0d98e6_.cpython-312.pyc | Bin 717 -> 717 bytes .../__pycache__/b2a61aef79e9_.cpython-312.pyc | Bin 687 -> 687 bytes .../__pycache__/ec6bbcd361bd_.cpython-312.pyc | Bin 2058 -> 2058 bytes serve.py | 6 ++++++ static/js/searchonaud.js | 6 +++--- 13 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 serve.py diff --git a/__pycache__/app.cpython-312.pyc b/__pycache__/app.cpython-312.pyc index 18d2bc281950e860c1d94224d7808b208d6fba18..68458579ecda5474bdf3b2a139fc698582711aaa 100644 GIT binary patch delta 3913 zcmaJ@Yiv}<6~432yX$?JeR%C%dw0ESY+u`87n_H9*o7E11;vC{NF3CS?R#U^-G@E9 z3o$iWP(U>;3ZPL65=}*_rX_(yshmorRnteJs#1Q$TT>Zbksnp5)ck3kmrzku^_;oh z2Q2DH`|Zp*-^@L8=A1M0ixcnX9Us~4Rsq_XZPw@g%@-Z@r0!zdctjRtQ({%pHR2+I zPEd&AzD|%P2qPZZtav6n*dJ`}HR4u~$QBrPapeOL^A(4j!Dl>SL_~u5mA!?KDvSUJb!&%hHwWo#aE6a>DmUyeGc&-Xw zQ;FxU;(01~!4l6~#jC5}g-SeM6|cU67cTJ{s(AhiUUQKb2o${{H&*B)MSZlXYMo#O zFIwV-s(9fFUQ3DBT*Zr2@K%?2(JEd`1+TTlTV2I#t>Cp4dHrowy!HxSyDXg+MkKid zutRano!@O21nPy^hcGI97P(7ab7Spwy%q>Wm@&>6rEa#taI8imsyUaM&ZV=;{9A^v z4aCddw0uAUEM=95pIx@@Hul1_hWUS5H|a?mYjzCQwt#?I5SkEzY|7#BOW5rIP)+0M zWHO$mA`B!w-N1h0@VhalRr8cWl~g)Icfe>p`^a&g^s#51hq^s5re1_P0Etio{JkO2 zJ{0k(rcqhmo|EZLkPNcFIU8Z-f1N=mCM@pjiyeTM1hzN4lTFn=PIj~RY6nT@{C{fC z66Z65a2S&1gzrjY?tUZ%$g=!(PwV`k4?qcBEq?6 z4MJ98PPcbcCwz-H*)S{2k{iaNSN98&X_(?hRB<#X$FpfVBbiilDwm8MRb;l`-IrHI zI+~eEC(;wgYct9y9Y2yz0e9_@Y%(F~s2?ZmsgjZED%}fGT7wWmFe5||wjuDdKqt^v z096;4wL=ioR90wgY=*X>GK|W+1&kR}D40W=QHq;UZAF`uR9xYQ#=S3@=^Eq=BWyq- znWh08d-9$bw;Q8NjXj0Np3m&&M#ooz+3sA{!<;W&?0IjH^v$2~?jm^} zDrmSk=SYCage(lgXy#F**X` z@1Xt=z)9h**};Z=`@xi-`aZ5Og?Gt`jl2o# z{wgw|gL>JtdQW$GT^mm4xoDtCIs0(ZYFl7eR!4RnLFUs451zP|etMckRSG~gXX8l) zPB^275ga;qB%MY*!X;*IeIM-kQ|oIakC96I0S?g3*xiDF4-KhS^JKYflrlq$MQ(Zd zjE~~PV+b!G%pl|txV5~v>*y>BctGM~1T1rMZ|Ns9>*xuPyw1LA{~?%mN&?dwkW3LW z0L26;AL^s*K~K^&0^Dg(-x3L4%jgt}w78=^s97mHiaau!)LhpM;!>V~%iO@S93M?; z^@*MW_1o;-&L2VW?e1#TMRe>fuSC9PuXY8Q8uYMmuh?=z$f8xe%?jlkA&UvYTegNJ zIs$B0z|H;@tf?avd{W}Gd^E(K>+smJctP-Xov=`Y-!n^OJ^JN_p-7%=VAHjMb{%Mp zsF~Hp?AjFQ6WO#PbF9et(#Oo)TtfIrZsDUm5whr9-ej{Z#))i^t#VDAlrOCrL9z|= ztM@+XqIihBgnf#=PYDkD0jgrjRgsl(AgCr;8BfcKYMi3+RF*nHmRF4#NXP6Wi%dDr z_TfkNB4A*t#_>ctquoQ2UbRi<6gm^jWMS0_)tO7hDg|2PRVIasg&Qw4xZ_6XIau)5 z@XIU$@XG!D7f-!-x$ZCK&|P2f((J|AC0|Fu*Rkm9nzP*%?Q@A+V&IOy`Dbm{x)viF z7yX--`~wC5z|G8}|FJnIGSaui;FltMt;v(`DcE~%4*vNYg)L7k*n1Z3!%Ox91^a@|8l)7xd2v#|RtlZJ0l`v4N07?8>HrgY*o{%3+0B_~pVo3%`NiZwsg3 zb*NQakkbhO$wpts{&@u4m1-TQ3e@u$TpHSIlNU^W9SyRz{Xx@Or25&uerXLiSJWoJ zz5P09?!YheZvZgXVmlu?8(OsZKNH%FjqFj34-0Vep~FIOMW?=rCj7Ya9x)cQ^NtF7}VjPp#p_^D4}v z7XVaSjwTZEv9(j96k;2bLltAO)M!$P#puiI;FewaUL@~8*olA-C;sxFc$f2=lHY0k z0@6x9)>mG|c%1XI;d_QBWG+RAP+NLG-xs$g({e7M4A7gPz{Jj6fKy)96GHBp1j2$_ zefm#?Fk8R%@2l#_x5*cJLD#pe!|w9Bd1>2L5^#|NT->{?!|vxjCere`tDQ71Kg~`K JL=E`0{{gw;N;?1m delta 4021 zcmaJ@eQaA-6@S;?cKsDQaU45woR21bY4for>C!amSHfWZNULQVER0%C-fQdDvD5qP zltj+FNkdENph@pW2W2dUKj_HBkRrs#ACsW{55!V3vFfQ31x67P5?(1Psw&1g_r)Jg z8lL2z?>*=I?mO??bI!dVWPdp0{Efq56X5ylKOf394f9SvvCTJ+Wp#o~yRpvZ&MaBYtq9vuK+iNt-0QNlW;3$#3|u7uUF0jqu;tD(rsjx=sSYg|X$T%?U`-hkD# zj@4YkYLd3RDvUHsBH$LeOlmpZ3B^P!V6ox+1{D7#i?mhR_Fn6vUXu}F$~a{d+t_}? z*`@1-hXzv4er3Hz0_nXN}pnplr>PfG&`s1>0ap#}l_fNDJ+ zi>G878J(h7&{SksoZhx>R9Rw)$wYEorm8MEs^Hth;V^vyRptqq%88^x_ra`-{n>fJ zfweeoZjVY*G%c~R79V@V)!ps|DJ@69)*upUfWLPIiq_gvCSdGKOLPz+^yZ4ZaC3o35LI&7(Jaz1b$4|l+y%p>;kFUQT)>!jM z`tKU@sZ4~|KW7k9oAV}_f@WAqHM5i6kQ@C~E${`gRFY1K2KJ7(D?9DZ`vQu#ld18z zsH0VAsi(3cmah%$CQ#83f*GL>0oxwsyMSS*=!2?@NmRsvB}pZ153ps@T7)n{3&IN) zL=2p0rrU6Q5P|OzIYR?Dc?v)^Cr6VsEh!4V7WN7sEy$ZnK7bwt?Ew6gI`+HrYh@;@ z>xR8%_6u_-ZrZ&UhRzMK#fti}Pp!sk=f4G`!NS1FXzVcn7 z`H7n+ZYud)+zIV-3rVNyVW%mN&2H2h5ljHE2nJKZ!)MiBo0dkYq%=yO1M!zp|3!e8 zg-^^*cDuHc-Kp#YcN+X3mbgRrfC+sP0V_as{(p~(WkCCpqZI&-9(7PO6eF&^VlNme zxFZJD;mZf{519lq{tu;;}Ip&|_fm3R|h|fCw1E_X#=3 z9@YiLM;j2Y1YQMN#qiJKU*5v@*4F^%SbfmLn~rHRA%kP|1g!fSJ751JSa(Om2_5vm z?`=NPUR>7>23my~=(vB&uQnsyP)Kmtlt=>4P+m zdW1LFY|{te&*z)3kn9U6?E!d}?!;j)!Y%;Otwplf3<}kuo28S`b~ZCzeR zgc6-4V_Bnf6?j(379-mAGe+`<^)SSEh#!E{#&qg{j>cd_zbRw|;b&l@TnFH7{k4}~dFd_R@6ENhDnpkt z^O;%u?O^lA!L}R0wyS4Xf=@16{5g{l-1>2#<3^z4C*GAn_pA#fKL4!kW_iP1L1%58 z9lTjp^G@K~frWv~wdW4Z4$M{D3^mLim{Y!fBxeMJoK5hBFCCjdw(!hTD-~Oj8M-ty zKeW)jQZCL~Ke0HL-SrE-3)_~R?H^e>ZsELcL0kwfJ6k`pwB54^cJJKNZ>5&KjSFK} z4=?XJyu5X2Wz&&m!x7rKw9@f&eIsuwYYK^XbzVp!d@c>K_q(cg9Ks=%GE^}?%}uKZ z_-Y~ZI)?DVB@Dwx>6>8tho%2^?I&b#Y2OaLj#$}1Pa}C^>10n2A zVk`H^G6s5R^rQ4DX#NO4H#AVY|`Je%$+u;he#0wcj5mFwddz z{(fSxzDRNc;)DAG1;qme!}I38u0fyv*VcXRL7VYfpa~||ZN@>b^}5T9W1n%bmi=^B z2WeqOQ@KCtwSC#7^;-c5fA3cS83-+-;l=?NkCO#)%t z`zzU@{=bx!lc&kQ^n$J{r^8{cZE5fBJ`(hkqg>pX)8X)LpNTZy^>h+@F3v9PX)tuc GivI(!=`EoE diff --git a/__pycache__/models.cpython-312.pyc b/__pycache__/models.cpython-312.pyc index 3d4cca7df5775e8cc87b28c16291eda4aa899dd7..1dc19b0d8c218ea2652853ebd2e708387a36bb2f 100644 GIT binary patch delta 21 bcmdljv|EVhG%qg~0}!;@a;0tL(dPsJI?M#U delta 21 bcmdljv|EVhG%qg~0}woY|0i`Lk3J^=NKppB diff --git a/migrations/__pycache__/env.cpython-312.pyc b/migrations/__pycache__/env.cpython-312.pyc index 26bd5f43025677793ecc3a3f32f9f3c9b03e87ad..a104e78ffe25b27c534ddc5db40d1bfc95d24f79 100644 GIT binary patch delta 21 bcmdn2yjhv&G%qg~0}!;@a;0tLSuO|wJqiU+ delta 21 bcmdn2yjhv&G%qg~0}woY|0i`L&vHQkN{tN>B$? diff --git a/migrations/versions/__pycache__/b2a61aef79e9_.cpython-312.pyc b/migrations/versions/__pycache__/b2a61aef79e9_.cpython-312.pyc index a7e9152bb66bea3a82a0e44bde5e09775d76a7e2..93c8f6c291d50128949113cd91c596f191e4cb2a 100644 GIT binary patch delta 21 bcmZ3_x}KHiG%qg~0}!;@a;0tLSl9G;{?d delta 21 bcmeAY=n~*L&CAQh00d9p|4H4*^N$?>LHP$K diff --git a/serve.py b/serve.py new file mode 100644 index 0000000..3e35f73 --- /dev/null +++ b/serve.py @@ -0,0 +1,6 @@ +from waitress import serve +from app import app + + +if __name__ == '__main__': + serve(app, port='3800') diff --git a/static/js/searchonaud.js b/static/js/searchonaud.js index ac233b4..b5a4d9d 100644 --- a/static/js/searchonaud.js +++ b/static/js/searchonaud.js @@ -16,9 +16,9 @@ function getData(){ var data = response; const table = document.getElementById('datatable') - table.innerHTML = '' + var headTable = '' - table.innerHTML += headTable + var tr ="" @@ -33,7 +33,7 @@ function getData(){ tr += '' }); - table.innerHTML += tr + table.innerHTML = headTable + tr } }) } From 87c4ebe33e69ec19b443f976557a6f5fa2905476 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Tue, 2 Apr 2024 16:34:06 +0300 Subject: [PATCH 06/32] db schema update --- migrations/__pycache__/env.cpython-312.pyc | Bin 4531 -> 4531 bytes migrations/versions/6fc3d1adb061_.py | 34 ++++++++++++++++++ .../__pycache__/256c3a3e91a2_.cpython-312.pyc | Bin 1319 -> 1319 bytes .../__pycache__/4f95d12a8352_.cpython-312.pyc | Bin 1317 -> 1317 bytes .../__pycache__/50f85881169e_.cpython-312.pyc | Bin 687 -> 687 bytes .../__pycache__/6fc3d1adb061_.cpython-312.pyc | Bin 0 -> 1549 bytes .../__pycache__/873defe09f22_.cpython-312.pyc | Bin 1324 -> 1324 bytes .../__pycache__/8e838956713f_.cpython-312.pyc | Bin 1321 -> 1321 bytes .../__pycache__/b24baa0d98e6_.cpython-312.pyc | Bin 717 -> 717 bytes .../__pycache__/b2a61aef79e9_.cpython-312.pyc | Bin 687 -> 687 bytes .../__pycache__/be7c94c549e5_.cpython-312.pyc | Bin 1579 -> 1579 bytes .../__pycache__/ec6bbcd361bd_.cpython-312.pyc | Bin 2058 -> 2058 bytes models.py | 6 ++-- 13 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 migrations/versions/6fc3d1adb061_.py create mode 100644 migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc diff --git a/migrations/__pycache__/env.cpython-312.pyc b/migrations/__pycache__/env.cpython-312.pyc index 26bd5f43025677793ecc3a3f32f9f3c9b03e87ad..d40e79f400bb16ed92d574bacba9859fc929731d 100644 GIT binary patch delta 33 ncmdn2yjhw1G%qg~0}wb?|J=y^k%`e|@?R!##`Mji%=7pFrmYFs delta 33 ocmdn2yjhw1G%qg~0}woY|7RojM diff --git a/migrations/versions/6fc3d1adb061_.py b/migrations/versions/6fc3d1adb061_.py new file mode 100644 index 0000000..fedf8b5 --- /dev/null +++ b/migrations/versions/6fc3d1adb061_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 6fc3d1adb061 +Revises: be7c94c549e5 +Create Date: 2024-04-02 16:32:23.180273 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '6fc3d1adb061' +down_revision = 'be7c94c549e5' +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('buhnumberpp', sa.String(length=100), nullable=True)) + batch_op.add_column(sa.Column('kolichestvo', sa.Integer(), nullable=True)) + + # ### 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.drop_column('kolichestvo') + batch_op.drop_column('buhnumberpp') + + # ### end Alembic commands ### diff --git a/migrations/versions/__pycache__/256c3a3e91a2_.cpython-312.pyc b/migrations/versions/__pycache__/256c3a3e91a2_.cpython-312.pyc index 280709a1ee6a6bff249d19d258745785f406cb45..77081c020d0561fcf0bae39f174e7f1634cd7da5 100644 GIT binary patch delta 50 zcmZ3^wVaFlG%qg~0}wb?|J=xZhf&hSDkh*PKfNe1H#ajcJtm;CBqKi$B(jM~of!a$ CV-R%! delta 50 zcmZ3^wVaFlG%qg~0}woY|7Roj9Y#rKtC)bI{Pd#4+}zB(^q7Fkl8pR3ph(sxCUs^2 DvBD9O diff --git a/migrations/versions/__pycache__/4f95d12a8352_.cpython-312.pyc b/migrations/versions/__pycache__/4f95d12a8352_.cpython-312.pyc index a22fbdba7d14976b081fd4de951dc714d7f8fb34..2889172c48bcc637f0802a4cc60643c47ee508aa 100644 GIT binary patch delta 51 zcmZ3=wUmqdG%qg~0}wb?|J=wO&m`$$6%$aDpI(%ho12-J9urVml98VW64~6$w1^1+ Di|r8e delta 51 zcmZ3=wUmqdG%qg~0}woY|7Rn2Jd>oeRZKupetJ=2Zf<5?dQ3oNNk)DiP$X+}Gt(j_ E0JUin5C8xG diff --git a/migrations/versions/__pycache__/50f85881169e_.cpython-312.pyc b/migrations/versions/__pycache__/50f85881169e_.cpython-312.pyc index 09660f0669e349e2275b93619a0d0111d9f51a66..aee53e012d4bd8c8629af841795a6c4383eced9d 100644 GIT binary patch delta 51 zcmZ3_x}KH$G%qg~0}wb?|J=we#VF}w6%$aDpI(%ho12-J9urVml98VW64`9WSjY$f DgKQ8# delta 51 zcmZ3_x}KH$G%qg~0}woY|7Rn&6r-fGRZKupetJ=2Zf<5?dQ3oNNk)DiP$X-!9b+LQ E0IcW{TmS$7 diff --git a/migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc b/migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..42c75e8fe00a35ef480aa614c57cb252456ff8f1 GIT binary patch literal 1549 zcmb_c&2Jk;6rb^~ch_sXBz!a#alumIU}37*j?>mcNJ-5h970Lp;KkKycV}ul?1!0I zCm4a01OEd-LZa6yIZ%NFCj^|3xDd%wqvhC2sJD~|RmzDs>vdzKNC?E(``b6~y?Hb5 zz2EFF`Mi!`{I2D0eJ>$&UrZ(=l?caILHG<2WFUe`%EeyFNMRvMu4KqWHqs<*C`2+; zcr>DXii`|V0rjC&(mv`^uOAMJ9_8HXP+ecATRq+j{Nie}QCzy^)JVl5_QFzSY@xhS zwCNS++M-imyhiK#bw;g_7MlQ#Vs)Xq`04`utHsJvqgHKHYnLlm7phlky8cicxP+rr z&|iyk(~+axbVMgfEPiDGA#-%x#3IWOa6C3A`A-z^hMduUYA>CpUPz7xVT*|CPYG4O!K=>UTDck`9SW(s|f zaVt`;k7Z>eWIewVsjGfSJCwl@wDIbo&qYy-CvP{e1Pd_s#mZt-GxsoKgMFU*Bzw3dTr# z?<^e)SKOkJIS;99P@14A|oiz1CB-@hm?PH3J^ZD#qva<~T6<&jQkpZbKG zfgkgVi7f7*V?Y#Vc%r@L1!UmT*V)UU6Wr!CfFlWG{3xYh`Ok9*&;5qxjx>~een&f; dd0{7iIP)w(es)LyLy_?YK7LxpW%d%R`wPuFKkvD;f(PeTTlQ?7g<~F9qOaQ9&3A6wJ delta 35 pcmZ3A9r^J5kOmmCQ2 diff --git a/models.py b/models.py index 24c2840..df3623a 100644 --- a/models.py +++ b/models.py @@ -15,10 +15,12 @@ class Auditory(db.Model): class Oboruds(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) invNumber=db.Column(db.Integer) - nazvanie=db.Column(db.String(500)) - balancenumber = db.Column(db.String(30)) + nazvanie=db.Column(db.String(500)) raspologenie = db.Column(db.String(200)) numberved = db.Column(db.String(100)) + buhnumberpp = db.Column(db.String(100)) + kolichestvo = db.Column(db.Integer) + balancenumber = db.Column(db.String(30)) aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id)) From 3cd5fe63b55fb8f41e0b4d4fd24d296822e0eda7 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Wed, 3 Apr 2024 20:01:50 +0300 Subject: [PATCH 07/32] 12311 --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3eab82b..117f06f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,4 @@ project.db c*.txt migrations/__pycache__/* -migrations/versions/__pycache__/* \ No newline at end of file +migrations/versions/__pycache__/* \ No newline at end of file From d71945ecb2d353326a38de16a09154f86998479d Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Wed, 3 Apr 2024 20:02:05 +0300 Subject: [PATCH 08/32] 11111 --- models.py | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 models.py diff --git a/models.py b/models.py deleted file mode 100644 index 289ed24..0000000 --- a/models.py +++ /dev/null @@ -1,51 +0,0 @@ - -from flask_sqlalchemy import SQLAlchemy -import datetime - -db = SQLAlchemy() - - -class Auditory(db.Model): - id = db.Column(db.Integer, primary_key=True, autoincrement=True) - audnazvanie=db.Column(db.String) - oboruds = db.relationship('Oboruds') - - - -class Oboruds(db.Model): - id = db.Column(db.Integer, primary_key=True, autoincrement=True) - invNumber=db.Column(db.Integer) - nazvanie=db.Column(db.String(500)) - raspologenie = db.Column(db.String(200)) - numberved = db.Column(db.String(100)) -<<<<<<< HEAD -<<<<<<< HEAD - buhnumberpp = db.Column(db.String(100)) - kolichestvo = db.Column(db.Integer) - balancenumber = db.Column(db.String(30)) -======= - numberppasu = db.Column(db.String(100)) - kolichestvo = db.Column(db.Integer) - ->>>>>>> dev -======= - kolichestvo = db.Column(db.Integer) -======= - buhnumberpp = db.Column(db.String(100)) - kolichestvo = db.Column(db.Integer) - balancenumber = db.Column(db.String(30)) ->>>>>>> 87c4ebe33e69ec19b443f976557a6f5fa2905476 ->>>>>>> 4c6166c9078d5d913b83b681af7f7241af0399ca - aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id)) - - - - - -class Zametki(db.Model): - id = db.Column(db.Integer, primary_key=True, autoincrement=True) - txtzam=db.Column(db.String(10000)) - created_date = db.Column(db.DateTime, default=datetime.datetime.utcnow) - rmdt = db.Column(db.DateTime) - - From 0c4bf4b9fdbd7bf3b1183fc948a3b1a4d633eec2 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Wed, 3 Apr 2024 20:05:36 +0300 Subject: [PATCH 09/32] 12333 --- models.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 models.py diff --git a/models.py b/models.py new file mode 100644 index 0000000..2674a93 --- /dev/null +++ b/models.py @@ -0,0 +1,33 @@ + +from flask_sqlalchemy import SQLAlchemy +import datetime + +db = SQLAlchemy() + + +class Auditory(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + audnazvanie=db.Column(db.String) + oboruds = db.relationship('Oboruds') + + + +class Oboruds(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + invNumber=db.Column(db.Integer) + nazvanie=db.Column(db.String(500)) + balancenumber = db.Column(db.String(30)) + raspologenie = db.Column(db.String(200)) + numberved = db.Column(db.String(100)) + numberppasu = db.Column(db.String(100)) + kolichestvo = db.Column(db.Integer) + aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id)) + + +class Zametki(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + txtzam=db.Column(db.String(10000)) + created_date = db.Column(db.DateTime, default=datetime.datetime.utcnow) + rmdt = db.Column(db.DateTime) + + From 86f0f9d9777131b6bab5d4e2be189cef382a6745 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Wed, 3 Apr 2024 22:24:02 +0300 Subject: [PATCH 10/32] db check --- app.py | 3 +-- migrations/versions/c208cbc25232_.py | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 migrations/versions/c208cbc25232_.py diff --git a/app.py b/app.py index e51a222..cb89f7a 100644 --- a/app.py +++ b/app.py @@ -121,11 +121,10 @@ def alloborud(): def getall(): oboruds = Oboruds.query.all() oboruds_json = [{ - 'id': oborud.id, + 'invNumber': oborud.invNumber, 'nazvanie': oborud.nazvanie, 'raspologenie': oborud.raspologenie, - 'numberved': oborud.numberved, 'balancenumber': oborud.balancenumber, 'kolichestvo': oborud.kolichestvo, 'balancenumber': oborud.balancenumber, diff --git a/migrations/versions/c208cbc25232_.py b/migrations/versions/c208cbc25232_.py new file mode 100644 index 0000000..d158e4b --- /dev/null +++ b/migrations/versions/c208cbc25232_.py @@ -0,0 +1,24 @@ +"""empty message + +Revision ID: c208cbc25232 +Revises: 6fc3d1adb061, 885bdd7b5161 +Create Date: 2024-04-03 22:11:15.008480 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c208cbc25232' +down_revision = ('6fc3d1adb061', '885bdd7b5161') +branch_labels = None +depends_on = None + + +def upgrade(): + pass + + +def downgrade(): + pass From 509a3ee9131e7e27c0652a68ddcccfd3a7aed383 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Wed, 3 Apr 2024 22:31:08 +0300 Subject: [PATCH 11/32] edit gitignore --- .gitignore | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 117f06f..1408a6e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,15 +3,10 @@ instance venv/ -__pychache__/* 123 - - -zabalans.csv +*.csv project.db - - c*.txt - migrations/__pycache__/* -migrations/versions/__pycache__/* \ No newline at end of file +migrations/versions/__pycache__/* +__pycache__ \ No newline at end of file From 927d8d75a9d7c0ef40694c7d97e26bb80a63ddf0 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Wed, 3 Apr 2024 22:37:57 +0300 Subject: [PATCH 12/32] edit db scheme --- models.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/models.py b/models.py index 2674a93..772481f 100644 --- a/models.py +++ b/models.py @@ -16,11 +16,11 @@ class Oboruds(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) invNumber=db.Column(db.Integer) nazvanie=db.Column(db.String(500)) - balancenumber = db.Column(db.String(30)) raspologenie = db.Column(db.String(200)) numberved = db.Column(db.String(100)) numberppasu = db.Column(db.String(100)) kolichestvo = db.Column(db.Integer) + balancenumber = db.Column(db.Integer) aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id)) @@ -30,4 +30,3 @@ class Zametki(db.Model): created_date = db.Column(db.DateTime, default=datetime.datetime.utcnow) rmdt = db.Column(db.DateTime) - From cb862c63a631c771a7b7fbf12c6a49aca9bfa030 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Wed, 3 Apr 2024 22:50:16 +0300 Subject: [PATCH 13/32] add new func --- static/js/allmatc.js | 39 ++++++++++++++++++++------------------- templates/all.html | 2 +- templates/js.html | 1 + 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/static/js/allmatc.js b/static/js/allmatc.js index c9e2668..bd27654 100644 --- a/static/js/allmatc.js +++ b/static/js/allmatc.js @@ -7,29 +7,30 @@ function getAllData(){ dataType: 'json', success: function(response){ - console.log(response) + console.log("1111") let data = response; - $('#datatable tbody').empty(); - $.each(response, function(index, item) { - $('#datatable tbody').append( - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' - ); - }) - }, + var table = document.getElementById('alldatable'); + var tbody = table.getElementsByTagName('tbody')[0]; + // Clear existing data + tbody.innerHTML = ''; + + // Loop through the data and create table rows + data.forEach(function(item) { + var row = document.createElement('tr'); + Object.values(item).forEach(function(value) { + var cell = document.createElement('td'); + cell.textContent = value; + row.appendChild(cell); + }); + tbody.appendChild(row); + }); + + + }, }) } -$(document).ready(function(){ - getAllData() -}) \ No newline at end of file +getAllData() diff --git a/templates/all.html b/templates/all.html index 591890a..62b54bf 100644 --- a/templates/all.html +++ b/templates/all.html @@ -15,7 +15,7 @@
-
Номер в Инв. ведИнв. номерНазваниеАудиторияРасположениеНомер в Инв. ведИнв. номерНазваниеАудиторияРасположение' + element.oboruds_id + '' + element.auditory_name + '' +element.raspolog + '' + '\n' + '' + '\n' + '
Номер в Инв. вед Инв. номерНазваниеАудитория Расположение Проверено
' + item.invNumber + '' + item.nazvanie + '' + item.raspologenie + '' + item.numberved + '' + item.buhnumberpp + '' + item.kolichestvo + '' + item.balancenumber + '
+
diff --git a/templates/js.html b/templates/js.html index f8d9f27..0892e18 100644 --- a/templates/js.html +++ b/templates/js.html @@ -10,3 +10,4 @@ + From 63115f0328a086230b963fb89074d8662cef8bfd Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 3 Apr 2024 23:28:55 +0300 Subject: [PATCH 14/32] asdsadsa --- .gitignore | 7 ++- migrations/versions/4eacd6dcd461_.py | 54 ++++++++++++++++++ .../__pycache__/6fc3d1adb061_.cpython-312.pyc | Bin 1549 -> 1549 bytes .../__pycache__/885bdd7b5161_.cpython-312.pyc | Bin 1301 -> 1301 bytes 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 migrations/versions/4eacd6dcd461_.py diff --git a/.gitignore b/.gitignore index 1408a6e..502dd3b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,9 @@ project.db c*.txt migrations/__pycache__/* migrations/versions/__pycache__/* -__pycache__ \ No newline at end of file +__pycache__ +migrations/versions/__pycache__ +migrations/__pycache__ +migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc +migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc +migrations/versions/__pycache__/885bdd7b5161_.cpython-312.pyc \ No newline at end of file diff --git a/migrations/versions/4eacd6dcd461_.py b/migrations/versions/4eacd6dcd461_.py new file mode 100644 index 0000000..7bbfec8 --- /dev/null +++ b/migrations/versions/4eacd6dcd461_.py @@ -0,0 +1,54 @@ +"""empty message + +Revision ID: 4eacd6dcd461 +Revises: c208cbc25232 +Create Date: 2024-04-03 23:25:42.271936 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '4eacd6dcd461' +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.VARCHAR(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 ### diff --git a/migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc b/migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc index 42c75e8fe00a35ef480aa614c57cb252456ff8f1..4d546f9f7ca6012e9499b75a9532fc7557f65d40 100644 GIT binary patch delta 53 zcmeC>>E+=)&CAQh00bX)@TQ&E$oq;((%C8|peR4RC^0uTGcP?Rpt2+*KMyF9wON4q GFB1UC01|Hi delta 53 zcmeC>>E+=)&CAQh00hrDc+&Q50%WVP?Voul$e{FnU@|DP+5|Zp9d1zEWrGi F2>`1`5vc$G diff --git a/migrations/versions/__pycache__/885bdd7b5161_.cpython-312.pyc b/migrations/versions/__pycache__/885bdd7b5161_.cpython-312.pyc index 74241f9535d5eaf3dc252ae18501e377824a4f06..aa20e0ed9c33cefa3dec43d423a33b0d6a771671 100644 GIT binary patch delta 33 ncmbQrHI<9|G%qg~0}xC|<=My`#Kh=4IgUx3F>7-f(|jfXe)R{> delta 33 ncmbQrHI<9|G%qg~0}$Mm;@!v{#Kh<_IgUx3F@19x(|jfXe{=`X From 7ccbba06c16689cb9da436ef98a8265d39bf46d6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 4 Apr 2024 12:48:43 +0300 Subject: [PATCH 15/32] add click on row --- app.py | 30 ++++++++++------- static/js/allmatc.js | 69 +++++++++++++++++++++----------------- templates/all.html | 59 ++++++++++++++++++++++++++++++-- templates/searchonaud.html | 5 ++- 4 files changed, 114 insertions(+), 49 deletions(-) diff --git a/app.py b/app.py index cb89f7a..23b2c07 100644 --- a/app.py +++ b/app.py @@ -119,20 +119,26 @@ def alloborud(): @app.route('/getall') def getall(): - oboruds = Oboruds.query.all() - oboruds_json = [{ - - 'invNumber': oborud.invNumber, - 'nazvanie': oborud.nazvanie, - 'raspologenie': oborud.raspologenie, - 'balancenumber': oborud.balancenumber, - 'kolichestvo': oborud.kolichestvo, - 'balancenumber': oborud.balancenumber, - 'aud_id': oborud.aud_id - } for oborud in oboruds] + oborud = db.session.query(Auditory, Oboruds).filter( + Oboruds.aud_id==Auditory.id + ).order_by(Oboruds.invNumber).all() + results = [] + for auditory, oboruds in oborud : + results.append({ + 'invNumber': oboruds.invNumber, + 'nazvanie': oboruds.nazvanie, + 'raspologenie': oboruds.raspologenie, + 'balancenumber': oboruds.balancenumber, + 'kolichestvo': oboruds.kolichestvo, + 'numberppasu': oboruds.numberppasu, + 'numberved': oboruds.numberved, + 'aud': auditory.audnazvanie + + }) + - return jsonify(oboruds_json) + return jsonify(results) @app.route('/updateduplicate', methods=['GET', 'POST']) def updateduplicate(): diff --git a/static/js/allmatc.js b/static/js/allmatc.js index bd27654..ff2c8e2 100644 --- a/static/js/allmatc.js +++ b/static/js/allmatc.js @@ -1,36 +1,43 @@ -function getAllData(){ - $.ajax({ - url: "/getall", - type: "get", - contentType: 'application/json', - dataType: 'json', +$(document).ready(function() { - success: function(response){ - console.log("1111") - let data = response; - var table = document.getElementById('alldatable'); - var tbody = table.getElementsByTagName('tbody')[0]; + let tableBody = document.getElementById('alldatatable').getElementsByTagName("tbody")[0]; + tableBody.innerHTML = ''; + i = 0; + + $.getJSON("/getall", function(data) { + $.each(data, function(index, item) { + let newRow = tableBody.insertRow(tableBody.rows.length); + let cell1 = newRow.insertCell(0); + let cell2 = newRow.insertCell(1); + let cell3 = newRow.insertCell(2); + let cell4 = newRow.insertCell(3); + let cell5 = newRow.insertCell(4); + let cell6 = newRow.insertCell(5); + let cell7 = newRow.insertCell(6); + i++; + + cell1.innerText = i; + cell2.innerText = item.invNumber; + cell4.innerText = item.nazvanie; + cell3.innerText = item.kolichestvo; + cell5.innerText = item.numberved; + cell6.innerText = item.raspologenie; + cell7.innerText = item.aud; - // Clear existing data - tbody.innerHTML = ''; - - // Loop through the data and create table rows - data.forEach(function(item) { - var row = document.createElement('tr'); - Object.values(item).forEach(function(value) { - var cell = document.createElement('td'); - cell.textContent = value; - row.appendChild(cell); - }); - tbody.appendChild(row); - }); - - - }, - - }) -} + $(newRow).data('itemData', i); -getAllData() + $(newRow).on("click", function() { + let ind = newRow.cells[0].innerText; + let invNumber = newRow.cells[1].innerText; + + $('#getmodal').modal('show') + }); + + }); + }); + + }); + + diff --git a/templates/all.html b/templates/all.html index 62b54bf..0729e6d 100644 --- a/templates/all.html +++ b/templates/all.html @@ -2,10 +2,53 @@ {% block content %} + + + +
-

Все мат. ценности

+

Все мат. ценности

@@ -14,8 +57,8 @@
-
-
№ п/п
+
+
@@ -27,6 +70,16 @@ + + + + + + + + + +
№ п/пАудитория
1234567
diff --git a/templates/searchonaud.html b/templates/searchonaud.html index 7cef429..ff0d394 100644 --- a/templates/searchonaud.html +++ b/templates/searchonaud.html @@ -8,12 +8,12 @@
-<<<<<<< HEAD + -======= +
@@ -38,7 +38,6 @@
->>>>>>> 965695a6936eaf44348f73ca898f98c76b663157
From 1fce4b41c0b2bbbeb924c66276118e7021355598 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 4 Apr 2024 19:31:07 +0300 Subject: [PATCH 16/32] add modal fucnc --- static/css/index.css | 7 +- static/js/allmatc.js | 169 ++++++++++++++++++++++++++++++++++++------- templates/all.html | 37 +++++----- 3 files changed, 165 insertions(+), 48 deletions(-) diff --git a/static/css/index.css b/static/css/index.css index 72385ec..3e00e63 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -78,10 +78,13 @@ nav{ } -.table{ +table{ word-break: break-all; + border-collapse: separate!important; +} +td{ + padding: 0; } - .aud{ width: 110px; } diff --git a/static/js/allmatc.js b/static/js/allmatc.js index ff2c8e2..6e6c306 100644 --- a/static/js/allmatc.js +++ b/static/js/allmatc.js @@ -1,43 +1,156 @@ -$(document).ready(function() { +function getAllData(){ + let tableBody = document.getElementById('alldatatable').getElementsByTagName("tbody")[0]; + i = 0; + $.getJSON("/getall", function(data) { + $.each(data, function(index, item) { + let newRow = tableBody.insertRow(tableBody.rows.length); + let cell1 = newRow.insertCell(0); + let cell2 = newRow.insertCell(1); + let cell3 = newRow.insertCell(2); + let cell4 = newRow.insertCell(3); + let cell5 = newRow.insertCell(4); + let cell6 = newRow.insertCell(5); + let cell7 = newRow.insertCell(6); + let cell8 = newRow.insertCell(7); - let tableBody = document.getElementById('alldatatable').getElementsByTagName("tbody")[0]; - tableBody.innerHTML = ''; - i = 0; + i++; - $.getJSON("/getall", function(data) { - $.each(data, function(index, item) { - let newRow = tableBody.insertRow(tableBody.rows.length); - let cell1 = newRow.insertCell(0); - let cell2 = newRow.insertCell(1); - let cell3 = newRow.insertCell(2); - let cell4 = newRow.insertCell(3); - let cell5 = newRow.insertCell(4); - let cell6 = newRow.insertCell(5); - let cell7 = newRow.insertCell(6); - i++; + cell1.innerText = i; + cell2.innerText = item.numberved; + cell3.innerText = item.invNumber; + cell4.innerText = item.nazvanie; + cell5.innerText = item.kolichestvo; + cell6.innerText = item.balancenumber; + cell7.innerText= item.aud; + cell8.innerText = item.raspologenie; - cell1.innerText = i; - cell2.innerText = item.invNumber; - cell4.innerText = item.nazvanie; - cell3.innerText = item.kolichestvo; - cell5.innerText = item.numberved; - cell6.innerText = item.raspologenie; - cell7.innerText = item.aud; + + $(newRow).data('itemData', i); + + + $(newRow).on("click", function() { - $(newRow).data('itemData', i); + let vednumbertxt = newRow.cells[1].innerText; + let invnomertxt = newRow.cells[2].innerText; + let nazvanietxt = newRow.cells[3].innerText; + let kolvotxt = newRow.cells[4].innerText; + let schettxt = newRow.cells[5].innerText; + let raspologtxt = newRow.cells[7].innerText; - $(newRow).on("click", function() { - let ind = newRow.cells[0].innerText; - let invNumber = newRow.cells[1].innerText; + $('#getmodal').modal('show'); + + + let vedomost = document.getElementById('modal_vednumber') + let invnom = document.getElementById('modal_invnom') + let matcen = document.getElementById('modal_matcenn') + let kolvo = document.getElementById('modal_kolvo') + let balancenumber = document.getElementById('modal_balance') + let rasp = document.getElementById('modal_rapolog') - $('#getmodal').modal('show') - }); + invnom.innerText = invnomertxt + matcen.innerText = nazvanietxt.substring(0,15) + + if (vednumbertxt.length>0){ + vedomost.value = vednumbertxt; + } + + if (kolvotxt.length>0){ + kolvo.value = kolvotxt; + } + + if (schettxt.length>0){ + balancenumber.value = kolvotxt; + } + + if (raspologtxt.length>0){ + rasp.value = raspologtxt; + } }); + }); + }); + +} + +$( document ).ready(function() { + + getAllData(); }); + $('#modalclose').click(function(){ + + + let vednumber = document.getElementById('modal_vednumber') + let kolvo = document.getElementById('modal_kolvo') + let balancenumber = document.getElementById('modal_balance') + let matcen = document.getElementById('modal_matcenn') + let rasp = document.getElementById('modal_rapolog') + + + + vednumber = ''; + kolvo = ''; + balancenumber = ''; + matcen = ''; + rasp = ''; + $('#getmodal').modal('hide') + + + +} ) + +$('#modalsavetodb').click(function(){ + + let invnom = document.getElementById('modal_invnom') + let vednumber = document.getElementById('modal_vednumber') + let kolvo = document.getElementById('modal_kolvo') + let balancenumber = document.getElementById('modal_balance') + let matcen = document.getElementById('modal_matcenn') + let rasp = document.getElementById('modal_rapolog') + + + + + let changeddata = new Array() + + changeddata[0] = invnom.text; + changeddata[1] = vednumber.value; + changeddata[2] = kolvo.value; + changeddata[3] = balancenumber.value; + changeddata[4] = rasp.value; + + + let sendData = changeddata.join(',') + console.log(sendData) + + $.ajax({ + + url: "/addraspved", + type: "POST", + contentType: "application/json;charset=utf-8", + dataType: "json", + data: sendData, + + success: function(){ + + invnom = ''; + vednumber = ''; + kolvo = ''; + balancenumber = ''; + matcen = ''; + rasp = ''; + changeddata = [] + + $('#getmodal').modal('hide') + + getAllData(); + } + }) + + +}) \ No newline at end of file diff --git a/templates/all.html b/templates/all.html index 0729e6d..260e58d 100644 --- a/templates/all.html +++ b/templates/all.html @@ -9,38 +9,37 @@
- - - - - -
-
-
№ из ведомости - +
+
- Расположение - + Количество +
+
+ Балансовый счёт + +
+ +
+ Расположение + +
-
- -
@@ -57,17 +56,19 @@
-
+
- - + + - + + + From f9a188c927522375fde1479d1b10278191aa747f Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 4 Apr 2024 20:00:26 +0300 Subject: [PATCH 17/32] add data to db --- app.py | 21 ++++++-------- static/js/allmatc.js | 66 ++++++++++++++++++++++---------------------- 2 files changed, 42 insertions(+), 45 deletions(-) diff --git a/app.py b/app.py index 23b2c07..efabbad 100644 --- a/app.py +++ b/app.py @@ -140,11 +140,6 @@ def getall(): return jsonify(results) -@app.route('/updateduplicate', methods=['GET', 'POST']) -def updateduplicate(): - if request.method == 'POST': - aud = request.form.get('auditory_dubl') - @app.route('/vneaud', methods=['GET', 'POST']) def vneaud(): @@ -200,19 +195,21 @@ def addraspved(): query_string = request.data.decode() - print(query_string) un_query_string = unquote(unquote(query_string)).split(',') - print(un_query_string) - - ob = db.session.query(Oboruds).filter_by(invNumber=un_query_string[0]).first() - ob.raspologenie=un_query_string[2] - 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] + + db.session.commit() db.session.close() - + + return jsonify({'success': True}, 200, {'ContentType': 'application/json'}) diff --git a/static/js/allmatc.js b/static/js/allmatc.js index 6e6c306..644f435 100644 --- a/static/js/allmatc.js +++ b/static/js/allmatc.js @@ -50,7 +50,7 @@ function getAllData(){ let rasp = document.getElementById('modal_rapolog') invnom.innerText = invnomertxt - matcen.innerText = nazvanietxt.substring(0,15) + matcen.innerText = nazvanietxt.substring(0,20) if (vednumbertxt.length>0){ vedomost.value = vednumbertxt; @@ -93,11 +93,11 @@ $( document ).ready(function() { - vednumber = ''; - kolvo = ''; - balancenumber = ''; - matcen = ''; - rasp = ''; + vednumber.value = ''; + kolvo.value = ''; + balancenumber.value = ''; + matcen.value = ''; + rasp.value = ''; $('#getmodal').modal('hide') @@ -116,40 +116,40 @@ $('#modalsavetodb').click(function(){ - let changeddata = new Array() + let changeddata = new Array() - changeddata[0] = invnom.text; - changeddata[1] = vednumber.value; - changeddata[2] = kolvo.value; - changeddata[3] = balancenumber.value; - changeddata[4] = rasp.value; - + changeddata[0] = invnom.text; + changeddata[1] = vednumber.value; + changeddata[2] = kolvo.value; + changeddata[3] = balancenumber.value; + changeddata[4] = rasp.value; + - let sendData = changeddata.join(',') - console.log(sendData) + let sendData = changeddata.join(',') + console.log(sendData) $.ajax({ - url: "/addraspved", - type: "POST", - contentType: "application/json;charset=utf-8", - dataType: "json", - data: sendData, + url: "/addraspved", + type: "POST", + contentType: "application/json;charset=utf-8", + dataType: "json", + data: sendData, - success: function(){ - - invnom = ''; - vednumber = ''; - kolvo = ''; - balancenumber = ''; - matcen = ''; - rasp = ''; - changeddata = [] + success: function(){ + $('#getmodal').modal('hide') - $('#getmodal').modal('hide') - - getAllData(); - } + getAllData() + + vednumber.value = ''; + kolvo.value = ''; + balancenumber.value = ''; + matcen.value = ''; + rasp.value = ''; + changeddata = [] + + + }, }) From 1c901ddb00534301ead96960ca5ae184f888dfec Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 4 Apr 2024 22:51:45 +0300 Subject: [PATCH 18/32] all done --- app.py | 68 ++++++++++++++++++------- static/js/allmatc.js | 115 ++++++++++++++++++++++++++++++++++++++++--- templates/all.html | 77 +++++++++++++++++++++++++---- 3 files changed, 225 insertions(+), 35 deletions(-) diff --git a/app.py b/app.py index efabbad..3a120cc 100644 --- a/app.py +++ b/app.py @@ -119,23 +119,32 @@ def alloborud(): @app.route('/getall') def getall(): - oborud = db.session.query(Auditory, Oboruds).filter( - Oboruds.aud_id==Auditory.id - ).order_by(Oboruds.invNumber).all() + oborud = db.session.query(Oboruds).order_by(Oboruds.invNumber).all() results = [] - for auditory, oboruds in oborud : - results.append({ - 'invNumber': oboruds.invNumber, - 'nazvanie': oboruds.nazvanie, - 'raspologenie': oboruds.raspologenie, - 'balancenumber': oboruds.balancenumber, - 'kolichestvo': oboruds.kolichestvo, - 'numberppasu': oboruds.numberppasu, - 'numberved': oboruds.numberved, - 'aud': auditory.audnazvanie - - }) + for oboruds in oborud : + if oboruds.aud_id is None: + results.append({ + 'invNumber': oboruds.invNumber, + 'nazvanie': oboruds.nazvanie, + 'raspologenie': oboruds.raspologenie, + 'balancenumber': oboruds.balancenumber, + 'kolichestvo': oboruds.kolichestvo, + 'numberppasu': oboruds.numberppasu, + 'numberved': oboruds.numberved, + 'aud': "" }) + else: + aud = db.session.query(Auditory).filter_by(id=oboruds.aud_id).first() + results.append({ + 'invNumber': oboruds.invNumber, + 'nazvanie': oboruds.nazvanie, + 'raspologenie': oboruds.raspologenie, + 'balancenumber': oboruds.balancenumber, + 'kolichestvo': oboruds.kolichestvo, + 'numberppasu': oboruds.numberppasu, + 'numberved': oboruds.numberved, + 'aud': aud.audnazvanie }) + return jsonify(results) @@ -196,7 +205,7 @@ def addraspved(): 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() @@ -211,7 +220,32 @@ def addraspved(): 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(',') + print(un_query_string) + + + db.session.add( + Oboruds(invNumber=un_query_string[0], + nazvanie=un_query_string[5], + raspologenie= un_query_string[4], + numberved=un_query_string[1], + kolichestvo=un_query_string[2], + balancenumber=un_query_string[3] + ) + ) + + db.session.commit() + + + return jsonify({'success': True}, 200, {'ContentType': 'application/json'}) # ================================================================================== diff --git a/static/js/allmatc.js b/static/js/allmatc.js index 644f435..acd3864 100644 --- a/static/js/allmatc.js +++ b/static/js/allmatc.js @@ -1,5 +1,18 @@ +function clearTable() { + var table = document.getElementById("alldatatable"); + var rowCount = table.rows.length; + + // Iterate through each row and remove it + for (var i = rowCount - 1; i > 0; i--) { + table.deleteRow(i); + } +} + function getAllData(){ + console.log('12321321') + ///clearTable(); + let tableBody = document.getElementById('alldatatable').getElementsByTagName("tbody")[0]; i = 0; $.getJSON("/getall", function(data) { @@ -82,7 +95,7 @@ $( document ).ready(function() { }); - $('#modalclose').click(function(){ +$('#modalclose').click(function(){ let vednumber = document.getElementById('modal_vednumber') @@ -112,6 +125,7 @@ $('#modalsavetodb').click(function(){ let balancenumber = document.getElementById('modal_balance') let matcen = document.getElementById('modal_matcenn') let rasp = document.getElementById('modal_rapolog') + let nazv = document.getElementById('modal_nazvanie') @@ -124,6 +138,7 @@ $('#modalsavetodb').click(function(){ changeddata[3] = balancenumber.value; changeddata[4] = rasp.value; + let sendData = changeddata.join(',') console.log(sendData) @@ -138,19 +153,103 @@ $('#modalsavetodb').click(function(){ success: function(){ $('#getmodal').modal('hide') - - getAllData() - + + getAllData(); vednumber.value = ''; kolvo.value = ''; balancenumber.value = ''; matcen.value = ''; rasp.value = ''; - changeddata = [] - - + changeddata = []; }, }) -}) \ No newline at end of file +}) + + +$('#addoborud').click(function(){ + + $('#addmodal').modal('show'); + +}) + +$('#modal2savetodb').click(function(){ + + let invnom = document.getElementById('modal2_invnom') + let vednumber = document.getElementById('modal2_vednumber') + let kolvo = document.getElementById('modal2_kolvo') + let balancenumber = document.getElementById('modal2_balance') + let matcen = document.getElementById('modal2_matcenn') + let rasp = document.getElementById('modal2_rapolog') + let nazv = document.getElementById('modal2_nazvanie') + + + + + let changeddata = new Array() + + changeddata[0] = invnom.value; + changeddata[1] = vednumber.value; + changeddata[2] = kolvo.value; + changeddata[3] = balancenumber.value; + changeddata[4] = rasp.value; + changeddata[5] = nazv.value; + + + + let sendData = changeddata.join(',') + console.log(sendData) + + $.ajax({ + + url: "/addoborudasu", + type: "POST", + contentType: "application/json;charset=utf-8", + dataType: "json", + data: sendData, + + success: function(){ + vednumber.value = ''; + invnom.value= ''; + nazvanie.value=''; + kolvo.value = ''; + balancenumber.value = ''; + matcen.value = ''; + rasp.value = ''; + $('#addmodal').modal('hide') + + + }, + + }) + + +}) + +$('#modal2close').click(function(){ + + + let vednumber = document.getElementById('modal2_vednumber') + let invnomer = document.getElementById('modal2_invnom') + let nazvanie = document.getElementById('modal2_nazvanie') + let kolvo = document.getElementById('modal2_kolvo') + let balancenumber = document.getElementById('modal2_balance') + let matcen = document.getElementById('modal2_matcenn') + let rasp = document.getElementById('modal2_rapolog') + + + + vednumber.value = ''; + invnomer.value= ''; + nazvanie.value=''; + kolvo.value = ''; + balancenumber.value = ''; + matcen.value = ''; + rasp.value = ''; + + $('#addmodal').modal('hide') + + + +} ) \ No newline at end of file diff --git a/templates/all.html b/templates/all.html index 260e58d..e0c36de 100644 --- a/templates/all.html +++ b/templates/all.html @@ -44,15 +44,78 @@ + + + + + + +

Все мат. ценности

-
- -
+
+ +
+ +
+
+ +
@@ -72,13 +135,7 @@
- - - - - - - +
№ п/п№ п/п вед№
п/п
АСУ		№ п/п
вед		 Инв. номер Название Кол-во СчётАудиторияАуд - яРасположение
1234567
From d943894ae873ef70fad94b5a4399680ecc91e50a Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 4 Apr 2024 22:55:38 +0300 Subject: [PATCH 19/32] all done2 --- app.py | 3 --- static/js/allmatc.js | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app.py b/app.py index 3a120cc..7e478da 100644 --- a/app.py +++ b/app.py @@ -229,9 +229,6 @@ def addoborud(): query_string = request.data.decode() un_query_string = unquote(unquote(query_string)).split(',') - print(un_query_string) - - db.session.add( Oboruds(invNumber=un_query_string[0], nazvanie=un_query_string[5], diff --git a/static/js/allmatc.js b/static/js/allmatc.js index acd3864..10c7c82 100644 --- a/static/js/allmatc.js +++ b/static/js/allmatc.js @@ -176,7 +176,7 @@ $('#addoborud').click(function(){ $('#modal2savetodb').click(function(){ - let invnom = document.getElementById('modal2_invnom') + let invnomer = document.getElementById('modal2_invnom') let vednumber = document.getElementById('modal2_vednumber') let kolvo = document.getElementById('modal2_kolvo') let balancenumber = document.getElementById('modal2_balance') @@ -189,7 +189,7 @@ $('#modal2savetodb').click(function(){ let changeddata = new Array() - changeddata[0] = invnom.value; + changeddata[0] = invnomer.value; changeddata[1] = vednumber.value; changeddata[2] = kolvo.value; changeddata[3] = balancenumber.value; @@ -211,15 +211,15 @@ $('#modal2savetodb').click(function(){ success: function(){ vednumber.value = ''; - invnom.value= ''; + invnomer.value= ''; nazvanie.value=''; kolvo.value = ''; balancenumber.value = ''; matcen.value = ''; rasp.value = ''; + $('#addmodal').modal('hide') - - + }, }) From 2e9cc918d59a44ea26fa46510646c3a26e63cb27 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 5 Apr 2024 01:26:46 +0300 Subject: [PATCH 20/32] update db schema --- migrations/versions/10da3140ab2e_.py | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 migrations/versions/10da3140ab2e_.py diff --git a/migrations/versions/10da3140ab2e_.py b/migrations/versions/10da3140ab2e_.py new file mode 100644 index 0000000..f82f04f --- /dev/null +++ b/migrations/versions/10da3140ab2e_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 10da3140ab2e +Revises: 4eacd6dcd461 +Create Date: 2024-04-05 01:25:48.931573 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '10da3140ab2e' +down_revision = '4eacd6dcd461' +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('kolichestvo', sa.Integer(), nullable=True)) + + # ### 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.drop_column('kolichestvo') + + # ### end Alembic commands ### From 29b0070260e67241b0fc57cd041cf4e495206e47 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 8 Apr 2024 10:47:54 +0300 Subject: [PATCH 21/32] add reload page --- release-05-04-24/asuinventory | 1 + static/js/allmatc.js | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 160000 release-05-04-24/asuinventory diff --git a/release-05-04-24/asuinventory b/release-05-04-24/asuinventory new file mode 160000 index 0000000..2e9cc91 --- /dev/null +++ b/release-05-04-24/asuinventory @@ -0,0 +1 @@ +Subproject commit 2e9cc918d59a44ea26fa46510646c3a26e63cb27 diff --git a/static/js/allmatc.js b/static/js/allmatc.js index 10c7c82..5a15a9b 100644 --- a/static/js/allmatc.js +++ b/static/js/allmatc.js @@ -154,13 +154,13 @@ $('#modalsavetodb').click(function(){ success: function(){ $('#getmodal').modal('hide') - getAllData(); vednumber.value = ''; kolvo.value = ''; balancenumber.value = ''; matcen.value = ''; rasp.value = ''; changeddata = []; + window.location.reload(); }, }) @@ -219,6 +219,7 @@ $('#modal2savetodb').click(function(){ rasp.value = ''; $('#addmodal').modal('hide') + window.location.reload() }, @@ -252,4 +253,8 @@ $('#modal2close').click(function(){ -} ) \ No newline at end of file +} ) + +$('#modal2').on('hidden.bs.modal', function () { + location.reload(); + }) \ No newline at end of file From 496ef3fa9db318bf3f43b8b3601fdad6c227d873 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 9 Apr 2024 23:51:48 +0300 Subject: [PATCH 22/32] bug fix --- .../__pycache__/6fc3d1adb061_.cpython-312.pyc | Bin 1549 -> 0 bytes .../__pycache__/885bdd7b5161_.cpython-312.pyc | Bin 1301 -> 0 bytes release-05-04-24/asuinventory | 1 - 3 files changed, 1 deletion(-) delete mode 100644 migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc delete mode 100644 migrations/versions/__pycache__/885bdd7b5161_.cpython-312.pyc delete mode 160000 release-05-04-24/asuinventory diff --git a/migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc b/migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc deleted file mode 100644 index 4d546f9f7ca6012e9499b75a9532fc7557f65d40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1549 zcmb_c&2Jk;6rb5|uj7*N(Nx3*ONE1lsbV`$TMHrOgF`rklF)+}qt$w6YCG%~GwTE+ zkaFOEAV^5`S|tZ6kmwOORpLS*rP9fU6sK^7vINFMejOTt2yJ=s!-VyQ&6G$LC%JO%7MB+ItS4X^nGzY7-Jp&Z@U^3yG{)wPU8M(a{i74`cKd}bBy}v z3MwOxcYp~EgyGjmAIlB2gNvEk)nzCmMHw08Wx^^*TY%Z&4OSj|l7qjnX_C zwBycuAR0l>^PHAPlkA6~*M&7a-VTd86S*fdEhlz6w&TT=*>UP-I)vD6==J;{k+_p+ zD??e^j9E8mC;D0t(>7&r1Y@{5jJPOj;q;xAdh;d=+syHOaBbe~$DJ?$%@%cI-gJ1c z8*I}c4q3nHcflOnd zy5A^+Ozjv+>L$K_>ByLVXv`fNb6+igz4qnW9sj$H?;H0TKe&V1+rQju4D!~%c>g>n z>z?&(^TFyM|L(xpc&dtMPt%x>Q#|FOuX{_i<%{x97uDsL^}kVF17k|{J0SdDR44L3 z(UK@<9{++y>N*p*h=~itE(j1;r6{M2V9$V@WC;tS5ee7}pcyup%?e|Ngge2oEpsr> z3-en5=eMOa>Pr65$nSkHFkVZ`|JO{^x+F?n5|u8U@+?H!yRxLnKPu`{PA_H?-L^^S z+IFHl9`##YcSv26f8;ryxC4DQ1B()ajlO?LPMpv_o3@w}0L$STP>&}jp%D!Tx5FUi z6%$$9MJIqL&G6KC!w*T%qi?cTK_|G)s{qF`#`v+MVdcpMglB(6v&ROSdU4k{nto|F acQpMxKyGH&{6kalCO&yq!6o(ztosvgombTW diff --git a/migrations/versions/__pycache__/885bdd7b5161_.cpython-312.pyc b/migrations/versions/__pycache__/885bdd7b5161_.cpython-312.pyc deleted file mode 100644 index aa20e0ed9c33cefa3dec43d423a33b0d6a771671..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1301 zcmb_c&1(}|6u&o<%uFVUv?^3gm67Krm?v%1*fx}cwwrGHw7PMK43oL{wW;$F@13+p zRJ!mFaAyTUw^A31f^OgL!2_XCuw0kAao1Wz=*n{^6HMi;9`DY~Z_YjE+%xCn$NW<$ z7zoxwn*Vb~LFkj*^j0bn_9sDjgb1<_!6fBjKV_w`loe00(j;wVNXAl$VrlT`M16p) zEYSdsj#AR^EK|P~bxfaf?krKmSfr~>-V6hCey(OtPF5R)Of;&a7e>1l%4=qWPPkL! zZgqT$R*hLkors!q05x-LWNiHR5xB?9u}W>EQmam#A0HX5T$nP9FEZg07OAkcAoBf@ zMZQ0xn-mtmbU>&a?Y{?jgd!Yk0akkT_Z0Akn$e5YW@4$Ld+07&$@DoSVx;wSD>D8s zizt2exc`S8Hj^z$zsPLL++b}cc|qUftCs^t9rPO-MI5ieOs*pgR|nlzuA?@F z9%PXtENmt7VuPUR&VE~!45XA)@=+k~k+8&)@XFw;}$14E43dVRZrQ-Cr qBM1+DL_@ne%AZ` Date: Tue, 9 Apr 2024 23:52:19 +0300 Subject: [PATCH 23/32] bug fix --- static/js/allmatc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/js/allmatc.js b/static/js/allmatc.js index 5a15a9b..41c321f 100644 --- a/static/js/allmatc.js +++ b/static/js/allmatc.js @@ -11,7 +11,7 @@ function clearTable() { function getAllData(){ console.log('12321321') - ///clearTable(); + clearTable(); let tableBody = document.getElementById('alldatatable').getElementsByTagName("tbody")[0]; i = 0; @@ -74,7 +74,7 @@ function getAllData(){ } if (schettxt.length>0){ - balancenumber.value = kolvotxt; + balancenumber.value = schettxt; } if (raspologtxt.length>0){ From 9cde4e2c7d2a3caefce02ae6d2b35b9a68513d20 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Mon, 6 May 2024 15:14:47 +0300 Subject: [PATCH 24/32] add readexcell func --- app.py | 34 +++++++++++++++++- .../__pycache__/6fc3d1adb061_.cpython-312.pyc | Bin 1549 -> 0 bytes .../__pycache__/885bdd7b5161_.cpython-312.pyc | Bin 1301 -> 0 bytes 3 files changed, 33 insertions(+), 1 deletion(-) delete mode 100644 migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc delete mode 100644 migrations/versions/__pycache__/885bdd7b5161_.cpython-312.pyc diff --git a/app.py b/app.py index cb89f7a..b921edd 100644 --- a/app.py +++ b/app.py @@ -7,6 +7,9 @@ from datetime import * import csv import random from urllib.parse import unquote +from flask_httpauth import HTTPBasicAuth +from werkzeug.security import generate_password_hash, check_password_hash +from openpyxl import load_workbook app = Flask(__name__) @@ -22,6 +25,13 @@ 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 = [] @@ -264,10 +274,32 @@ def createdb(): db.session.commit() +def write2excell(): + wb = load_workbook("VedomostMOL.xlsx") + sheet = wb.worksheets[0] + x=19314 + + with app.app_context(): + joinQuery = db.session.query(Oboruds, Auditory).filter( + Oboruds.aud_id == Auditory.id).filter( + Oboruds.invNumber==x) + + print(joinQuery.all()) + + + + for i in range(10): + cell = 'B'+str(i+6) + + + + + + if __name__ == '__main__': - + #write2excell() #ranomraspr() #createdb() app.run(debug=True, host='0.0.0.0', port='3800') diff --git a/migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc b/migrations/versions/__pycache__/6fc3d1adb061_.cpython-312.pyc deleted file mode 100644 index 42c75e8fe00a35ef480aa614c57cb252456ff8f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1549 zcmb_c&2Jk;6rb^~ch_sXBz!a#alumIU}37*j?>mcNJ-5h970Lp;KkKycV}ul?1!0I zCm4a01OEd-LZa6yIZ%NFCj^|3xDd%wqvhC2sJD~|RmzDs>vdzKNC?E(``b6~y?Hb5 zz2EFF`Mi!`{I2D0eJ>$&UrZ(=l?caILHG<2WFUe`%EeyFNMRvMu4KqWHqs<*C`2+; zcr>DXii`|V0rjC&(mv`^uOAMJ9_8HXP+ecATRq+j{Nie}QCzy^)JVl5_QFzSY@xhS zwCNS++M-imyhiK#bw;g_7MlQ#Vs)Xq`04`utHsJvqgHKHYnLlm7phlky8cicxP+rr z&|iyk(~+axbVMgfEPiDGA#-%x#3IWOa6C3A`A-z^hMduUYA>CpUPz7xVT*|CPYG4O!K=>UTDck`9SW(s|f zaVt`;k7Z>eWIewVsjGfSJCwl@wDIbo&qYy-CvP{e1Pd_s#mZt-GxsoKgMFU*Bzw3dTr# z?<^e)SKOkJIS;99P@14A|oiz1CB-@hm?PH3J^ZD#qva<~T6<&jQkpZbKG zfgkgVi7f7*V?Y#Vc%r@L1!UmT*V)UU6Wr!CfFlWG{3xYh`Ok9*&;5qxjx>~een&f; dd0{7iIP)w(es)LyLy_?YK7LxpW%d%R`wPu}U=&Z{?Cx*hy!Ynq`}nbM^LYco`Z$!o zdP+g)liYMyDiL<3K)8npvJk-}xfs0FAa% z)Nd|QzZtbnpK|UjP{Wv~%MIQL19Nt!YEDg6>V!2bF*K20me zSw@|Rnlk`Zb8KX6{P+mmW9C@7I#RAyrcaEIjFu;+4daVUxQIn6Y|e?k-pHb_H=>&q z7Qb{rs2uIQ1GtAG9BToVy7hMz@P?Yvlhk@*si52F7Fx>mI3!}Eb#+TJ{vV4dJ@&Z& zzdNiaTatc~S(mxNT2JzVzQ~q6;R17fzY#3d&bOn*FpwJRM!e?mRwG!Z zK@_rf&2NBP1f1ZtWy&Nuc&&GS_K9X&XssrA5z6*M{C)87Ie=C4Ih%W*J-CrQxYl@@ z-pp3E5zbu1uMTYK{qOa{hF*AZ=Hcx9*+>41`Ipu+>v`?X%;xZgO@01{A{~Fk?q6fv zCA-5u8AxOSAtF_2Vq~3=1G9Rce0c;a(F`@Uc0iXACp}x$)=TL&q}*orm(iR ztUS-0)QUNw*)|DX+ZLMRQNP}BJESuBb&yv&f51uV zabXbJqygb}7{rrjGU>-?2N1;t?dm7}khDB{iX8@>WFIdBY%3V!uPGI$zwbeK@B Date: Mon, 6 May 2024 15:23:24 +0300 Subject: [PATCH 25/32] add fumc for login --- VedomostMOL.xls | Bin 0 -> 125440 bytes VedomostMOL.xlsx | Bin 0 -> 45566 bytes app.py | 2 +- migrations/versions/8e5efc4de919_.py | 54 +++++++++++++++++++++++ templates/login.html | 62 +++++++++++++++++++++++++++ 5 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 VedomostMOL.xls create mode 100644 VedomostMOL.xlsx create mode 100644 migrations/versions/8e5efc4de919_.py create mode 100644 templates/login.html diff --git a/VedomostMOL.xls b/VedomostMOL.xls new file mode 100644 index 0000000000000000000000000000000000000000..b103dca4f843b24c2038288e32b8f28e25df8364 GIT binary patch literal 125440 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 HxBveDt|N`q literal 0 HcmV?d00001 diff --git a/VedomostMOL.xlsx b/VedomostMOL.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..f50504305c81ff2843a74f86c190bc2e3e07d8d4 GIT binary patch literal 45566 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 literal 0 HcmV?d00001 diff --git a/app.py b/app.py index c57e92d..9b847a3 100644 --- a/app.py +++ b/app.py @@ -168,7 +168,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)) diff --git a/migrations/versions/8e5efc4de919_.py b/migrations/versions/8e5efc4de919_.py new file mode 100644 index 0000000..a5efc2a --- /dev/null +++ b/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 ### diff --git a/templates/login.html b/templates/login.html new file mode 100644 index 0000000..7489ae6 --- /dev/null +++ b/templates/login.html @@ -0,0 +1,62 @@ +{% extends 'base.html' %} + + +{% block content %} + + +
+
+
+ + +
+
+ + + Авторизация + + +
+ +
+ + +
+
+ + +
+ + + +
+
+ +
+ + + +
+ + + + + + + + + + +
+
+
+ + + + + + + + + {% endblock %} + \ No newline at end of file From 7b956d89bfd5c5b7b4d374a1247cb6460c31d03d Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 6 May 2024 08:29:58 -0400 Subject: [PATCH 26/32] merge head by alembic --- migrations/versions/d4a8e4c9e65a_.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 migrations/versions/d4a8e4c9e65a_.py diff --git a/migrations/versions/d4a8e4c9e65a_.py b/migrations/versions/d4a8e4c9e65a_.py new file mode 100644 index 0000000..d16f67b --- /dev/null +++ b/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 From 946ad5c31f5ac9ba75f3d6181176603a0177bf44 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Sat, 18 May 2024 20:58:55 +0300 Subject: [PATCH 27/32] add sorting func --- app.py | 174 ++++++++++--------- static/js/allmatc.js | 390 +++++++++++++++++++++++-------------------- 2 files changed, 298 insertions(+), 266 deletions(-) diff --git a/app.py b/app.py index 9b847a3..79f99ba 100644 --- a/app.py +++ b/app.py @@ -9,12 +9,14 @@ import random from urllib.parse import unquote from flask_httpauth import HTTPBasicAuth from werkzeug.security import generate_password_hash, check_password_hash -from openpyxl import load_workbook - +import xlrd +import xlwt +import xlsxwriter +from xlutils.copy import copy app = Flask(__name__) -app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///project.db" +app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///PRODproject.db" app.jinja_env.auto_reload = True app.config['TEMPLATES_AUTO_RELOAD'] = True @@ -25,14 +27,12 @@ db.init_app(app) migrate = Migrate(app, db) - -@app.route("/login", methods=['GET', 'POST']) +@app.route("/login", methods=['GET', 'POST']) def login(): return render_template('login.html') - -@app.route("/", methods=['GET', 'POST']) +@app.route("/", methods=['GET', 'POST']) def index(): results = [] results1 = [] @@ -56,7 +56,7 @@ def index(): results1.append(s.nazvanie) aud = db.session.get(Auditory, s.aud_id) results1.append(aud.audnazvanie) - return render_template('index.html', aud=all_aud, results=results, res1=results1) + return render_template('index.html', aud=all_aud, results=results, res1=results1) return render_template('index.html', aud=all_aud, results=results, res1=results1) @@ -101,7 +101,7 @@ def searchonaud(): return render_template('searchonaud.html', aud=all_aud, res=res) -@app.route("/addaudtodb", methods=['GET', 'POST']) +@app.route("/addaudtodb", methods=['GET', 'POST']) def addaudtodb(): if request.method == 'POST': aud = request.form.get('auditory') @@ -132,30 +132,28 @@ 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, - 'nazvanie': oboruds.nazvanie, - 'raspologenie': oboruds.raspologenie, - 'balancenumber': oboruds.balancenumber, - 'kolichestvo': oboruds.kolichestvo, - 'numberppasu': oboruds.numberppasu, - 'numberved': oboruds.numberved, - 'aud': "" }) + 'invNumber': oboruds.invNumber, + 'nazvanie': oboruds.nazvanie, + 'raspologenie': oboruds.raspologenie, + 'balancenumber': oboruds.balancenumber, + 'kolichestvo': oboruds.kolichestvo, + 'numberppasu': oboruds.numberppasu, + 'numberved': oboruds.numberved, + 'aud': ""}) else: - aud = db.session.query(Auditory).filter_by(id=oboruds.aud_id).first() + aud = db.session.query(Auditory).filter_by(id=oboruds.aud_id).first() results.append({ - 'invNumber': oboruds.invNumber, - 'nazvanie': oboruds.nazvanie, - 'raspologenie': oboruds.raspologenie, - 'balancenumber': oboruds.balancenumber, - 'kolichestvo': oboruds.kolichestvo, - 'numberppasu': oboruds.numberppasu, - 'numberved': oboruds.numberved, - 'aud': aud.audnazvanie }) - - + 'invNumber': oboruds.invNumber, + 'nazvanie': oboruds.nazvanie, + 'raspologenie': oboruds.raspologenie, + 'balancenumber': oboruds.balancenumber, + 'kolichestvo': oboruds.kolichestvo, + 'numberppasu': oboruds.numberppasu, + 'numberved': oboruds.numberved, + 'aud': aud.audnazvanie}) return jsonify(results) @@ -173,7 +171,7 @@ def vneaud(): return render_template('vneaud.html', res=res, kolvo=len(data), all_kol=len(ak)) -@app.route('/zametki', methods=['GET', 'POST']) +@app.route('/zametki', methods=['GET', 'POST']) def zametki(): zam = db.session.query(Zametki).filter(Zametki.rmdt == None).all() if request.method == 'POST': @@ -196,7 +194,7 @@ def js2(): return jsonify({'success': True}), 200, {'ContentType': 'application/json'} -@app.route('/zamsearch', methods=['GET', 'POST']) +@app.route('/zamsearch', methods=['GET', 'POST']) def zamsearch(): p = request.form.get('srch') @@ -204,66 +202,61 @@ def zamsearch(): Zametki.txtzam.contains(p)).ll() zam = [] for item in searchedZam: - zam.append([item.txtzam, item.created_date]) + zam.append([item.txtzam, item.created_date]) return render_template('zametki.html', zam=zam) @app.route('/addraspved', methods=['GET', 'POST']) def addraspved(): - if request.method == 'POST': - + 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': - + 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], - numberved=un_query_string[1], - kolichestvo=un_query_string[2], - balancenumber=un_query_string[3] - ) - ) - - db.session.commit() + Oboruds(invNumber=un_query_string[0], + nazvanie=un_query_string[5], + raspologenie=un_query_string[4], + numberved=un_query_string[1], + kolichestvo=un_query_string[2], + balancenumber=un_query_string[3] + ) + ) + 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: - audid = random.choice(db.session.query(Auditory).all()) - oborud = random.choice(db.session.query(Oboruds).filter(Oboruds.aud_id == None).all()) - oborud.aud_id = audid.id - db.session.commit() + with app.app_context(): + 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 is None).all()) + oborud.aud_id = audid.id + db.session.commit() def createdb(): @@ -305,35 +298,52 @@ def createdb(): for row in csv_reader: db.session.add( Oboruds(invNumber=row[0], nazvanie=row[1], typeBalanse='баланс')) - + db.session.commit() - + + def write2excell(): - wb = load_workbook("VedomostMOL.xlsx") - sheet = wb.worksheets[0] + wb = xlrd.open_workbook("VedIsh.xls") + sheet = wb.sheet_by_index(0) - x=19314 + newFile = copy(wb) + newSheet = newFile.get_sheet(0) + invNomerColum = 6 - with app.app_context(): - joinQuery = db.session.query(Oboruds, Auditory).filter( - Oboruds.aud_id == Auditory.id).filter( - Oboruds.invNumber==x) - - print(joinQuery.all()) - + 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,)) - for i in range(10): - cell = 'B'+str(i+6) - - + 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') + #write2excell() + + app.run(debug=True, host='0.0.0.0', port='3800') diff --git a/static/js/allmatc.js b/static/js/allmatc.js index 41c321f..58551c0 100644 --- a/static/js/allmatc.js +++ b/static/js/allmatc.js @@ -1,109 +1,108 @@ function clearTable() { - var table = document.getElementById("alldatatable"); - var rowCount = table.rows.length; + var table = document.getElementById("alldatatable"); + var rowCount = table.rows.length; - // Iterate through each row and remove it - for (var i = rowCount - 1; i > 0; i--) { - table.deleteRow(i); - } + // Iterate through each row and remove it + for (var i = rowCount - 1; i > 0; i--) { + table.deleteRow(i); + } } -function getAllData(){ - console.log('12321321') - clearTable(); +function getAllData() { + console.log('12321321') + clearTable(); - let tableBody = document.getElementById('alldatatable').getElementsByTagName("tbody")[0]; - i = 0; - $.getJSON("/getall", function(data) { - $.each(data, function(index, item) { - let newRow = tableBody.insertRow(tableBody.rows.length); - let cell1 = newRow.insertCell(0); - let cell2 = newRow.insertCell(1); - let cell3 = newRow.insertCell(2); - let cell4 = newRow.insertCell(3); - let cell5 = newRow.insertCell(4); - let cell6 = newRow.insertCell(5); - let cell7 = newRow.insertCell(6); - let cell8 = newRow.insertCell(7); + let tableBody = document.getElementById('alldatatable').getElementsByTagName("tbody")[0]; + i = 0; + $.getJSON("/getall", function (data) { + $.each(data, function (index, item) { + let newRow = tableBody.insertRow(tableBody.rows.length); + let cell1 = newRow.insertCell(0); + let cell2 = newRow.insertCell(1); + let cell3 = newRow.insertCell(2); + let cell4 = newRow.insertCell(3); + let cell5 = newRow.insertCell(4); + let cell6 = newRow.insertCell(5); + let cell7 = newRow.insertCell(6); + let cell8 = newRow.insertCell(7); - i++; + i++; - cell1.innerText = i; - cell2.innerText = item.numberved; - cell3.innerText = item.invNumber; - cell4.innerText = item.nazvanie; - cell5.innerText = item.kolichestvo; - cell6.innerText = item.balancenumber; - cell7.innerText= item.aud; - cell8.innerText = item.raspologenie; - - - $(newRow).data('itemData', i); + cell1.innerText = i; + cell2.innerText = item.numberved; + cell3.innerText = item.invNumber; + cell4.innerText = item.nazvanie; + cell5.innerText = item.kolichestvo; + cell6.innerText = item.balancenumber; + cell7.innerText = item.aud; + cell8.innerText = item.raspologenie; - $(newRow).on("click", function() { - - let vednumbertxt = newRow.cells[1].innerText; - let invnomertxt = newRow.cells[2].innerText; - let nazvanietxt = newRow.cells[3].innerText; - let kolvotxt = newRow.cells[4].innerText; - let schettxt = newRow.cells[5].innerText; - let raspologtxt = newRow.cells[7].innerText; + $(newRow).data('itemData', i); - $('#getmodal').modal('show'); - - - let vedomost = document.getElementById('modal_vednumber') - let invnom = document.getElementById('modal_invnom') - let matcen = document.getElementById('modal_matcenn') - let kolvo = document.getElementById('modal_kolvo') - let balancenumber = document.getElementById('modal_balance') - let rasp = document.getElementById('modal_rapolog') + $(newRow).on("click", function () { - invnom.innerText = invnomertxt - matcen.innerText = nazvanietxt.substring(0,20) + let vednumbertxt = newRow.cells[1].innerText; + let invnomertxt = newRow.cells[2].innerText; + let nazvanietxt = newRow.cells[3].innerText; + let kolvotxt = newRow.cells[4].innerText; + let schettxt = newRow.cells[5].innerText; + let raspologtxt = newRow.cells[7].innerText; - if (vednumbertxt.length>0){ - vedomost.value = vednumbertxt; - } - - if (kolvotxt.length>0){ - kolvo.value = kolvotxt; - } - - if (schettxt.length>0){ - balancenumber.value = schettxt; - } - - if (raspologtxt.length>0){ - rasp.value = raspologtxt; - } - }); + $('#getmodal').modal('show'); + + let vedomost = document.getElementById('modal_vednumber') + let invnom = document.getElementById('modal_invnom') + let matcen = document.getElementById('modal_matcenn') + let kolvo = document.getElementById('modal_kolvo') + let balancenumber = document.getElementById('modal_balance') + let rasp = document.getElementById('modal_rapolog') + + invnom.innerText = invnomertxt + matcen.innerText = nazvanietxt.substring(0, 20) + + if (vednumbertxt.length > 0) { + vedomost.value = vednumbertxt; + } + + if (kolvotxt.length > 0) { + kolvo.value = kolvotxt; + } + + if (schettxt.length > 0) { + balancenumber.value = schettxt; + } + + if (raspologtxt.length > 0) { + rasp.value = raspologtxt; + } + + }); + + }); }); - }); } -$( document ).ready(function() { +$(document).ready(function () { - getAllData(); + getAllData(); + +}); + + +$('#modalclose').click(function () { - }); - - -$('#modalclose').click(function(){ - let vednumber = document.getElementById('modal_vednumber') let kolvo = document.getElementById('modal_kolvo') let balancenumber = document.getElementById('modal_balance') let matcen = document.getElementById('modal_matcenn') let rasp = document.getElementById('modal_rapolog') - vednumber.value = ''; @@ -113,11 +112,10 @@ $('#modalclose').click(function(){ rasp.value = ''; $('#getmodal').modal('hide') - -} ) +}) -$('#modalsavetodb').click(function(){ +$('#modalsavetodb').click(function () { let invnom = document.getElementById('modal_invnom') let vednumber = document.getElementById('modal_vednumber') @@ -126,8 +124,6 @@ $('#modalsavetodb').click(function(){ let matcen = document.getElementById('modal_matcenn') let rasp = document.getElementById('modal_rapolog') let nazv = document.getElementById('modal_nazvanie') - - let changeddata = new Array() @@ -137,124 +133,150 @@ $('#modalsavetodb').click(function(){ changeddata[2] = kolvo.value; changeddata[3] = balancenumber.value; changeddata[4] = rasp.value; - - + let sendData = changeddata.join(',') console.log(sendData) - $.ajax({ + $.ajax({ - url: "/addraspved", - type: "POST", - contentType: "application/json;charset=utf-8", - dataType: "json", - data: sendData, + url: "/addraspved", + type: "POST", + contentType: "application/json;charset=utf-8", + dataType: "json", + data: sendData, - success: function(){ - $('#getmodal').modal('hide') - - vednumber.value = ''; - kolvo.value = ''; - balancenumber.value = ''; - matcen.value = ''; - rasp.value = ''; - changeddata = []; - window.location.reload(); - }, - }) + success: function () { + $('#getmodal').modal('hide') - -}) - - -$('#addoborud').click(function(){ - - $('#addmodal').modal('show'); - -}) - -$('#modal2savetodb').click(function(){ - - let invnomer = document.getElementById('modal2_invnom') - let vednumber = document.getElementById('modal2_vednumber') - let kolvo = document.getElementById('modal2_kolvo') - let balancenumber = document.getElementById('modal2_balance') - let matcen = document.getElementById('modal2_matcenn') - let rasp = document.getElementById('modal2_rapolog') - let nazv = document.getElementById('modal2_nazvanie') - - - - - let changeddata = new Array() - - changeddata[0] = invnomer.value; - changeddata[1] = vednumber.value; - changeddata[2] = kolvo.value; - changeddata[3] = balancenumber.value; - changeddata[4] = rasp.value; - changeddata[5] = nazv.value; - - - - let sendData = changeddata.join(',') - console.log(sendData) - - $.ajax({ - - url: "/addoborudasu", - type: "POST", - contentType: "application/json;charset=utf-8", - dataType: "json", - data: sendData, - - success: function(){ - vednumber.value = ''; - invnomer.value= ''; - nazvanie.value=''; - kolvo.value = ''; - balancenumber.value = ''; - matcen.value = ''; - rasp.value = ''; - - $('#addmodal').modal('hide') - window.location.reload() - - }, - - }) + vednumber.value = ''; + kolvo.value = ''; + balancenumber.value = ''; + matcen.value = ''; + rasp.value = ''; + changeddata = []; + window.location.reload(); + }, + }) }) -$('#modal2close').click(function(){ - - let vednumber = document.getElementById('modal2_vednumber') - let invnomer = document.getElementById('modal2_invnom') - let nazvanie = document.getElementById('modal2_nazvanie') - let kolvo = document.getElementById('modal2_kolvo') - let balancenumber = document.getElementById('modal2_balance') - let matcen = document.getElementById('modal2_matcenn') - let rasp = document.getElementById('modal2_rapolog') +$('#addoborud').click(function () { + + $('#addmodal').modal('show'); + +}) + +$('#modal2savetodb').click(function () { + + let invnomer = document.getElementById('modal2_invnom') + let vednumber = document.getElementById('modal2_vednumber') + let kolvo = document.getElementById('modal2_kolvo') + let balancenumber = document.getElementById('modal2_balance') + let matcen = document.getElementById('modal2_matcenn') + let rasp = document.getElementById('modal2_rapolog') + let nazv = document.getElementById('modal2_nazvanie') + let changeddata = new Array() - vednumber.value = ''; - invnomer.value= ''; - nazvanie.value=''; - kolvo.value = ''; - balancenumber.value = ''; - matcen.value = ''; - rasp.value = ''; + changeddata[0] = invnomer.value; + changeddata[1] = vednumber.value; + changeddata[2] = kolvo.value; + changeddata[3] = balancenumber.value; + changeddata[4] = rasp.value; + changeddata[5] = nazv.value; - $('#addmodal').modal('hide') - + let sendData = changeddata.join(',') + console.log(sendData) -} ) + $.ajax({ + + url: "/addoborudasu", + type: "POST", + contentType: "application/json;charset=utf-8", + dataType: "json", + data: sendData, + + success: function () { + vednumber.value = ''; + invnomer.value = ''; + nazvanie.value = ''; + kolvo.value = ''; + balancenumber.value = ''; + matcen.value = ''; + rasp.value = ''; + + $('#addmodal').modal('hide') + window.location.reload() + + }, + + }) + + +}) + +$('#modal2close').click(function () { + + + let vednumber = document.getElementById('modal2_vednumber') + let invnomer = document.getElementById('modal2_invnom') + let nazvanie = document.getElementById('modal2_nazvanie') + let kolvo = document.getElementById('modal2_kolvo') + let balancenumber = document.getElementById('modal2_balance') + let matcen = document.getElementById('modal2_matcenn') + let rasp = document.getElementById('modal2_rapolog') + + + vednumber.value = ''; + invnomer.value = ''; + nazvanie.value = ''; + kolvo.value = ''; + balancenumber.value = ''; + matcen.value = ''; + rasp.value = ''; + + $('#addmodal').modal('hide') + + +}) $('#modal2').on('hidden.bs.modal', function () { - location.reload(); - }) \ No newline at end of file + 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'); + }); +}); \ No newline at end of file From 43ab114e1aa251ed10bd9ff1be9284e74721e03a Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Wed, 22 May 2024 13:42:52 +0300 Subject: [PATCH 28/32] fixed table --- static/css/index.css | 14 ++++++++++++-- static/js/allmatc.js | 2 +- templates/all.html | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/static/css/index.css b/static/css/index.css index 3e00e63..9a5b0ea 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -82,9 +82,15 @@ table{ word-break: break-all; border-collapse: separate!important; } -td{ + +.table td{ + font-size: 14px; padding: 0; + max-width: 10rem; + word-break: break-all; + border-collapse: separate!important; } + .aud{ width: 110px; } @@ -94,8 +100,9 @@ td{ } .rasp{ - max-width: 200px; + width: 200px; word-break: break-word; + white-space: nowrap; } #modal_matcenn{ @@ -108,7 +115,10 @@ td{ } +.datatable th:nth-child(7) { + width: 200px; +} diff --git a/static/js/allmatc.js b/static/js/allmatc.js index 58551c0..1477f10 100644 --- a/static/js/allmatc.js +++ b/static/js/allmatc.js @@ -10,7 +10,7 @@ function clearTable() { function getAllData() { - console.log('12321321') + clearTable(); let tableBody = document.getElementById('alldatatable').getElementsByTagName("tbody")[0]; diff --git a/templates/all.html b/templates/all.html index e0c36de..50bd2ac 100644 --- a/templates/all.html +++ b/templates/all.html @@ -137,7 +137,7 @@ - +
From 1c33775f920365f5b17795a9cdb7cf9665fad984 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Wed, 22 May 2024 15:58:16 +0300 Subject: [PATCH 29/32] 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 %} - -