Commit graph

1356 commits

Author SHA1 Message Date
Simon Lehericey
d14a75c24a DescriptionController: refactor check_mandatory_fields 2017-04-11 12:11:10 +02:00
Simon Lehericey
191b29aff5 DescriptionController: simplify update logic 2017-04-11 12:11:10 +02:00
Simon Lehericey
3a9065e4c1 DescriptionController: remove useless code 2017-04-11 12:11:10 +02:00
Simon Lehericey
c4e128a506 DescriptionController: rename variable 2017-04-11 12:11:09 +02:00
Simon Lehericey
4df03fc28e ChampsService: add tests and refactor 2017-04-11 12:11:09 +02:00
gregoirenovel
1db37894c2 Factorize some code in Dossier#serialize_value_for_export 2017-04-11 11:43:42 +02:00
gregoirenovel
ae5b4f6249 Refactor Dossier#full_data_strings_array 2017-04-11 11:39:34 +02:00
gregoirenovel
df878b9ef4 Change Dossier#convert_specific_array_values_to_string’s signature and name
- It is always called with the data_with_champs
  argument

- Changing the signature requires a change of name
  in this case
2017-04-11 10:29:07 +02:00
gregoirenovel
57ee3c5b3f Separate ternary operators with spaces on both sides 2017-04-10 17:55:55 +02:00
gregoirenovel
9c04d3ff93 All CSS declarations must end with a semi-colon 2017-04-10 17:55:55 +02:00
gregoirenovel
3797015908 All colons must be followed by a single space 2017-04-10 17:55:55 +02:00
gregoirenovel
97df69bcd8 In HAML files, separate arguments by a comma and a single space 2017-04-10 17:55:55 +02:00
gregoirenovel
6db4a69cb2 Use spaces inside hashes 2017-04-10 17:55:54 +02:00
gregoirenovel
aaaed328fb Remove unnecessary string outputs 2017-04-10 17:55:54 +02:00
gregoirenovel
8d9cdf8e33 Remove a useless string in the gestionnaires list 2017-04-10 17:55:54 +02:00
gregoirenovel
6cb53b5545 Move a comment to avoid a haml-lint MultilineScript warning 2017-04-10 17:55:54 +02:00
gregoirenovel
7a941d3219 Remove a useless id in _list.html.haml 2017-04-10 17:55:54 +02:00
gregoirenovel
aa255e7e2d Use HAML comments in HAML files 2017-04-10 17:55:54 +02:00
gregoirenovel
69ba92009b Separate HAML comments from the leading # by a space 2017-04-10 17:55:54 +02:00
gregoirenovel
a8d2a003c1 Do not define static class names in the attributes hash 2017-04-10 17:55:53 +02:00
gregoirenovel
4788e280f5 Fix the indentation in the drop down list template 2017-04-10 17:55:53 +02:00
gregoirenovel
2d5df47c4e Use implicit div tags in HAML files 2017-04-10 17:55:53 +02:00
gregoirenovel
7e067c2624 Static classes attribute must use the inline tag syntax 2017-04-10 17:55:53 +02:00
gregoirenovel
a3d04fe7a9 Html Ruby evaluation tags must be followed by a single space 2017-04-10 17:55:53 +02:00
gregoirenovel
e7e4e41e12 Haml Ruby evaluation tags must be followed by a space 2017-04-10 17:55:53 +02:00
gregoirenovel
3ca914aba8 Delete some environment-based conditions
We should always try to be the closest to the
production environment
2017-04-10 16:17:33 +02:00
Mathieu Magnin
bf0d466f4b Move export_full_generation method from Dossier to Procedure 2017-04-05 12:26:38 +02:00
Mathieu Magnin
b18c09e9fd Download dossiers button exports all dossiers except draft 2017-04-05 11:04:53 +02:00
gregoirenovel
cb677dfb45 Indent using 2 spaces 2017-04-04 16:59:40 +02:00
gregoirenovel
d1e463b7ab Files should end with a single new line 2017-04-04 16:59:39 +02:00
gregoirenovel
d5e7bbd80d Files should end with a new line 2017-04-04 16:59:38 +02:00
gregoirenovel
15802b18ea Files should not start with a new line 2017-04-04 16:59:38 +02:00
gregoirenovel
87ab2ba9eb Remove trailing spaces 2017-04-04 16:59:37 +02:00
gregoirenovel
6cb78acd85 Make the birthday field a date field
And remove the date picker (you can now use the
native one)
2017-04-03 16:03:38 +02:00
gregoirenovel
8126549a0d Make the datepicker french for the auto archive field 2017-04-03 16:03:38 +02:00
Mathieu Magnin
d5e5a7997a Disable turbolinks cache to avoid weird behavior (ex: page change twice after single click) 2017-04-03 15:43:42 +02:00
Mathieu Magnin
08442e64a3 Update turbolinks 2017-04-03 15:43:41 +02:00
gregoirenovel
28747a951f Delete unused assets 2017-04-03 13:25:19 +02:00
Mathieu Magnin
95b83a57c1 Checkbox should be checked when value is 'on' 2017-04-03 10:50:15 +02:00
Mathieu Magnin
096f1e7198 Imageoptim on assets saved 400 ko 2017-03-30 15:51:39 +02:00
Mathieu Magnin
e4826b468a Fix departements / pays / regions drop down list 2017-03-29 14:22:23 +02:00
gregoirenovel
c6738bf223 Rename Mr in M. 2017-03-27 15:45:07 +02:00
Mathieu Magnin
6a8ca67a83 Merge branch 'develop' into auto_archive_on_date 2017-03-27 15:35:52 +02:00
gregoirenovel
458f557c93 Add a sort order to the demo procedures list 2017-03-22 17:52:56 +01:00
Mathieu Magnin
c2a27c6f6a Merge branch 'develop' into auto_archive_on_date 2017-03-22 11:32:56 +01:00
Mathieu Magnin
8e91d4ba97 Merge branch 'develop' into select_multiple 2017-03-20 12:30:42 +01:00
Mathieu Magnin
75007825f8 Update champ_decorator.rb 2017-03-20 12:14:16 +01:00
Simon Lehericey
a076dc2987 Wording 2017-03-20 12:03:27 +01:00
Simon Lehericey
ce343aac96 Select Multiple: text in placeholder and add separator 2017-03-20 11:36:06 +01:00
Simon Lehericey
ebd2051337 multiple_select: fix decorateur interference 2017-03-16 09:09:15 +01:00
Simon Lehericey
b3624256cd select_multiple: add decoration for view of multiple_select 2017-03-15 17:51:34 +01:00
Simon Lehericey
2f561a9cd0 select_multiple: clean user input 2017-03-15 17:51:34 +01:00
Simon Lehericey
1fa1e9e8e8 select_multiple: add select2 2017-03-15 17:51:34 +01:00
Simon Lehericey
3ed14bf1a4 Cleaning 2017-03-15 17:51:34 +01:00
Simon Lehericey
657ce53a60 select_multiple: add multiple_drop_down_list type 2017-03-15 17:51:34 +01:00
Mathieu Magnin
a87b54b168 Typo 2017-03-15 15:28:09 +01:00
Mathieu Magnin
237d4bdc28 Auto archive option is available even if procedure is published 2017-03-15 15:22:29 +01:00
Mathieu Magnin
4d323497e7 Remove puts 2017-03-15 15:16:00 +01:00
Mathieu Magnin
24d17dc0f3 Sidekiq worker to archive procedures automatically + tests 2017-03-15 12:40:59 +01:00
Simon Lehericey
7596c2424e Explication: do not show explication in _infos_dossier 2017-03-14 13:59:37 +01:00
Simon Lehericey
fb2aef1810 Explication: style in edit page 2017-03-14 13:58:59 +01:00
Simon Lehericey
d250cafccc Explication: add champ in edit formulaire 2017-03-14 13:58:21 +01:00
Simon Lehericey
fcca0bb247 Cleaning 2017-03-14 13:54:31 +01:00
Mathieu Magnin
359807b4f7 Procedure has an auto_archive date 2017-03-14 10:45:59 +01:00
Simon Lehericey
176092c256 Explication: add field and template 2017-03-13 15:02:05 +01:00
Simon Lehericey
ec0092fb3c Cleaning 2017-03-13 15:01:41 +01:00
LeSim
8f5f86b2f3 Merge pull request #40 from sgmap/destroy_emails_with_procedure
Destroy emails with procedure
2017-03-13 13:59:32 +01:00
Mathieu Magnin
fc9ef92c37 Destroy emails with procedure 2017-03-13 10:27:19 +01:00
Mathieu Magnin
ad1250af6f Add confirm popup on important actions 2017-03-09 16:55:47 +01:00
Mathieu Magnin
48d12cfa34 max width in Administration 2017-03-08 14:52:37 +01:00
Simon Lehericey
66cb0c09b1 Stats: wording 2017-03-08 14:26:45 +01:00
Mathieu Magnin
5d4e8622f6 Merge pull request #38 from sgmap/stats
Stats: add adminitrations stats view
2017-03-08 10:59:06 +01:00
Mathieu Magnin
342a6b239e Small css changes 2017-03-08 10:55:24 +01:00
LeSim
78325cc9f9 Merge pull request #34 from sgmap/customize_submission_mail
Customize submission mail
2017-03-07 18:32:55 +01:00
Mathieu Magnin
9cd506e265 Clone mail_templates with procedure 2017-03-07 18:19:48 +01:00
Simon Lehericey
6cb88a995f Stats: add adminitrations stats view 2017-03-07 18:09:09 +01:00
Mathieu Magnin
4ea7635dfc Fix after review 2017-03-07 16:23:44 +01:00
LeSim
2e19dd26b7 Merge pull request #36 from sgmap/remember_me
Add remember me on login
2017-03-07 14:15:37 +01:00
LeSim
9764604430 Merge branch 'develop' into customize_submission_mail 2017-03-07 11:05:04 +01:00
Mathieu Magnin
a88b150c3c Add remember me on login 2017-03-07 10:29:48 +01:00
Simon Lehericey
65e83dd6ec Mails: factorize default and change slug 2017-03-07 10:27:14 +01:00
Simon Lehericey
02bbf0543f Mails: move to their own namespace 2017-03-07 10:27:14 +01:00
Simon Lehericey
335caed65e Mail Template: Delete 2017-03-07 10:27:14 +01:00
Simon Lehericey
2536774519 DescriptionController: send initiatedMail notification 2017-03-07 10:27:14 +01:00
Simon Lehericey
3d7f04ad3d DossierController: send receivedMail when the mail is ... received 2017-03-07 10:27:14 +01:00
Simon Lehericey
9d710336b3 MailTemplate: allow edition of all the new mails 2017-03-07 10:27:13 +01:00
Simon Lehericey
c8f515832b MailTemplate: add email and nom_organisation tag 2017-03-07 10:27:13 +01:00
Simon Lehericey
6c560e65eb Notification Mailer: use send_notification for all the mails 2017-03-07 10:27:13 +01:00
Simon Lehericey
70b2020656 Procedure: remove mail_template 2017-03-07 10:27:13 +01:00
Simon Lehericey
206d56f106 Procedure: add the new mails 2017-03-07 10:27:13 +01:00
Simon Lehericey
695dc16b85 Mails: add refused, without_continuation, draft, closed, received mails object 2017-03-07 10:27:05 +01:00
Simon Lehericey
7b336922cc Cleaning 2017-03-07 10:25:34 +01:00
Simon Lehericey
36500407b4 DossierController: use the new method send_notification 2017-03-07 10:25:34 +01:00
Simon Lehericey
65d399b4b0 NotificationMailer: add send notification 2017-03-07 10:25:34 +01:00
Simon Lehericey
89763ec8d4 MailTemplateController: use new initiated_mail 2017-03-07 10:25:34 +01:00
Simon Lehericey
c22c84f1f9 Procedure: add inititad_mail with default provider 2017-03-07 10:25:34 +01:00
Simon Lehericey
2f5dde381a NotificationMailer: simplify using default method 2017-03-07 10:25:34 +01:00
Simon Lehericey
47fc6e6957 InitiatedEmail: add initiated email 2017-03-07 10:25:28 +01:00
LeSim
22837c01b0 Merge pull request #35 from sgmap/state_wording
Wording
2017-03-06 20:49:22 +01:00
Simon Lehericey
a334888363 Wording 2017-03-06 20:44:25 +01:00
Simon Lehericey
a5bb6ea0d7 Dossier: fix merge 2017-03-06 18:17:28 +01:00
LeSim
caf1f1b74f Merge branch 'develop' into add_dossier_workflow_dates 2017-03-06 17:54:45 +01:00
LeSim
4de6a9595a Merge pull request #33 from sgmap/block_dossier_initiation_if_procedure_is_archived
Block dossier initiation if procedure is archived
2017-03-06 17:48:18 +01:00
Mathieu Magnin
376c50db8f Long procedure title should be cut if too long 2017-03-06 16:18:22 +01:00
Mathieu Magnin
44819bb0b1 Fix reopened dossier should not be listed in new dossiers 2017-03-06 15:59:52 +01:00
Mathieu Magnin
7e4f473027 When procedure is archived user can update dossier if not in brouillon 2017-03-06 15:03:51 +01:00
Mathieu Magnin
a24980145c Block dossier initiation if procedure is archived 2017-03-06 14:29:01 +01:00
Simon Lehericey
7eb77ba667 Mail Received: remove useless template_decorator 2017-03-05 22:17:17 +01:00
Mathieu Magnin
d03016db9c Merge branch 'develop' into list_dossiers_archived 2017-03-02 16:22:59 +01:00
Simon Lehericey
5cceb9773c Style: simple css for custom emails list 2017-03-02 16:19:05 +01:00
Mathieu Magnin
858c9a3bba Export dates and add tests 2017-03-02 16:18:14 +01:00
Mathieu Magnin
c77c46bf37 Remove unused title 2017-03-02 11:53:03 +01:00
Mathieu Magnin
6fcd35fd4c Merge branch 'develop' into add_dossier_workflow_dates 2017-03-02 11:46:17 +01:00
Mathieu Magnin
e9147a8e76 Fix floating login button 2017-03-02 11:20:20 +01:00
Simon Lehericey
494d5fed5c Dossier_list_controller: renaming 2017-03-01 16:00:39 +01:00
Simon Lehericey
ca799421c9 backoffice dossiers index: simple cleaning 2017-03-01 15:51:02 +01:00
Simon Lehericey
0862f2fc51 Dossier_list_controller: same name pattern 2017-03-01 15:51:02 +01:00
Simon Lehericey
5b475fdd06 Dossier_list_controller: simplify smartlisting 2017-03-01 15:51:02 +01:00
Simon Lehericey
925a087f4a Dossier_list_controller: use same system for archived dossiers 2017-03-01 15:50:57 +01:00
Mathieu Magnin
4d60aecb6d Merge branch 'develop' into try_to_use_sqlite 2017-03-01 14:59:17 +01:00
Simon Lehericey
8dc634f4d3 Dossier_list_controller: factorize smart_listing_create 2017-03-01 14:19:22 +01:00
Mathieu Magnin
87865fcf1b Merge branch 'develop' into list_dossiers_archived 2017-03-01 10:35:20 +01:00
Mathieu Magnin
d9f5603f05 Add state dates to dossier 2017-03-01 09:51:55 +01:00
Simon Lehericey
c56a346f2e fix wrong mail subject 2017-02-28 18:07:58 +01:00
Simon Lehericey
b097e1d6b8 Tests: adapt to sqlite 2017-02-28 17:01:58 +01:00
Simon Lehericey
db3884cc93 Style: fix width in show dossier 2017-02-28 16:00:42 +01:00
LeSim
0da239c657 Merge branch 'develop' into simplify_dossier_workflow 2017-02-28 15:23:25 +01:00
Simon Lehericey
870d3719e1 Dossier: add method to allow gestionnaire to reopen dossier 2017-02-28 15:14:27 +01:00
Simon Lehericey
43e6f15c5f Style: fix backoffice navbar 2017-02-28 15:14:01 +01:00
Mathieu Magnin
67daaa033c Merge pull request #28 from sgmap/simplify_dossier_workflow
Simplify dossier workflow
2017-02-28 14:56:57 +01:00
Mathieu Magnin
fa884f3ed0 Unarchive button & tests 2017-02-28 14:33:05 +01:00
Simon Lehericey
7b877dc28f Style: fix backoffice dossier width for small screen 2017-02-28 13:54:19 +01:00
Mathieu Magnin
ef1d46d30e Fix tests 2017-02-28 11:37:37 +01:00
Mathieu Magnin
6774dd008f List dossiers archived 2017-02-27 17:44:08 +01:00
Mathieu Magnin
ab3c1b4be4 Remove mail validated in procedure 2017-02-27 13:29:26 +01:00
Mathieu Magnin
4cc6aedfb9 Fix tests after workflow simplication 2017-02-27 11:56:26 +01:00
Mathieu Magnin
10add61bd1 Clean some tests after removing :validated & :submitted states 2017-02-23 17:54:11 +01:00
Mathieu Magnin
3fcf9bf350 Landing is no longer a symlink on prod/staging env, new call to action on landing is a mailto 2017-02-22 16:07:06 +01:00
Mathieu Magnin
cae5b37e38 First step to remove :validated and :submitted states 2017-02-21 18:05:48 +01:00
Mathieu Magnin
6f1243eb7e Do not hide link if procedure is archived 2017-02-21 11:05:11 +01:00
Simon Lehericey
b6fc30fd62 Search: see only its own files 2017-02-20 18:07:33 +01:00
Mathieu Magnin
ab0d8deef1 Modify wording : Procedure can be edited after publication 2017-02-20 15:08:31 +01:00
Mathieu Magnin
c4f57087fe Merge pull request #23 from sgmap/admin_can_modify_procedure_description_after_published
Admin can modify procedure description after published
2017-02-20 14:52:14 +01:00
Mathieu Magnin
62152e0b6e After environment.rb updated this should work 2017-02-20 14:11:12 +01:00
Mathieu Magnin
2798d225fd Fix uninitialized constant 2017-02-17 17:18:10 +01:00
Mathieu Magnin
85c07f8095 Quick & dirty fix 2017-02-16 18:05:42 +01:00
Mathieu Magnin
ff9c95f18e Merge branch 'develop' into admin_can_modify_procedure_description_after_published 2017-02-16 15:59:49 +01:00
Mathieu Magnin
9fcc0920e6 Css update 2017-02-16 13:59:32 +01:00
Mathieu Magnin
6979f6b5f6 Add some tests 2017-02-15 17:09:25 +01:00
Simon Lehericey
a124069210 Procedure: use after_create to build_default_mails 2017-02-15 15:44:27 +01:00
Mathieu Magnin
1d0a236813 Typo 2017-02-15 15:21:34 +01:00
Mathieu Magnin
a0d84eda5c Fix logo display in development 2017-02-15 15:13:49 +01:00
Mathieu Magnin
a636d4f98d Filter procedure update parms if procedure is locked 2017-02-15 14:13:02 +01:00
Mathieu Magnin
85608f18ab Description page is accessible, some field are disabled if procedure is locked 2017-02-14 18:13:19 +01:00
Mathieu Magnin
c0ae500aa3 Merge branch 'develop' into remove_cerfa_text 2017-02-14 17:59:41 +01:00
Mathieu Magnin
9986ab1f01 Merge pull request #21 from sgmap/clean_grid
Clean grid
2017-02-14 17:58:15 +01:00
LeSim
7bc6e67e15 Merge pull request #19 from sgmap/clickable-links-in-champs-description
Add clickable links in champ description and use bootstrap layout for…
2017-02-14 17:28:03 +01:00
Simon Lehericey
5359c046e6 Clean grid usage 2017-02-14 17:12:44 +01:00
Simon Lehericey
3b827fa5e3 Remove specific cerfa in favor of default enclosed documents 2017-02-14 16:26:25 +01:00
Mathieu Magnin
11c793a60c Remove custom button code, use bootstrap classes 2017-02-14 16:23:48 +01:00
Mathieu Magnin
6c41cbcc5e Clean css 2017-02-14 16:20:52 +01:00
Mathieu Magnin
e7b91c3db5 Bootstrap default font-size is set to 16px 2017-02-14 16:09:52 +01:00
Mathieu Magnin
1e3c5bf14a Fix engagement field 2017-02-14 15:23:39 +01:00
Mathieu Magnin
f60098311e Fix hidden checkbox bug, address field : full width 2017-02-14 14:55:08 +01:00
Mathieu Magnin
b08a4c5091 Fix style for checkbox and radios 2017-02-14 14:34:00 +01:00
Mathieu Magnin
308a037f19 Add clickable links in champ description and use bootstrap layout for forms 2017-02-14 11:13:48 +01:00
Xavier J
5d733c11fd Delete references @opensimplif 2017-02-13 15:46:28 +01:00
Xavier Julien
3c6ae2d005 Merge pull request #14 from sgmap/customizable-emails
Customizable emails
2017-02-13 15:20:04 +01:00
Xavier J
c344c99fbb Merge branch 'sync-passwords-on-login' into develop 2017-02-13 13:47:36 +01:00
Mathieu Magnin
5613b896b1 Gestionnaire can archive dossier 2017-02-08 17:35:28 +01:00
Mathieu Magnin
82546a3ad4 Fix merge error 2017-02-08 15:32:49 +01:00
Mathieu Magnin
8ba8135e6b Allow blank for lien_demarche 2017-02-07 18:12:25 +01:00
Mathieu Magnin
1bd66b6a9e Add tests and lien_demarche in serialize 2017-02-07 18:12:25 +01:00
Mathieu Magnin
f15e9ec7da In dev mode, demo buttons link to localhost 2017-02-07 18:12:25 +01:00
Mathieu Magnin
566fd8bc74 Add lien demarche to type de piece justificative 2017-02-07 18:12:25 +01:00
Xavier J
333ea9a610 Merge commit '99248a75a02710899e7ee2ecbcb3b304620cb721' into develop 2017-02-07 17:54:21 +01:00
Xavier J
5edd16c30f Fix indentation 2017-02-07 17:52:56 +01:00
Xavier J
7cd08ec3f9 Merge branch 'develop' into print_css_for_dossier_show
# Conflicts:
#	app/views/dossiers/_messagerie.html.haml
2017-02-07 17:38:02 +01:00
Mathieu Magnin
aa88fad777 Sync password after login 2017-02-07 16:56:21 +01:00
Mathieu Magnin
6444aa5be6 Use has_one instead of scope 2017-02-06 16:52:57 +01:00
Mathieu Magnin
749baedf43 Replace administration with services instructeurs 2017-02-01 18:05:58 +01:00
Mathieu Magnin
6bf3b9edf8 Fix test : do not send notification if commentaire is not saved 2017-02-01 17:16:08 +01:00
Mathieu Magnin
e99746639b Merge branch 'send_user_notification_when_invite_send_a_message' into develop 2017-02-01 17:01:34 +01:00
Mathieu Magnin
91bd058106 Some fixes after review 2017-02-01 15:58:56 +01:00
Mathieu Magnin
34d05e4d9e Improve the print css for the dossier/show 2017-02-01 14:24:24 +01:00
Mathieu Magnin
9266cf0feb Disable scrollwheel zoom on map 2017-02-01 10:31:45 +01:00
Mathieu Magnin
ef9012cd82 Add lien cerfa vierge in the modification popup 2017-01-31 17:58:44 +01:00
Mathieu Magnin
37d31fae7b Rename formulaire to formulaire de demande 2017-01-31 11:45:29 +01:00
Mathieu Magnin
38e8acf285 Change some wordings and clean some templates 2017-01-31 10:46:20 +01:00
Mathieu Magnin
c7934b2f97 Send a mail to usager if somebody else wrote a new commentaire on his dossier 2017-01-30 15:17:45 +01:00
Mathieu Magnin
99248a75a0 Add accompagnateurs emails in export 2017-01-26 17:54:04 +01:00
Mathieu Magnin
b40193e7b5 New customizable mail : mail_validated, new balise --lien_dossier-- 2017-01-26 12:12:52 +01:00
Mathieu Magnin
2bc5ee88f7 Change controller name according to model name, add simple_form 2017-01-24 15:53:42 +01:00
Mathieu Magnin
482ca2a317 Add a mail_template decorator 2017-01-24 11:58:09 +01:00
Mathieu Magnin
0e5c90cb0c Real index and edit for mail_templates 2017-01-24 10:19:42 +01:00
JC
4880101202 Fixing nomethoderror for opensimplif 2017-01-23 17:18:57 +01:00
Mathieu Magnin
7e24adbca0 Add mail preview and small fix 2017-01-23 15:49:19 +01:00
Mathieu Magnin
c41c36b4d1 Fix typo 2017-01-19 12:07:55 +01:00
Mathieu Magnin
52bf1d1ea2 Fix typos 2017-01-19 11:58:38 +01:00
Mathieu Magnin
2e3cb7a861 Cleaning HAML 2017-01-18 15:34:03 +01:00