From 55b9210990aba3258cf92c87635290477a1fedc1 Mon Sep 17 00:00:00 2001 From: kerem Date: Thu, 15 Aug 2024 18:40:23 +0200 Subject: [PATCH] Started addinf a search button for every selecField. now its not well automated but it works. need to make it more proper and then we can concentrate on only funtional stuff --- web/instance/test.db | Bin 19292160 -> 19292160 bytes .../company/__pycache__/forms.cpython-311.pyc | Bin 11131 -> 11158 bytes .../__pycache__/routes.cpython-311.pyc | Bin 4847 -> 4512 bytes web/minibase/blueprints/company/forms.py | 3 +- web/minibase/blueprints/company/routes.py | 9 +- .../sensor/__pycache__/forms.cpython-311.pyc | Bin 10564 -> 12224 bytes .../sensor/__pycache__/models.cpython-311.pyc | Bin 6254 -> 6254 bytes .../sensor/__pycache__/routes.cpython-311.pyc | Bin 12257 -> 7988 bytes web/minibase/blueprints/sensor/forms.py | 110 +++++++--------- web/minibase/blueprints/sensor/routes.py | 120 ++++++++---------- .../sensor/manufacturer_options.html | 3 + .../sensor/manufacturer_search_results.html | 7 + web/minibase/templates/edit.html | 3 +- web/minibase/templates/editModal.html | 21 +++ .../templates/form/allFieldsModal.html | 7 + web/minibase/templates/form/selectField.html | 4 +- .../templates/form/selectFieldModal.html | 33 +++++ web/minibase/templates/formModal.html | 18 +++ 18 files changed, 193 insertions(+), 145 deletions(-) create mode 100644 web/minibase/blueprints/sensor/templates/sensor/manufacturer_options.html create mode 100644 web/minibase/blueprints/sensor/templates/sensor/manufacturer_search_results.html create mode 100644 web/minibase/templates/editModal.html create mode 100644 web/minibase/templates/form/allFieldsModal.html create mode 100644 web/minibase/templates/form/selectFieldModal.html create mode 100644 web/minibase/templates/formModal.html diff --git a/web/instance/test.db b/web/instance/test.db index 88f1be944d53672d3e55d09e98d04628bcefea68..e118a4ab1399345d8c8e770bffddd257a370c591 100644 GIT binary patch delta 2488 zcmc)K2TdsP4dvc&wU!e-o2ekzT=_{Jb3d)))3rY@_=E_!|5KnD_)}Shvk(26nyR+SH zoldP{SjJ>{#$=cO-=t{plwwx$^URJsi!H@$c6nb$vv&+-rn$qU$@17zEQ-r&bLE?j zibJtGoCB8rYsP8O)`t5SRAn*-oxd{T;TiGD(OEd;{jGgtzyXcm)Cb*EbC*dI^Uoz% zTvof$$t^f+1NM+h=%2A`YsxhSRk4ggm(ceGhyBJg>=mQCpwRnq1Ag-e&ei)g=X#%J z#md}BkEW<6h6-~Ge&A1&cSdJA~iB(vQJJ5$6dG^ z_uyXKhx_pWIhCBDMf_y*r%6E@>JY{6D+ z!*=Yz_xJ%n;wS9HF6_o0{ET1lD|+!8e#am96MtbZ_F+H%UZOXt>mkudd?Z?luVkFW zPvS4pN%WEcNuVT15-bUkgi69B;gSeRq$EmWkVH#jB(ah>NxURMk|;@%Bui2xsgg8F Qx+FuAsqW@aLfvaV08f8-ga7~l delta 1437 zcmdVa_k#`u9Khk;JC1vev)3JGSE9S5qbMY!rBYE;?kdva8b%sUNM(;pnn;5R4V7dQ zl_E_lWt7YmAZ@C`&oYlR*V4Qi;k`p(@p=P7P{O zi%hbpO&zkSOFin-fQB@pF(+~oC)0#eXi76qC5K#2qdBM3f-}gYC9OD7tZGbF61IErYo0lDVNcW%ejIp=}r%>;%a)*i)*-+>*!5B1zgV! z+(;k#aufZynOnG(+qj+n44{xZxRblMn}G~sFhjV9q1?-T+|L6Hqln==$OuLma~GDtYS55c%QYb;{!hABi8dVpRj?A ze99(1<8!{?OTOZ3HnW9q_?GY3%J=-hHny{ao&3m8?BZv3vxmLxV?PJ@g@gRcZye$< zzjK769ODm;^Cy4tH~;YOm}E|30+EzRYNSM@WF#$8DpER<9!W;ZM9N0WMaoAqA{8PP zBb6eRBUK_*Bh@0+BQ+v5Bef!#k*rAVNS#P_q;8~Mq<*A9q+z5{Vwp)Kj^zFaaxk>7 diff --git a/web/minibase/blueprints/company/__pycache__/forms.cpython-311.pyc b/web/minibase/blueprints/company/__pycache__/forms.cpython-311.pyc index cd7de6aa02b24737b2513334fe0291b4fdeb9c65..2f1c87a7f38f8f7c771ccb117ca00134be0c2072 100644 GIT binary patch delta 410 zcmewzHZ7cYIWI340}x0s?Mutp$ScduXgYbJpd52%Ui#z%f+CaSxTm0rsPUkSyu%RL z#=8tn*91Ovkt}|6bBqMg)$jgIJqW=s;I1^ES~If*5y@oD)*@udYRi6ubS zS1H2$u~|}7ijC1~vWfI@M!U&>q?fVT13g@1J(*EvA*0J=FWKXhZ_4pZmX+JX=r;M5 z-0{ho3Otk7%I{(H*qo&h#>kj3`JkdW+XprV<#@);w-wWw7`-<;t8_9839}|LeqcZ% fbvEBqk70JSXAA?1V<#tQegw;W!69E{4s;s;%y@q| delta 404 zcmbOh{yU6!IWI340}%8a+?$rVkynaDxk%K zBCrBgb|3FDRDoH1XaZ&YDEdVvI|!hukP$>v@k|g^#pXjoW=xakDe`fY7NjJWq*lp8 z9K6|3REmw!aNYk5Aqy&$GE#!JAP!mXU#>f#HUtS_exH_Z1GwD;#n+cmz89A1K9b{-&7D#OSp- wPNkDsNQgC&@dE=AsWth(y4YrZ4L4>-JH{}e9CmVo=0~v17aa0M=0HaS04!#IrT_o{ diff --git a/web/minibase/blueprints/company/__pycache__/routes.cpython-311.pyc b/web/minibase/blueprints/company/__pycache__/routes.cpython-311.pyc index 62dff425305740bffd580773534aa0fe4d995dda..5a8b19049fcc9ea2ea549e908d010318e44d4332 100644 GIT binary patch delta 941 zcmZ`%O-vI(7@gVvu)FPUw}qA#p_D2=rHYUcKw|`h(P)gKgiAxRS(u@0+@CUSP2eIi zBzn@2N%Y`_c&H(en8;Oc#xp9Xs%H~p6t0|{SxStFPIlhBdGmey&Agdk-5V#>mx>|- z*1o-eyYNL?SCjDZdhgl$5FmhjmSoEX+2ejIWQPmkhOXG^ya0h6@lY#78+xpvH#hVa zPY+meJ5fkLAOIXhLEMU(w#AwcfGyUKS|N#(8>!sSDVHl9sy2V2^a`tKwxq6l4uoq-d7Lbd;fMtNvcJMv9~T#O#VtDUf}T5i#F zbb^`pGxb%Kaq#WF*NTCy-{&Q*_)v9q3|I*?H!F z=Ywr@R$NI$n6MHy=I7n2QyEyS*jCO*lJtjoYl8o$9$2bkvRs#oxT3p6A08YgA+E-9rea!U(odJAu6UdWE2eD}@fFj;H%#X)>7}ovF)__o zL^MaEYJvvju9&ym0Ld|(ggNBtnB3o;;c-ok9g=Z2Yhk_YLI765eh`S!1JF(%%H3M_ zqnOuvaWv?(T+`CG_jNQMn{pMemWWNd^^tDC_rW4R70L`GwE)ixb-&M4!7 z$|ANg^K~lH$8KpVlA>=Tr(v3YkM#R_HTp<9b=@;o)OE+Ov95a_)C0t=RxsiB=AGTE zvGl?nPHcFoUg{RVR>*>L~> delta 1259 zcmah|&1=*^6rb7bZj;?6n{BOI*KIeoT{Ts!#jk==EVYUvdZ=Ea5MpP#4d!E=B!?}E z3jP7ghzCzSRYVc77ZE%No~4Qh$ypDctQQX==u9?>f*-@o%bVZ(z2SXjY4~G9xhu;B zz*gV$XY)4-HcSclA4tmr0QcGH zETe{NOGC5_d&dDPpd#vSW**4P8OC9!vygHfEHm}~4*(dOes~Q4RQj_Q7LiI1!Fq1^ z7jF5l+#b&D8bQJ=(0l1qcyw?431iesj=i*ws$79oq%ko z4QZ&a!l|GT9PpvhG?L^YFi$eWfCKcKd@n!3G`&F|D*G#h|2whb+Ma#h3h-FCfL%2=S!o9cy#gbzuh90CTSzbdtALP&bT<}Deo_Alnstm$shnFP@^J~PHNeCt0c6zcgZy(CzJb$gS#CK@XUoU3JofKEkVFRn diff --git a/web/minibase/blueprints/company/forms.py b/web/minibase/blueprints/company/forms.py index 6e2d6f62..5fea3b3f 100644 --- a/web/minibase/blueprints/company/forms.py +++ b/web/minibase/blueprints/company/forms.py @@ -32,7 +32,7 @@ class companyForm(FlaskForm): # Defines the form class to be used for the user submit = SubmitField() - def populate_for_update(self, company): + def populate_for_updating(self, company): self.submit.label.text = "Update" self.country_id.choices = [(row.id, row.name) for row in geoUtils.queryCountryNamesWithDefault(company.country_id)] @@ -54,6 +54,7 @@ class companyForm(FlaskForm): # Defines the form class to be used for the user self.submit.label.text = "Add" del self.image_file + self.country_id.choices = [(row.id, row.name) for row in geoUtils.queryCountryNames()] # This is for the htmx implementation. please be careful how of there is data we switch the funtion needed diff --git a/web/minibase/blueprints/company/routes.py b/web/minibase/blueprints/company/routes.py index b0a7781e..f9057c0f 100644 --- a/web/minibase/blueprints/company/routes.py +++ b/web/minibase/blueprints/company/routes.py @@ -1,12 +1,9 @@ from flask import render_template, url_for, flash, redirect, request, Blueprint -from flask_login import login_required, current_user +from flask_login import login_required import minibase.theme as theme from minibase.blueprints.company.models import Companies -from minibase.blueprints.geography.models import City import minibase.blueprints.database.utils as dbUtils import minibase.blueprints.main.utils as mainUtils -import minibase.blueprints.geography.utils as geoUtils -import minibase.blueprints.company.utils as companyUtils from minibase.blueprints.company.forms import companyForm # Declaring a blueprint @@ -26,8 +23,7 @@ def account(companyId): if companyId: company = Companies.query.get_or_404(companyId) form = companyForm() - form.populate_for_update(company) - + form.populate_for_updating(company) _accountInfo = mainUtils.accountInfo( title=company.name, description=company.legal_entity.name, @@ -55,7 +51,6 @@ def account(companyId): return redirect(url_for('company.list')) - @company.route("/add", methods=['GET', 'POST']) @login_required def add(): diff --git a/web/minibase/blueprints/sensor/__pycache__/forms.cpython-311.pyc b/web/minibase/blueprints/sensor/__pycache__/forms.cpython-311.pyc index af45123c2de734afb0253ba3e6b446b584269c1c..aa521cc72d5894d211cd1967e89722964ddc3a33 100644 GIT binary patch literal 12224 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 literal 10564 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 A!2kdN diff --git a/web/minibase/blueprints/sensor/__pycache__/models.cpython-311.pyc b/web/minibase/blueprints/sensor/__pycache__/models.cpython-311.pyc index fb9244c2a7d321d60b0aedae88c8afd43ff711a0..c427c599d13cb280b71ca1b838c29fec65a0acb5 100644 GIT binary patch delta 20 acmaE7@XmmHIWI340}%W=ws#|UvIGE0W(LOq delta 20 acmaE7@XmmHIWI340}yO&*|U*5Spon>@&-Qu diff --git a/web/minibase/blueprints/sensor/__pycache__/routes.cpython-311.pyc b/web/minibase/blueprints/sensor/__pycache__/routes.cpython-311.pyc index 9bb30bdea0c88441d7d7f9dc7fa79853514f16b2..d83ead7120e77e72b775dd6bf007a0c2ee1d33e9 100644 GIT binary patch delta 3879 zcmZ`+U2Gd!6`mQ-*yGIDjvYIHb{yAroH)Ntw@OPlODUg} z<3fwOj>>8YQjvCdDu`Gu@>2*jh@h@epAbB(w2xzJq(p-Z-G{sZa>c^KA_3=)$4=6e zo0;P~=bm%#x#xW6+?!7mA5A%b;c&DN(3X0CzxZj}d(KYscklI27io!4JK_$K5D0;i zoN3nrMH1;&gSz7$gU?89X>Z(X%J@u~c2lOq2qW(!LR1a4eBq&J7CW;H@{o^)|5q z-6stO5kKD4XcgSA(C{45h%_|pZGszCp|+e#J9UidYw~?fejNDG27j!h!GFoB&LeB| zH*`k2UTIbL5siU{#+d(=8i6AkF@d^4#Cnv6)VKYlZvRp?y^_qN#9WNjU77h*R-P8` zrWQoSYdJyvl6X38S)!C}rjtT`E@cLdejerBqHv)5={gP7W$%F6y(xC=TyG zW`X{cC=lEQKl6^`Hc&TOfm~)A{pEvP zyYig(M)p}U*AOF!pF~eha;|Y?-!_LXJc&H)##zV zL({f4_=lyHYp#y#bb&6A3BDn5NYCBi7RUm17(XN-M;fDGcw3`i@|w0eXF+7B!6qPY z1<=$@HTr_}j*(}`cgXJU#(04$kji#nPoGW3 zATV12e7MDK(BM~i>kU>IQvT)c?fQQvamu!@cbvZ(W6*g}(K$iPEuhqjoXTc&CU-lF zWZjyRlX5<%x1`d^B{8v>l0;>@`%)CU;Xa>SSjgrx^5|_jEyXMdgHz{B=B3PHR=MDR z9Y9_1cNK9sbl*yLB`+mqm?(=9`4zx-Dzl{9)5%okrks*;=n592Gs(25^OCrfloDb_ zPRaLl+jqtJTuK(vSuEi&%$WsiuB0+|&?U_C+)YX;m{Ck*Gl^V&KAnc&SlcQXnT)<>OqDpWPn|dC zG#r$}&<^2drllyPWHb*u8`&mt}-QmI&E?nj!8W&+|1ZO{~ z{H=GeZIAb9e5lmE=`Hi48b7M?qsm`H7l!s6-bdeB&sQ7~)e)&;q2s0L&1jh)*Z6Uj zAK!BY*Wao}hjxe0DA&Um!-KHj`}9~+5Eh`p0eC~h^h*+xYw z_Q}m!0LsQ;j#nwb8b{Ku^q_1mK_{<>P^Y;#Xm@`*sYndLmK=Y7LmioCw>CjO=4pP%0zqu9qf4 zMryPj1b+e|28oHV@6jzxzKO{kCUH!xnBYjjQbprLO5hKi8HY|J3rvKTfSbi5e+05h z>^VArbnDTr)!8c7UFHHB7g(LH(ss3FdXv@$CbfZ!(1oW=&uH|FO3&=l><%5M(1G~u(VA&SZY@r%q zVa``sx5mOmrEfHIX^(ZN&Xe1h%IuWJPO0qF9@oA8dNtg?d#tavO27H*GC9$!p}l90ePYigm1K-emVnE~^5Qu(+2)TzT@ct92aA}0RkWb9G1 z?E||GVM?|t7g#SK0b~xNVAO!kD3zY8wRcheWS$sep1ggNmQ9-;CRJsF-UQ)WA z7ty_oXh|oK2upuX_TBH#iJ4p$jU9qWeWM8^=JJx9Gcl&y%x_#qjr|wF0kM`kW-h>d zD2NG%$=8ACRw%bnztIi+!K9?r9Z|O=CCR`MoF3_hB$A+)!=7uFP~Nn`SPFdyhJJu$ z@<0GkeA}ZdJA5%v;REZ5&G~vcTAg`rbF02+#THd<(W=M)cx=ZrQ1J}>x@#-A6FXOl zoqHzzq3@Z5|H`q;TI_P!b4Bx9+3{Sfc&?Q_bDC#v%?4ml{nMW;sq>P`rORAezKM-Bj6|HHKjOAw-5tV}m-Q+#C9W)woL>Q=Sj`F<3>o8sI{vhk@g5 zT`(@$_eRYTPWjW&6xjQk< zgps_7gwEi5Ng9n~E`xC0MKLTkfyp!`_!Kt^ngK$?0|?(K4dadD{&RK`%*spR6nX~+ za6!oZ1Q1ZOkR-WFys6e7z<+meI_ZgKq^z15s8R=GPBV6mGN*sC=_h?jk zINGcHeDplC%eJgCN_F%%#SnR-MgVzXA*k~jIaQ-D2kxsB`@_J)z}n(^zO=ZWT@94U zQH>m}QEn2784#>6*5pJ@dDR)&%x^AX@d=Hbs8LojL)HjPvBK$np2yHQ_b{M3Pd&>& bGgM|Za<)b>m7Sv=bWS+fkW|)r| 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', methods=['GET']) +def search_field(field_name): + query = request.args.get('modalQueryArg', '') + # Assuming field_name corresponds to a model field, you would add conditional logic here to query the correct model. + if field_name == 'manufacturer_id': + results = Companies.query.filter(Companies.name.ilike(f'%{query}%')).all() + # Add more conditions for other fields as needed + return render_template('sensor/manufacturer_search_results.html', results=results, field_name=field_name) + + +@sensor.route('/select//', methods=['GET']) +def select_field(field_name, result_id): + # Return the selected option + # This is a simplified example, you'll need to adapt this to your specific model fields and logic. + if field_name == 'manufacturer_id': + selected = Companies.query.get(result_id) + return render_template("sensor/manufacturer_options.html", selected=selected) + diff --git a/web/minibase/blueprints/sensor/templates/sensor/manufacturer_options.html b/web/minibase/blueprints/sensor/templates/sensor/manufacturer_options.html new file mode 100644 index 00000000..fb4d2fab --- /dev/null +++ b/web/minibase/blueprints/sensor/templates/sensor/manufacturer_options.html @@ -0,0 +1,3 @@ + diff --git a/web/minibase/blueprints/sensor/templates/sensor/manufacturer_search_results.html b/web/minibase/blueprints/sensor/templates/sensor/manufacturer_search_results.html new file mode 100644 index 00000000..636c830c --- /dev/null +++ b/web/minibase/blueprints/sensor/templates/sensor/manufacturer_search_results.html @@ -0,0 +1,7 @@ + diff --git a/web/minibase/templates/edit.html b/web/minibase/templates/edit.html index 38540c37..eb4c26fb 100644 --- a/web/minibase/templates/edit.html +++ b/web/minibase/templates/edit.html @@ -5,7 +5,7 @@

{{ title }}

- {% include 'form.html' %} + {% include 'formModal.html' %} {% if extraButtons %}
@@ -18,5 +18,4 @@
{% endif %} - {% endblock content %} diff --git a/web/minibase/templates/editModal.html b/web/minibase/templates/editModal.html new file mode 100644 index 00000000..bdef555a --- /dev/null +++ b/web/minibase/templates/editModal.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} +{% block title %}{{ title }}{% endblock %} +{% block content %} +
+

{{ title }}

+
+
+ {% include 'form.html' %} + {% if extraButtons %} +
+
+
+
+ {% for button in extraButtons %} +
  • {{ button.name }} + {% endfor %} +
    +
    • + {% endif %} +
    +{% endblock content %} diff --git a/web/minibase/templates/form/allFieldsModal.html b/web/minibase/templates/form/allFieldsModal.html new file mode 100644 index 00000000..342a5ecb --- /dev/null +++ b/web/minibase/templates/form/allFieldsModal.html @@ -0,0 +1,7 @@ +{% include 'form/stringField.html' %} +{% include 'form/selectFieldModal.html' %} +{% include 'form/dateField.html' %} +{% include 'form/boolField.html' %} +{% include 'form/fileField.html' %} +{% include 'form/urlField.html' %} +{% include 'form/integerField.html' %} diff --git a/web/minibase/templates/form/selectField.html b/web/minibase/templates/form/selectField.html index 92237bd6..c73e3524 100644 --- a/web/minibase/templates/form/selectField.html +++ b/web/minibase/templates/form/selectField.html @@ -2,5 +2,5 @@
    {{ item.label(class=theme.form.select_label_class, style=theme.form.select_label_style) }}
    - {{ item(class=theme.form.select_class, type=theme.form.select_type, style=theme.form.select_style)}} -{% endif %} + {{ item(class=theme.form.select_class, type=theme.form.select_type, style=theme.form.select_style)}} + {% endif %} diff --git a/web/minibase/templates/form/selectFieldModal.html b/web/minibase/templates/form/selectFieldModal.html new file mode 100644 index 00000000..22e34208 --- /dev/null +++ b/web/minibase/templates/form/selectFieldModal.html @@ -0,0 +1,33 @@ +{% if item.type in ['SelectField'] %} +
    + {{ item.label(class=theme.form.select_label_class, style=theme.form.select_label_style) }} +
    +
    + {{ item(class=theme.form.select_class, type=theme.form.select_type, style=theme.form.select_style)}} + +
    + +{% endif %} diff --git a/web/minibase/templates/formModal.html b/web/minibase/templates/formModal.html new file mode 100644 index 00000000..433d0856 --- /dev/null +++ b/web/minibase/templates/formModal.html @@ -0,0 +1,18 @@ +
    + {{ form.hidden_tag() }} +
    + {% for item in form %} + {% if item.id == 'submit' %} + {% elif item.id == 'csrf_token' %} + {% else %} + {% include 'form/allFieldsModal.html' %} + {% if item.errors %} + {% include 'form/formError.html' %} + {% endif %} + {% endif %} + {% endfor %} +
    +
    + {% include 'form/submitField.html' %} +
    +