aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2016-05-26 09:38:52 +0200
committerAlban Peignier2016-05-26 09:38:52 +0200
commita1f01c4eb5b3f8cc587775fedc825bbfb2f100d9 (patch)
tree5f0468992484aba0aa01abe27eeff024618f81b4
parent11b611acc80cc6bb80b369e33c090d3f6975d694 (diff)
parent1c5c343cb27225e970bca65f1b1269054a8386d8 (diff)
downloadchouette-core-a1f01c4eb5b3f8cc587775fedc825bbfb2f100d9.tar.bz2
Merge branch 'master' into staging
Diffstat
-rw-r--r--app/assets/images/stif.pngbin0 -> 6398 bytes
-rw-r--r--app/models/offer_workbench.rb2
-rw-r--r--app/models/referential.rb2
-rw-r--r--app/models/user.rb2
-rw-r--r--app/views/layouts/application.html.erb2
-rw-r--r--app/views/offer_workbenches/_referential.erb12
-rw-r--r--app/views/offer_workbenches/show.html.erb3
-rw-r--r--app/views/referentials/_referential.erb12
-rw-r--r--app/views/shared/_footer.erb24
-rw-r--r--app/views/shared/_header.erb6
-rw-r--r--config/environment.rb2
-rw-r--r--config/environments/development.rb7
-rw-r--r--db/seeds.rb33
-rw-r--r--spec/models/offer_workbench_spec.rb1
14 files changed, 52 insertions, 56 deletions
diff --git a/app/assets/images/stif.png b/app/assets/images/stif.png
new file mode 100644
index 000000000..577d4bb72
--- /dev/null
+++ b/app/assets/images/stif.png
Binary files differ
diff --git a/app/models/offer_workbench.rb b/app/models/offer_workbench.rb
index a1c8f3b9c..65feafdd5 100644
--- a/app/models/offer_workbench.rb
+++ b/app/models/offer_workbench.rb
@@ -1,7 +1,7 @@
class OfferWorkbench < ActiveRecord::Base
belongs_to :organisation
- validates :name, presence: true, uniqueness: true
+ validates :name, presence: true
validates :organisation, presence: true
has_many :referentials
diff --git a/app/models/referential.rb b/app/models/referential.rb
index af2cc2182..b41a7a434 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -165,7 +165,7 @@ class Referential < ActiveRecord::Base
before_destroy :destroy_jobs
def destroy_jobs
- Ievkit.delete_jobs(slug)
+ #Ievkit.delete_jobs(slug)
true
end
diff --git a/app/models/user.rb b/app/models/user.rb
index 475e7629c..e00b6a35a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -11,7 +11,7 @@ class User < ActiveRecord::Base
# FIXME https://github.com/nbudin/devise_cas_authenticatable/issues/53
# Work around :validatable, when database_authenticatable is diabled.
- attr_accessor :password
+ attr_accessor :password unless authentication_type == :database_authenticatable
# Setup accessible (or protected) attributes for your model
# attr_accessible :email, :password, :current_password, :password_confirmation, :remember_me, :name, :organisation_attributes
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 81f3d1e83..78c4f4a5f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="<%= I18n.locale %>">
<head>
- <title>Chouette - <%= title %></title>
+ <title>STIF BOIV - <%= title %></title>
<%= favicon_link_tag "logo_chouette_small.ico" %>
<%= favicon_link_tag 'logo_chouette_small.png', rel: 'apple-touch-icon', type: 'image/png' %>
<%= stylesheet_link_tag :application %>
diff --git a/app/views/offer_workbenches/_referential.erb b/app/views/offer_workbenches/_referential.erb
index 1f985bc65..ea1a1f899 100644
--- a/app/views/offer_workbenches/_referential.erb
+++ b/app/views/offer_workbenches/_referential.erb
@@ -1,7 +1,7 @@
<div id="index_item" class="panel panel-default referential">
<div class="panel-heading">
<div class="panel-title clearfix">
- <span class="pull-right">
+ <span class="pull-right">
<%= link_to edit_referential_path(referential), :class => "btn btn-default btn-sm" do %>
<span class="fa fa-pencil"></span>
<% end %>
@@ -10,22 +10,22 @@
<% end %>
</span>
<h5>
- <%= link_to([@referential, referential], :class => "preview", :title => "#{Referential.model_name.human.capitalize} #{referential.name}") do %>
+ <%= link_to([@referential, referential], :class => "preview", :title => "#{Referential.model_name.human.capitalize} #{referential.name}") do %>
<span class="name">
- <%= truncate(referential.name, :length => 20) %>
+ <%= truncate(referential.name, :length => 30) %>
</span>
<% end %>
</h5>
- </div>
+ </div>
</div>
<div id="referential_<%= referential.id %>" class="panel-body">
- <p>
+ <p>
<%= referential.human_attribute_name('lines') %>: <span class="lines_count"></span>
</p>
<p>
<%= referential.human_attribute_name('networks') %>: <span class="networks_count"></span>
</p>
- <p>
+ <p>
<%= referential.human_attribute_name('vehicle_journeys') %>: <span class="vehicle_journeys_count"></span>
</p>
<p>
diff --git a/app/views/offer_workbenches/show.html.erb b/app/views/offer_workbenches/show.html.erb
index 9a47977e3..43335a68f 100644
--- a/app/views/offer_workbenches/show.html.erb
+++ b/app/views/offer_workbenches/show.html.erb
@@ -1,5 +1,6 @@
-<%= title_tag @offer_workbench.name %>
+<%= title_tag "#{@offer_workbench.name} - Tableau de bord" %>
<div class="referentials paginated_content">
+ <h4>Liste des jeux de données</h3>
<%= paginated_content @offer_workbench.referentials %>
</div>
diff --git a/app/views/referentials/_referential.erb b/app/views/referentials/_referential.erb
index 1f985bc65..ea1a1f899 100644
--- a/app/views/referentials/_referential.erb
+++ b/app/views/referentials/_referential.erb
@@ -1,7 +1,7 @@
<div id="index_item" class="panel panel-default referential">
<div class="panel-heading">
<div class="panel-title clearfix">
- <span class="pull-right">
+ <span class="pull-right">
<%= link_to edit_referential_path(referential), :class => "btn btn-default btn-sm" do %>
<span class="fa fa-pencil"></span>
<% end %>
@@ -10,22 +10,22 @@
<% end %>
</span>
<h5>
- <%= link_to([@referential, referential], :class => "preview", :title => "#{Referential.model_name.human.capitalize} #{referential.name}") do %>
+ <%= link_to([@referential, referential], :class => "preview", :title => "#{Referential.model_name.human.capitalize} #{referential.name}") do %>
<span class="name">
- <%= truncate(referential.name, :length => 20) %>
+ <%= truncate(referential.name, :length => 30) %>
</span>
<% end %>
</h5>
- </div>
+ </div>
</div>
<div id="referential_<%= referential.id %>" class="panel-body">
- <p>
+ <p>
<%= referential.human_attribute_name('lines') %>: <span class="lines_count"></span>
</p>
<p>
<%= referential.human_attribute_name('networks') %>: <span class="networks_count"></span>
</p>
- <p>
+ <p>
<%= referential.human_attribute_name('vehicle_journeys') %>: <span class="vehicle_journeys_count"></span>
</p>
<p>
diff --git a/app/views/shared/_footer.erb b/app/views/shared/_footer.erb
index e8fe2d5e4..e65a45f3f 100644
--- a/app/views/shared/_footer.erb
+++ b/app/views/shared/_footer.erb
@@ -1,15 +1,7 @@
<div class="container">
<div class="row">
<div class="col-md-3 logo">
- <%= image_tag "#{ChouetteIhm::Application.config.company_name}.png" %>
- </div>
- <div class="col-md-3">
- <ul>
- <li><h4><%= t("layouts.footer.product.title") %></h4></li>
- <li><%= link_to t("layouts.footer.product.licence"), "http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.html", :target => "_blank" %></li>
- <li><%= link_to t("layouts.footer.product.source_code"), "https://github.com/afimb/chouette2", :target => "_blank" %></li>
- <li><%= link_to t("layouts.footer.product.user_group"), "http://www.chouette.mobi/club-utilisateurs/", :target => "_blank" %></li>
- </ul>
+ <%= image_tag "#{ChouetteIhm::Application.config.company_name.downcase}.png" %>
</div>
<div class="col-md-3">
<ul>
@@ -24,19 +16,5 @@
<li><%= link_to t("layouts.footer.support.help"), help_path, :target => "chouette_help" %></li>
</ul>
</div>
- <div class="col-md-3">
- <ul>
- <li><h4><%= t("layouts.footer.contact.title") %></h4></li>
- <li>
- <% if ChouetteIhm::Application.config.company_contact.include?("@") %>
- <%= mail_to "#{ChouetteIhm::Application.config.company_contact}", t("layouts.footer.contact.mail") %>
- <% else %>
- <%= link_to t("layouts.footer.contact.mail"), "#{ChouetteIhm::Application.config.company_contact}", :target => "_blank" %>
- <% end %>
- </li>
- <li><%= link_to t("layouts.footer.contact.newsletter"),"http://www.chouette.mobi/club-utilisateurs/newsletter/", :target => "_blank" %></li>
- <li><%= link_to t("layouts.footer.contact.forum"), "http://forum.chouette.mobi/", :target => "_blank" %></li>
- </ul>
- </div>
</div>
</div>
diff --git a/app/views/shared/_header.erb b/app/views/shared/_header.erb
index ae712e48d..d06941817 100644
--- a/app/views/shared/_header.erb
+++ b/app/views/shared/_header.erb
@@ -10,9 +10,9 @@
<span class="icon-bar version"><%= APP_VERSION %></span>
</button>
<%= link_to referentials_path, :class =>"navbar-brand" do %>
- <%= image_tag("logo_chouette.png") %>
+ <%#= image_tag("logo_chouette.png") %>
<% end %>
- <p class="navbar-text"><span class="brand_name">CHOUETTE</span><span class="version"><%= APP_VERSION %></span></p>
+ <p class="navbar-text"><span class="brand_name">STIF BOIV</span><span class="version"><%= APP_VERSION %></span></p>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@@ -81,6 +81,7 @@
<% end %>
</ul>
<ul class="nav navbar-nav navbar-right">
+ <%- if false %>
<li class="dropdown languages">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<%= image_tag("language_engine/#{selected_language}_flag.png", { :'data-locale' => "#{selected_language}" } ) %><b class='caret'></b>
@@ -90,6 +91,7 @@
<li><%= link_to_language :en, { :class => language_class( :en ) } %></li>
</ul>
</li>
+ <% end %>
<li><%= link_to t('layouts.help'), help_path, :class =>("current" if help_page?), :target => "chouette_help" %></li>
<% if user_signed_in? %>
<li class="dropdown">
diff --git a/config/environment.rb b/config/environment.rb
index dbb8bc8b6..3bc3051d1 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,4 +5,4 @@ require File.expand_path('../application', __FILE__)
Rails.application.initialize!
# Fix version
-APP_VERSION = '3.2.0'
+APP_VERSION = 'Iteration 4'
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 336b3b700..a197dd366 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -51,11 +51,10 @@ Rails.application.configure do
end
# Specific theme for each company
- # AFIMB
- config.company_name = "afimb"
- config.company_theme = "#61970b" # AFIMB color
+ config.company_name = "STIF"
+ config.company_theme = "#66b4e0"
config.company_contact = "http://www.chouette.mobi/club-utilisateurs/contact-support/"
- config.accept_user_creation = true
+ config.accept_user_creation = false
config.chouette_authentication_settings = {
type: "database"
diff --git a/db/seeds.rb b/db/seeds.rb
index 8d25a45c0..bbd555700 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -11,12 +11,25 @@ stif = Organisation.find_or_create_by(name: "STIF")
stif.users.find_or_create_by!(username: "admin") do |user|
user.email = 'stif-boiv@af83.com'
+ user.password = "secret"
user.name = "STIF Administrateur"
user.skip_confirmation!
end
+OfferWorkbench.find_or_create_by(name: "Gestion de l'offre", organisation: stif)
+
+operator = Organisation.find_or_create_by(name: "Transporteur A")
+
+operator.users.find_or_create_by!(username: "transporteur") do |user|
+ user.email = 'stif-boiv+transporteur@af83.com'
+ user.password = "secret"
+ user.name = "Martin Lejeune"
+ user.skip_confirmation!
+end
+
stop_area_referential = StopAreaReferential.find_or_create_by(name: "Reflex") do |referential|
referential.add_member stif, owner: true
+ referential.add_member operator
end
10.times do |n|
@@ -25,18 +38,22 @@ end
line_referential = LineReferential.find_or_create_by(name: "CodifLigne") do |referential|
referential.add_member stif, owner: true
+ referential.add_member operator
end
10.times do |n|
line_referential.lines.find_or_create_by name: "Test #{n}"
end
-offer_workbench = OfferWorkbench.find_or_create_by(name: "Gestion de l'offre", organisation: stif)
-
-stif.referentials.find_or_create_by(slug: "test") do |referential|
- referential.name = "Test"
- referential.prefix = "test"
- referential.offer_workbench = offer_workbench
- referential.line_referential = line_referential
- referential.stop_area_referential = stop_area_referential
+offer_workbench = OfferWorkbench.find_or_create_by(name: "Gestion de l'offre", organisation: operator)
+
+[["parissudest201604", "Paris Sud-Est Avril 2016"],
+ ["parissudest201605", "Paris Sud-Est Mai 2016"]].each do |slug, name|
+ operator.referentials.find_or_create_by!(slug: slug) do |referential|
+ referential.name = name
+ referential.prefix = slug
+ referential.offer_workbench = offer_workbench
+ referential.line_referential = line_referential
+ referential.stop_area_referential = stop_area_referential
+ end
end
diff --git a/spec/models/offer_workbench_spec.rb b/spec/models/offer_workbench_spec.rb
index 6b29d3d82..6cd383260 100644
--- a/spec/models/offer_workbench_spec.rb
+++ b/spec/models/offer_workbench_spec.rb
@@ -7,7 +7,6 @@ RSpec.describe OfferWorkbench, :type => :model do
end
it { should validate_presence_of(:name) }
- it { should validate_uniqueness_of(:name) }
it { should validate_presence_of(:organisation) }
end
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-04 14:01:22 +0000