From 68e50ee4a8a22a94d0ab68f4d77b9068d25ef0e8 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Mon, 1 Apr 2024 13:01:51 +0300 Subject: [PATCH 1/5] 123 --- static/js/searchonaud.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/static/js/searchonaud.js b/static/js/searchonaud.js index 1e1b6e4..ce603b8 100644 --- a/static/js/searchonaud.js +++ b/static/js/searchonaud.js @@ -77,8 +77,9 @@ $("#searchbutton").click(function(){ contentType: 'application/json', dataType: 'json', data: { - rasp: rasp.value, - ved: vedomost.value + ved: vedomost.value, + rasp: rasp.value + }, }) From 54c61b9756c6d49d0075019d0fa5179ab15c91f9 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Mon, 1 Apr 2024 13:05:06 +0300 Subject: [PATCH 2/5] some func --- __pycache__/app.cpython-312.pyc | Bin 15045 -> 16039 bytes __pycache__/models.cpython-311.pyc | Bin 0 -> 2602 bytes __pycache__/models.cpython-312.pyc | Bin 2363 -> 2363 bytes addoborudtodb | 0 app.py | 45 +++--- 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 | 133 +++++++++++------- static/js/tmp.js | 47 +++++++ templates/searchonaud.html | 44 ++++-- 18 files changed, 197 insertions(+), 95 deletions(-) create mode 100644 __pycache__/models.cpython-311.pyc create mode 100644 addoborudtodb create mode 100644 static/js/tmp.js 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^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/__pycache__/models.cpython-312.pyc b/__pycache__/models.cpython-312.pyc index 84cd74ba589dca8257aa975630f7edb50500d3ab..3d4cca7df5775e8cc87b28c16291eda4aa899dd7 100644 GIT binary patch delta 51 zcmdljv|EV#G%qg~0}woY|7Rn&4U?p^RZKupetJ=2Zf<5?dQ3oNNk)DiP$X+}0@H0a E0K9k-LjV8( delta 51 zcmdljv|EV#G%qg~0}!0x_`Q+ahDp-JDkh*PKfNe1H#ajcJtm;CBqKi$B(gby={6ex Dmah>! diff --git a/addoborudtodb b/addoborudtodb new file mode 100644 index 0000000..e69de29 diff --git a/app.py b/app.py index 1aa53ca..75793c3 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,10 +78,12 @@ 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, }) return jsonify(results) @@ -183,30 +186,24 @@ 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") - # Split the query string by '&' to get individual key-value pairs - key_value_pairs = query_string_str.split("&") + query_string = request.data.decode() - # Create a dictionary to store the key-value pairs - query_dict = {} - for pair in key_value_pairs: - key, value = pair.split("=") - query_dict[key] = value + print(query_string) + un_query_string = unquote(unquote(query_string)).split(',') - # 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}") + print(un_query_string) - - return jsonify({'success': True}, 200, {'ContentType': 'application/json'}) - + + 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'}) + # ================================================================================== @@ -262,16 +259,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 ce603b8..ac233b4 100644 --- a/static/js/searchonaud.js +++ b/static/js/searchonaud.js @@ -13,21 +13,23 @@ function getData(){ }, success: function(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 += '' + '\n' + '' + tr += '' +element.raspolog + '' + tr += '' + '\n' + '' tr += '' }); @@ -40,59 +42,84 @@ $("#searchbutton").click(function(){ getData(); }) - function tableclick(x){ - let roww = x.rowIndex - 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') - console.log(datas) + let changeddata = new Array() - $('#getmodal').modal('show') + changeddata[0] = invnom.text + changeddata[1] = vedomost.value + changeddata[2] = rasp.value - let rasp = document.getElementById('rapolog') - let vedomost = document.getElementById('vednumber') + let sendData = changeddata.join(',') - if (datas[0].length>0){ - rasp.value=datas[0]; + 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(); } - - if (datas[4].length>0){ - vedomost.value=datas[4] - } - - $('#modalclose').click(function(){ - - $('#getmodal').modal('hide'); - } ) - - $('#modalsavetodb').click(function(){ - - console.log(datas) - - $.ajax({ - - url: "/addraspved", - type: "post", - contentType: 'application/json', - dataType: 'json', - data: { - ved: vedomost.value, - rasp: rasp.value - - }, - - }) - - rasp.value=''; - - vedomost.value=''; - - - - $('#getmodal').modal('hide'); - - // 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('modal_rapolog') + let vedomost = document.getElementById('modal_vednumber') + let invnom = document.getElementById('modal_invnom') + let matcen = document.getElementById('modal_matcenn') + + invnom.innerText = invnomer + matcen.innerText = nazvanie.substring(0,15) + + if (nomved.length >0){ + + vedomost.value = nomved + } + + if(raspolog.length>0){ + rasp.value = raspolog + } + + $("#mimodal").on('hidden.bs.modal', function () { + $(this).data('bs.modal', null); + }); + + + $('#modalclose').click(function(){ + + $('#getmodal').modal('hide').data( 'bs.modal', null ); + + } ) + + +} \ 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 3d811af..5214d5d 100644 --- a/templates/searchonaud.html +++ b/templates/searchonaud.html @@ -8,15 +8,33 @@
- - - +
+ + +
+ +
+
+ № из ведомости + +
+ +
+ Расположение + +
+ + +
+
+ + +
+
-
- - -
+ +
@@ -45,13 +63,13 @@

Поаудиторно

- +
- - - - - + + + + + {% for item in res: %} From 1b472f4fee133e8306fbc76fc11e290a5332c2f0 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Mon, 1 Apr 2024 13:05:38 +0300 Subject: [PATCH 3/5] some func --- templates/searchonaud.html | 46 ++++++++++++-------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/templates/searchonaud.html b/templates/searchonaud.html index 5214d5d..8540948 100644 --- a/templates/searchonaud.html +++ b/templates/searchonaud.html @@ -8,33 +8,15 @@
- -
- - -
- -
-
- № из ведомости - -
- -
- Расположение - -
- - - -
- - -
- + + + + +
+
+ +
- -
@@ -63,13 +45,13 @@

Поаудиторно

-
Номер в Инв. ведИнв. номерНазваниеАудиторияРасположениеНомер в Инв. ведИнв. номерНазваниеАудиторияРасположение
+
- - - - - + + + + + {% for item in res: %} From e464960fe572756da1e27c7441e42235a9a7bdc7 Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Mon, 1 Apr 2024 15:11:24 +0300 Subject: [PATCH 4/5] rename column to model --- 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__/be7c94c549e5_.cpython-312.pyc | Bin 0 -> 1579 bytes .../__pycache__/ec6bbcd361bd_.cpython-312.pyc | Bin 2058 -> 2058 bytes migrations/versions/be7c94c549e5_.py | 34 ++++++++++++++++++ models.py | 2 +- 12 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 migrations/versions/__pycache__/be7c94c549e5_.cpython-312.pyc create mode 100644 migrations/versions/be7c94c549e5_.py 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/__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__/873defe09f22_.cpython-312.pyc b/migrations/versions/__pycache__/873defe09f22_.cpython-312.pyc index 6f099d51484d56605be5ccf068b24509e6ecdd5b..fd851b545b20ef076a3b75ffd03cc99fa5620d02 100644 GIT binary patch delta 33 ncmZ3(wT6rPG%qg~0}wb?|J=x(%Eah0xsXYmF@19<(_$t7lKu$n delta 33 ncmZ3(wT6rPG%qg~0}woY|7Rn2DifpgFKkvD;f(PeTTlQ?7g<~F9qOaQ9&3A6wJ delta 35 pcmZ3ht+baI7Gk!?_L7?uwFG?Xo0Wt_OaFt8w7+@#-kX{C z=J($In$K$pM&VoS&Mz`Tzl)d2kjBEW4#HhTkbwv$l7n5zkg$+tM>bL!E1YICX4tXA};dZkgXY1(rUa2dyv z-@hKu&F&n}&F*NA6HBHnAY_h)e*)Y^0Zz04+mrk!3YZ~hbSNE+Emib2`U-8QXB@_2 zpiFez>O`8(M4quH_dm4>iKGtG2je(M=1@5h@xhqrusAh8(#;}Kryd0OB4`pRMj?6& zEhCP1fw@hD;TNJW|(L zTS50Gh^jYm9INBdI2VL{dQG@5;x5v#I${9;CivdtvItf zk~5zKtmkdTIl}z@*g@<++QIL0aTTT0kJp;*8_eHgmg|Ch`$iaaeNSkp9q_ir2R(0x zdV$Zvw%Y@@0BVf4cPJCZ#@n;?VCwxaRtA0WB9xtn{a=HJw*mIhAKBcq?1iK3h5g?5 zsVG}LK~nni4{sc+g=gyGk-B*Q+Jp6b>ks|M>`C}2{8@@>A3eQgM8(^Y+D@E`M{05Z zvq*jCRT@^l63br*I33Qx0sF0dOP7Dr)2*8Fe9uEb(`}5$B?wi^BZhoa_JQ+J`DcE;!c(=lUsIgj347STRlF+ol;SmP6f6&mQ%O z#y@u~N3>j+q!FuZ{CSM?B3g6$+F{U-T@!kaIy}}0?Ng6%)Ay1BW=V&lA)JPiY){qq zT%Qaa`aZh^I?+VD0&pT@j9*9@ocikw!VABlg%cIco!?WB3m5nD$AxnM`T0HVWhR9$ N56`Bs&fbP)e*@1MTonKS literal 0 HcmV?d00001 diff --git a/migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc b/migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc index e5f76bc43be7407a1fc729ddd056775d7ae128ae..1d027b0c3daaddba27d7e21b2e3b7083749d8fec 100644 GIT binary patch delta 33 ncmeAY=n~*Q&CAQh00fTJKR0qSGc&qO=4TdXOy8`|{Fns*fpiDc delta 33 ncmeAY=n~*Q&CAQh00d9p|JlgR%*^OKnV(slF>A9r^J5kOmmCQ2 diff --git a/migrations/versions/be7c94c549e5_.py b/migrations/versions/be7c94c549e5_.py new file mode 100644 index 0000000..52e3c4e --- /dev/null +++ b/migrations/versions/be7c94c549e5_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: be7c94c549e5 +Revises: 8e838956713f +Create Date: 2024-04-01 15:09:52.082987 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'be7c94c549e5' +down_revision = '8e838956713f' +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('balancenumber', sa.String(length=30), nullable=True)) + batch_op.drop_column('typeBalanse') + + # ### 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('typeBalanse', sa.VARCHAR(length=30), nullable=True)) + batch_op.drop_column('balancenumber') + + # ### end Alembic commands ### diff --git a/models.py b/models.py index c6a6620..24c2840 100644 --- a/models.py +++ b/models.py @@ -16,7 +16,7 @@ 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)) - typeBalanse = db.Column(db.String(30)) + balancenumber = db.Column(db.String(30)) raspologenie = db.Column(db.String(200)) numberved = db.Column(db.String(100)) aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id)) From 294d646bb620b12262e6783ac675794b754b7b6c Mon Sep 17 00:00:00 2001 From: Alex Danamir Date: Mon, 1 Apr 2024 15:17:12 +0300 Subject: [PATCH 5/5] remove cache --- __pycache__/app.cpython-312.pyc | Bin 16039 -> 0 bytes __pycache__/models.cpython-311.pyc | Bin 2602 -> 0 bytes __pycache__/models.cpython-312.pyc | Bin 2363 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 __pycache__/app.cpython-312.pyc delete mode 100644 __pycache__/models.cpython-311.pyc delete mode 100644 __pycache__/models.cpython-312.pyc diff --git a/__pycache__/app.cpython-312.pyc b/__pycache__/app.cpython-312.pyc deleted file mode 100644 index 18d2bc281950e860c1d94224d7808b208d6fba18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16039 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 E7vLHM$^ZZW diff --git a/__pycache__/models.cpython-312.pyc b/__pycache__/models.cpython-312.pyc deleted file mode 100644 index 3d4cca7df5775e8cc87b28c16291eda4aa899dd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2363 zcmcIm%}*Og6yIHc+t|1e(o&?VP11y|Dh^gIppq(pNC^o|6E0p*R|`9Vh5aD2yOiZn z88rudGFA^Z;(#l)Y9n$;Pwk&jsi$ZUv8Jc0id0UmgnNm4=)7Ile3_&iGLqlCee>SD zdGmg6o_|fJlMEft|N0lLhZyD$_y|U1pV|ACG8INY~7ddSFO6k3P}+Z@b0)B_A5;%P>xX7m-BQBN~QHRG?)j5!>i*oEzRmL%_ecI&!2 zJC8JHVish`Xr5NNNcynuHy35ji9+*_NT`vlwYew@B>M83Wt0 zIl-q$ToiRlL!wBMqNo|NtpeXBiVti_-CyD484?{fR9n+YY)rS%9KwWCWD>n+VMU)K zDan>~X?0oB6-3%FQYA|X1cExERP_MWhNR|?k zprDt=jNb zpPS_m@4H%Ft>wNS{ATdUTR-*u*yCOtbko zsx`r9{s&Zjd`7JmYgN)nd_=O)q@p1bmnmlf7qzWf-S~pE(RM*)vIr|Aj5XOh4#!J0 zP7LI2`ZEzFFM(q!UFt9PZ``fq%lWG9cD?VWE*C}*a5l9$^`!S%Zun_#_*w4e)7;IC zez$X+Vy2YIxejgR~igu8<`mU a@%l_@zBu1tDBCz6W-s{P|1gyG&iWr4+`&))
Номер в Инв. ведИнв. номерНазваниеАудиторияРасположениеНомер в Инв. ведИнв. номерНазваниеАудиторияРасположение