From 5c83d36ea58f954ba14a2aca98f585bb79cca023 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Mon, 19 Aug 2013 16:46:26 +0200 Subject: [PATCH 01/31] semester migration --- app/models/semester.rb | 12 ++++++++++-- .../20130819143148_remove_name_from_semesters.rb | 7 +++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20130819143148_remove_name_from_semesters.rb diff --git a/app/models/semester.rb b/app/models/semester.rb index 913a370..7b6c364 100755 --- a/app/models/semester.rb +++ b/app/models/semester.rb @@ -13,9 +13,17 @@ # class Semester < ActiveRecord::Base - attr_accessible :name, :nummer, :ssws, :lva_ids + attr_accessible :nummer, :ssws, :lva_ids has_and_belongs_to_many :lvas belongs_to :studium, :foreign_key => "studium_id" - validates :name, :presence => true validates :nummer, :presence => true + + def name + if self.nummer == 0 + return I18n.t("ohnezuordnung") + " (" + self.studium.name + ")" + else + return self.nummer.to_s + ". " + self.studium.name + end + end + end diff --git a/db/migrate/20130819143148_remove_name_from_semesters.rb b/db/migrate/20130819143148_remove_name_from_semesters.rb new file mode 100644 index 0000000..4f364e8 --- /dev/null +++ b/db/migrate/20130819143148_remove_name_from_semesters.rb @@ -0,0 +1,7 @@ +class RemoveNameFromSemesters < ActiveRecord::Migration + def change + remove_column :semesters, :name + + + end +end From 9c1eff6bec64b6ba9be5a65ac6889282322d5d39 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Mon, 19 Aug 2013 17:59:29 +0200 Subject: [PATCH 02/31] Form kosmetik --- app/controllers/studien_controller.rb | 21 +++++++++++++++++++-- app/models/semester.rb | 12 +++++++++--- app/views/lecturers/_form.html.erb | 2 +- app/views/lvas/_form.html.erb | 2 +- app/views/studien/verwalten.html.erb | 8 ++++++++ config/locales/de.yml | 1 + 6 files changed, 39 insertions(+), 7 deletions(-) diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb index f5b9d63..22fae68 100755 --- a/app/controllers/studien_controller.rb +++ b/app/controllers/studien_controller.rb @@ -92,14 +92,16 @@ class StudienController < ApplicationController end def verwalten - @new_params={:std_verw=>params[:std_verw], :mg_verw=>params[:mg_verw], :m_verw=>params[:m_verw], :lva_verw=>params[:lva_verw], :b_verw=>params[:b_verw]} + @new_params={:std_verw=>params[:std_verw], :mg_verw=>params[:mg_verw], :m_verw=>params[:m_verw], :lva_verw=>params[:lva_verw], :b_verw=>params[:b_verw], :lec_verw=>params[:lec_verw]} if @new_params.values.compact.empty? @studien=Studium.all @modulgruppen=Modulgruppe.all @module=Modul.all @lvas=Lva.all @beispiele=Beispiel.all + @lecturers=Lecturer.all else + if !@new_params[:std_verw].nil? @studien = [Studium.find(@new_params[:std_verw])] else @@ -144,7 +146,7 @@ class StudienController < ApplicationController @beispiele = [Beispiel.find(@new_params[:b_verw])] temp = @lvas.map{|x| x.beispiele}.flatten.uniq #Force Force Lvas @lvas=@lvas.select{|k| temp.include?(k)} - temp = @module.map{|x| x.lvas}.flatten.uniq #Force Module + temp = @lva.map{|x| x.moduls}.flatten.uniq #Force Module @module=@module.select{|k| temp.include?(k)} temp = @module.map{|x| x.modulgruppen}.flatten.uniq # Force Modulgruppen @modulgruppen = @modulgruppen.select{|k| temp.include?(k)} @@ -157,6 +159,21 @@ class StudienController < ApplicationController temp = @lvas.map{|x| x.beispiele}.flatten.uniq # Force beispiel @beispiele=@beispiele.select{|k| temp.include?(k)} end + if !@new_params[:lec_verw].nil? + @lecturers=[Lecturer.find(@new_params[:lec_verw])] + temp = @lecturers.map{|x| x.lva}.flatten.uniq #Force Force Lvas + @lvas=@lvas.select{|k| temp.include?(k)} + temp = @lva.map{|x| x.moduls}.flatten.uniq #Force Force Lvas + @module=@module.select{|k| temp.include?(k)} + temp = @module.map{|x| x.modulgruppen}.flatten.uniq # Force Modulgruppen + @modulgruppen = @modulgruppen.select{|k| temp.include?(k)} + temp = @modulgruppen.map{|x| x.studium}.flatten.uniq # Force Studien + @studien=@studien.select{|k| temp.include?(k)} + temp = @lvas.map{|x| x.beispiele}.flatten.uniq # Force beispiel + @beispiele=@beispiele.select{|k| temp.include?(k)} + else + @lecturers = @lvas.map{|k| k.lecturers}.flatten.uniq + end end @messages = [] diff --git a/app/models/semester.rb b/app/models/semester.rb index 7b6c364..2adb3aa 100755 --- a/app/models/semester.rb +++ b/app/models/semester.rb @@ -21,9 +21,15 @@ class Semester < ActiveRecord::Base def name if self.nummer == 0 return I18n.t("ohnezuordnung") + " (" + self.studium.name + ")" - else + else return self.nummer.to_s + ". " + self.studium.name - end end - + end + def name_kurz + if self.nummer == 0 + return I18n.t("ohnezuordnung") + " (" + self.studium.abkuerzung + ")" + else + return self.nummer.to_s + ". " + self.studium.abkuerzung + end + end end diff --git a/app/views/lecturers/_form.html.erb b/app/views/lecturers/_form.html.erb index baf4f49..d9f1416 100644 --- a/app/views/lecturers/_form.html.erb +++ b/app/views/lecturers/_form.html.erb @@ -3,7 +3,7 @@ <%= f.input :name %> <%= f.input :email %> <%= f.input :oid %> - <%= f.input :picture %> + <%= f.input :picture, :as=>:file %> <%= f.input :lvas %> <% end %> diff --git a/app/views/lvas/_form.html.erb b/app/views/lvas/_form.html.erb index ec38a70..4fe897b 100755 --- a/app/views/lvas/_form.html.erb +++ b/app/views/lvas/_form.html.erb @@ -40,7 +40,7 @@
<%= f.input :semester, :as=>:check_boxes%> - + <%= f.input :lecturers, :as=>:check_boxes%>
<% end %> <%= f.actions do %> diff --git a/app/views/studien/verwalten.html.erb b/app/views/studien/verwalten.html.erb index c1008e8..3c6e4b4 100644 --- a/app/views/studien/verwalten.html.erb +++ b/app/views/studien/verwalten.html.erb @@ -28,6 +28,14 @@ <%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%> + +

Vortragende

+
+ + <% @lecturers.each do |lec| %> + <%= (lec.valid?) ? ' '.html_safe : ''.html_safe %> <%= link_to lec.name, lec %> | <%=link_to ''.html_safe+ 'edit', edit_lecturer_path(lec)%> || + + <% end %>
diff --git a/config/locales/de.yml b/config/locales/de.yml index 2784350..c3564ad 100755 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1,6 +1,7 @@ # Sample localization file for English. Add more files in this directory for other locales. # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. de: + ohnezuordnung: "Ohne Zuordnung" hello: "Hallo Welt" common: edit: "Bearbeiten" From 401689d04cec8829800adfacabc845fab6b8937e Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 19 Aug 2013 18:54:04 +0200 Subject: [PATCH 03/31] ignore tempfiles --- .gitignore | 2 +- app/controllers/home_controller.rb | 3 +++ app/views/home/dev.html.erb | 1 + config/routes.rb | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a978807..d88beef 100755 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ # Ignore bundler config /.bundle - +*.*~ # Ignore the default SQLite database. /db/*.sqlite3 /db/schema.rb diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 150a2c3..8c5379b 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -7,4 +7,7 @@ class HomeController < ApplicationController def startdev render 'setup_fetsite_dev' end + def linksnotimplemented + render 'links_notimplemented' + end end diff --git a/app/views/home/dev.html.erb b/app/views/home/dev.html.erb index 1e9d341..1eef047 100755 --- a/app/views/home/dev.html.erb +++ b/app/views/home/dev.html.erb @@ -1,4 +1,5 @@

Entwicklungsprojekt

+<%= link_to "notimplemented", home_linksnotimplemented_path %>

Feature List: 2013-07-17

  • Info zu Studien/Studienpläne
    • diff --git a/config/routes.rb b/config/routes.rb index 8e872f0..4cc0f80 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -58,6 +58,9 @@ resources :home, :only=>[:index] get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev' get 'home/startdev', :controller=>:home, :action=>:startdev, :as=>'home_startdev' + get 'home/linksnotimplemented', :controller=>:home, :action=>:linksnotimplemented, :as=>'home_linksnotimplemented' + + resources :beispiele resources :themen resources :themengruppen do From 7ea676639174d6ca1e1eb9cf9b309fa9592191e6 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 19 Aug 2013 18:54:31 +0200 Subject: [PATCH 04/31] notimplemented home site --- app/views/home/links_notimplemented.html.erb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 app/views/home/links_notimplemented.html.erb diff --git a/app/views/home/links_notimplemented.html.erb b/app/views/home/links_notimplemented.html.erb new file mode 100644 index 0000000..f9622d5 --- /dev/null +++ b/app/views/home/links_notimplemented.html.erb @@ -0,0 +1,7 @@ +Vorhandene Resourcen +
      +
    • <%= link_to "galleries", galleries_path %>
      • +
    • <%= link_to "fotos", fotos_path %>
      • +
    • <%= link_to "gremien", gremien_path %>
      • +
    • <%= link_to "memberships", memberships_path %>
      • +
    From cb44e90d1c5f1385059d8dc061ad4ce458a1a0be Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Mon, 19 Aug 2013 19:16:48 +0200 Subject: [PATCH 05/31] Rubriken tab fix --- app/views/rubriken/_tabs.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/rubriken/_tabs.html.erb b/app/views/rubriken/_tabs.html.erb index 04ed2a5..89a2eb3 100644 --- a/app/views/rubriken/_tabs.html.erb +++ b/app/views/rubriken/_tabs.html.erb @@ -1,6 +1,6 @@
      -
    • > - <%= link_to I18n.t ('rubriken.alle') , calendars_url %>
      • +
    • > + <%= link_to I18n.t('rubriken.alle') , rubriken_path %>
      • <% for r in Rubrik.all %>
    • title="<%= r.name %>"> <%= link_to r.name, r %> From 4e7c7c23ddd1cf25a77da3d34be6c8c1c9997908 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Mon, 19 Aug 2013 19:17:27 +0200 Subject: [PATCH 06/31] =?UTF-8?q?Lecturer=20in=20verwalten=20eingef=C3=BCg?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/studien/verwalten.html.erb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/views/studien/verwalten.html.erb b/app/views/studien/verwalten.html.erb index 3c6e4b4..c045817 100644 --- a/app/views/studien/verwalten.html.erb +++ b/app/views/studien/verwalten.html.erb @@ -36,7 +36,23 @@ <%= (lec.valid?) ? ' '.html_safe : ''.html_safe %> <%= link_to lec.name, lec %> | <%=link_to ''.html_safe+ 'edit', edit_lecturer_path(lec)%> || <% end %> - +
      +
      + + <%= params[:lec_verw].nil? ? I18n.t("filter.lecturer") : Lecturer.find(params[:lec_verw]).name %> + + + +
        +
      • <%= link_to 'Alle Vortragenden', studien_verwalten_path(:lec_verw=>nil) %>
        • + <% for lec in @lecturers %> +
      • <%= link_to lec.name, studien_verwalten_path(:lec_verw=>lec)%>
        • + <% end %> +
      + +
      + <%= link_to "Neuer Vortragender", new_lecturer_path, :class=>"btn"%> +
From d96a694a730760fb5f67db1b395b9226bcf0dca7 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 19 Aug 2013 20:49:07 +0200 Subject: [PATCH 07/31] fotogallery --- app/controllers/fotos_controller.rb | 6 ++-- app/models/foto.rb | 3 ++ app/models/gallery.rb | 1 + app/views/fotos/show.html.erb | 48 ++++++++++++++++------------- app/views/galleries/show.html.erb | 7 +++++ config/routes.rb | 6 ++-- 6 files changed, 45 insertions(+), 26 deletions(-) diff --git a/app/controllers/fotos_controller.rb b/app/controllers/fotos_controller.rb index 591bf1f..4090ae3 100644 --- a/app/controllers/fotos_controller.rb +++ b/app/controllers/fotos_controller.rb @@ -44,8 +44,8 @@ class FotosController < ApplicationController respond_to do |format| if @foto.save - format.html { redirect_to @foto, notice: 'Foto was successfully created.' } - format.json { render json: @foto, status: :created, location: @foto } + format.html { redirect_to gallery_foto_path(@foto.gallery,@foto), notice: 'Foto was successfully created.' } + format.json { render json: gallery_foto_path(@foto.gallery,@foto), status: :created, location: @foto } else format.html { render action: "new" } format.json { render json: @foto.errors, status: :unprocessable_entity } @@ -60,7 +60,7 @@ class FotosController < ApplicationController respond_to do |format| if @foto.update_attributes(params[:foto]) - format.html { redirect_to @foto, notice: 'Foto was successfully updated.' } + format.html { redirect_to gallery_foto_path(@foto.gallery,@foto), notice: 'Foto was successfully updated.' } format.json { head :no_content } else format.html { render action: "edit" } diff --git a/app/models/foto.rb b/app/models/foto.rb index 08a5d59..f548189 100644 --- a/app/models/foto.rb +++ b/app/models/foto.rb @@ -1,3 +1,6 @@ class Foto < ActiveRecord::Base attr_accessible :datei, :desc, :gallery_id, :title + belongs_to :gallery + mount_uploader :datei, FotoUploader + end diff --git a/app/models/gallery.rb b/app/models/gallery.rb index 746a1d1..0b0f977 100644 --- a/app/models/gallery.rb +++ b/app/models/gallery.rb @@ -1,3 +1,4 @@ class Gallery < ActiveRecord::Base attr_accessible :datum, :desc, :name + has_many :fotos end diff --git a/app/views/fotos/show.html.erb b/app/views/fotos/show.html.erb index 2a4c611..9183e5e 100644 --- a/app/views/fotos/show.html.erb +++ b/app/views/fotos/show.html.erb @@ -1,25 +1,31 @@ -

<%= notice %>

-

- Title: - <%= @foto.title %> -

+
-

- Desc: - <%= @foto.desc %> -

+ +
+
+ <%= link_to image_tag(@foto.datei.resized.url), gallery_foto_path(@foto.gallery, ((@foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].nil?) ? (@foto.gallery.fotos[0].try(:id).to_i) : @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].try(:id).to_i) ) %> +
+
-

- Gallery: - <%= @foto.gallery_id %> -

+
+
+

<%= @foto.title %>

+

<%= @foto.desc %>

+
+
+

+ <%= link_to 'last' , gallery_foto_path(@foto.gallery, @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)-1].try(:id).to_i) unless @foto.gallery.fotos.index(@foto)==0 %> + <%= link_to 'next' , gallery_foto_path(@foto.gallery, @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].try(:id).to_i) unless @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].nil? %> + <%= link_to 'Edit', edit_foto_path(@foto) %> | + <%= link_to 'Back', gallery_path(@foto.gallery) %> +

+
+
+
+
+

<%= notice %>

+
+
+
-

- Datei: - <%= @foto.datei %> -

- - -<%= link_to 'Edit', edit_foto_path(@foto) %> | -<%= link_to 'Back', fotos_path %> diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb index 2fa130b..392008b 100644 --- a/app/views/galleries/show.html.erb +++ b/app/views/galleries/show.html.erb @@ -14,7 +14,14 @@ Datum: <%= @gallery.datum %>

+<% @gallery.fotos.each do |f| %> +<%= link_to image_tag(f.datei.big_thumb.url,{:class=>"img-polaroid"}) , gallery_foto_path(@gallery,f) %> + +<% end %> + + +<%= link_to 'NewFoto' , new_gallery_foto_path(@gallery) %> | <%= link_to 'Edit', edit_gallery_path(@gallery) %> | <%= link_to 'Back', galleries_path %> diff --git a/config/routes.rb b/config/routes.rb index 3cd943b..16e35ef 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -36,8 +36,10 @@ get 'verwalten/studien', :controller=>:studien, :action=>:verwalten, :as=>'studien_verwalten' resources :fetzneditions - resources :fotos - resources :galleries + resources :fotos, :except=>[:new, :show] + resources :galleries do + resources :fotos, :only=>[:new,:show] + end resources :memberships resources :gremien resources :fetprofiles From 18dfe603099112f99f6b1670c0a549e81b5bccdf Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Mon, 19 Aug 2013 23:38:34 +0200 Subject: [PATCH 08/31] =?UTF-8?q?Design=C3=A4nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/lvas.css.scss | 2 +- app/views/studien/semesteransicht.html.erb | 3 +- app/views/studien/verwalten.html.erb | 72 ++++++++++++---------- 3 files changed, 44 insertions(+), 33 deletions(-) diff --git a/app/assets/stylesheets/lvas.css.scss b/app/assets/stylesheets/lvas.css.scss index d9b9a12..3e95e92 100755 --- a/app/assets/stylesheets/lvas.css.scss +++ b/app/assets/stylesheets/lvas.css.scss @@ -4,7 +4,7 @@ div.lva-semester { border: solid; -border-width: 1px; +border-width: 0px; margin: 1px; padding: 5px; border-color: green; diff --git a/app/views/studien/semesteransicht.html.erb b/app/views/studien/semesteransicht.html.erb index 5ae6c83..b5b3a85 100644 --- a/app/views/studien/semesteransicht.html.erb +++ b/app/views/studien/semesteransicht.html.erb @@ -14,8 +14,9 @@
+
-

<%= sem.name %>

+

<%= sem.name %>

<%= link_to 'Lvas hinzufügen/entfernen', edit_semester_path(sem), :class=>"btn-small"%>
diff --git a/app/views/studien/verwalten.html.erb b/app/views/studien/verwalten.html.erb index c045817..af2b07e 100644 --- a/app/views/studien/verwalten.html.erb +++ b/app/views/studien/verwalten.html.erb @@ -7,10 +7,16 @@ <%= I18n.t("studien.verwaltung.explanation").html_safe %>

Studien

- - | - <% @studien.each do |s| %> - <%= (s.valid?) ? ' '.html_safe : ''.html_safe %> <%= link_to s.name, s %> | <%=link_to ''.html_safe+ 'edit', edit_studium_path(s)%> ||<% end %> +
+ <% @studien.each_slice((Studium.count/2.0).ceil) do |col| %> + +
+ <% col.each do |s| %> + <%= (s.valid?) ? ' '.html_safe : ''.html_safe %> <%= link_to s.name, s %> | <%=link_to ''.html_safe+ 'edit', edit_studium_path(s)%>
+ <% end %> +
+ <% end %> +
@@ -21,38 +27,42 @@
  • <%= link_to 'Alle Studien', studien_verwalten_path(:std_verw=>nil) %>
    • <% for s in @studien %>
  • <%= link_to s.name, studien_verwalten_path(:std_verw=>s)%>
    • - <% end %> +
    <%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%>
    +
    +

    Vortragende

    +
    +
    + <% @lecturers.each_slice((Lecturer.count/3.0).ceil) do |col| %> +
    + <% col.each do |lec| %> + <%= (lec.valid?) ? ' '.html_safe : ''.html_safe %> <%= link_to lec.name, lec %> | <%=link_to ''.html_safe+ 'edit', edit_lecturer_path(lec)%>
    + <% end %>
    -

    Vortragende

    -
    - - <% @lecturers.each do |lec| %> - <%= (lec.valid?) ? ' '.html_safe : ''.html_safe %> <%= link_to lec.name, lec %> | <%=link_to ''.html_safe+ 'edit', edit_lecturer_path(lec)%> || - <% end %> -
    -
    - - <%= params[:lec_verw].nil? ? I18n.t("filter.lecturer") : Lecturer.find(params[:lec_verw]).name %> +
    +
    +
    + + <%= params[:lec_verw].nil? ? I18n.t("filter.lecturer") : Lecturer.find(params[:lec_verw]).name %> - - -
      -
    • <%= link_to 'Alle Vortragenden', studien_verwalten_path(:lec_verw=>nil) %>
      • - <% for lec in @lecturers %> -
    • <%= link_to lec.name, studien_verwalten_path(:lec_verw=>lec)%>
      • - <% end %> -
    - -
    - <%= link_to "Neuer Vortragender", new_lecturer_path, :class=>"btn"%> -
    + + +
      +
    • <%= link_to 'Alle Vortragenden', studien_verwalten_path(:lec_verw=>nil) %>
      • + <% for lec in @lecturers %> +
    • <%= link_to lec.name, studien_verwalten_path(:lec_verw=>lec)%>
      • + <% end %> +
    + +
    + <%= link_to "Neuer Vortragender", new_lecturer_path, :class=>"btn"%> +
    @@ -60,7 +70,7 @@

    Modulgruppen

    <% @modulgruppen.each do |mg| %> - <%= (mg.valid?) ? ' '.html_safe : ''.html_safe %> <%= link_to mg.name, mg %> | <%=link_to ''.html_safe+ 'edit', edit_modulgruppe_path(mg)%>
    + <%= (mg.valid?) ? ' '.html_safe : ''.html_safe %> <%= link_to mg.name, mg %> | <%=link_to ''.html_safe+ 'edit', edit_modulgruppe_path(mg)%>
    <% end %>
    @@ -118,7 +128,7 @@ <% @lvas.each do |lva| %> <%= (lva.valid?) ? ' '.html_safe : ''.html_safe %><%= link_to lva.name, lva %> | - <%=link_to ''.html_safe+ 'edit', edit_lva_path(lva)%>
    + <%=link_to ''.html_safe+ 'edit', edit_lva_path(lva)%>
    <% end %>
    @@ -147,7 +157,7 @@
    - <%= link_to I18n.t("filter.reset"), studien_verwalten_path(:std_verw=>nil, :mg_verw=>nil, :m_verw=>nil, :lva_verw=>nil, :b_verw=>nil), :class=>"btn" %> + <%= link_to I18n.t("filter.reset"), studien_verwalten_path(:std_verw=>nil, :mg_verw=>nil, :m_verw=>nil, :lva_verw=>nil, :b_verw=>nil), :class=>"btn" %>

    Error Log

    • Red: Error, Solve immediately
      • @@ -169,7 +179,7 @@ <% @beispiele.each do |b| %> -<%= (b.valid?) ? ' '.html_safe : ''.html_safe %> <%= link_to b.name, b %> | <%=link_to ''.html_safe+ 'edit', edit_beispiel_path(b)%> + <%= (b.valid?) ? ' '.html_safe : ''.html_safe %> <%= link_to b.name, b %> | <%=link_to ''.html_safe+ 'edit', edit_beispiel_path(b)%> <% end %>
      From faf977e6517588e27673fefadf51f6d994d93072 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Tue, 20 Aug 2013 18:11:04 +0200 Subject: [PATCH 09/31] foto uploader --- app/uploaders/foto_uploader.rb | 56 ++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 app/uploaders/foto_uploader.rb diff --git a/app/uploaders/foto_uploader.rb b/app/uploaders/foto_uploader.rb new file mode 100644 index 0000000..a47f073 --- /dev/null +++ b/app/uploaders/foto_uploader.rb @@ -0,0 +1,56 @@ +# encoding: utf-8 + +class FotoUploader < CarrierWave::Uploader::Base + + # Include RMagick or MiniMagick support: + include CarrierWave::RMagick + # include CarrierWave::MiniMagick + + # Choose what kind of storage to use for this uploader: + storage :file + # storage :fog + + # Override the directory where uploaded files will be stored. + # This is a sensible default for uploaders that are meant to be mounted: + def store_dir + "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" + end + + # Provide a default URL as a default if there hasn't been a file uploaded: + # def default_url + # # For Rails 3.1+ asset pipeline compatibility: + # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) + # + # "/images/fallback/" + [version_name, "default.png"].compact.join('_') + # end + + # Process files as they are uploaded: + # process :scale => [200, 300] + # + # def scale(width, height) + # # do something + # end + + # Create different versions of your uploaded files: + version :thumb do + process :resize_to_fill => [64, 64] + end + version :big_thumb do + process :resize_to_fill => [128, 128] + end + version :resized do + process :resize_to_fit => [1024, 1024] + end + # Add a white list of extensions which are allowed to be uploaded. + # For images you might use something like this: + def extension_white_list + %w(jpg jpeg gif png) + end + + # Override the filename of the uploaded files: + # Avoid using model.id or version_name here, see uploader/store.rb for details. + # def filename + # "something.jpg" if original_filename + # end + +end From 162781ac0496c0167996f43d93bbf1c1cc77ef20 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Wed, 21 Aug 2013 12:12:34 +0200 Subject: [PATCH 10/31] Bugfix in studien/verwalten --- app/controllers/studien_controller.rb | 8 +++++--- app/views/studien/verwalten.html.erb | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb index 22fae68..f94a440 100755 --- a/app/controllers/studien_controller.rb +++ b/app/controllers/studien_controller.rb @@ -161,9 +161,9 @@ class StudienController < ApplicationController end if !@new_params[:lec_verw].nil? @lecturers=[Lecturer.find(@new_params[:lec_verw])] - temp = @lecturers.map{|x| x.lva}.flatten.uniq #Force Force Lvas + temp = @lecturers.map{|x| x.lvas}.flatten.uniq #Force Force Lvas @lvas=@lvas.select{|k| temp.include?(k)} - temp = @lva.map{|x| x.moduls}.flatten.uniq #Force Force Lvas + temp = @lvas.map{|x| x.modul}.flatten.uniq #Force Force Lvas @module=@module.select{|k| temp.include?(k)} temp = @module.map{|x| x.modulgruppen}.flatten.uniq # Force Modulgruppen @modulgruppen = @modulgruppen.select{|k| temp.include?(k)} @@ -247,7 +247,9 @@ class StudienController < ApplicationController :mg_verw=> params[:mg_verw], :m_verw=>params[:m_verw], :lva_verw=>params[:lva_verw], - :b_verw=>params[:b_verw]}.merge(super) + :b_verw=>params[:b_verw], + :lec_verw=>params[:lec_verw]}.merge(super) + end end diff --git a/app/views/studien/verwalten.html.erb b/app/views/studien/verwalten.html.erb index af2b07e..4a22854 100644 --- a/app/views/studien/verwalten.html.erb +++ b/app/views/studien/verwalten.html.erb @@ -8,7 +8,7 @@

      Studien

      - <% @studien.each_slice((Studium.count/2.0).ceil) do |col| %> + <% @studien.each_slice([(Studium.count/2.0).ceil, 1].max) do |col| %>
      <% col.each do |s| %> @@ -38,7 +38,7 @@

      Vortragende

      - <% @lecturers.each_slice((Lecturer.count/3.0).ceil) do |col| %> + <% @lecturers.each_slice([(Lecturer.count/3.0).ceil, 1].max) do |col| %>
      <% col.each do |lec| %> <%= (lec.valid?) ? ' '.html_safe : ''.html_safe %> <%= link_to lec.name, lec %> | <%=link_to ''.html_safe+ 'edit', edit_lecturer_path(lec)%>
      From 414f740ac2ff14c9ee3b3cac79f13c434fdd3c16 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Wed, 21 Aug 2013 13:08:21 +0200 Subject: [PATCH 11/31] translations --- config/locales/studien.de.yml | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 config/locales/studien.de.yml diff --git a/config/locales/studien.de.yml b/config/locales/studien.de.yml new file mode 100644 index 0000000..538d33f --- /dev/null +++ b/config/locales/studien.de.yml @@ -0,0 +1,47 @@ +de: + studien: + studien: "Studien" + list: "Studien der Fakultät Elektrotechnik" + anzeigen: "Studium anzeigen" + new: "Neues Studium" + allestudien: "Alle Studien" + loeschen: "Dieses Studium löschen" + edit: "Studium bearbeiten" + verwaltung: + title: "Studien verwalten" + explanation: "
        +
      • Klick auf den Namen eines Objektes führt zu dessen Ansicht, ein Klick auf edit direkt zum Bearbeitungsformular
        • +
      • Per Dropdown-Menü kann nach einzelnen Objekten gefiltert werden. Die Filter können kombiniert werden, wobei nur erlaubte Kombinationen möglich sind. Solange validation-Fehler (im Log rot und fett) auftreten, keine Filter verwenden
        • +
      " + modul: + edit: "Modul bearbeiten" + list: "Alle Module" + add: "Neues Modul" + keine: + beschreibung: "Keine Beschreibung vorhanden" + lva: + add: "Lva hinzufügen" + list: "Alle Lvas" + semester: + ohne: "Ohne Semesterzuordnung" + modulgruppe: + typ: "Typ" + addmodul: "Neues Modul hinzufügen" + studium: "Studium" + new: "Neue Modulgruppe" + list: "Alle Modulgruppen auflisten" + show: + title: "Auflistung aller Modulgruppen" + link: "Modulgruppen auflisten" + filter: + studium: "Studium" + modulgruppe: "Modulgruppe" + modul: "Modul" + lva: "Lva" + beispiel: "Beispiel" + reset: "Alle Filter zurücksetzen" + verwalten: + fehler: + keine: "Keine Fehlermeldungen oder Warnungen" + lecturers: + lecturers: "Vortragende" \ No newline at end of file From ff4a14a35065f0840db31ed0490f98568bace314 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Wed, 21 Aug 2013 13:08:36 +0200 Subject: [PATCH 12/31] show changes --- app/views/lecturers/_lec_lva.html.erb | 1 + app/views/lvas/show.html.erb | 13 +++++++------ app/views/studien/index.html.erb | 9 ++++++--- app/views/studien/verwalten.html.erb | 4 ++-- 4 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 app/views/lecturers/_lec_lva.html.erb diff --git a/app/views/lecturers/_lec_lva.html.erb b/app/views/lecturers/_lec_lva.html.erb new file mode 100644 index 0000000..0cc48224 --- /dev/null +++ b/app/views/lecturers/_lec_lva.html.erb @@ -0,0 +1 @@ +

      <%= lec_lva.name %>

      diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb index a294a2e..99bc1ff 100755 --- a/app/views/lvas/show.html.erb +++ b/app/views/lvas/show.html.erb @@ -18,12 +18,6 @@

      Beispiele

      -

      Beschreibung

      - <%= @lva.desc %> - -<%= link_to "Beispiel neu" , new_beispiel_path(:lva_id=>@lva.id) %> -

      -

      Beispiele

        <% @lva.beispiele.each do |b|%> @@ -53,6 +47,13 @@ <% end %>
      +
      +

      <%= I18n.t "lecturers.lecturers" %>

      + <% @lva.lecturers.each do |lec| %> + <%= render :partial=>'lecturers/lec_lva', :object=>lec %> + + <% end %> +
      diff --git a/app/views/studien/index.html.erb b/app/views/studien/index.html.erb index 0d58a99..23459f3 100755 --- a/app/views/studien/index.html.erb +++ b/app/views/studien/index.html.erb @@ -4,12 +4,15 @@

      <%= I18n.t("studien.list") %>

      - <% @studien.sort_by{|z| z[:zahl]}.each do |studium| %> -
      + <% @studien.each_slice(2) do |row| %> +
      + <% row.each do |studium|%> +
      <%= render studium%>
      <% end %> - +
      + <%end%>
      diff --git a/app/views/studien/verwalten.html.erb b/app/views/studien/verwalten.html.erb index 4a22854..dd56b33 100644 --- a/app/views/studien/verwalten.html.erb +++ b/app/views/studien/verwalten.html.erb @@ -5,7 +5,7 @@

      <%= I18n.t("studien.verwaltung.title") %>

      <%= I18n.t("studien.verwaltung.explanation").html_safe %> -

      Studien

      +

      <%= I18n.t "studien.studien"%>

      <% @studien.each_slice([(Studium.count/2.0).ceil, 1].max) do |col| %> @@ -166,7 +166,7 @@
      - <% @messages.flatten.each do |m| %> + <% @messages.flatten.compact.each do |m| %> <% if !m.strip.empty? %>
    • <%= m.html_safe %>
      • <% end %> From 04b91b9f33dfa06c6c6d36eac0ae7c66809d5f02 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Wed, 21 Aug 2013 13:48:49 +0200 Subject: [PATCH 13/31] Lecturer in Lva eingebunden, Image thumb integriert --- app/models/lecturer.rb | 4 +- app/views/calendars/index.html.erb | 40 +++++++++---------- app/views/lecturers/_form.html.erb | 24 +++++++++-- app/views/lecturers/_lec_lva.html.erb | 12 +++++- app/views/lvas/show.html.erb | 16 ++++---- .../20130821113333_add_link_to_lecturers.rb | 5 +++ 6 files changed, 68 insertions(+), 33 deletions(-) create mode 100644 db/migrate/20130821113333_add_link_to_lecturers.rb diff --git a/app/models/lecturer.rb b/app/models/lecturer.rb index 773e2de..664e612 100644 --- a/app/models/lecturer.rb +++ b/app/models/lecturer.rb @@ -1,4 +1,6 @@ class Lecturer < ActiveRecord::Base - attr_accessible :email, :name, :oid, :picture, :lva_ids + attr_accessible :email, :name, :oid, :picture, :remove_picture, :picture_cache, :lva_ids, :link has_and_belongs_to_many :lvas + mount_uploader :picture, PictureUploader + resourcify end diff --git a/app/views/calendars/index.html.erb b/app/views/calendars/index.html.erb index ad394cb..fd90c6c 100644 --- a/app/views/calendars/index.html.erb +++ b/app/views/calendars/index.html.erb @@ -1,28 +1,28 @@
      -
      -
      -<%= render 'tabs' %> -
      -
      +
      +
      + <%= render 'tabs' %> +
      +
      -
      -
      -

      <%= I18n.t 'calendars.calendar' %>

      -<% @calendars.each do |calendar| %> -
      +
      +
      +

      <%= I18n.t 'calendars.calendar' %>

      + <% @calendars.each do |calendar| %> +
      - +
      -

      <%= link_to calendar.name, calendar %>

      +

      <%= link_to calendar.name, calendar %>

      +
      + <% end %>
      -<% end %> -
      -
      -
      -
      -<%= link_to 'New Calendar', new_calendar_path unless cannot?(:new, Calendar) %> -
      -
      +
      +
      +
      + <%= link_to 'New Calendar', new_calendar_path unless cannot?(:new, Calendar) %> +
      +
      diff --git a/app/views/lecturers/_form.html.erb b/app/views/lecturers/_form.html.erb index d9f1416..5dbf669 100644 --- a/app/views/lecturers/_form.html.erb +++ b/app/views/lecturers/_form.html.erb @@ -1,10 +1,28 @@ <%= semantic_form_for @lecturer do |f| %> <%= f.inputs do %> +
      +
      <%= f.input :name %> <%= f.input :email %> - <%= f.input :oid %> - <%= f.input :picture, :as=>:file %> - <%= f.input :lvas %> + <%= f.input :link %> +
      +
      +

      + + <%= image_tag(@lecturer.picture.thumb.url) unless @lecturer.picture.nil? %> + <%= f.file_field :picture %> + <%= f.hidden_field :picture_cache %> +

      +

      + +

      +
      +
      + <%= f.input :lvas, :as=>:check_boxes%> +
      <% end %> <%= f.actions do %> diff --git a/app/views/lecturers/_lec_lva.html.erb b/app/views/lecturers/_lec_lva.html.erb index 0cc48224..21a9536 100644 --- a/app/views/lecturers/_lec_lva.html.erb +++ b/app/views/lecturers/_lec_lva.html.erb @@ -1 +1,11 @@ -

      <%= lec_lva.name %>

      +
      + + + +
      +

      <%= link_to lec_lva.name, lec_lva %>

      + Email: <%= mail_to lec_lva.email %>
      + TISS: <%= link_to lec_lva.name, lec_lva.link %> +
      +
      + diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb index 99bc1ff..7aa4d24 100755 --- a/app/views/lvas/show.html.erb +++ b/app/views/lvas/show.html.erb @@ -18,11 +18,11 @@

      Beispiele

      -
        - <% @lva.beispiele.each do |b|%> +
          + <% @lva.beispiele.each do |b|%> <%= render b%> - <% end %> + <% end %>
      @@ -48,12 +48,12 @@
    -

    <%= I18n.t "lecturers.lecturers" %>

    - <% @lva.lecturers.each do |lec| %> - <%= render :partial=>'lecturers/lec_lva', :object=>lec %> +

    <%= I18n.t "lecturers.lecturers" %>

    + <% @lva.lecturers.each do |lec| %> + <%= render :partial=>'lecturers/lec_lva', :object=>lec %> - <% end %> -
    + <% end %> +
    diff --git a/db/migrate/20130821113333_add_link_to_lecturers.rb b/db/migrate/20130821113333_add_link_to_lecturers.rb new file mode 100644 index 0000000..f376657 --- /dev/null +++ b/db/migrate/20130821113333_add_link_to_lecturers.rb @@ -0,0 +1,5 @@ +class AddLinkToLecturers < ActiveRecord::Migration + def change + add_column :lecturers, :link, :string + end +end From 24d21df84b60e644e59127073f12eb95d8560560 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Wed, 21 Aug 2013 14:11:53 +0200 Subject: [PATCH 14/31] minor changes --- app/controllers/lvas_controller.rb | 1 + app/models/ability.rb | 3 ++- config/locales/de.yml | 43 ------------------------------ 3 files changed, 3 insertions(+), 44 deletions(-) diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb index d2ee71f..7a2667c 100755 --- a/app/controllers/lvas_controller.rb +++ b/app/controllers/lvas_controller.rb @@ -16,6 +16,7 @@ class LvasController < ApplicationController @toolbar_elements<<{:hicon=>'icon-plus-sign', :icon=>:plus, :text => "Neues Beispiel", :path=> new_beispiel_path(:lva_id =>@lva.id)} @toolbar_elements<<{:hicon=>'icon-pencil', :icon=>:pencil,:text =>I18n.t('common.edit'),:path => edit_lva_path(@lva)} + @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('common.delete'), :path=> lva_path(@lva), :method=>:delete, :confirm=>"Sure?"} end # GET /lvas/new diff --git a/app/models/ability.rb b/app/models/ability.rb index 293df62..dd9aefd 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- class Ability include CanCan::Ability def initialize(user) @@ -27,7 +28,7 @@ class Ability # For Debug allow everything # Remove this line in production environment and for testing user management - # can :manage, :all + can :manage, :all can :addfetuser, User can :addfetadmin, User can [:show, :index], Studium diff --git a/config/locales/de.yml b/config/locales/de.yml index e6e8ed7..8ebc3cf 100755 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -7,39 +7,6 @@ de: edit: "Bearbeiten" actions: "Aktionen" delete: "Löschen" - studien: - list: "Studien der Fakultät Elektrotechnik" - anzeigen: "Studium anzeigen" - new: "Neues Studium" - allestudien: "Alle Studien" - loeschen: "Dieses Studium löschen" - edit: "Studium bearbeiten" - verwaltung: - title: "Studien verwalten" - explanation: "
      -
    • Klick auf den Namen eines Objektes führt zu dessen Ansicht, ein Klick auf edit direkt zum Bearbeitungsformular
      • -
    • Per Dropdown-Menü kann nach einzelnen Objekten gefiltert werden. Die Filter können kombiniert werden, wobei nur erlaubte Kombinationen möglich sind. Solange validation-Fehler (im Log rot und fett) auftreten, keine Filter verwenden
      • -
    " - modul: - edit: "Modul bearbeiten" - list: "Alle Module" - add: "Neues Modul" - keine: - beschreibung: "Keine Beschreibung vorhanden" - lva: - add: "Lva hinzufügen" - list: "Alle Lvas" - semester: - ohne: "Ohne Semesterzuordnung" - modulgruppe: - typ: "Typ" - addmodul: "Neues Modul hinzufügen" - studium: "Studium" - new: "Neue Modulgruppe" - list: "Alle Modulgruppen auflisten" - show: - title: "Auflistung aller Modulgruppen" - link: "Modulgruppen auflisten" home: mtitle: "Menu" @@ -111,16 +78,6 @@ de: attributes: modulgruppen: blank: "Wählen Sie zumindest eine Modulgruppe aus" - filter: - studium: "Studium" - modulgruppe: "Modulgruppe" - modul: "Modul" - lva: "Lva" - beispiel: "Beispiel" - reset: "Alle Filter zurücksetzen" - verwalten: - fehler: - keine: "Keine Fehlermeldungen oder Warnungen" support: array: two_words_connector: ', ' From c2647a1d084afd0e8c6039281d013feddf87a68b Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Wed, 21 Aug 2013 18:27:47 +0200 Subject: [PATCH 15/31] broken gallery --- Gemfile | 2 ++ Gemfile.lock | 3 ++ app/assets/javascripts/application.js | 5 ++- app/assets/stylesheets/application.css.scss | 4 +++ app/views/galleries/show.html.erb | 38 +++++++++++++++++++-- app/views/layouts/application.html.erb | 7 +++- 6 files changed, 55 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 98dc781..36a96f3 100755 --- a/Gemfile +++ b/Gemfile @@ -78,3 +78,5 @@ end gem "simple_calendar", "~> 0.1.9" gem 'rmagick' + +gem 'bootstrap-addons-rails' diff --git a/Gemfile.lock b/Gemfile.lock index ff6d52b..9fba644 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,6 +35,8 @@ GEM activerecord (>= 3.0.0) bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-x86-mingw32) + bootstrap-addons-rails (0.1.2) + rails bootstrap-sass (2.3.2.1) sass (~> 3.2) builder (3.0.4) @@ -179,6 +181,7 @@ PLATFORMS DEPENDENCIES annotate (>= 2.5.0) awesome_nested_set + bootstrap-addons-rails bootstrap-sass (~> 2.3.2.1) cancan carrierwave diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 68c0b94..f880db0 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,4 +16,7 @@ //= require_tree . //= require tinymce-jquery //= require bootstrap - +//= require bootstrap/colorpicker +//= require bootstrap/datepicker +//= require bootstrap/load-image.min +//= require bootstrap/image-gallery.min diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index bd9a219..b127f38 100755 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -11,10 +11,14 @@ *= require_self *= require_tree . * require 'bootstrap' + */ $linkColor: #03006E; @import 'bootstrap'; @import 'bootstrap-responsive'; +@import 'bootstrap/image-gallery'; + + h1 {font-size: 23px} h2 diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb index 392008b..a19e755 100644 --- a/app/views/galleries/show.html.erb +++ b/app/views/galleries/show.html.erb @@ -14,14 +14,48 @@ Datum: <%= @gallery.datum %>

    + + + + + + + + <%= link_to 'NewFoto' , new_gallery_foto_path(@gallery) %> | <%= link_to 'Edit', edit_gallery_path(@gallery) %> | <%= link_to 'Back', galleries_path %> + + + + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 81c8440..774d3c9 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,9 +5,14 @@ Fetsite <%= stylesheet_link_tag "application", :media => "all" %> - + + + + + <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> +
    From a4538fa61a95f2319ec5ab0fea9a3966dcfe2431 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Wed, 21 Aug 2013 19:04:26 +0200 Subject: [PATCH 16/31] Fetprofile, Gremien etc bearbeitet --- app/controllers/memberships_controller.rb | 33 +++----------- app/models/fetprofile.rb | 6 +++ app/models/gremium.rb | 1 + app/models/membership.rb | 2 + app/uploaders/picture_uploader.rb | 3 ++ app/views/fetprofiles/_form.html.erb | 40 +++++++++++++---- app/views/fetprofiles/index.html.erb | 4 +- app/views/fetprofiles/show.html.erb | 45 +++++++++----------- app/views/home/links_notimplemented.html.erb | 1 + app/views/memberships/_form.html.erb | 5 +-- config/routes.rb | 6 ++- 11 files changed, 79 insertions(+), 67 deletions(-) diff --git a/app/controllers/memberships_controller.rb b/app/controllers/memberships_controller.rb index fa9c90c..ae0383f 100644 --- a/app/controllers/memberships_controller.rb +++ b/app/controllers/memberships_controller.rb @@ -1,31 +1,9 @@ class MembershipsController < ApplicationController - # GET /memberships - # GET /memberships.json - def index - @memberships = Membership.all - - respond_to do |format| - format.html # index.html.erb - format.json { render json: @memberships } - end - end - - # GET /memberships/1 - # GET /memberships/1.json - def show - @membership = Membership.find(params[:id]) - - respond_to do |format| - format.html # show.html.erb - format.json { render json: @membership } - end - end - # GET /memberships/new # GET /memberships/new.json def new @membership = Membership.new - + @membership.fetprofile=Fetprofile.find(params[:fetprofile_id]) respond_to do |format| format.html # new.html.erb format.json { render json: @membership } @@ -44,8 +22,8 @@ class MembershipsController < ApplicationController respond_to do |format| if @membership.save - format.html { redirect_to @membership, notice: 'Membership was successfully created.' } - format.json { render json: @membership, status: :created, location: @membership } + format.html { redirect_to @membership.fetprofile, notice: 'Membership was successfully created.' } + format.json { render json: @membership.fetprofile, status: :created, location: @membership.fetprofile } else format.html { render action: "new" } format.json { render json: @membership.errors, status: :unprocessable_entity } @@ -60,7 +38,7 @@ class MembershipsController < ApplicationController respond_to do |format| if @membership.update_attributes(params[:membership]) - format.html { redirect_to @membership, notice: 'Membership was successfully updated.' } + format.html { redirect_to @membership.fetprofile, notice: 'Membership was successfully updated.' } format.json { head :no_content } else format.html { render action: "edit" } @@ -73,10 +51,11 @@ class MembershipsController < ApplicationController # DELETE /memberships/1.json def destroy @membership = Membership.find(params[:id]) + fp = @membership.fetprofile @membership.destroy respond_to do |format| - format.html { redirect_to memberships_url } + format.html { redirect_to fp } format.json { head :no_content } end end diff --git a/app/models/fetprofile.rb b/app/models/fetprofile.rb index 34ae476..ca5eb35 100644 --- a/app/models/fetprofile.rb +++ b/app/models/fetprofile.rb @@ -1,3 +1,9 @@ class Fetprofile < ActiveRecord::Base attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname + has_many :memberships + has_many :gremien, :through=> :membership + mount_uploader :picture, PictureUploader + def name + [vorname, nachname, "(",short,")"].join(" ") + end end diff --git a/app/models/gremium.rb b/app/models/gremium.rb index 3c0bfae..ef6710f 100644 --- a/app/models/gremium.rb +++ b/app/models/gremium.rb @@ -1,3 +1,4 @@ class Gremium < ActiveRecord::Base attr_accessible :desc, :name, :typ + has_many :memberships end diff --git a/app/models/membership.rb b/app/models/membership.rb index 701d603..a1c876e 100644 --- a/app/models/membership.rb +++ b/app/models/membership.rb @@ -1,3 +1,5 @@ class Membership < ActiveRecord::Base attr_accessible :fetprofile_id, :gremium_id, :start, :stop, :typ + belongs_to :fetprofile + belongs_to :gremium end diff --git a/app/uploaders/picture_uploader.rb b/app/uploaders/picture_uploader.rb index ec0f27a..58d233a 100644 --- a/app/uploaders/picture_uploader.rb +++ b/app/uploaders/picture_uploader.rb @@ -36,6 +36,9 @@ class PictureUploader < CarrierWave::Uploader::Base process :resize_to_fill => [64, 64] end + version :portrait do + process :resize_to_fill => [128,192] + end # Add a white list of extensions which are allowed to be uploaded. # For images you might use something like this: def extension_white_list diff --git a/app/views/fetprofiles/_form.html.erb b/app/views/fetprofiles/_form.html.erb index 016e4cf..4205b13 100644 --- a/app/views/fetprofiles/_form.html.erb +++ b/app/views/fetprofiles/_form.html.erb @@ -1,15 +1,39 @@ +
    + <%= semantic_form_for @fetprofile do |f| %> <%= f.inputs do %> - <%= f.input :vorname %> - <%= f.input :nachname %> - <%= f.input :short %> - <%= f.input :fetmailalias %> - <%= f.input :desc %> - <%= f.input :picture %> - <%= f.input :active %> +
    +
    + <%= f.input :vorname %>
    +
    <%= f.input :nachname %>
    +
    <%= f.input :short %> +
    +
    +
    + <%= f.input :desc %>
    +
    +
    +
    <%= f.input :active %>
    +
    <%= f.input :picture, :as=>:file %>
    +
    <%= f.input :fetmailalias %>
    +
    + <% @fetprofile.memberships.each do |m| %> + <%= semantic_fields_for m do |mf| %> +
    +
    +
    <%= mf.input :start, :as=>:date %>
    +
    <%= mf.input :stop %>
    +
    <%= mf. input :gremium %>
    +
    <%= mf.input :typ ,:as=>:radio, :collection=>{"mitglied"=>1, "ersatzmitglied"=>2} %>
    + +
    <% end %> - +<% end +end %> +
    +
    <%= f.actions do %> <%= f.action :submit, :as => :input %> <% end %> <% end %> +
    diff --git a/app/views/fetprofiles/index.html.erb b/app/views/fetprofiles/index.html.erb index 133fc40..3f5ce2f 100644 --- a/app/views/fetprofiles/index.html.erb +++ b/app/views/fetprofiles/index.html.erb @@ -7,7 +7,7 @@ Short Fetmailalias Desc - Picture + Active @@ -21,7 +21,7 @@ <%= fetprofile.short %> <%= fetprofile.fetmailalias %> <%= fetprofile.desc %> - <%= fetprofile.picture %> + <%= fetprofile.active %> <%= link_to 'Show', fetprofile %> <%= link_to 'Edit', edit_fetprofile_path(fetprofile) %> diff --git a/app/views/fetprofiles/show.html.erb b/app/views/fetprofiles/show.html.erb index c11f77e..7c964a6 100644 --- a/app/views/fetprofiles/show.html.erb +++ b/app/views/fetprofiles/show.html.erb @@ -1,40 +1,35 @@

    <%= notice %>

    +
    +
    +
    + <%= image_tag @fetprofile.picture.portrait.url %> +
    +
    +

    <%= @fetprofile.name %>

    - Vorname: - <%= @fetprofile.vorname %> -

    - -

    - Nachname: - <%= @fetprofile.nachname %> -

    - -

    - Short: - <%= @fetprofile.short %> -

    - -

    - Fetmailalias: <%= @fetprofile.fetmailalias %>

    -

    - Desc: <%= @fetprofile.desc %>

    -

    - Picture: - <%= @fetprofile.picture %> + <%= "Aktiv".html_safe if @fetprofile.active %>

    -

    - Active: - <%= @fetprofile.active %> -

    +
    +
    +
    +
    +<% @fetprofile.memberships.each do |m| %> +<%= m.start.to_s %> +<%= m.gremium.try(:name).to_s %> +<%= link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) %> +<% end %> +<%= link_to 'Edit', new_fetprofile_membership_path(@fetprofile) %> | <%= link_to 'Edit', edit_fetprofile_path(@fetprofile) %> | <%= link_to 'Back', fetprofiles_path %> +
    +
    diff --git a/app/views/home/links_notimplemented.html.erb b/app/views/home/links_notimplemented.html.erb index f9622d5..72a8f21 100644 --- a/app/views/home/links_notimplemented.html.erb +++ b/app/views/home/links_notimplemented.html.erb @@ -3,5 +3,6 @@ Vorhandene Resourcen
  • <%= link_to "galleries", galleries_path %>
  • <%= link_to "fotos", fotos_path %>
  • <%= link_to "gremien", gremien_path %>
    • +
  • <%= link_to "fetprofiles", fetprofiles_path %>
  • <%= link_to "memberships", memberships_path %>
    • diff --git a/app/views/memberships/_form.html.erb b/app/views/memberships/_form.html.erb index 15bbe9a..d964a24 100644 --- a/app/views/memberships/_form.html.erb +++ b/app/views/memberships/_form.html.erb @@ -1,10 +1,9 @@ <%= semantic_form_for @membership do |f| %> <%= f.inputs do %> - <%= f.input :fetprofile_id %> - <%= f.input :gremium_id %> + <%= f.input :gremium, :as=>:radio %> <%= f.input :start %> <%= f.input :stop %> - <%= f.input :typ %> + <%= f.input :typ ,:as=>:radio, :collection=>{"mitglied"=>1, "ersatzmitglied"=>2} %> <% end %> <%= f.actions do %> diff --git a/config/routes.rb b/config/routes.rb index 16e35ef..bd638f7 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -40,9 +40,11 @@ resources :galleries do resources :fotos, :only=>[:new,:show] end - resources :memberships + resources :memberships, :except=>[:new, :show, :edit] resources :gremien - resources :fetprofiles + resources :fetprofiles do + resources :memberships, :only=>[:new, :show, :edit] + end resources :lecturers resources :semesters resources :moduls From 091198198766b66d069e091e6ac094da55538708 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Wed, 21 Aug 2013 21:22:03 +0200 Subject: [PATCH 17/31] fix gallery --- app/views/galleries/show.html.erb | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb index a19e755..7b9e440 100644 --- a/app/views/galleries/show.html.erb +++ b/app/views/galleries/show.html.erb @@ -14,15 +14,6 @@ Datum: <%= @gallery.datum %>

    - - - - - +
    +
    -<% @fetprofile.memberships.each do |m| %> -<%= m.start.to_s %> -<%= m.gremium.try(:name).to_s %> -<%= link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) %> -<% end %> +
      + <% @fetprofile.memberships.each do |m| %> +
    • <%= m.start.to_s %> bis <%= m.stop.to_s %> in <%= m.gremium.try(:name).to_s %> + <%= link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) %> +
      • + <% end %> +
    -<%= link_to 'Edit', new_fetprofile_membership_path(@fetprofile) %> | + +<%= link_to 'Neue Mitgliedschaft', new_fetprofile_membership_path(@fetprofile) %> | <%= link_to 'Edit', edit_fetprofile_path(@fetprofile) %> | <%= link_to 'Back', fetprofiles_path %> From cbe536a56b6f76d57b9f9224d41a3f57584e783a Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Thu, 22 Aug 2013 13:49:11 +0200 Subject: [PATCH 24/31] bugfix multiple lines --- app/controllers/fotos_controller.rb | 2 +- app/models/foto.rb | 2 +- app/views/fotos/_form_bulk.html.erb | 155 ++++++++++++++-------------- 3 files changed, 80 insertions(+), 79 deletions(-) diff --git a/app/controllers/fotos_controller.rb b/app/controllers/fotos_controller.rb index 168e32e..af920da 100644 --- a/app/controllers/fotos_controller.rb +++ b/app/controllers/fotos_controller.rb @@ -46,7 +46,7 @@ class FotosController < ApplicationController @foto.gallery_id = (params[:gallery_id]) @gallery = @foto.gallery respond_to do |format| - @foto.title = @foto.datei + @foto.title = @foto.datei.filename if @foto.save format.html { render :json => [@foto.to_jq_upload].to_json, diff --git a/app/models/foto.rb b/app/models/foto.rb index 022d0fe..bcd6a2b 100644 --- a/app/models/foto.rb +++ b/app/models/foto.rb @@ -8,7 +8,7 @@ class Foto < ActiveRecord::Base "id" => read_attribute(:id), "title" => read_attribute(:title), "description" => read_attribute(:desc), - "name" => read_attribute(:datei), + "name" => read_attribute(:title), "size" => datei.size, "url" => datei.url, "thumbnail_url" => datei.thumb.url, diff --git a/app/views/fotos/_form_bulk.html.erb b/app/views/fotos/_form_bulk.html.erb index 6c2d0a1..283bfa3 100644 --- a/app/views/fotos/_form_bulk.html.erb +++ b/app/views/fotos/_form_bulk.html.erb @@ -1,43 +1,43 @@

    Upload file

    <%= semantic_form_for [@gallery, @foto], :remote=>true, :html => { :multipart => true, :id => "fileupload" } do |f| %> - -
    -
    - - - - Add files... - <%= f.file_field :datei, :multiple=>true%> - <%= f.input :gallery %> - - - - - -
    -
    - -
    -
    -
    + +
    +
    + + + + Add files... + <%= f.file_field :datei, :multiple=>true%> + <%= f.input :gallery %> + + + + + +
    +
    + +
    +
    - -
    -
    - - -
    +
    + +
    +
    + + +
    <% end %>
    @@ -86,53 +86,54 @@ + + + From 12b453fdc8d93fd95f6eaf9d291e940407a056f4 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Thu, 22 Aug 2013 19:00:39 +0200 Subject: [PATCH 29/31] gallery now default on fullscreen --- app/views/galleries/show.html.erb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb index 8b38415..95849b0 100644 --- a/app/views/galleries/show.html.erb +++ b/app/views/galleries/show.html.erb @@ -16,7 +16,7 @@ <%= @gallery.datum %>

    -