From b75376899d784587c66af3ec7f1ff4c38734b543 Mon Sep 17 00:00:00 2001 From: Jadowyne Ulve Date: Mon, 28 Apr 2025 06:53:28 -0500 Subject: [PATCH] items_API.updateItemLink updated to new schema --- .../database_items.cpython-312.pyc | Bin 18794 -> 22785 bytes .../__pycache__/items_API.cpython-312.pyc | Bin 36933 -> 37075 bytes application/items/database_items.py | 91 +++++++++++++++++- application/items/items_API.py | 63 +++++++----- application/items/sql/getItemAllByBarcode.sql | 75 +++++++++++++++ application/items/sql/itemsModal.sql | 4 +- database.log | 5 +- static/handlers/itemEditHandler.js | 2 +- templates/items/itemlink.html | 3 +- 9 files changed, 212 insertions(+), 31 deletions(-) create mode 100644 application/items/sql/getItemAllByBarcode.sql diff --git a/application/items/__pycache__/database_items.cpython-312.pyc b/application/items/__pycache__/database_items.cpython-312.pyc index fd32af6fd312808a3cd3b511dc05f341d17551bf..56e5d99b133f348cbf968e842f7131358fd9f1ea 100644 GIT binary patch delta 3461 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 b!F>NpcCZ|0>ro5Uf!FoANA!i?0fYYq=D%W^ delta 1610 zcma)+OKclO7{_;ZJzlRLYdbcL^K?p@v>P`Rr|H8<+$t}}4oTCz6jUC;$~eV!9%a@N zO0*F{3Ie3IY8VB9LaTzfpymMVg##6pAP0mZTJb0fy&xeW!6gVTNF4ZP;&bXKsyA<|0fcn+tvAPhtXIrfa7}V)up+dMhY0hBo<@h+ zROlQ&3gEQ47WxhE5PV+Qh8oy%s6604pUL-5lk~*k6T><^4)PK6Sa@Nl{JIii_Ybs# zXH`uC$3Qe~=4$R@bdtp*wSY-v5XS+(VtyK#$Ecabqpw?&rG8~%dMusKPEYBy3>1`$ zPqS!4Ic|l=Wpkk6O@vOds$hvJHfj>?0Q!;n_=y_`N$l>)vOqaO3usOv6-0!)Ei24n z_O5);V>b|yNX6Kp|GXcQBP%7FzoN6 zE9jUo=Vaf-!q`RZ;L_i`KOhr3*Jg#>323*)fafj0n8N^_<+SOF4ac%Tsin^^O$|KtHIEFEg`c(hr-}a&wX3=AA|3kCfn*(wmC4D8if@ zzL1T7A;Wzk!1^7ftf{Y&`HuUMhkX_gV-Gl%vC3!}3Y!=E))4HutF5OXe%+dYxUX#q zt+JK2pO9`|X%C4(4WFU>G@7l|Uzj+OIy2ZgFvM0nYgNrfAKsFGbw(h)CQ%K$C6&lM zdJl5+?;*?!KkN&==DP3k-w8H-GW3n7Z9_mx{5E0t61QNJFLfo{U7%aHjZS4=q)GNm z*JFw%(j+k2#VV7R(RsF#JP_2BbtRvj%;@>_)4QEo$v`COLINx96- zI)*UXK+8FOmQ!qHu(v~%Y$N6K>%hK%OYejK=DhHSX!^Tfm1KGWm=<7%M=H=H>mI49 zs|P^&k!2l3G{#5#SfTu=pdAp_Z6rIEr#ibnQsJBhfZ)=-Y;}aN_9rhL{Jr)pLLKNW VX+y9EH--v>4;%m7BysI{{5CYfmw1U!={ZF5}e7MnjzG{n)q&=Lp^L9ZO~fG zU|@Y_ARp8|S;1t3rM}8`#QdyygG}CLzvH zr|Bd+1S#O!tm^1*ruij7GMk0>K|0p5;x+lDuUTDQq25~Oa@Sg`o2?#Rl3eZ`R+lr= z>JZ(H_8Q*d6-lPGnkNp?DP&s3I;R~q^zzC)s)Qd+SnsroH9=myqP4-}RTX^OLSWU5hi@t)l6u_vJ8D7BxUl`>CZ_KxHaZ!7B3nbC(?Qv zBn|lg3*vH8e&Ldk^?3e5I6oaJh@m|N5p-6eE!D=6M5rLyjj#tmu}p+`S`*@-u^Z>L zm6BJ`Bp<+LAUdSyAxH=Ygm3^Q(j!XVGPN!k5aSVSJexicrwJ`F4rxKi0ZuCw;T9ZTdj5@~nTiD(g|Fr%0eh;(wIgtF9omo@@IkVB^J3|O z&9U48;69Z%ZXRUgl~6l2Eq01jdYVyPHVVW`|0(NP(T2O)0TkneZ^dl4OF|t4Ep71B z34ywE;UcCM>3zwbp$myO%y#5>P4vd zEtFt!$uHnJn!er^#woxy%2jQ5wXyglS`5{McRO=)6;36{Ia<6wG4g#>g%YvJj@_1< zOFp8${nMDY>AQdf^vnJ2Qx25h8NF&0wkWz?qRTxQ*Jcb{YS68K6yc~Ay)*Wn!Q zJ_t|9A0M8<1jf%I;30cSbgM&1@Ve>+lB5b@2sSH5BJ6GuB(FpU(H;I-Ag2&cQ*HMe zrh~5QcIDwrCph)UF$8?R1fLkWgn<1^upbFF2f-^QcpC)IOYYML-N~VU0g3+vq#QZs z$O9(k4r6)9PG^eQM_LUVj<9%KN5gv(^HohevyFMC$sX4sKfXxAnhvIPr1&E;hSP`R a+fzoF+=uKOrb0DcHm;K6Z_19Id(6K8PN_Bk delta 2625 zcmZuyYfu~472aKG^%f5c86*Kh0vpSwggB7cYT^fhj2&Ym9=4O#Ml9Ne$OuW?U0X&7 zWLj)PNSw#@WSDWB;-+ng?N0INN0XVPwcAPJPTHwd+(OrOlQfy>bka63VJ4mQM|;nT z1Ub{4(b3uOeD^%=J!kLyCFY$O#{9n7Y@o=~`gYz^O)r>jwEJ4MN2TJ+#_>_r{VKj< zJas|!@12HP%33^4Pc)x;3|CZd$8UEOr~diqq}tp~Qc8XNf^VRI0zf@mZI{zzNO z95ds#pj|zpmGbciBc*wKaga)=e?*_78>kT-ey+}G)g{;j(@XQZtNJVItlJSie$DN? zUz^bL25^^Ph-L(hH}PgZFQG}$2^F9JGIO=yihgyCL9*cVcgiZkAA5n~3okMWidQA* zAkD9Pnfb~$O%Yysd#Nq~M8h#BBxt_^MU#hEU0IF9vhYP$t@y@7S^gTPKx3wZRhUJ4EfqQnhEl>q1@L{TdN3h?@_P32Jnpa`G_ zKLihvAmZx`vI9Pd-#l<16L(|ZWRW%S6c_FjYATxB+gsaR=wU+e6yi_2Y)M%MIYA^@ z6^_JYT~r(jM529LmFmJmKvEc74<`z;rB9Idl0dsdp~j&`4h15-Ae;9OHE|Lb2yvn) zi1NBl#DzstR4@|uaYLa9$IE8FKU;g}@n}epi-Td2Y#R`3SD9kgqK#%(An0+AFJx3=+0n7l>Gkt?qV)i~qM;lve6ibB5AXTNh03jLAJyKWm#Cn(M!APuI7k z4<1hQgK2Rz9Y`(@kkO}iGbY8B@({=iK%;`WJSzWp=d9@94N?>bzsI z&sfuShi+L8e^CiJFH;~_swk6Xx+q<}@0PJ8t#0{Z1E5Qa?Mu;2Hs{w=qosMX>YdGO z^8?zH&xaTTnj|=Snh5;I_SSs#BD`(`aUQT;9S@Mfqo|9ilN~>1jOaAcJ5d}=4TsKo zzg~={2n4+#3L(;0%86$WnnkY=Q}(oToMYy&o4rIVms6g@Z5ld`hmUS&Q35>w@@ShC z6!bk1-v==c;x)Xp%SzAUgI!VUPXRas;vxtH;s^MnuBw8yoDKmvg{^)ci=HJqmi(Kx zya3>HM0oO18R)NqQ2KB!J!SgNyTK7~;bHN|*nN7?@O5 z-``al#rZh4^aqS<-lp+bf1OLo@jCdp0YVutHuos;ANp(A-w<1IiVd07Z8;7IC>K1c zeC$Lr)?z2u6B5w7;O9LMif_fE7IgveK8SDZ*LfU>*0H}Qmd&Z@s7IA^2-86S9nOg5 z1sPD+DnF0^D^?li3HUHWhW3Xz8QYL*m-aAO;vlfsgE)gPpQxjMi*KLEJ>6Bu`LS|3 zgKJ~O#$3<7*amiitlgW6#~xGBXYh@u0Mymfr!$i3CbdT7CHKQsdG z4iU2YSR@!;E6bzHc16xM0(BQq4N(q}D^n7Xh;Cxz={ojP0-s3jI(=6~#<+YkcF&Q_ zOqOi8zeV*BSA9&3gwa{xJCt{F=?%#`Bn%!W zcdm%8fdxKTNSV@S@z_)oJ&oU;3O)i?2!anDxy9>EME7#;)-j-X)?^cMOM1RNoP zy3l7h^h}xIOQO=`CvHmNXZ}TZFEiz|kNI3hF%3(Ky3|NhjPa~<%$Y8%ob8=`;*@iq tesGy7p}$K5?V%+_U8?_@RXw+Ht^`, 'update': {'brand': 1066, 'item_type': 'FOOD_PLU'}}, - sql='UPDATE test_items SET brand = %s, item_type = %s WHERE id=%s RETURNING *;') \ No newline at end of file + sql='UPDATE test_items SET brand = %s, item_type = %s WHERE id=%s RETURNING *;') +2025-04-28 06:46:35.145654 --- ERROR --- DatabaseError(message='can't adapt type 'builtin_function_or_method'', + payload={'id': , 'update': {'conv_factor': 3}}, + sql='UPDATE test_itemlinks SET conv_factor = %s WHERE id=%s RETURNING *;') \ No newline at end of file diff --git a/static/handlers/itemEditHandler.js b/static/handlers/itemEditHandler.js index e7577d6..a7e594e 100644 --- a/static/handlers/itemEditHandler.js +++ b/static/handlers/itemEditHandler.js @@ -702,7 +702,7 @@ async function updateItemsModalTable(logis) { tableRow.id = fetchedItems[i].id tableRow.onclick = async function(){ - closeZoneLocationBrandModal([fetchedItems[i].barcode, fetchedItems[i].item_info.uom], fetchedItems[i].id, logis) + closeZoneLocationBrandModal([fetchedItems[i].barcode, fetchedItems[i].uom], fetchedItems[i].id, logis) } tableRow.append(idCell, barcodeCell, nameCell) itemsTableBody.append(tableRow) diff --git a/templates/items/itemlink.html b/templates/items/itemlink.html index a55b93f..e41d463 100644 --- a/templates/items/itemlink.html +++ b/templates/items/itemlink.html @@ -129,6 +129,7 @@ } async function postUpdate(){ + console.log(linked_item) const response = await fetch(`/item/updateItemLink`, { method: 'POST', headers: { @@ -138,7 +139,7 @@ id: parseInt(id), conv_factor: parseFloat(document.getElementById('conversion').value), barcode: document.getElementById('barcode').value, - old_conv: linked_item[4] + old_conv: linked_item['conv_factor'] }), }); data = await response.json()