From e39473857ea1a41372cff94d0b9f2b179bfd2e33 Mon Sep 17 00:00:00 2001 From: ada-dmitry Date: Mon, 13 May 2024 23:26:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=20update=200.7?= =?UTF-8?q?=20=D0=B2=20=D0=BF=D1=80=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/add_func.cpython-311.pyc | Bin 2139 -> 2369 bytes .../__pycache__/dbconnection.cpython-311.pyc | Bin .../__pycache__/dbtable.cpython-311.pyc | Bin 8788 -> 8788 bytes .../project_config.cpython-311.pyc | Bin .../__pycache__/texts.cpython-311.pyc | Bin 1690 -> 1740 bytes {0.7_indev => 0.7_stable}/add_func.py | 7 +++ {0.7_indev => 0.7_stable}/config.yaml | 0 {0.7_indev => 0.7_stable}/dbconnection.py | 0 {0.7_indev => 0.7_stable}/dbtable.py | 0 {0.7_indev => 0.7_stable}/main.py | 19 ++++---- {0.7_indev => 0.7_stable}/project_config.py | 0 .../__pycache__/cath_table.cpython-311.pyc | Bin .../__pycache__/dish_table.cpython-311.pyc | Bin 18789 -> 19397 bytes .../tables/cath_table.py | 0 .../tables/dish_table.py | 44 +++++++++++------- {0.7_indev => 0.7_stable}/test.py | 0 {0.7_indev => 0.7_stable}/texts.py | 1 + 17 files changed, 45 insertions(+), 26 deletions(-) rename {0.7_indev => 0.7_stable}/__pycache__/add_func.cpython-311.pyc (72%) rename {0.7_indev => 0.7_stable}/__pycache__/dbconnection.cpython-311.pyc (100%) rename {0.7_indev => 0.7_stable}/__pycache__/dbtable.cpython-311.pyc (99%) rename {0.7_indev => 0.7_stable}/__pycache__/project_config.cpython-311.pyc (100%) rename {0.7_indev => 0.7_stable}/__pycache__/texts.cpython-311.pyc (80%) rename {0.7_indev => 0.7_stable}/add_func.py (91%) rename {0.7_indev => 0.7_stable}/config.yaml (100%) rename {0.7_indev => 0.7_stable}/dbconnection.py (100%) rename {0.7_indev => 0.7_stable}/dbtable.py (100%) rename {0.7_indev => 0.7_stable}/main.py (96%) rename {0.7_indev => 0.7_stable}/project_config.py (100%) rename {0.7_indev => 0.7_stable}/tables/__pycache__/cath_table.cpython-311.pyc (100%) rename {0.7_indev => 0.7_stable}/tables/__pycache__/dish_table.cpython-311.pyc (57%) rename {0.7_indev => 0.7_stable}/tables/cath_table.py (100%) rename {0.7_indev => 0.7_stable}/tables/dish_table.py (89%) rename {0.7_indev => 0.7_stable}/test.py (100%) rename {0.7_indev => 0.7_stable}/texts.py (96%) diff --git a/0.7_indev/__pycache__/add_func.cpython-311.pyc b/0.7_stable/__pycache__/add_func.cpython-311.pyc similarity index 72% rename from 0.7_indev/__pycache__/add_func.cpython-311.pyc rename to 0.7_stable/__pycache__/add_func.cpython-311.pyc index 1b2fa6cca86830ef6e64504490fdea5e3ccd5c2d..12426f4dcbd69215f8ba34d3db63580e020972f8 100644 GIT binary patch delta 389 zcmcaDa8RgzIWI340}#9^bV^g=U|@I*;=lkql<~O?$e7NM!jQt4!w|)g!qmbL#hAhj zB$-lJqL@=yqgYbdqF9+2QrUo*F_n24BLl-~Acg?27z-9L)@8~l3YRehwE-~%FaoU$ zX3%8c=(d2p{uXa)QAT-wdR}^dUU^Y|6^EfhZf0I-Notj#kwQj(X;HC)F;t{jlf8%q zXhabwh!6u3w^&P3i%Se4lo5n7F5(ButYjzxdA|tgbB13WHo5sJr8%i~MKVAx$oa+f zK;i>4BjaRw4xJDq22P0v)*Bo`AVRu<^#KEG1M3AgDIl6*dXY`>3Y+2uWpg0f!Fo~I g?uxSA1&0t23XQtx5PiiV`XWQj6^57#Fa)+40G0(?5dZ)H delta 151 zcmX>obX&k}IWI340}u$rJEfJeGcY^`abSQ6%J?h=WK3sBVMt-jVTfW#VQOKBVoYHM zl1wR#!3>%#8y78LH_~J-Vgafv;sg<5Kw>3B5y&d$~j0G6P7-JbffJv}&0Iro9h5!Hn diff --git a/0.7_indev/__pycache__/dbconnection.cpython-311.pyc b/0.7_stable/__pycache__/dbconnection.cpython-311.pyc similarity index 100% rename from 0.7_indev/__pycache__/dbconnection.cpython-311.pyc rename to 0.7_stable/__pycache__/dbconnection.cpython-311.pyc diff --git a/0.7_indev/__pycache__/dbtable.cpython-311.pyc b/0.7_stable/__pycache__/dbtable.cpython-311.pyc similarity index 99% rename from 0.7_indev/__pycache__/dbtable.cpython-311.pyc rename to 0.7_stable/__pycache__/dbtable.cpython-311.pyc index ee9d80902261ba6af597075ffdeb1a22612ca699..22fefc998a6ca4ab8ef4a60d52615d64a4a217aa 100644 GIT binary patch delta 19 ZcmccOa>a#fIWI340}#~YZRGM&0suPv1s4DS delta 19 ZcmccOa>a#fIWI340}!y9ZRGM&0suD}1ZV&N diff --git a/0.7_indev/__pycache__/project_config.cpython-311.pyc b/0.7_stable/__pycache__/project_config.cpython-311.pyc similarity index 100% rename from 0.7_indev/__pycache__/project_config.cpython-311.pyc rename to 0.7_stable/__pycache__/project_config.cpython-311.pyc diff --git a/0.7_indev/__pycache__/texts.cpython-311.pyc b/0.7_stable/__pycache__/texts.cpython-311.pyc similarity index 80% rename from 0.7_indev/__pycache__/texts.cpython-311.pyc rename to 0.7_stable/__pycache__/texts.cpython-311.pyc index a7e4b31367aaba7e632ffd012d6f473a9efc5784..165ae1bd1fb13357caf2dfe91625145df422e485 100644 GIT binary patch delta 128 zcmbQmdxn>HIWI340}v#aIi)#mMI17k!EmK&rM5iKd zf;?MbGiLQ4rXw!hDv8+;b(zVsCGKi4YslQPC1&%Vr6lf;nPu#`LeV;myWaiod4JFQ ze7w(l@6!h(91Z0w z3~-da19fVJ_E$6*rFh~Z=P91PAcLI>JA9|^tdKSIX4!*?gdtE8#MQm(ht(f{-N_RQQ^Wl2q^>%N5!Ark0-2%-;A)wBO#`($Sjp zgtg*y#~y@!D!^K=rHia};f6dWWkjI_R&9VBO(y+V2IrGG-(iiPCVH5NwJ3RYJB@~v zPyk)ACc?r{Y{jZD=`C;)Nx5+GN*9gm)4*@ByNK3T6=#rDRCoW3N^!*BFHVY6{vl5M z9DkGIReY|C(>UbtJt=WG1sQRQ^S>=l<6uhk`j3f|@O@k&djl0W{AY0dh5vXC%qF;f zza&-@rVgDucKWjQSIFv{t#?gzqNy&RNgB%^bPu=#Ny)>G2SzSPk<>DJjv_0|=|>X6 zKL(>RJpE4=Ovw(Y*CyQPb_ihl;&j%#T+KWF{k2*B_9*|G87kN<5i^l->4NjTODrRvz z^iDb4T9vRy9+^3xxH!MSC66p+q`lX)V4wXQdv5_ID}O3kc{tg9e3DDPOtKp>+33aK zg%QQoN2b`vxR}V)FckAtC?*_=;SDavB?G@XPQUc+d)s)*MoCXrazpn!@VB|wvX;Yx z{blHs<6%94hxV%IwFd+9^FkU{`r$lY-Cj7$mBDn%4zd=`;n`M}lyZX9V;)Lp1q`Vf ztGaVg%2A3Vi@oBS)Cim_x$1e+0N**BXz?0mDcwaMOjsM{&LB57Wg zpbm1=6O9chW<`fOun;X7kR!9q!IrirI}gq2DRPP9;ADEP+li9Hh>Pl{?#HNu6s6gP zU5HZb#x5iwGKhf{u>&NaOBgkem_6}+on=O6@pR4TvIdv{s~L_RY(3q2U#p+dW?~=9 z>LG#Nx5U1qb26eUle!t=KzWd%w7TJxLFZ}beIqBP^xUizQ`9{u;O#f|&KP^ak>OKU z5bT2KR)TivR>-$pu&gwD^dFR7vigm=!!ZGE{HSU~HCA^??=AFei)XaOV(5n7Erl`P zwBF6Ii5WKFGE4HpgP@Z7pDubc^DHLLQ|vcodu4u8{;)C}uGZ7$wfMC~Guk3iTNJeU zzRElkO?E&-ZX;=g@!TI#KEBpN8hz<`iG;NHHoTNXNGsU#2gw`oQ@)$*_3d7_iY9jG zD|C^4zQ=`Y2vPYk`oQMYibipC2i;v+b&6aByhtIH7Vp<_^akr4kI@PsU^^6%JDyI w3AT}Jd2x_h0vlb+_oqi8c**1^*i5p zzTfvdk9+$4F}O1TrZYyPjv?)&cga@mf_~F3Skd3JQoV|C8^8GFs1e-QVfq~_tr_e+ z6&mvRScf&v0*8w^7b|*jJC_GW zBDT-WRfl}{4R~~BK&K_yD)Rod4)uA3yhQC}lQb!dVFdOxQFRXRxmmW=d)Xi>sC>%M zFe~mMJ$0fNFc4dlw6(<6CTwxmV~Nuq5*O`d!>qqjp<`+7Fo^F?QIQ^GFp^=%raZIm z1T&Np)u%7Os!TJN;ZxEAb&`HkI^HnO!DyCQuk)#?GvJhr7}qeh!v$28|M<;<8ia zqUWB#8I>Q(&i;?==y;Hcq~mQh*DY9ssvw*uTXSx5CxP*Qs%(q0IHEXZQkhd%V6Qr; z7P6Ad$VpkLm0_3;<%rXMP(3wA^pG5blGDs2ru?)eqIpkOBI-%a&?Rs|^)xeFpd7Zu z3`@x}KjX}|CNw1_r3gHNEvWfF0ZE@c(b3%kvx=dw+rF&p2(B%7(=pG(%NOLU@jhNY zA3q#FAYUWhXxAzHyP(RzKhkhf;p^Sr3jXc`(!@ftUU#XgyL3Cct`m?4ykQ* zkLclfsz^l?;f2E4X<{XjAXZ^kQIEcwnoFpzllVc=QheW*g{N%AsGH3@YG|yMf}O(4 z6zDwghuH_0HV|V()$W(XI_mdQc!fee1$u3WkgPukl02)wF!pcmdPB>>}`9e?WWlhcJ@jkDZFdYIUt3l!CevOacNK*N%0mNhe6J;3#Iqq)57Z27wO$K~HHmshWk*KQcD-9S9# ziRZQs=eA;KPR!U$*@{{yK~W3V7Y{kC*~jz)`oX4;9nnQ`OZl*+Tvi^`yBD%yA2ztX zd12p}j(P0BOKy+d!YM5Ek&ft`xTS2^QYKr<#$Jt?N)D&NYCP^)3v2LC&#%P3@q7f< z#5(8O09s>*7T5tce3yp&p-sXHDAAOUF_X}O4;o9M5lfrq!hT%WR8qZ%1@jm) RJ%-c9mB_?n;-ZOE{}-ae4j=#k diff --git a/0.7_indev/tables/cath_table.py b/0.7_stable/tables/cath_table.py similarity index 100% rename from 0.7_indev/tables/cath_table.py rename to 0.7_stable/tables/cath_table.py diff --git a/0.7_indev/tables/dish_table.py b/0.7_stable/tables/dish_table.py similarity index 89% rename from 0.7_indev/tables/dish_table.py rename to 0.7_stable/tables/dish_table.py index 540d020..23d9ba9 100644 --- a/0.7_indev/tables/dish_table.py +++ b/0.7_stable/tables/dish_table.py @@ -64,6 +64,14 @@ class DishTable(DbTable): cur.close() return str(result) + def id_by_name(self, name): + sql = f"""SELECT id FROM dish WHERE dish_name = '{name}'""" + cur = self.dbconn.conn.cursor() + cur.execute(sql) + result = cur.fetchone() + cur.close() + return str(result) + def insert_dishone(self, cath_id): ins_name = input('Введите название добавляемого блюда (1 - для отмены): ') @@ -89,11 +97,12 @@ class DishTable(DbTable): ins_time = input(f'Процесс добавления блюда: {ins_name}\ \nВведите время приготовления в формате 10 minutes/1 hour 5 minutes (1 - для отмены): ') - while(ins_time==0)or(add_func.validate_time_format(ins_time)): + while(ins_time==0)or(add_func.validate_time_format(ins_time)==False): if ins_time == "0": return "1" else: - ins_time = input('Введите время приготовления в формате 10 minutes/1 hour 5 minutes (1 - для отмены): ') + ins_time = input('Время введено в неверном формате. Повторите попытку.\n\ +Введите время приготовления в формате 10 minutes/1 hour 5 minutes (1 - для отмены): ') ins_manual = input(f'Процесс добавления блюда: {ins_name}\ \nВведите краткую инструкцию приготовления блюда (1 - для отмены): ') @@ -104,16 +113,16 @@ class DishTable(DbTable): self.insert_one(insert) - def update_dish(self, dish_id): - print('После изменения выберите другой пункт для изменения или введите -1 для выхода') - x = int(input('Что вы хотите изменить в рецепте?\n\ - 1 - Название\n2 - Время приготовления\n3 - Инструкция\n=> ')) + def update_dish(self, dish): + print('После изменения выберите другой пункт для изменения или введите 0 для выхода') + x = -10000 + obj_id = self.id_by_name(dish)[1] while(x!=-1): - if(x!=1 or x!=2 or x!=3): - x = int(input('Введите корректное число из списка (-1 - для выхода)\n\ - 1 - Название\n2 - Время приготовления\n3 - Инструкция\n=> ')) - elif(x==1): - new_name = input(f"Текущее название {self.name_by_id(dish_id)}") + x = add_func.validate_input('Что вы хотите изменить в рецепте?\n\ +1 - Название\n2 - Время приготовления\n3 - Инструкция\n0 - для отмены\n=> ', 0, 3) + + if(x==1): + new_name = input(f"Текущее название {dish}.\nВведите новое название: ") while (new_name.strip() == '')or(len(new_name.strip()) > 32)\ or(DishTable().check_by_name(new_name)): if(new_name.strip() == ''): @@ -123,7 +132,7 @@ class DishTable(DbTable): elif(len(new_name.strip()) > 32): new_name = input("Слишком длинная строка. Повторите ввод!\ - Укажите название блюда (0 - отмена): ") + Укажите название блюда (0 - отмена): ") if new_name == "0": return "1" else: @@ -131,22 +140,25 @@ class DishTable(DbTable): new_name = input("Повторите ввод! Укажите название блюда (0 - отмена): ") if new_name == "0": return "1" - self.update('dish_name', new_name, dish_id) + new_name = "'" + new_name + "'" + self.update('dish_name', new_name, obj_id) elif(x==2): new_time = input(f'Введите время приготовления в формате 10 minutes/1 hour 5 minutes (1 - для отмены): ') - while(new_time==0)or(add_func.validate_time_format(new_time)): + while(new_time==0)or(add_func.validate_time_format(new_time)==False): if new_time == "0": return "1" else: new_time = input('Введите время приготовления в формате 10 minutes/1 hour 5 minutes (1 - для отмены): ') - self.update('cook_time', new_time, dish_id) + new_time = "'" + new_time + "'" + self.update('cook_time', new_time, obj_id) elif(x==3): new_manual = input(f'Введите краткую инструкцию приготовления блюда (1 - для отмены): ') if new_manual == "0": return "1" - self.update('manual', new_manual, dish_id) + new_manual = "'" + new_manual + "'" + self.update('manual', new_manual, obj_id) diff --git a/0.7_indev/test.py b/0.7_stable/test.py similarity index 100% rename from 0.7_indev/test.py rename to 0.7_stable/test.py diff --git a/0.7_indev/texts.py b/0.7_stable/texts.py similarity index 96% rename from 0.7_indev/texts.py rename to 0.7_stable/texts.py index f616474..2cbce54 100644 --- a/0.7_indev/texts.py +++ b/0.7_stable/texts.py @@ -18,6 +18,7 @@ show_dish_in_cath_txt = """----------------------------------------------------- 1 - возврат в просмотр категорий; 6 - добавление нового блюда; 7 - удаление блюда; + 88 - для обновления блюда; 9 - выход.""" text_choice_update = """-------------------------------------------------------------------------------------------\n