Corrections in admin interface

vbosquet · Mar 31, 2016 · 48d6287 · 48d6287
1 parent 01488a3
commit 48d6287
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 42 deletions.
diff --git a/app/dashboards/postulation_dashboard.rb b/app/dashboards/postulation_dashboard.rb
@@ -9,7 +9,8 @@ class PostulationDashboard < Administrate::BaseDashboard
   # on pages throughout the dashboard.
   ATTRIBUTE_TYPES = {
       id: Field::Number,
-      teacher: Field::BelongsTo,
+      user: Field::BelongsTo.with_options(class_name: "Teacher"),
+      teacher: Field::BelongsTo.with_options(class_name: "Teacher"),
       interview_ok: Field::Boolean,
       avatar_ok: Field::Boolean,
       gen_informations_ok: Field::Boolean,
@@ -27,7 +28,6 @@ class PostulationDashboard < Administrate::BaseDashboard
   COLLECTION_ATTRIBUTES = [
       :teacher,
       :id,
-      :user_id,
       :interview_ok,
       :avatar_ok,
       :gen_informations_ok,
@@ -37,13 +37,13 @@ class PostulationDashboard < Administrate::BaseDashboard
   # SHOW_PAGE_ATTRIBUTES
   # an array of attributes that will be displayed on the model's show page.
   SHOW_PAGE_ATTRIBUTES = [
-      :teacher,
+      :user,
       :id,
+      :teacher,
       :interview_ok,
       :avatar_ok,
       :gen_informations_ok,
       :advert_ok,
-      :user_id,
       :created_at,
       :updated_at,
   ]
@@ -52,12 +52,11 @@ class PostulationDashboard < Administrate::BaseDashboard
   # an array of attributes that will be displayed
   # on the model's form (`new` and `edit`) pages.
   FORM_ATTRIBUTES = [
-      :teacher,
+      :user,
       :interview_ok,
       :avatar_ok,
       :gen_informations_ok,
       :advert_ok,
-      :user_id,
   ]
 
   # Overwrite this method to customize how postulations are displayed

diff --git a/app/dashboards/student_dashboard.rb b/app/dashboards/student_dashboard.rb
@@ -157,10 +157,6 @@ class StudentDashboard < Administrate::BaseDashboard
       :unlock_token,
       :locked_at,
       :admin,
-      :avatar_file_name,
-      :avatar_content_type,
-      :avatar_file_size,
-      :avatar_updated_at,
   ]
 
   # Overwrite this method to customize how students are displayed

diff --git a/app/dashboards/teacher_dashboard.rb b/app/dashboards/teacher_dashboard.rb
@@ -165,10 +165,6 @@ class TeacherDashboard < Administrate::BaseDashboard
       :unlock_token,
       :locked_at,
       :admin,
-      :avatar_file_name,
-      :avatar_content_type,
-      :avatar_file_size,
-      :avatar_updated_at,
   ]
 
   # Overwrite this method to customize how teachers are displayed

diff --git a/app/dashboards/user_dashboard.rb b/app/dashboards/user_dashboard.rb
@@ -157,10 +157,6 @@ class UserDashboard < Administrate::BaseDashboard
       :unlock_token,
       :locked_at,
       :admin,
-      :avatar_file_name,
-      :avatar_content_type,
-      :avatar_file_size,
-      :avatar_updated_at,
   ]
 
   # Overwrite this method to customize how users are displayed

diff --git a/app/models/postulation.rb b/app/models/postulation.rb
@@ -1,4 +1,4 @@
 class Postulation < ActiveRecord::Base
 
-  belongs_to :teacher
+  belongs_to :teacher, :foreign_key => :user_id, class_name: 'Teacher'
 end
diff --git a/app/models/teacher.rb b/app/models/teacher.rb
@@ -4,6 +4,8 @@ class Teacher  < Student
   has_one :postulation, foreign_key:  "user_id"
   has_many :degrees, foreign_key:  "user_id"
   acts_as_reader
+  after_create :create_gallery, :create_postulation
+
   def self.reader_scope
     where(:is_admin => true)
   end
@@ -29,5 +31,8 @@ def accept_postulance
   def is_prof
     self.postulance_accepted?
   end
-
+  # Méthode permettant de créer une postulation
+  def create_postulation
+    Postulation.create(:user_id => self.id)
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -31,8 +31,8 @@ class User < ActiveRecord::Base
   has_one :gallery
   has_many :adverts
 
-  # on crée une postulation et une gallery après avoir créé le user
-  after_create :create_gallery, :create_postulation
+  # on crée une gallery après avoir créé le user
+  after_create :create_gallery
 
   has_many :sent_comment, :class_name => 'Comment', :foreign_key => 'sender_id'
   has_many :received_comment, :class_name => 'Comment', :foreign_key => 'subject_id'
@@ -56,11 +56,6 @@ def create_gallery
     Gallery.create(:user_id => self.id)
   end
 
-  # Méthode permettant de créer une postulation
-  def create_postulation
-    Postulation.create(:user_id => self.id)
-  end
-
   # Méthode liée au crop de l'avatar, elle permet de savoir si une modification a été faite
   def cropping?
     !crop_x.blank? && !crop_y.blank? && !crop_w.blank? && !crop_h.blank?

diff --git a/app/views/fields/mailboxer_conversation_field/show.html.erb b/app/views/fields/mailboxer_conversation_field/show.html.erb
@@ -33,11 +33,11 @@
   <% end %>
 </table>
 <hr style="border-width: 6px;">
-<table style="width: 68%; table-layout: fixed;">
+<table style="width: auto; table-layout: fixed;">
   <% @conversation.messages.each do |message| %>
       <% if message.sender.id == @first %>
           <tr>
-            <td style="background-color: darkgray;">
+            <td style="background-color: darkgray;width: 25%;">
               <%= image_tag(message.sender.avatar.url(:small), :style => "  background-color: white;
   border: 1px solid #d9d9d9;
   border-radius: 25px;
@@ -47,30 +47,28 @@
   width: 50px;
   overflow: hidden;
   text-align: center;
-  img { width: 100% }") %><br> <i><%= message.sender.email %></i>
-            </td>
-            <td>
-            <p style="    padding: 0.5rem;
+  img { width: 100% }") %><small style="    padding: 0.5rem;
                 overflow: hidden;
-                display: flex;    word-break: break-all;white-space: pre-wrap;">
+                display: flex;    word-break: break-all;white-space: pre-wrap;"><%= message.sender.email %></small>
+            </td>
+            <td style=" width: 50%;
+                  word-break: break-all;white-space: inherit;">
               <%= message.body %>
               <time datetime="<%= message.created_at %>" title="<%= message.created_at.strftime("%d %b  %Y at %I:%M%p") %>">
               </time>
-            </p></td>
+           </td>
             <td></td>
           </tr>
       <% else %>
           <tr>
             <td></td>
-            <td>
-              <p style="    padding: 0.5rem;
-                  overflow: hidden;
-                  display: flex;    word-break: break-all;white-space: pre-wrap;">
+            <td style=" width: 50%;
+                word-break: break-all;white-space: inherit;">
                 <%= message.body %>
                 <time datetime="<%= message.created_at %>" title="<%= message.created_at.strftime("%d %b  %Y at %I:%M%p") %>">
                 </time>
-              </p></td>
-            <td style="background-color: darkslategrey;">
+             </td>
+            <td style="background-color: darkslategrey;width: 25%;">
               <%= image_tag(message.sender.avatar.url(:small), :style => "  background-color: white;
   border: 1px solid #d9d9d9;
   border-radius: 25px;
@@ -80,7 +78,9 @@
   width: 50px;
   overflow: hidden;
   text-align: center;
-  img { width: 100% }") %><br> <i><%= message.sender.email %></i></td>
+  img { width: 100% }") %><small style="    padding: 0.5rem;
+                overflow: hidden;
+                display: flex;    word-break: break-all;white-space: pre-wrap;"><%= message.sender.email %></small></td>
           </tr>
       <% end %>
   <% end %>