entrouvert
/
passerelle-grandlyon-cartads
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Modifs mineures et mise en page

This commit is contained in:
Etienne Loupias 2019-01-15 16:24:34 +01:00
parent 7847bbf569
commit 5dfcdb8383
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cartads/models.py
View File

@ -260,6 +260,8 @@ class CartADS(BaseResource):
message += '<ns0:informationsComplementaires>' message += '<ns0:informationsComplementaires>'
message += '<arr:KeyValueOfstringstring><arr:Key>traitementImmediat</arr:Key><arr:Value>1</arr:Value></arr:KeyValueOfstringstring>' message += '<arr:KeyValueOfstringstring><arr:Key>traitementImmediat</arr:Key><arr:Value>1</arr:Value></arr:KeyValueOfstringstring>'
message += '<arr:KeyValueOfstringstring><arr:Key>idDossierExterne</arr:Key><arr:Value>'+formdata.values['tracking_code']+'</arr:Value></arr:KeyValueOfstringstring>' message += '<arr:KeyValueOfstringstring><arr:Key>idDossierExterne</arr:Key><arr:Value>'+formdata.values['tracking_code']+'</arr:Value></arr:KeyValueOfstringstring>'
#TODO: param si besoin
message += '<arr:KeyValueOfstringstring><arr:Key>urlNotification</arr:Key><arr:Value>http://ads-rec.grandlyon.fr/guichet/test.aspx</arr:Value></arr:KeyValueOfstringstring>'
message += '</ns0:informationsComplementaires>' message += '</ns0:informationsComplementaires>'
message += '</ns0:NotifierDepotDossier></ns1:Body></SOAP-ENV:Envelope>' message += '</ns0:NotifierDepotDossier></ns1:Body></SOAP-ENV:Envelope>'
@ -407,14 +409,15 @@ class CartADS(BaseResource):
# On parcourt la liste a partir de la fin pour chercher le bon dossier # On parcourt la liste a partir de la fin pour chercher le bon dossier
idDossierOut = '' idDossierOut = ''
nomDossierOut = '' nomDossierOut = ''
for objet in sorted(dict_resp['DossierEtape'], key=getOrder): if 'DossierEtape' in dict_resp:
resp_dossier = self.get_client('cartads-dossier.wsdl').service.GetInfosDossier(self.get_token_cartads(), objet["IdDossier"]) for objet in sorted(dict_resp['DossierEtape'], key=getOrder):
dict_resp_dossier = sudsobject_to_dict(resp_dossier) resp_dossier = self.get_client('cartads-dossier.wsdl').service.GetInfosDossier(self.get_token_cartads(), objet["IdDossier"])
if dict_resp_dossier["IdDossierExterne"] == tracking_code: dict_resp_dossier = sudsobject_to_dict(resp_dossier)
#print >> open('/home/grandlyon/log/cartads.debug', 'a+'), datetime.datetime.now(), "IdDossier: ", dict_resp_dossier["IdDossier"] if dict_resp_dossier["IdDossierExterne"] == tracking_code:
idDossierOut = dict_resp_dossier["IdDossier"] #print >> open('/home/grandlyon/log/cartads.debug', 'a+'), datetime.datetime.now(), "IdDossier: ", dict_resp_dossier["IdDossier"]
nomDossierOut = dict_resp_dossier["NomDossier"] idDossierOut = dict_resp_dossier["IdDossier"]
break; nomDossierOut = dict_resp_dossier["NomDossier"]
break;
###print >> open('/home/grandlyon/log/cartads.debug', 'a+'), datetime.datetime.now(), "idDossierOut: ", idDossierOut ###print >> open('/home/grandlyon/log/cartads.debug', 'a+'), datetime.datetime.now(), "idDossierOut: ", idDossierOut
return {'data': {'IdDossier': idDossierOut, 'NomDossier': nomDossierOut} } return {'data': {'IdDossier': idDossierOut, 'NomDossier': nomDossierOut} }
@ -706,6 +709,7 @@ class CartADS(BaseResource):
output_string += u"</field>\n" output_string += u"</field>\n"
# ajoute 5 PJ supplementaires par pièce # ajoute 5 PJ supplementaires par pièce
# voir pour - dans l'id, cf. https://dev.entrouvert.org/issues/27750
for i in range(5): for i in range(5):
output_string += u" <field>\n" output_string += u" <field>\n"
output_string += u" <label>"+str(piece["CodePiece"]).decode('utf8')+u" - "+h.unescape(piece["Libelle"])+u" "+str(i+1)+u"</label>\n" output_string += u" <label>"+str(piece["CodePiece"]).decode('utf8')+u" - "+h.unescape(piece["Libelle"])+u" "+str(i+1)+u"</label>\n"

17
extra/static/droitdusol.css
View File

@ -27,10 +27,10 @@
margin-bottom: 5px; margin-bottom: 5px;
} }
.formdef-category-logement .FileWithPreviewWidget .content { .formdef-category-logement .FileWithPreviewWidget .content {
position: relative; /* position: relative;*/
float: right; float: right;
max-width: 258px; /* max-width: 258px;
height: 35px; height: 35px;*/
} }
.formdef-category-logement .FileWithPreviewWidget.widget-required.has-no-file { .formdef-category-logement .FileWithPreviewWidget.widget-required.has-no-file {
background-color: #ff000030; background-color: #ff000030;
@ -49,11 +49,12 @@
padding-right: 10px; padding-right: 10px;
} }
.formdef-category-logement .FileWithPreviewWidget .hint { .formdef-category-logement .FileWithPreviewWidget .hint {
position: relative; /*position: relative;
color:#ffffff00; color:#ffffff00;
padding: 3px 8px 5px 8px; padding: 3px 8px 5px 8px;
top: -10px; top: -10px;
left: -270px; left: -270px;*/
width: 400px;
} }
/*.formdef-category-logement .FileWithPreviewWidget .hint:hover,*/ /*.formdef-category-logement .FileWithPreviewWidget .hint:hover,*/
.formdef-category-logement .FileWithPreviewWidget .hint:active { .formdef-category-logement .FileWithPreviewWidget .hint:active {
@ -65,7 +66,7 @@
} }
.formdef-category-logement .FileWithPreviewWidget .hint:before { .formdef-category-logement .FileWithPreviewWidget .hint:before {
position: relative; position: relative;
content: "ⓘ"; /*content: "ⓘ";*/
font-size: 1.3em; font-size: 1.3em;
color: #4242d0; color: #4242d0;
float: right; float: right;
@ -80,10 +81,10 @@
} }
.formdef-category-logement .FileWithPreviewWidget.has-file + .FileWithPreviewWidget.plus { .formdef-category-logement .FileWithPreviewWidget.has-file + .FileWithPreviewWidget.plus {
display: flow-root; display: flow-root;
position: relative; /*position: relative;
top: -7px; top: -7px;
background-color: #b9d4b9; background-color: #b9d4b9;
height: 43px; height: 43px;*/
} }
.formdef-category-logement .FileWithPreviewWidget.has-file + .FileWithPreviewWidget.plus2 { .formdef-category-logement .FileWithPreviewWidget.has-file + .FileWithPreviewWidget.plus2 {
top: -14px; top: -14px;