From ec8ca9083309d2fee6aa64df25400b9f79045c85 Mon Sep 17 00:00:00 2001 From: Etienne Loupias Date: Thu, 24 May 2018 12:21:45 +0200 Subject: [PATCH] =?UTF-8?q?Ajout=20du=20r=C3=A9pertoire=20extra=20pour=20d?= =?UTF-8?q?eploiement=20en=20prod=20(et=20recette)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extra/scripts/checkDuplicate.py | 17 + grandlyon_iodas/extra/static/social.css | 332 ++++++++++++++++++ grandlyon_iodas/migrations/0001_initial.pyc | Bin 0 -> 1985 bytes grandlyon_iodas/migrations/__init__.pyc | Bin 172 -> 172 bytes grandlyon_iodas/models.py | 16 +- grandlyon_iodas/models.pyc | Bin 5923 -> 6066 bytes 6 files changed, 357 insertions(+), 8 deletions(-) create mode 100644 grandlyon_iodas/extra/scripts/checkDuplicate.py create mode 100644 grandlyon_iodas/extra/static/social.css create mode 100644 grandlyon_iodas/migrations/0001_initial.pyc diff --git a/grandlyon_iodas/extra/scripts/checkDuplicate.py b/grandlyon_iodas/extra/scripts/checkDuplicate.py new file mode 100644 index 0000000..dd99244 --- /dev/null +++ b/grandlyon_iodas/extra/scripts/checkDuplicate.py @@ -0,0 +1,17 @@ +""" +Vérifie qu'il n'existe pas déja un formulaire soumis par l'utilisateur connecté ayant le meme dpap (numéro de dossier papier) +""" +# id du champ contenant le DPAP +field_id = [x for x in form_objects.formdef.fields if x.varname == 'dpap'][0].id + +noDuplicate = '' +try: + form_user_name_identifier_0 +except NameError: + # Si user anonyme on le laisse passer + noDuplicate = True +else: + # Si user connecté on check un eventuel doublon : False si doublon, True si pas doublon + noDuplicate = bool(len([x for x in form_objects.formdef.data_class().select() if x.get_user() and x.data.get(field_id) == form_var_dpap and x.get_user().name_identifiers[0] == form_user_name_identifier_0 and not x.is_draft()]) == 0) + +result = noDuplicate diff --git a/grandlyon_iodas/extra/static/social.css b/grandlyon_iodas/extra/static/social.css new file mode 100644 index 0000000..e678f76 --- /dev/null +++ b/grandlyon_iodas/extra/static/social.css @@ -0,0 +1,332 @@ +/* Test suivi PH */ +.formdef-suivi-dossier-ph .steps-1, +.formdef-suivi-dossier-ph div#rub_service div#receipt-intro, +.formdef-suivi-dossier-ph div#rub_service .wait .evolution-metadata, +.formdef-suivi-dossier-ph div#rub_service #evolutions.open::before, +.formdef-suivi-dossier-ph ul#evolutions > li.detail ~ li.detail, +.formdef-suivi-dossier-ph ul#evolutions > li.wait ~ li.wait, +.formdef-suivi-dossier-ph ul#evolutions li span.item, +.formdef-suivi-dossier-ph ul#evolutions li.None, +.formdef-suivi-dossier-ph ul#evolutions > .detail .status, +.formdef-suivi-dossier-ph ul#evolutions > .detail .time, +.formdef-suivi-dossier-ph ul#evolutions > .detail .user, +.formdef-suivi-dossier-ph ul#evolutions:after, +.formdef-suivi-dossier-ph input.infoInput:checked ~ li div.commentaire, +.formdef-suivi-dossier-ph input.infoInput:checked ~ li div.arrowUp, +.formdef-suivi-dossier-ph input[name="etape"] { + display: none; +} +.formdef-suivi-dossier-ph h2.foldable { + display: none !important; +} +/* form */ +.formdef-suivi-dossier-ph div#rub_service form { + padding: 0; +} +.formdef-suivi-dossier-ph div#rub_service h3 { + padding: 20px 0 20px 25px; + font-size: 1.3em; +} +.formdef-suivi-dossier-ph div.widget { + padding: 0 25px; +} +.formdef-suivi-dossier-ph div.submit { + height: 0; +} +.formdef-suivi-dossier-ph #var_dpap { + margin-bottom: 0; + padding: 5px 62px 30px 20px; +} +.formdef-suivi-dossier-ph .wrapperSearch { + background-color: #E3E3E3; + margin: 0; + width: 100%; +} +.formdef-suivi-dossier-ph h3.wrapperSearch { + width: calc(100% - 25px); +} +.formdef-suivi-dossier-ph div#gauche + div#rub_service div.buttons .submit-button button { + background: #DA0D02; + color: white; + margin: 0; + padding: 0; + height: 27px; + border-radius: 0 5px 5px 0; + position: relative; + top: -73px; + text-indent: -55px; + line-height: 0; +} +.formdef-suivi-dossier-ph div#gauche + div#rub_service div.buttons .submit-button button:after { + font-family: FontAwesome; + content: "\f002"; + padding: 0 1em; + text-indent: 0; + line-height: initial; +} +/* historique */ +@media screen and (min-width: 1000px) { + .formdef-suivi-dossier-ph div#rub_service div.contact#receipt-intro { + display: block; + position: absolute; + top: -46px; + left: 108%; + width: 40%; + background-color: #fff; + padding: 10px; + border-radius: 5px; + } + .formdef-suivi-dossier-ph div#rub_service div.colform#receipt-intro { + position: relative; + top: 1px; + left: 104%; + width: 35%; + } +} +.formdef-suivi-dossier-ph div#rub_service div.contform { + height: 0px; +} +.formdef-suivi-dossier-ph .detail { + font-size: 1.1em; +} +.formdef-suivi-dossier-ph .emphasized { + color: darkred; + font-size: 1.15em; + font-weight: bold; +} +.formdef-suivi-dossier-ph div#rub_service h3#procedure { + position: relative; + left: -40px; + margin-bottom: 2.5ex; + padding: 0; + font-size: 1.35em; +} +.formdef-suivi-dossier-ph div#rub_service div.contact#receipt-intro h3 { + margin: 0; + padding: 10px 0; +} +.formdef-suivi-dossier-ph div#rub_service .wait { + margin-bottom: 0; +} +.formdef-suivi-dossier-ph ul#evolutions { + overflow: visible; +} +.formdef-suivi-dossier-ph ul#evolutions.open { + margin-top:0 !important; +} +.formdef-suivi-dossier-ph ul#evolutions ul.suivi { + padding: 0 0 20px 0; +} +.formdef-suivi-dossier-ph ul#evolutions ul.suivi li { + list-style-type: none; + margin: 0; +} +.formdef-suivi-dossier-ph ul#evolutions ul.taches { + padding: 0px; + margin: 0px; +} +.formdef-suivi-dossier-ph ul#evolutions ul.taches > li { + margin: 0 0 15px 0; +} +.formdef-suivi-dossier-ph ul#evolutions ul.demande li { + margin: 0; +} +.formdef-suivi-dossier-ph ul#evolutions span.step { + box-sizing: border-box; + position: absolute; + left: -14px; + width: 15px; + height: 15px; + border-radius: 20px; + border: 1px solid #363636; +} +.formdef-suivi-dossier-ph ul#evolutions span.enCours { + color: #363636; + background-color: #fff; + margin-top: 3px; + color: #fff; +} +.formdef-suivi-dossier-ph ul#evolutions span.fini { + background-color: #363636; + color: #363636; + margin-top: 6px; +} +.formdef-suivi-dossier-ph ul#evolutions .etape { + font-size: 1.2em; + line-height: 1.8em; +} +.formdef-suivi-dossier-ph ul#evolutions .currentStep { + font-size: 1.25em; + color: #98e478; +} +.formdef-suivi-dossier-ph ul#evolutions li.listEtape:last-child::before { + position: absolute; + top: 25px; + left: -8px; + width: 3px; + height: 100%; + content: " "; + background: #fff; +} +/* comments */ +.formdef-suivi-dossier-ph ul#evolutions div.commentaire { + background-color: #E3E3E3; + border-radius: 5px; + padding: 15px; +} +.formdef-suivi-dossier-ph ul#evolutions div.arrowUp { + width: 0; + height: 0; + position: relative; + left: 15px; + border-left: 8px solid transparent; + border-right: 8px solid transparent; + border-bottom: 8px solid #E3E3E3; + padding-top: 5px; +} +/* opinions */ +.formdef-suivi-dossier-ph ul#evolutions div.Accord, .formdef-suivi-dossier-ph ul#evolutions div.Rejet, .formdef-suivi-dossier-ph ul#evolutions div.Refus, .formdef-suivi-dossier-ph ul#evolutions div.suspension { + width: 20px; + height: 30px; + float: left; + line-height: 0; + color: #fff; + font-weight: bold; +} +.formdef-suivi-dossier-ph ul#evolutions div.suspension { + height: 15px; +} +.formdef-suivi-dossier-ph ul#evolutions div.Rejet:before, +.formdef-suivi-dossier-ph ul#evolutions div.Refus:before, +.formdef-suivi-dossier-ph ul#evolutions div.suspension:before, +.formdef-suivi-dossier-ph ul#evolutions div.Accord:before { + content: "✖"; + margin: 0; + border: none; + width: 10px; + height: 7px; + border-radius: 100%; + background-color: #961111; + color: #fff; + text-align: center; + font-size: 0.81em; + overflow: hidden; + float: left; + padding: 9px 4px 0 3px; +} +.formdef-suivi-dossier-ph ul#evolutions div.Accord:before { + content: "✔"; + background-color: #86bd3c; + width: 11px; + height: 8px; +} +.formdef-suivi-dossier-ph ul#evolutions div.suspension:before, +.formdef-suivi-dossier-ph ul#evolutions div.mais:before { + content: "..."; + padding: 7px 4px 0 3px; + height: 10px; + background-color: #ff782a; +} +.formdef-suivi-dossier-ph ul#evolutions span.noOpinion { + width: 20px; + height: 50px; + float: left; +} +.formdef-suivi-dossier-ph ul#evolutions #maj { + font-size: 0.8em; +} +.formdef-suivi-dossier-ph ul#evolutions .missing::before { + content: "✖"; + color: darkred; +} +.formdef-suivi-dossier-ph ul#evolutions .check::before { + content: "✔"; + color: #86bd3c; +} +.formdef-suivi-dossier-ph ul#evolutions ul.suivi::before { + position: absolute; + /*top: 90px;*/ + left: 0; + width: 1px; + height: calc(100% - 120px); + content: " "; + background: #363636; +} +/* info button to display old comments */ +.formdef-suivi-dossier-ph .infoBt { + visibility: hidden; + cursor: pointer; + font-weight: bold; + font-size: 1.3em; + color: #2f2f7b; + float: right; +} +.formdef-suivi-dossier-ph input.infoInput { + visibility: hidden; +} +.formdef-suivi-dossier-ph .comment ~ .infoBt { + visibility: visible; +} +/* accordeon */ +.formdef-suivi-dossier-ph .suivi > li { + position: relative; + padding: 0 0 0 35px; + border-bottom: 1px solid white; +} +.formdef-suivi-dossier-ph .suivi > li label#phase:after { + content: "►"; + float: right; +} +.formdef-suivi-dossier-ph .suivi > li input:checked + label#phase:after { + content: "▼"; +} +.formdef-suivi-dossier-ph .suivi > li input + label#phase { + cursor: pointer; + border-radius: 3px; + font-weight: bold; + display: block; + padding: 7.5px 15px; + background-color: #2A2E4B; + color: #fff; +} +.formdef-suivi-dossier-ph .suivi > li input ~ div { + display: none; + height: 0px; + max-height: 0; + padding: 0; + opacity: 0; + -webkit-transition: all 1s ease; + transition: all 1s ease; +} +.formdef-suivi-dossier-ph .suivi > li input:checked + label#phase { + background-color: #2A2E4B; + color: #fff; +} +.formdef-suivi-dossier-ph .suivi > li input:checked ~ div { + display: block; + height: 100%; + max-height: 1000px; + opacity: 1; + -webkit-transition: all 1s ease; + transition: all 1s ease; +} +/* Bouton Grandlyon Connect */ +.formdef-suivi-dossier-ph div.connect-buttons a { + background: #DA0D02; + color: white; + border-radius: 40px; + display: block; + max-width: 275px; + padding: 0.5em; + font-weight: bold; + text-decoration: none; + } +.formdef-suivi-dossier-ph div.connect-buttons::before { + position: absolute; + top: 5px; + left: -18px; + width: 3px; + height: 100%; + content: " "; + background: #fff; + } diff --git a/grandlyon_iodas/migrations/0001_initial.pyc b/grandlyon_iodas/migrations/0001_initial.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b07ef175697a66eb39ad7f08f344c7d125f34615 GIT binary patch literal 1985 zcmcIl+j1L45bf2)*Tgm?4p3Bq!Y$%r%L!n3NKweL9aJUD)M{NJdf8gQ_Njp;uqQIO-q#)B}|4 z4lXWNsTMNMl$Ax2nRCiY z5Hl@tJ{8IpbHkJ{5m|++6%hDa1+fMa*L9Fp&OfOr?gQxMNUd=26o5Z{701o0gVS7!-) z$b0eM@mJ$rk7o&dGz*K+#|(WkgFan?{I1Vt&=ZF6ED!mxc>MYd`kbLH5MO}!62w>j z2z1yX9&-;A)^i_30}gMYOl94Muvh;ctL`eeTqZ`k2PhmI92~}lG};xZG&Zr$SaQgd zv2s;raEtHk$7SUN@l`1;#~=Q4<9$OxYS0*yo>DZW9Hq+LM54cBiSo)R>x@} z6Dx(?M6XGq#z`@aujSNLQMbxw(zjCbI?iN1v?KKl0Y)Q29qkj+q=lMLtFeB(q*L-H zb3<-H?A2eLbku^G9%95Bnb}p2Fi2cx`Kayg>A9l*WxtLd);e>)bfgv4h5EUB9`#Nl zONkzz99_KNKrfqNx7~fg){`(i5A7P_t*{-nTg?uePn%J*!?CTtmU--oOaXR1n<6sR zF2WA8;T^C}BVDLBe3#Vk7>_~k+FS-5{n>9uWE7N@m%ZZ-hod?nEov~0Q(0J7L%lVU z>2>X=DEhfqYoSpMRElKOZjd9PtS7-CX~y!U){e-fUfFL>)CB^3pvx@Dule+vIWTUQ zg6lk&sgFzLvs?$T=D?XPlTG8;LXJO9aUyY zUIb(AI2cPFSf=|GkQ12;nWsvckOwQV z)#96RMpHB7@>AO)-TIX7n{OqYx00JSDxBmi)*2;+cOdsjzP1akhxfp1lsq<>S15%e ztuvYA-mr~^vm~EJnpSV43!x`C;d!9fQG>-|UZL6;>9K6g=R?C3X=9QY>=Kz}a&Hdo zDViJ$$JpzOw?zYo(9>Au%HputpG-q~jS)-c16)?h>y`CjrSv3tKiI|ZbA0;m<5D^3 z@+<1D$OC6xfkh5+8*p{RRgw?&zPRKvb6Gk1;wUWrzvtn8c datetime.now(): - for nb in [3,6] : - deltafindroit = nb if (datetime.strptime(tache['datearret'], "%d/%m/%Y") - dateutil.relativedelta.relativedelta(months=nb)) == datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) else 0 - droits.append({"libl":tache['produit']['libl'], "dateproposition":tache['dateproposition'], "datearret":tache['datearret'], "dateeffet":tache['dateeffet'], "deltafindroit":deltafindroit}) + for procedure in data['procedures']['procedures']['procedure'] : + for etape in procedure['etapes']['etape'] : + if 'taches' in etape : + for tache in etape['taches']['tache'] : + if tache['idtypetache'] == 2 and datetime.strptime(tache['datearret'], "%d/%m/%Y") > datetime.now(): + for nb in [3,6] : + deltafindroit = nb if (datetime.strptime(tache['datearret'], "%d/%m/%Y") - dateutil.relativedelta.relativedelta(months=nb)) == datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) else 0 + droits.append({"libl":tache['produit']['libl'], "dateproposition":tache['dateproposition'], "datearret":tache['datearret'], "dateeffet":tache['dateeffet'], "deltafindroit":deltafindroit}) return {'hash': hashlib.sha224(json.dumps(data)).hexdigest(), 'libl': data['procedures']['procedures']['procedure'][nbProc]['libl'] if 'procedures' in data else '', diff --git a/grandlyon_iodas/models.pyc b/grandlyon_iodas/models.pyc index a2ef70076369a630a1acf37c82b2ff1cfdae16eb..3d511ac37f4a7753c896f54f3148993c4adf81f4 100644 GIT binary patch delta 720 zcmZ8fzi-n(6n^K#iHRNmO47u%X)|;{Ad19bn2>--P@n~+62C+QY0eNksogpkNF_%M zfr$y-QVBNLSb+WmY~A?>KrBp5h!ye9%}^oveg5vd@7;Uv>~|}l&*U?|i-iMg?^FIj zUYZAh%TXA5UFMDA#_G-H#f`?5xD(RGjom2R|0$0Z-9(cvj2OeGd`sV1`$EQRBvF78 zaMF;#X|`Q5QDJiY+r)7O)w|S2xVfx&R@8b z6d+K+mm$Ft6)ZfLhAWm;q*X|%ic~$MHKa9g<-`E$@bAXbJq>~)FdYJHNr5R5Phg6U z=y7oI5>OQbD$;-Vk{nBmIijO1VCf^~b%|O0u35h@4|D-u;8}HGHXbd_+%mR<11}y; z3MHDE%}1BO-8j+U`{v74KZD=L&mk}YTT#e*LzYF_i$<}J@7abQj+mEvhF&)cDN}{r z@5a&LnqRffTSe5UH(;H|en{iUXZ)4*feiRL`y?sxO?z8od9=jd_Mp@C_*eTHF?qdo zd!d7B>$-q-0k;sCgb;4F9&jUfpZ_RT>&qxWW|?Txij*T7aYzNRLe7#B>GE><4SB{t hmS2-Tzf^fkcKNr;d$ortE%7h5YP?Z=$bZeb{{W)bmO=mk delta 608 zcmZ8eL2DCH5dLQ4X4C8@yV+#ZtUXx7gGgzq;G)N1J*ZU0f)u1E_NAB&-L%;ia@gRZ zdJ;q!1VO<=ym_i#J$Umhz4`;Z=*5di=dDG8urqvb=G*U^dGEu@blEEXs#Vw3%R}pn z83q6@50j*~o%J4#7O&o1>uxM&y)^sy!yH%YuCy&pkx09o*7w(+(YQl-1&R@nbIih;&)6OC=0oRK^dc07$0dYl~7eQ;WMwg5npjz{M?;;P=hMr0MyA$ z#Fiio42+gYs!0i|j!7MP6>$}P6S=Tm(ea9i^synZfdbkB?Z40$=nJevHF?21_1H%2 zAgdu3wF(YMf3d6WR11-;Bvn1`(f?cKbA?x^hdBXpo*{=u=II}2Z>8WLUxo^x+IS)! z7v_;Q#M3yIF=e(YRA*N0lJRe66(ZU=dy;>8Pra-x&#*g8vWID35cpH$qOG52ci2yN z`U#u+3