Merge pull request #4763 from betagouv/dev

2020-02-11-01

app/assets/stylesheets/new_design/new_footer.scss

@@ -69,8 +69,8 @@ footer {
   opacity: 0.8;
 }
 
-.footer-logo-dinsic {
-  @include ie-compatible-background-image("footer/logo-dinsic.svg");
+.footer-logo-dinum {
+  @include ie-compatible-background-image("footer/logo-dinum.svg");
 
   height: 104px;
   width: 90px;

app/views/dossiers/show.pdf.prawn

@@ -94,6 +94,9 @@ def render_single_champ(pdf, champ)
     pdf.text " - SIRET: #{champ.to_s}"
     render_identite_etablissement(pdf, champ.etablissement) if champ.etablissement.present?
     pdf.text "\n"
+  when 'Champs::NumberChamp'
+    value = number_with_delimiter(champ.to_s)
+    format_in_2_lines(pdf, champ.libelle, value)
   else
     value = champ.to_s.empty? ? 'Non communiqué' : champ.to_s
     format_in_2_lines(pdf, champ.libelle, value)

app/views/layouts/_footer.html.haml

@@ -1,6 +1,6 @@
 #footer
   %p{ class: "copyright col-md-push-#{12-main_container_size} col-md-#{main_container_size} col-lg-push-#{12-main_container_size} col-lg-#{main_container_size} text-muted small" }
-    = link_to 'DINSIC', "http://etatplateforme.modernisation.gouv.fr"
+    = link_to 'DINUM', 'https://www.numerique.gouv.fr/dinum/'
     = Time.zone.now.year
     \-
     = link_to 'Nouveautés', 'https://doc.demarches-simplifiees.fr/nouveautes', target: '_blank'

app/views/layouts/mailers/notifications_layout.html.erb

@@ -145,7 +145,7 @@
                       <tr>
                         <td style="word-wrap:break-word;font-size:0px;padding:0px 20px 0px 20px;padding-top:0px;padding-bottom:0px;" align="center">
                           <div class="" style="cursor:auto;color:#55575d;font-family:Helvetica, Arial, sans-serif;font-size:11px;line-height:22px;text-align:center;">
-                            demarches-simplifiees.fr est un service fourni par la DINSIC et incubé par beta.gouv.fr
+                            demarches-simplifiees.fr est un service fourni par la DINUM et incubé par beta.gouv.fr
                           </div>
                         </td>
                       </tr>

app/views/root/_footer.html.haml

@@ -12,7 +12,7 @@
             = link_to "beta.gouv.fr", "https://beta.gouv.fr", title: "le site de Beta.gouv.fr"
           %li
             = link_to "http://www.modernisation.gouv.fr/", title: "DINUM" do
-              %span.footer-logo.footer-logo-dinsic{ role: 'img', 'aria-label': 'DINSIC' }
+              %span.footer-logo.footer-logo-dinum{ role: 'img', 'aria-label': 'DINUM' }
             = link_to "https://beta.gouv.fr", title: "le site de Beta.gouv.fr" do
               %span.footer-logo.footer-logo-beta-gouv-fr{ role: 'img', 'aria-label': 'beta.gouv.fr' }
 

app/views/shared/dossiers/_champ_row.html.haml

@@ -34,6 +34,8 @@
               = c.to_s
             - when TypeDeChamp.type_champs.fetch(:datetime)
               = c.to_s
+            - when TypeDeChamp.type_champs.fetch(:number)
+              = number_with_delimiter(c.to_s)
             - else
               = format_text_value(c.to_s)
 

app/views/users/sessions/new.html.haml

@@ -9,7 +9,7 @@
     = f.text_field :email, autofocus: true
 
     = f.label :password, "Mot de passe"
-    = f.password_field :password, placeholder: "8 caractères minimum"
+    = f.password_field :password
 
     .auth-options
       %div

config/env.example

@@ -36,7 +36,6 @@ FOG_OPENSTACK_USERNAME=""
 FOG_OPENSTACK_URL=""
 FOG_OPENSTACK_IDENTITY_API_VERSION=""
 FOG_OPENSTACK_REGION=""
-FOG_DIRECTORY=""
 FOG_ENABLED="" # valeur attendue: enabled
 DS_PROXY_URL=""
 

config/secrets.yml

@@ -33,15 +33,6 @@ defaults: &defaults
     key: <%= ENV['API_ENTREPRISE_KEY'] %>
   pipedrive:
     key: <%= ENV['PIPEDRIVE_KEY'] %>
-  fog:
-    enabled: <%= ENV['FOG_ENABLED'] == 'enabled' %>
-    openstack_tenant: <%= ENV['FOG_OPENSTACK_TENANT'] %>
-    openstack_api_key: <%= ENV['FOG_OPENSTACK_API_KEY'] %>
-    openstack_username: <%= ENV['FOG_OPENSTACK_USERNAME'] %>
-    openstack_auth_url: <%= ENV['FOG_OPENSTACK_URL'] %>
-    openstack_identity_api_version: "<%= ENV['FOG_OPENSTACK_IDENTITY_API_VERSION'] %>"
-    openstack_region: <%= ENV['FOG_OPENSTACK_REGION'] %>
-    directory: <%= ENV['FOG_DIRECTORY'] %>
   mailtrap:
     username: <%= ENV['MAILTRAP_USERNAME'] %>
     password: <%= ENV['MAILTRAP_PASSWORD'] %>
@@ -87,8 +78,6 @@ test:
   signing_key: aef3153a9829fa4ba10acb02927ac855df6b92795b1ad265d654443c4b14a017
   api_entreprise:
     key: api_entreprise_test_key
-  fog:
-    directory: tps_dev
   pipedrive:
     key: pipedrive_test_key
   france_connect_particulier:

spec/controllers/manager/demandes_controller_spec.rb

@@ -0,0 +1,20 @@
+describe Manager::DemandesController, type: :controller do
+  let(:administration) { create(:administration) }
+
+  describe 'GET #index' do
+    before do
+      sign_in administration
+    end
+
+    it "display pending demandes" do
+      approved_administrateur = create(:administrateur, email: "approved@example.com")
+      pending_demande = { email: 'pending@example.com' }
+      demandes = [{ email: approved_administrateur.email }, pending_demande]
+      allow(PipedriveService).to receive(:get_demandes).and_return(demandes)
+
+      get :index
+
+      expect(assigns(:pending_demandes)).to eq([pending_demande])
+    end
+  end
+end

spec/factories/procedure.rb

@@ -3,8 +3,8 @@ FactoryBot.define do
   factory :procedure do
     sequence(:libelle) { |n| "Procedure #{n}" }
     description { "Demande de subvention à l'intention des associations" }
-    organisation { "Orga DINSIC" }
-    direction { "direction DINSIC" }
+    organisation { "Orga DINUM" }
+    direction { "direction DINUM" }
     cadre_juridique { "un cadre juridique important" }
     published_at { nil }
     duree_conservation_dossiers_dans_ds { 3 }