diff options
| -rw-r--r-- | app/assets/stylesheets/components/_labels.sass | 12 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/time_tables.sass | 6 | ||||
| -rw-r--r-- | app/views/time_tables/_form.html.slim | 17 | ||||
| -rw-r--r-- | app/views/time_tables/_periods.html.slim | 5 | ||||
| -rw-r--r-- | app/views/time_tables/_show_time_table.html.slim | 120 | ||||
| -rw-r--r-- | app/views/time_tables/index.js.slim | 1 | ||||
| -rw-r--r-- | app/views/time_tables/show.html.slim | 64 | ||||
| -rw-r--r-- | config/locales/actions.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/actions.fr.yml | 1 | ||||
| -rw-r--r-- | config/locales/calendars.en.yml | 8 | ||||
| -rw-r--r-- | config/locales/calendars.fr.yml | 21 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/locales/fr.yml | 1 | ||||
| -rw-r--r-- | spec/features/time_tables_spec.rb | 32 | ||||
| -rw-r--r-- | spec/views/time_tables/show.html.erb_spec.rb | 7 |
15 files changed, 150 insertions, 147 deletions
diff --git a/app/assets/stylesheets/components/_labels.sass b/app/assets/stylesheets/components/_labels.sass index 3514bce81..9607a97b8 100644 --- a/app/assets/stylesheets/components/_labels.sass +++ b/app/assets/stylesheets/components/_labels.sass @@ -8,7 +8,15 @@ font-weight: inherit padding: 0.35em 0.4em border-radius: 2px + border: 1px solid + + + .label + margin-left: 0.5em &.label-default - background-color: rgba(#fff, 0.3) - color: #fff + background-color: #fff + color: $darkgrey + border-color: rgba($grey, 0.5) + + &.disabled + color: rgba($grey, 0.5) diff --git a/app/assets/stylesheets/main/time_tables.sass b/app/assets/stylesheets/main/time_tables.sass index de2ae8253..6918bec1e 100644 --- a/app/assets/stylesheets/main/time_tables.sass +++ b/app/assets/stylesheets/main/time_tables.sass @@ -28,13 +28,13 @@ z-index: 100001 .validity_out - color: $brand-danger + color: red .validity_out_soon - color: $brand-warning + color: orange .validity_regular - color: $brand-success + color: green span.included_day_type font-weight: bolder diff --git a/app/views/time_tables/_form.html.slim b/app/views/time_tables/_form.html.slim index cd8b299ee..f97e63d33 100644 --- a/app/views/time_tables/_form.html.slim +++ b/app/views/time_tables/_form.html.slim @@ -26,9 +26,16 @@ = form.input :calendar, as: :select, collection: current_organisation.calendars .separator - .row .col-lg-12 + #periods + .alert.alert-info + |Intégration statique (avant Reactux) du composant 'periodes' + + .separator + + .row + .col-lg-8.col-lg-offset-4 .subform .nested-head .wrapper @@ -50,8 +57,12 @@ .links.nested-linker = link_to_add_association t("time_tables.actions.add_period"), form, :periods, class: 'btn btn-outline-primary' - .separator - + .row + .col-lg-12.mb-sm.mt-md + #periods + .alert.alert-warning + |Les éléments ci-dessous sont à supprimer. + .row .col-lg-6.col-md-6.col-sm-12.col-xs-12 .subform diff --git a/app/views/time_tables/_periods.html.slim b/app/views/time_tables/_periods.html.slim deleted file mode 100644 index e3c6d5f39..000000000 --- a/app/views/time_tables/_periods.html.slim +++ /dev/null @@ -1,5 +0,0 @@ -ul.periods - - @time_table.periods.each do |tmp| - li.period - = "#{('time_tables.show.from')} #{l tmp.period_start}" - = "#{t('time_tables.show.to')} #{l tmp.period_end}"
\ No newline at end of file diff --git a/app/views/time_tables/_show_time_table.html.slim b/app/views/time_tables/_show_time_table.html.slim index 419d13c96..f92f02b54 100644 --- a/app/views/time_tables/_show_time_table.html.slim +++ b/app/views/time_tables/_show_time_table.html.slim @@ -1,94 +1,26 @@ -#time_table_show.time_table_show - p - span class="state-code #{@time_table.presenter.time_table_state_code}" - i.fa.fa-certificate - - label - - if @time_table.bounding_dates.empty? - = t(".resume_empty") - - else - = t(".resume", :start_date => l(@time_table.bounding_dates.min), :end_date => l(@time_table.bounding_dates.max)) - - p - label = "#{@time_table.human_attribute_name('tag_list')} : " - = @time_table.tag_list - - ul.nav.nav-tabs id="tabs" data-tabs="tabs" - li.active - a href="#time_tables" data-toggle="tab" - = @time_table.human_attribute_name("calendars") - - li - a href="#time_tables_datas" data-toggle="tab" - = @time_table.human_attribute_name("calendar_details") - - #my-tab-content.tab-content - #time_tables.tab-pane.active - #associated_calendar - => "#{t('calendars.standard_calendar')} : " - - if @time_table.calendar - = link_to @time_table.calendar.name, @time_table.calendar - - else - = '--' - - .well.legend - span.title = t(".legend") - span.label.excluded_date X - = t(".excluded_date") - span.label.overlaped_date X - = t(".overlap_date") - span.label.selected_date X - = t(".selected_date") - span.label.selected_period X - = t(".selected_period") - - #calendars - .year_choice - span.previous = link_to("<", referential_time_table_path(@referential, @time_table, year: (@year - 1)) ) - span.year = "#{@year}" - span.next = link_to(">", referential_time_table_path(@referential, @time_table, year: (@year + 1)) ) - - .calendar_helper - - cal = "" - - (1..12).each do |month| - - cal << calendar(year: @year, month: month, first_day_of_week: 1) do |d| - - if @time_table.excluded_date?(d) - - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "day excluded_date"}] - - elsif @time_table.include_in_overlap_dates?(d) - - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "day overlaped_date"}] - - elsif @time_table.include_in_dates?(d) - - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "day selected_date"}] - - elsif @time_table.include_in_periods?(d) - - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "day selected_period"}] - - = cal.html_safe - - #time_tables_datas.tab-pane - .summary - p - label = "#{@time_table.human_attribute_name('version')} : " - = @time_table.version - - p - label = "#{@time_table.human_attribute_name('day_types')} : " - - if @time_table.int_day_types & 508 == 0 - label = "#{@time_table.human_attribute_name('none')} : " - - else - - %w(monday tuesday wednesday thursday friday saturday sunday).each do |day_type| - span class="#{@time_table.send(day_type) ? 'included_day_type' :'excluded_day_type'}" - = @time_table.human_attribute_name(day_type) - - - if @time_table.periods.present? - h3.time_table_periods = @time_table.human_attribute_name("periods") - .periods.content - == render 'time_tables/periods' - - - if @time_table.dates.where("in_out = true").present? - h3.time_table_dates = @time_table.human_attribute_name("dates") - .dates.content - == render "time_tables/dates" - - - if @time_table.dates.where("in_out = false").present? - h3.time_table_dates = @time_table.human_attribute_name("excluded_dates") - .excluded_dates.content - == render "time_tables/excluded_dates" +.calendar_helper + - cal = "" + - (1..12).each do |month| + - cal << calendar(year: @year, month: month, first_day_of_week: 1, calendar_title: "#{I18n.t("date.month_names")[month]} #{@year}") do |d| + - if @time_table.excluded_date?(d) + - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "day excluded_date"}] + - elsif @time_table.include_in_overlap_dates?(d) + - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "day overlaped_date"}] + - elsif @time_table.include_in_dates?(d) + - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "day selected_date"}] + - elsif @time_table.include_in_periods?(d) + - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "day selected_period"}] + + = cal.html_safe + + +/ wip +- if @time_table.dates.where("in_out = true").present? + h3.time_table_dates = @time_table.human_attribute_name("dates") + .dates.content + == render "time_tables/dates" + +- if @time_table.dates.where("in_out = false").present? + h3.time_table_dates = @time_table.human_attribute_name("excluded_dates") + .excluded_dates.content + == render "time_tables/excluded_dates" diff --git a/app/views/time_tables/index.js.slim b/app/views/time_tables/index.js.slim deleted file mode 100644 index bc9585c4b..000000000 --- a/app/views/time_tables/index.js.slim +++ /dev/null @@ -1 +0,0 @@ -| $('#time_tables').html("#{escape_javascript(render('time_tables'))}");
\ No newline at end of file diff --git a/app/views/time_tables/show.html.slim b/app/views/time_tables/show.html.slim index 436886faa..54d26875e 100644 --- a/app/views/time_tables/show.html.slim +++ b/app/views/time_tables/show.html.slim @@ -1,27 +1,53 @@ - require 'calendar_helper' -= title_tag t('time_tables.show.title', :time_table => @time_table.comment ) +/ PageHeader += pageheader 'map-marker', + @time_table.comment, + '', + (policy(@time_table).edit? ? link_to(t('actions.edit'), edit_referential_time_table_path(@referential, @time_table), class: 'btn btn-default') : '') -== render 'time_table_combinations/combine' + / Below is secundary actions & optional contents (filters, ...) + .row.mb-sm + .col-lg-12.text-right + / - if policy(@time_table).create? && @referential.organisation == current_organisation + / = link_to t('time_tables.actions.new'), new_referential_time_table_path(@referential), class: 'btn btn-primary' -== render 'show_time_table' + /- if policy(@time_table).create? && @referential.organisation == current_organisation + = link_to t('actions.combine'), new_referential_time_table_time_table_combination_path(@referential, @time_table), {remote: true, 'data-toggle' => "modal", 'data-target' => '#modal_combine', class: 'btn btn-primary' } -- content_for :sidebar do - ul.actions - li - if policy(@time_table).create? && @referential.organisation == current_organisation - = link_to t('time_tables.actions.new'), new_referential_time_table_path(@referential), class: 'add' - li - - if policy(@time_table).edit? - = link_to t('time_tables.actions.edit'), edit_referential_time_table_path(@referential, @time_table), class: "edit" - li + = link_to t('actions.clone'), duplicate_referential_time_table_path(@referential, @time_table), class: 'btn btn-primary' + - if policy(@time_table).destroy? - = link_to t('time_tables.actions.destroy'), referential_time_table_path(@referential, @time_table), :method => :delete, :data => {:confirm => t('time_tables.actions.destroy_confirm')}, class: "remove" - li - - if policy(@time_table).create? && @referential.organisation == current_organisation - = link_to t('time_tables.actions.duplicate'), duplicate_referential_time_table_path(@referential, @time_table), class: "clone" - li - /- if policy(@time_table).create? && @referential.organisation == current_organisation - = link_to t('time_tables.actions.combine'), new_referential_time_table_time_table_combination_path(@referential, @time_table), {:remote => true, 'data-toggle' => "modal", 'data-target' => '#modal_combine', class: "merge"} + = link_to referential_time_table_path(@referential, @time_table), method: :delete, data: {confirm: t('time_tables.actions.destroy_confirm')}, class: 'btn btn-primary' do + span.fa.fa-trash + span = t('actions.destroy') + +/ PageContent +.page_content + .container-fluid + .row + .col-lg-6.col-md-6.col-sm-12.col-xs-12 + = definition_list t('metadatas'), + { "Période d'application" => (@time_table.bounding_dates.empty? ? '-' : t('bounding_dates', debut: l(@time_table.bounding_dates.min), end: l(@time_table.bounding_dates.max))), + 'Etiquettes' => @time_table.tag_list.collect{ |t| content_tag(:span, t, class: 'label label-default') }.join().html_safe, + 'Modèle de calendrier' => (@time_table.calendar ? link_to(@time_table.calendar.name, @time_table.calendar) : '-'), + "Journées d'application pour les périodes ci-dessous" => %w(monday tuesday wednesday thursday friday saturday sunday).collect{ |d| content_tag(:span, t("calendars.days.#{d}"), class: "label label-default #{@time_table.send(d) ? '' : 'disabled'}") }.join.html_safe } + + .row + .col-lg-12 + .pagination.pull-right + = @year + .page_links + = link_to '', referential_time_table_path(@referential, @time_table, year: (@year - 1)), class: 'previous_page' + = link_to '', referential_time_table_path(@referential, @time_table, year: (@year + 1)), class: 'next_page' + + .row + .col-lg-12 + / To update + = render 'show_time_table' - = creation_tag(@time_table) + .row + .col-lg-12 + / WTF ??! + = render 'time_table_combinations/combine' diff --git a/config/locales/actions.en.yml b/config/locales/actions.en.yml index e4b0bcb28..a5fbbeb64 100644 --- a/config/locales/actions.en.yml +++ b/config/locales/actions.en.yml @@ -11,6 +11,7 @@ en: clone: 'Clone' clean_up: 'Clean up' sync: 'Synchronize' + combine: 'Combine' or: "or" cancel: "Cancel" search_hint: "Type in a search term" diff --git a/config/locales/actions.fr.yml b/config/locales/actions.fr.yml index 0cd3de8e5..f6e4d74e2 100644 --- a/config/locales/actions.fr.yml +++ b/config/locales/actions.fr.yml @@ -12,6 +12,7 @@ fr: clone: 'Dupliquer' clean_up: 'Purger' sync: 'Synchroniser' + combine: 'Combiner' or: "ou" cancel: "Annuler" search_hint: "Entrez un texte à rechercher" diff --git a/config/locales/calendars.en.yml b/config/locales/calendars.en.yml index cb63afde5..17dc8baf1 100644 --- a/config/locales/calendars.en.yml +++ b/config/locales/calendars.en.yml @@ -1,5 +1,13 @@ en: calendars: + days: + monday: M + tuesday: Tu + wednesday: W + thursday: Th + friday: F + saturday: Sa + sunday: Su standard_calendars: Standard calendars standard_calendar: Standard calendar actions: diff --git a/config/locales/calendars.fr.yml b/config/locales/calendars.fr.yml index 81254c81e..32e3c66d2 100644 --- a/config/locales/calendars.fr.yml +++ b/config/locales/calendars.fr.yml @@ -1,5 +1,26 @@ fr: calendars: + days: + monday: L + tuesday: Ma + wednesday: Me + thursday: J + friday: V + saturday: S + sunday: D + months: + 1: Janvier + 2: Février + 3: Mars + 4: Avril + 5: Mai + 6: Juin + 7: Juillet + 8: Août + 9: Septembre + 10: Octobre + 11: Novembre + 12: Décembre standard_calendars: Calendriers standards standard_calendar: Calendrier standard actions: diff --git a/config/locales/en.yml b/config/locales/en.yml index 77ad82605..5ed0b9ec5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -16,4 +16,5 @@ en: last_update: 'Last update on<br>%{time}' last_sync: 'Last sync on %{time}' validity_range: '%{debut} > %{end}' + bounding_dates: '%{debut} > %{end}' metadatas: 'Informations' diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 5ac6bb8b1..db8a3608d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -16,4 +16,5 @@ fr: last_update: 'Dernière mise à jour<br>le %{time}' last_sync: 'Dernière mise à jour le %{time}' validity_range: '%{debut} > %{end}' + bounding_dates: '%{debut} > %{end}' metadatas: 'Informations' diff --git a/spec/features/time_tables_spec.rb b/spec/features/time_tables_spec.rb index 573b41150..9ace45f11 100644 --- a/spec/features/time_tables_spec.rb +++ b/spec/features/time_tables_spec.rb @@ -67,33 +67,33 @@ describe "TimeTables", :type => :feature do expect(page).to have_content(time_tables.first.comment) end - context 'user has permission to create time tables' do - it 'shows a create link for time tables' do - expect(page).to have_content(I18n.t('time_tables.actions.new')) - end - - it 'does not show link to duplicate the time table' do - expect(page).to have_content(I18n.t('time_tables.actions.duplicate')) - end - end + # context 'user has permission to create time tables' do + # it 'shows a create link for time tables' do + # expect(page).to have_content(I18n.t('time_tables.actions.new')) + # end + # + # it 'does not show link to duplicate the time table' do + # expect(page).to have_content(I18n.t('time_tables.actions.duplicate')) + # end + # end context 'user does not have permission to create time tables' do it 'does not show a create link for time tables' do @user.update_attribute(:permissions, []) visit referential_time_table_path(referential, time_table) - expect(page).not_to have_content(I18n.t('time_tables.actions.new')) + expect(page).not_to have_content(I18n.t('actions.new')) end it 'does not show link to duplicate the time table' do @user.update_attribute(:permissions, []) visit referential_time_table_path(referential, time_table) - expect(page).not_to have_content(I18n.t('time_tables.actions.duplicate')) + expect(page).not_to have_content(I18n.t('actions.duplicate')) end end context 'user has permission to edit time tables' do it 'shows the edit link for time table' do - expect(page).to have_content(I18n.t('time_tables.actions.edit')) + expect(page).to have_content(I18n.t('actions.edit')) end end @@ -101,13 +101,13 @@ describe "TimeTables", :type => :feature do it 'does not show the edit link for time table' do @user.update_attribute(:permissions, []) visit referential_time_table_path(referential, time_table) - expect(page).not_to have_content(I18n.t('time_tables.actions.edit')) + expect(page).not_to have_content(I18n.t('actions.edit')) end end context 'user has permission to destroy time tables' do it 'shows the destroy link for time table' do - expect(page).to have_content(I18n.t('time_tables.actions.destroy')) + expect(page).to have_content(I18n.t('actions.destroy')) end end @@ -115,7 +115,7 @@ describe "TimeTables", :type => :feature do it 'does not show a destroy link for time table' do @user.update_attribute(:permissions, []) visit referential_time_table_path(referential, time_table) - expect(page).not_to have_content(I18n.t('time_tables.actions.destroy')) + expect(page).not_to have_content(I18n.t('actions.destroy')) end end end @@ -133,7 +133,7 @@ describe "TimeTables", :type => :feature do describe "edit and return to show" do it "edit time_table" do visit referential_time_table_path(referential, subject) - click_link "Editer ce calendrier" + click_link "Editer" fill_in "Nom", :with => "TimeTable Modified" click_button("Valider") expect(page).to have_content("TimeTable Modified") diff --git a/spec/views/time_tables/show.html.erb_spec.rb b/spec/views/time_tables/show.html.erb_spec.rb index 3b5d7f1f1..f429f9dec 100644 --- a/spec/views/time_tables/show.html.erb_spec.rb +++ b/spec/views/time_tables/show.html.erb_spec.rb @@ -13,18 +13,17 @@ describe "/time_tables/show", :type => :view do it "should render h2 with the time_table comment" do render - expect(rendered).to have_selector("h2", :text => Regexp.new(time_table.comment)) + expect(rendered).to have_selector("h1", :text => Regexp.new(time_table.comment)) end it "should render a link to edit the time_table" do render - expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_time_table_path(referential, time_table)}']") + expect(rendered).to have_selector(" a[href='#{view.edit_referential_time_table_path(referential, time_table)}']") end it "should render a link to remove the time_table" do render - expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_time_table_path(referential, time_table)}'][class='remove']") + expect(rendered).to have_selector(" a[href='#{view.referential_time_table_path(referential, time_table)}']") end end - |