From 990ce4aa263b45e32eda967b2bdb0622deb23194 Mon Sep 17 00:00:00 2001 From: LeandroRoberto Date: Tue, 1 Dec 2015 16:53:33 -0200 Subject: [PATCH] Impl. of features for editing notes and quotes. --- .../migrations/0027_auto_20151130_1632.py | 33 ++++++++++++++++++ .../migrations/0028_auto_20151201_0042.py | 18 ++++++++++ .../migrations/0029_auto_20151201_1611.py | 19 ++++++++++ norma/migrations/0007_auto_20151130_1632.py | 19 ++++++++++ norma/models.py | 2 +- static/img/ajax-loader.gif | Bin 0 -> 7360 bytes 6 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 compilacao/migrations/0027_auto_20151130_1632.py create mode 100644 compilacao/migrations/0028_auto_20151201_0042.py create mode 100644 compilacao/migrations/0029_auto_20151201_1611.py create mode 100644 norma/migrations/0007_auto_20151130_1632.py create mode 100644 static/img/ajax-loader.gif diff --git a/compilacao/migrations/0027_auto_20151130_1632.py b/compilacao/migrations/0027_auto_20151130_1632.py new file mode 100644 index 000000000..81c64d951 --- /dev/null +++ b/compilacao/migrations/0027_auto_20151130_1632.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('compilacao', '0026_auto_20151122_1756'), + ] + + operations = [ + migrations.AlterModelOptions( + name='nota', + options={'verbose_name': 'Nota', 'ordering': ['-publicacao', '-modified'], 'verbose_name_plural': 'Notas'}, + ), + migrations.AlterField( + model_name='nota', + name='titulo', + field=models.CharField(verbose_name='Título', default='', blank=True, max_length=100), + ), + migrations.AlterField( + model_name='vide', + name='dispositivo_base', + field=models.ForeignKey(verbose_name='Dispositivo Base', related_name='cita', to='compilacao.Dispositivo'), + ), + migrations.AlterField( + model_name='vide', + name='dispositivo_ref', + field=models.ForeignKey(verbose_name='Dispositivo Referido', related_name='citado', to='compilacao.Dispositivo'), + ), + ] diff --git a/compilacao/migrations/0028_auto_20151201_0042.py b/compilacao/migrations/0028_auto_20151201_0042.py new file mode 100644 index 000000000..990c31fbc --- /dev/null +++ b/compilacao/migrations/0028_auto_20151201_0042.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('compilacao', '0027_auto_20151130_1632'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='vide', + unique_together=set([('dispositivo_base', 'dispositivo_ref')]), + ), + ] diff --git a/compilacao/migrations/0029_auto_20151201_1611.py b/compilacao/migrations/0029_auto_20151201_1611.py new file mode 100644 index 000000000..34055d72c --- /dev/null +++ b/compilacao/migrations/0029_auto_20151201_1611.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('compilacao', '0028_auto_20151201_0042'), + ] + + operations = [ + migrations.AlterField( + model_name='nota', + name='publicidade', + field=models.PositiveSmallIntegerField(verbose_name='Nível de Publicidade', choices=[(1, 'Nota Privada'), (2, 'Nota Institucional'), (3, 'Nota Pública')]), + ), + ] diff --git a/norma/migrations/0007_auto_20151130_1632.py b/norma/migrations/0007_auto_20151130_1632.py new file mode 100644 index 000000000..745eda239 --- /dev/null +++ b/norma/migrations/0007_auto_20151130_1632.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('norma', '0006_auto_20151025_1427'), + ] + + operations = [ + migrations.AlterField( + model_name='normajuridica', + name='complemento', + field=models.NullBooleanField(verbose_name='Complementar ?', choices=[(True, 'Sim'), (False, 'Não')]), + ), + ] diff --git a/norma/models.py b/norma/models.py index 875687f1b..d718c3c0d 100644 --- a/norma/models.py +++ b/norma/models.py @@ -3,7 +3,7 @@ from django.template import defaultfilters from django.utils.translation import ugettext_lazy as _ from materia.models import MateriaLegislativa -from sapl.utils import make_choices, YES_NO_CHOICES +from sapl.utils import YES_NO_CHOICES, make_choices class AssuntoNorma(models.Model): diff --git a/static/img/ajax-loader.gif b/static/img/ajax-loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..812bcf757a1dfb8f851886cfceab676628c8e23b GIT binary patch literal 7360 zcmds+`&$!d+Q;XVIb<@K$$4gyNoFRN+ z5Kf8+f{F?f@K8L|qSk6v+yoI16%1$<54B*`QnjvC+qHe&_KkbJ-QDYYukLUAOXnYW zuKC`d?|pyo=NU70bi(jiEWiTW03bIf_vo>swVP{i-ndy-UUs4T!tOo0A3uETFY=!~ zb9U?Yt@rNSt6o=q?aH^k?|c98 zH;>C!l%4H7yL;#Ed-w0vZmhj_{o2vPN1uNG^oJjQ0RB6l^aJ^F($p!g#FV5VgW_N? za*FgVLXdzA#6COm*>3{q_m0ZUnCTM`-h11%V8n}-QpBN{=Ikl1I@Facb`P{aj`@xA zDlzx@x^Z~@J^Pe}3z?D^{HY0n!apqKmbyrU&q7SUm**A~EJyh&ge-GP1sKL9A;sg@ zyXZ}rAZd*CXrr4Ggj&l^aQ?bPk#x zx&U{uRtSR6U^W9xns4aAGX@)M+phmwX*h^clx>j=eiOHpS=$gQe0!bSF*)cffOCI8 zA}z-A;P@~N#q)7qsWo5qsxiJNB@iqmv5jdxC13%Jfzj@gia_*f60XY)dU^*)IHSw& zzSa!h+NL5bPZ5n6JiF2OXq9S&6e?7jN)hn?M6>@(w8Eu-UiyrTjsGBH#lMk}|8Hch z`4<__m}q~-L`0ssAz@==Z_O%!G$2Q6|JMHdso+4JVru zW27F!8z|M1Ca5u|E(4@0-_%RYu-T`k%`39FvtkmS{?>D!wpu_ki>Bv0tu~d(q?-4- zTwGkLUZt{GUw0Mr#Ywg@m00Vl;_GDsYE*A`(>v-p8w71@cG4K%qBTGU`tT9#BxX3H zJmHivs}<8;INKq2cPl?`J3*7yUP*b=*uj%uU<#!mXgWxvkvt}#e(gt)O~z4((Zx#LbSBCXESh+wlY zS2#w)lp0&JM;DsVhMirG&Q}3o@wd^j#{6w%P4f@T4?_HFLBe9TX-Av`qxg!*7Fs}`;&JZ{S8N9GL2abSvqEc z)2h_ItrgQ{#XOx3pJ@lR70ONNc9^LFBs-?urG*>a79F4i?FvCq>fdwAl3B^u9uka4 zQ{>Y!hj!2>TWCLeRvmWJmp|gTrc2JtmnF4YI(JFt@6eiCYVuQ>e@Ii31X@15a~A`D z&~LWI8uIo-ElR7pCmH5NZI&xnWsl?X)S6@-8=B0zvFf{V2WC^Vr$Od z(+2q;qm|x#y?2pX4l1ZNl|T~i@&R*wsQYa^P(p}UM*+?I_x zyoB4S+2fWW-BFE(Q*-YgauG)X<+B>oZ7ypB4oJEPo^zuB!-5y}mt8W++w~x*@4O-3 zmo5Do@=Lmi7LRG(xctpGGOu+fS2*;0FN_-yc{Ev>74Qx4?pOM`q}KzjSl zJK9ar8S&pR0If=$hmice;rc{y5Wepz5WaM!iNjIxksnb2OVJ*(6lSFkBS?@M) zVQ|bQ?$6%klB|rD(U?I{-1&jad_-%}=|CNQ+$Cru-Boj1)9Ioa;E3ir(c|R00fzXT z=;*w{W}%P9zf>B`-`V;kgGFtf8`B&?f6^{zjB4;rmya~@bDIbBhv32+;;=&x zX36YIksDXq(|g>j^!cZq4Gt-ARJx4S@!5+*`D$!Lvp!2RL5!_34D30Y9cUWA%w|$0 zJXhThu8aE}b;q;6ptE}NKQ;Rq`XnCW3LA9;|KXEaaZ9VUW0O*dh);a>DPN`?xVqXA z27Yasnc0DN>?jrg`ikzrly@*1 z%NqqKhi-4e#$7^5*LD5V`?84bZ$Xcedr4o5M4e61nm8xvaNmUX= z#4aSHG8(}ob3h|(ahsYD6=pCWqMF^31u-IKN}({<9&srUglA1{iimImf6;2XeE7VR zK8qt1Wx9HeLvX(DhOPUWfHSztK-p}Kr_9V#i(rG%sT+;0FhVf$NET>z9-C~A68*t> ziG?f4YpZww^t$0s22M*0C)(@FtuGwau1SnKt>&zLRx2YokN~E6*Yw?r@zoEWb1}AJ zC{&{o)KM=nk9_AhnpO8K%kYe%zzY-aFXpFiKRY?`=Q~=uRSEhrG0eP-Nbp8ogx{$i z(;l1{seO{1dSLd!qVgQzgR;}rw}yW*IVOtg&#%fd#nLi88jLhIgLZ+FS6Ff_q(>Ho zQiC!bE>|ehJ$AALg7kKpty5S7ZfdK|z?1BOmG3%b6tdYAFh#N0AvfEiQi~x`KH=ttbH*z|kMvSrgdSY1|F{C+|!hR617N z_ie;GeOoG%-O*=&Q{a_|elO3OGZBprJdb|XqrIs(pJQB>VP@?Gu8&yktTqLSg>NPTL+eB5?yKGzadQO0MEPU4`sr3+KBH>W_ zAt%)WiH4A2bDI;hc3BJ;4tBl+sjLu58pumd+N!$p$tO~uV7#Xk{#wvyiWpA4U%+;^ zNlN6g*=jlUW`NrR@!!8%Qk|Gyr21m|D`KFb5ne^n-7ZTl$1cWzI#}C3f-h6a% z2%A(^t4MQCA0L*`k#U~PhLobW?=GFu?CHB+h5e6c+!d_w76MME!&1$RD}jvow8vp( zWBWK!+4NRs08k*jTbt3lC=3A+)f_+~6f>a)8CIgK1pfFkG3w3v&5rZ0V8obZ&YoAP z>BRuV^hX86)~zu=6XmJ~@=Yu$!` z9agJ3HP2)3V7pwhhC3qex8@&oi5!Y*uv1n!rz=z@Uo-9SKj25i3l6;dq?)Wjgnfj9NE`m=hde{@1FKli3`!o-)X1S zXxH+*PA7);N_p2l5rxk+c1&y5cgm8W6dE}|r)zAXw8}>_(CBMdGx4=83BcVIVY6|6mQ^i<*SQ z{o&%%2Z{NkensjR0OK4n6G2eTK4KEVjz~<(tl$UWKiw_oj#zmnu&+O&+pK=?gn_^5 z8GVa0jA}~0{q^~bG`{%$LD!6FYi})SX!i0$FC3S2%9oD8CX>Rf5K_6)x6&pH1!lsW zwwxPXHiI))5H>k)-TE0aNkoDxT|c@pMN(**4SD-_r;xfsinrfBkivmMLe7y|+_WyJ zGXsFS-9>|<2qGN-7nV7-`eRj(=_<@#C&Uh|J}iOk1DiqnSWC6r(C^qQ`o|1^r+K=^ zTX2kW8XXnQ6~UGmX;fxP&aIh*UkFQZ7_^t5RsTe$H#&qx4DM5dH%LsRGFBq-B6anXdm@&$i)ODS+yM{+p zYxv4LGWM4}p&Oi`Xb3ky^}|zn=!QLmm#BX6(b`b&qj{D| zp*gZ2z*~#k+mD_8Xr|^o!DzKisFjN>g@pBzmg+KqpiTiY_mm$+qxYL0B!S z!AX|;Qghh%3Wni{`d}g8LlM=eCe9lI1~ONMW%ML_fg+T2S0b=rgs+5q-JBE_@8q`E7Y3zg^6CDbBbD2F8hzFSvM3s ztROV?ZF64B>7V-I$^zX$6*u(M&1I9NKOQ<^e;ArNJEEHJ?hB)iI-~v^wAB_0R$R9% zgIi=PrJZ`9T*z>7aH)-y4dvzQE1j5)YM@1JIaKF{O}l*C08^7opmxEy_R#XZw4%in zS)P%-uA}CbU~Ah9bBCE{82oS(OU5fw z=xxMWQHep`=1UXXAP9dxs|Fj;1~AN*&ude?k!u7MoA4wY)wY#jEeYOfePjJARU@+) zhp%9~8da4bp$DfG^mD&U?b#tl3#dvQ*Z2i6dmFG$Ig{^kywQ&`mNk4$IIyEa{7G}F z3awn!5ch&%tLZ=7j_Zi4Yt3(%RrcDk^W{%`6wq0}=WoILvBnLr-N-Fxi%%9jp=^Vq zw13nJ(`5Qj1_L=))_Vb*EOgQ<46uJWNUVLxQS72cCWYDFo@Yyx5LTpj>PE5 z7PM%8k&Uv!IL;f7RYz#0K5RcFOQ!Rb@k69+KX+b1DR~63oe~tcZJJ2zV~=$cX7iu! z8jYXrAc+U&x$M^}2%k8jLd-w*mcYh6==HS%v668@4HNQwKw6DT2AJ(#%Wwmu0F7rh z;&W;72cj2JC@hiu(+eP{*BF}90^wB9J^@DOUPJ~brZ&J}?&4|u(&!SXWuy?p0In2_ z808+I{c-2~`OUKFnQD92oNpOT{qaI*h%d{1rg-#SzjAoVX(VoJ{DJ8m7tP+3lU0d- z-Zjb+KPfIswZmH?FT<=DJ=u&eMA(^jy1-glWEb#th;dcq^?}@+Oqxr~)J7L?-E5Tg zX2dLPcUvP*4w&*iWZOO`f8Ya^>3CL4Ief}^9D&+5of2VFYe%Onc8QQmWjoPAQ#WAY z6Wj7gGox4|VY5N%PVp{V0DWtKTday7Sk-VQrNN2O+vD}U4}NtXr?tv){k_bYe1u5I z#1jygn^2BOX%2uZQM*RFb>x~ciOGt{GY77b9e`4w8r_t