Projet

Général

Profil

0001-cartads-move-zip-upload-to-its-own-method-32419.patch

Frédéric Péters, 17 avril 2019 14:49

Télécharger (10,3 ko)

Voir les différences:

Subject: [PATCH] cartads: move zip upload to its own method (#32419)

 passerelle/apps/cartads_cs/models.py       |  10 +-
 passerelle/locale/fr/LC_MESSAGES/django.po | 155 +++++++++++++++------
 2 files changed, 120 insertions(+), 45 deletions(-)
passerelle/apps/cartads_cs/models.py
363 363
        dossier.save()
364 364
        self.add_job('send_to_cartads', dossier_id=dossier.id)
365 365

  
366
    def send_to_cartads(self, dossier_id):
367
        dossier = CartaDSDossier.objects.get(id=dossier_id)
368
        zip_filename = os.path.join(default_storage.path('cartads_cs'), '%s.zip' % dossier.tracking_code)
369

  
366
    def upload_zip(self, zip_filename):
370 367
        ftp = FTP(self.ftp_server)
371 368
        ftp.login(self.ftp_username, self.ftp_password)
372 369
        ftp.cwd(self.ftp_client_name)
......
375 372
                open(zip_filename))
376 373
        ftp.quit()
377 374

  
375
    def send_to_cartads(self, dossier_id):
376
        dossier = CartaDSDossier.objects.get(id=dossier_id)
377
        zip_filename = os.path.join(default_storage.path('cartads_cs'), '%s.zip' % dossier.tracking_code)
378
        self.upload_zip(zip_filename)
379

  
378 380
        def key_value_of_stringstring(d):
379 381
            return {'KeyValueOfstringstring': [{'Key': x, 'Value': y} for x, y in d.items()]}
380 382

  
passerelle/locale/fr/LC_MESSAGES/django.po
7 7
msgstr ""
8 8
"Project-Id-Version: Passerelle 0\n"
9 9
"Report-Msgid-Bugs-To: \n"
10
"POT-Creation-Date: 2019-04-04 11:35+0200\n"
10
"POT-Creation-Date: 2019-04-17 03:38-0500\n"
11 11
"PO-Revision-Date: 2019-02-21 13:32+0100\n"
12 12
"Last-Translator: Frederic Peters <fpeters@entrouvert.com>\n"
13 13
"Language: fr\n"
......
58 58
msgid "City Name"
59 59
msgstr "Nom de la ville"
60 60

  
61
#: passerelle/apps/api_entreprise/models.py:69
62
#: passerelle/apps/vivaticket/models.py:135
63
msgid "API URL"
64
msgstr "URL de l'API"
65

  
66
#: passerelle/apps/api_entreprise/models.py:70
67
msgid "API token"
68
msgstr "Jeton d'accès aux API (API token)"
69

  
70
#: passerelle/apps/api_entreprise/models.py:72
71
#: passerelle/apps/api_particulier/models.py:188
72
#: passerelle/apps/arpege_ecp/models.py:32
73
#: passerelle/apps/atos_genesys/models.py:35 passerelle/apps/bdp/models.py:26
74
#: passerelle/apps/clicrdv/models.py:42 passerelle/apps/cmis/models.py:51
75
#: passerelle/apps/family/models.py:121 passerelle/apps/gdc/models.py:28
76
#: passerelle/apps/okina/models.py:34 passerelle/apps/pastell/models.py:32
77
#: passerelle/apps/solis/models.py:100 passerelle/apps/vivaticket/models.py:139
78
#: passerelle/contrib/agoraplus/models.py:122
79
#: passerelle/contrib/dpark/models.py:179
80
#: passerelle/contrib/fake_family/models.py:31
81
#: passerelle/contrib/gdema/models.py:152 passerelle/contrib/greco/models.py:69
82
#: passerelle/contrib/grenoble_gru/models.py:72
83
#: passerelle/contrib/iparapheur/models.py:83
84
#: passerelle/contrib/iws/models.py:95 passerelle/contrib/maarch/models.py:37
85
#: passerelle/contrib/mdph13/models.py:56
86
#: passerelle/contrib/planitech/models.py:259
87
#: passerelle/contrib/seisin_by_email/models.py:37
88
#: passerelle/contrib/solis_apa/models.py:53
89
#: passerelle/contrib/teamnet_axel/models.py:77
90
msgid "Business Process Connectors"
91
msgstr "Connecteurs métiers"
92

  
93
#: passerelle/apps/api_entreprise/models.py:75
94
msgid "API Entreprise"
95
msgstr "API Entreprise"
96

  
97
#: passerelle/apps/api_entreprise/models.py:124
98
msgid "Get association's documents"
99
msgstr "Récupéter les documents de l'associaiton"
100

  
101
#: passerelle/apps/api_entreprise/models.py:127
102
#: passerelle/apps/api_entreprise/models.py:266
103
msgid "association id"
104
msgstr "identifiant de l'association"
105

  
106
#: passerelle/apps/api_entreprise/models.py:131
107
#: passerelle/apps/api_entreprise/models.py:182
108
#: passerelle/apps/api_entreprise/models.py:216
109
#: passerelle/apps/api_entreprise/models.py:243
110
#: passerelle/apps/api_entreprise/models.py:270
111
#: passerelle/apps/api_entreprise/models.py:298
112
msgid "request object"
113
msgstr "objet de l'appel"
114

  
115
#: passerelle/apps/api_entreprise/models.py:135
116
#: passerelle/apps/api_entreprise/models.py:186
117
#: passerelle/apps/api_entreprise/models.py:220
118
#: passerelle/apps/api_entreprise/models.py:247
119
#: passerelle/apps/api_entreprise/models.py:274
120
#: passerelle/apps/api_entreprise/models.py:302
121
msgid "request context"
122
msgstr "cadre de l'appel"
123

  
124
#: passerelle/apps/api_entreprise/models.py:139
125
#: passerelle/apps/api_entreprise/models.py:190
126
#: passerelle/apps/api_entreprise/models.py:224
127
#: passerelle/apps/api_entreprise/models.py:251
128
#: passerelle/apps/api_entreprise/models.py:278
129
#: passerelle/apps/api_entreprise/models.py:306
130
msgid "request recipient: usually customer number"
131
msgstr "bénéficiaire de l'appel (généralement SIRET de l'administration)"
132

  
133
#: passerelle/apps/api_entreprise/models.py:171
134
msgid "Get institution's document"
135
msgstr "Récupérer un document de l'association"
136

  
137
#: passerelle/apps/api_entreprise/models.py:174
138
#: passerelle/apps/api_entreprise/models.py:212
139
#: passerelle/apps/api_entreprise/models.py:239
140
#: passerelle/apps/api_entreprise/models.py:294
141
msgid "institution id"
142
msgstr "identifiant de l'organisation (SIREN)"
143

  
144
#: passerelle/apps/api_entreprise/models.py:178
145
msgid "document id"
146
msgstr "identifiant du document"
147

  
148
#: passerelle/apps/api_entreprise/models.py:209
149
msgid "Get institution's data from Infogreffe"
150
msgstr "Récupérer les données de l'organisation depuis Infogreffe"
151

  
152
#: passerelle/apps/api_entreprise/models.py:236
153
#: passerelle/apps/api_entreprise/models.py:263
154
#: passerelle/apps/api_entreprise/models.py:291
155
#, fuzzy
156
#| msgid "Get citizen's fiscal informations"
157
msgid "Get institution's related informations"
158
msgstr "Récupérer les données fiscales d'un citoyen"
159

  
61 160
#: passerelle/apps/api_particulier/models.py:38
62 161
msgid "Production"
63 162
msgstr "Production"
......
111 210
msgid "recipient identifier"
112 211
msgstr "numéro de l'allocataire"
113 212

  
114
#: passerelle/apps/api_particulier/models.py:188
115
#: passerelle/apps/arpege_ecp/models.py:32
116
#: passerelle/apps/atos_genesys/models.py:35 passerelle/apps/bdp/models.py:26
117
#: passerelle/apps/clicrdv/models.py:42 passerelle/apps/cmis/models.py:51
118
#: passerelle/apps/family/models.py:121 passerelle/apps/gdc/models.py:28
119
#: passerelle/apps/okina/models.py:34 passerelle/apps/pastell/models.py:32
120
#: passerelle/apps/solis/models.py:100 passerelle/apps/vivaticket/models.py:134
121
#: passerelle/contrib/agoraplus/models.py:122
122
#: passerelle/contrib/dpark/models.py:179
123
#: passerelle/contrib/fake_family/models.py:31
124
#: passerelle/contrib/gdema/models.py:152 passerelle/contrib/greco/models.py:69
125
#: passerelle/contrib/grenoble_gru/models.py:72
126
#: passerelle/contrib/iparapheur/models.py:83
127
#: passerelle/contrib/iws/models.py:95 passerelle/contrib/maarch/models.py:37
128
#: passerelle/contrib/mdph13/models.py:56
129
#: passerelle/contrib/planitech/models.py:259
130
#: passerelle/contrib/seisin_by_email/models.py:37
131
#: passerelle/contrib/solis_apa/models.py:53
132
#: passerelle/contrib/teamnet_axel/models.py:77
133
msgid "Business Process Connectors"
134
msgstr "Connecteurs métiers"
135

  
136 213
#: passerelle/apps/api_particulier/models.py:191
137 214
msgid "API Particulier"
138 215
msgstr "API Particulier"
......
328 405
msgid "Base Adresse Web Service"
329 406
msgstr "Service Web Base Adresse"
330 407

  
331
#: passerelle/apps/base_adresse/models.py:200
408
#: passerelle/apps/base_adresse/models.py:207
332 409
#: passerelle/apps/family/models.py:396 passerelle/apps/family/models.py:437
333 410
#: passerelle/contrib/iws/models.py:159
334 411
msgid "City"
335 412
msgstr "Ville"
336 413

  
337
#: passerelle/apps/base_adresse/models.py:201
414
#: passerelle/apps/base_adresse/models.py:208
338 415
#: passerelle/apps/family/models.py:392 passerelle/apps/family/models.py:433
339 416
msgid "Street name"
340 417
msgstr "Nom de la voie"
341 418

  
342
#: passerelle/apps/base_adresse/models.py:202
419
#: passerelle/apps/base_adresse/models.py:209
343 420
msgid "Street name ascii char"
344 421
msgstr "Nom de la voie (en ASCII)"
345 422

  
346
#: passerelle/apps/base_adresse/models.py:203
423
#: passerelle/apps/base_adresse/models.py:210
347 424
msgid "Postal code"
348 425
msgstr "Code postal"
349 426

  
350
#: passerelle/apps/base_adresse/models.py:204
427
#: passerelle/apps/base_adresse/models.py:211
351 428
msgid "Street type"
352 429
msgstr "Type de la voie"
353 430

  
354
#: passerelle/apps/base_adresse/models.py:205
431
#: passerelle/apps/base_adresse/models.py:212
355 432
msgid "City Code"
356 433
msgstr "Code de la ville (INSEE)"
357 434

  
358
#: passerelle/apps/base_adresse/models.py:206
435
#: passerelle/apps/base_adresse/models.py:213
359 436
#: passerelle/contrib/tcl/models.py:159 passerelle/contrib/tcl/models.py:243
360 437
msgid "Last update"
361 438
msgstr "Dernière mise à jour"
......
1771 1848
"Filtrer les éléments ayant ces codes (liste de codes séparés par des "
1772 1849
"virgules)"
1773 1850

  
1774
#: passerelle/apps/vivaticket/models.py:130
1775
msgid "API URL"
1776
msgstr "URL de l'API"
1777

  
1778
#: passerelle/apps/vivaticket/models.py:131
1851
#: passerelle/apps/vivaticket/models.py:136
1779 1852
msgid "API Login"
1780 1853
msgstr "Login pour l'API"
1781 1854

  
1782
#: passerelle/apps/vivaticket/models.py:132
1855
#: passerelle/apps/vivaticket/models.py:137
1783 1856
msgid "API Password"
1784 1857
msgstr "Mot de passe pour l'API"
1785 1858

  
1786
#: passerelle/apps/vivaticket/models.py:191
1859
#: passerelle/apps/vivaticket/models.py:196
1787 1860
msgid "Get event categories"
1788 1861
msgstr "Récupérer les catégories d'événements"
1789 1862

  
1790
#: passerelle/apps/vivaticket/models.py:195
1863
#: passerelle/apps/vivaticket/models.py:200
1791 1864
msgid "Get rooms"
1792 1865
msgstr "Récupérer les salles"
1793 1866

  
1794
#: passerelle/apps/vivaticket/models.py:202
1867
#: passerelle/apps/vivaticket/models.py:207
1795 1868
msgid "Get themes"
1796 1869
msgstr "Récupérer les thèmes"
1797 1870

  
1798
#: passerelle/apps/vivaticket/models.py:244
1871
#: passerelle/apps/vivaticket/models.py:249
1799 1872
msgid "Book an event"
1800 1873
msgstr "Réserver un événement"
1801 1874

  
1802
#: passerelle/apps/vivaticket/models.py:246
1875
#: passerelle/apps/vivaticket/models.py:251
1803 1876
msgid "Creates a booking for an event"
1804 1877
msgstr "Créer une réservation pour un événement"
1805 1878

  
1806
-