commit 0037553141938d69dfd95e282af42c7821144f03
Author: Kushnir Andrei 
Date:   Sat Sep 6 23:23:38 2008 +0300

    new feature: Meetings

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index c6fc766..a0cea38 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -96,6 +96,10 @@ protected
   def is_editor?
     logged_in? && current_user.user_status >= User::STATUS::EDITOR
   end
+  
+  def is_obj_owner? obj
+    logged_in? && (obj.user_id == current_user.id)
+  end
 
   def msg_private_network_on?
     current_user.char.msg_private_network_only == true 
diff --git a/app/controllers/meetings_controller.rb b/app/controllers/meetings_controller.rb
new file mode 100644
index 0000000..a033fba
--- /dev/null
+++ b/app/controllers/meetings_controller.rb
@@ -0,0 +1,241 @@
+class MeetingsController < ApplicationController
+  before_filter :login_required, :except => [:index]
+  helper :calendar
+  # GET /meetings
+  # GET /meetings.xml
+  def index
+    @title = "Встречи - Все записи"
+    @pages, @meetings = paginate :meetings,
+      :order => 'start_at desc', :per_page => 10
+
+    @right_part = :meetings_calendar
+    prepare_comment_count(@meetings, Comment::WHERE::MEETING)
+    
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @meetings }
+    end
+  end
+  
+  def my_meetings
+    @right_part = :meetings_calendar
+    @title = "Мои Встречи"
+    @pages, @meetings = paginate :meetings,
+      :conditions => 'user_id=' + current_user.id.to_s,
+      :order => 'start_at desc', :per_page => 10
+    prepare_comment_count(@meetings, Comment::WHERE::MEETING)
+  end
+
+  # GET /meetings/1
+  # GET /meetings/1.xml
+  def show
+    @right_part = :meetings_calendar
+    @meeting = Meeting.find(params[:id])
+    @current_participant = Participant.find :first, :conditions => ['user_id = ? and meeting_id = ?', current_user.id, @meeting.id]
+    @participants = @meeting.participants.find :all, :order => 'created_at asc' 
+    #@participants = Participant.find(:all, :conditions => 'meeting_id=' + @meeting.id.to_s, :order => 'start_at asc')
+    paginate_comments @meeting, Comment::WHERE::MEETING
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @meeting }
+    end
+  end
+  
+  def journal
+    redirect_to meetings_path
+  end
+  
+  # GET /meetings/new
+  # GET /meetings/new.xml
+  def new
+    @meeting = Meeting.new
+    @meeting_page == "event_info"
+    @title = "Новая встреча"
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render :xml => @meeting }
+    end
+  end
+
+  # GET /meetings/1/edit
+  def edit
+    @meeting = Meeting.find(params[:id])
+    @title = "Редактировать мероприятие: "+ @meeting.name.to_s
+    @meeting_page = "edit_info"
+  end
+
+  # POST /meetings
+  # POST /meetings.xml
+  def create
+    @meeting = Meeting.new(params[:meeting])
+    @meeting.user_id = current_user.id
+    respond_to do |format|
+      if @meeting.save
+        @participant = Participant.new( :user_id => current_user.id)
+        @participant.status = Participant::PLAN::YES
+        @participant.join_meeting @meeting
+        flash[:notice] = 'Информация о Вашей встрече была сохранена.'
+        format.html { redirect_to(meeting_path(:id => @meeting)) }
+        format.xml  { render :xml => @meeting, :status => :created, :location => @meeting }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @meeting.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /meetings/1
+  # PUT /meetings/1.xml
+  def update
+    @meeting = Meeting.find(params[:id])
+#   @meeting.user_id == current_user.id || is_moderator?
+    if is_obj_owner? @meeting
+      respond_to do |format|
+        if @meeting.update_attributes(params[:meeting])
+          @meeting_page = "edit_info"    
+          flash[:notice] = 'Информация о Вашей встрече была обновлена.'
+          format.html { render :action => "edit" }
+          format.xml  { head :ok }
+        else
+          @meeting_page = "edit_info"
+          format.html { render :action => "edit" }
+          format.xml  { render :xml => @meeting.errors, :status => :unprocessable_entity }
+        end
+      end
+    else
+      render :text => 'no'
+    end 
+  end
+  
+  def add_comment
+    @meeting = Meeting.find(params[:id])
+    add_obj_comment @meeting, Comment::WHERE::MEETING
+    redirect_to :action => "show", :id => @meeting.id
+  end
+  
+  def change_participant_status
+    @meeting = Meeting.find(params[:id])
+    @participant = Participant.find :first, 
+    :conditions => ['meeting_id = ? and user_id = ?', @meeting.id, current_user.id]
+    if @participant
+      @participant.status = params[:current_participant][:status]
+      @participant.save
+      redirect_to :action => "show", :id => @meeting.id
+    else
+      @meeting = Meeting.find(params[:id])
+      @participant = Participant.new( :user_id => current_user.id)
+      @participant.status = params[:current_participant][:status]
+      @participant.join_meeting @meeting
+      redirect_to :action => "show", :id => @meeting.id
+    end
+  end
+  
+  def edit_settings
+    @title = "Настроить параметры встречи"
+    @meeting = Meeting.find(params[:id])
+    @meeting_page = "edit_settings"
+    render :action => 'edit'
+  end
+
+  
+  def add_guests
+    @title = "Пригласить гостей "
+    @meeting = Meeting.find(params[:id])
+    @my_friends = MyFriend.find :all, :conditions => ['user_id = ?', current_user.id]
+
+    @meeting_page = "edit_guests"
+    render :action => 'edit'
+  end
+  
+  def add_photos
+    @photo_album = PhotoAlbum.new
+    @meeting = Meeting.find(params[:id])
+    @participant = Participant.find_by_user_id(current_user.id)
+    if request.post?
+      @photo_album.attributes = params[:photo_album]
+      @photo_album.user_id = current_user.id
+#      category_id = 8 for "Встречи"
+      @photo_album.category_id = 8
+      @photo_album.location = @meeting.location
+      if @photo_album.save
+        save_photos
+        @participant.update_participants_photo_album(@photo_album, @meeting)
+        flash[:notice] = 'Альбом был успешно сохранен.'._
+        redirect_to photo_album_url(:id => @photo_album)
+      else
+        render :action => 'add_photos'
+      end
+    end
+  end
+  
+  
+  def show_photos
+    @title = "Фото"._
+    cond = ['1 = 1']
+    @title1 = ''
+    @category_id = 8
+
+    if UserPhoto::CATEGORIES.has_key?(@category_id) && @category_id > 0
+      cond[0] += ' AND photo_albums.category_id = ?'
+      cond << @category_id
+    end
+
+    PhotoAlbum.public_scope do
+      @pages, @photos = paginate :photo_albums,
+        :conditions => cond,
+        :include => [:user, :cover_photo],
+        :order => 'photo_albums.taken_at desc', :per_page => 24
+    end
+    render :template => 'meetings/photos'
+  end
+
+
+  # DELETE /meetings/1
+  # DELETE /meetings/1.xml
+  def delete_meeting
+    @meeting = Meeting.find(params[:id])
+    @participants = Participant.find(:all, :conditions => 'meeting_id=' + @meeting.id.to_s)
+    if is_obj_owner?(@meeting) || is_moderator?
+      @meeting.destroy
+      for participant in @participants
+        participant.destroy
+      end
+      respond_to do |format|
+       format.html { redirect_to :action => :my_meetings }
+       format.xml  { head :ok }
+      end
+    else
+      render :text => 'no'
+    end    
+  end
+
+private
+
+  def save_photos
+  1.upto(5) do |i|
+    if !params["photo#{i}"].blank?
+      @photo = UserPhoto.new params["photo#{i}"]
+      @photo.user_id = current_user.id
+      @photo.category_id = 0
+      @photo.photo_album = @photo_album
+      @photo.moderate_status = UserPhoto::MODERATE_STATUS::AUTO_ACCEPTED if special_photo_user(current_user)
+
+      if @photo.save
+        flash[:notice] = "Фотографии добавлены"._
+      else
+        logger.debug "c-type:#{@photo.content_type}"
+      end
+    end
+  end
+  end
+  
+  def send_checked_guests_notification(guest_id_array)
+    checked_guests = []
+    checked_params = params[:guest_list] || []
+    for check_box_id in checked_params
+      guest = User.find(check_box_id)
+    end
+    return checked_guests
+  end
+  
+end
diff --git a/app/helpers/meetings_helper.rb b/app/helpers/meetings_helper.rb
new file mode 100644
index 0000000..de8cd78
--- /dev/null
+++ b/app/helpers/meetings_helper.rb
@@ -0,0 +1,11 @@
+module MeetingsHelper
+  
+  def is_active_tab? current_action
+    if current_page?(:action => current_action)
+      "activetab"
+    else
+      "inactivetab"
+    end
+  end
+  
+end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index d6d9357..6a2f3c3 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -43,6 +43,7 @@ class Comment < ActiveRecord::Base
     VIDEO_LINK, PAID_NEWS = 5, 6
     SURVEY = 7
     HATE_CASE = 8
+    MEETING= 9
   end
   
   def relations
@@ -54,7 +55,8 @@ class Comment < ActiveRecord::Base
       WHERE::VIDEO_LINK => [Event::OBJ_TYPE::VIDEO_LINK, VideoLink],
       WHERE::PAID_NEWS => [Event::OBJ_TYPE::PAID_NEWS, PaidNews],
       WHERE::SURVEY => [Event::OBJ_TYPE::SURVEY, Survey],
-      WHERE::HATE_CASE => [Event::OBJ_TYPE::HATE_CASE, HateCase]
+      WHERE::HATE_CASE => [Event::OBJ_TYPE::HATE_CASE, HateCase],
+      WHERE::MEETING => [Event::OBJ_TYPE::MEETING, Meeting]
     }
   end
 end
diff --git a/app/models/event.rb b/app/models/event.rb
index 467449b..68bb84e 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -12,6 +12,7 @@ class Event < ActiveRecord::Base
     PAID_NEWS = 100
     BIRTHDAY = 110
     HATE_CASE = 120
+    MEETING = 130
   end
 
   OBJ_TYPE_H = { OBJ_TYPE::GROUP => "Клану",
@@ -20,7 +21,8 @@ class Event < ActiveRecord::Base
                  OBJ_TYPE::NEWS => "Новости",
                  OBJ_TYPE::SURVEY => "Опросу",
                  OBJ_TYPE::HATE_CASE => "Заявка",
-                 OBJ_TYPE::NOTE => "Дневнику"
+                 OBJ_TYPE::NOTE => "Дневнику",
+                 OBJ_TYPE::MEETING => "Встрече"
   }
 
   class TYPE
diff --git a/app/models/meeting.rb b/app/models/meeting.rb
new file mode 100644
index 0000000..cc64bd5
--- /dev/null
+++ b/app/models/meeting.rb
@@ -0,0 +1,13 @@
+class Meeting < ActiveRecord::Base
+  has_many :comments, :foreign_key => '_for', :conditions => '_where = ' + Comment::WHERE::MEETING.to_s,
+          :dependent => :delete_all, :order => 'created_at'
+
+  belongs_to :user
+  has_many  :participants
+  validates_presence_of :name, :location, :city, :description, :start_at
+  
+  def has_participant? user
+    Participant.find :first, :conditions => ['meeting_id=? and user_id=?', self.id, user.id]
+  end
+
+end
diff --git a/app/models/participant.rb b/app/models/participant.rb
new file mode 100644
index 0000000..c749d6c
--- /dev/null
+++ b/app/models/participant.rb
@@ -0,0 +1,49 @@
+class Participant < ActiveRecord::Base
+  has_many    :meetings
+  has_many    :photo_albums
+  belongs_to  :user
+  validates_presence_of :user_id, :meeting_id
+#  validates_uniqueness_of :user_id, :scope => [:photo_album_id]
+  
+  def join_meeting meeting
+    self.meeting_id = meeting.id
+    self.save
+  end
+  
+  def is_participant? meeting
+    if Participant.find_by_id(current_user.id, :conditions => 'meeting_id=' + meeting.id.to_s)
+      true
+    else
+      false
+    end
+  end
+  
+  def update_participants_photo_album(album, meeting)
+    p = Participant.find_by_user_id(self.user_id,:conditions => "photo_album_id is null")
+    if !p.nil?
+      self.photo_album_id = album.id
+      self.save
+    elsif p.nil?
+      Participant.new(:user_id => self.user_id, :photo_album_id => album.id, :meeting_id => meeting.id)
+      self.save
+   end
+  end
+  
+  class PLAN
+    NO = 0
+    YES = 1
+    MAYBE = 2
+    PENDING = 3
+  end
+  
+  PLAN_A = [
+    ["пойду", PLAN::YES],
+    ["не пойду", PLAN::NO],
+    ["возможно пойду", PLAN::MAYBE],
+    ["еще не ответил", PLAN::PENDING]
+  ]
+  
+  PLAN_H = PLAN_A.to_hash2
+  
+end
+
diff --git a/app/models/user.rb b/app/models/user.rb
index 746cc2d..7708379 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -70,6 +70,7 @@ class User < ActiveRecord::Base
   has_many :surveys, :dependent => :delete_all
   has_many :notifications, :dependent => :delete_all
   has_many  :sent_notifications, :class_name => 'Notification', :foreign_key => 'sender_id', :dependent => :delete_all
+  has_many :meetings
 
   def is_seller?
     user_caracter.is_seller? == true
diff --git a/app/models/user_photo.rb b/app/models/user_photo.rb
index 870b3bd..761febd 100644
--- a/app/models/user_photo.rb
+++ b/app/models/user_photo.rb
@@ -136,6 +136,7 @@ class UserPhoto < ActiveRecord::Base
     ["Май Фамили", 5],
     ["Отдыхаем", 6],
     ["Афтор Жжжооот", 7],
+    ["Встречи", 8]
   ]
 
   CATEGORIES = to_hash(CATEGORIES_A)
diff --git a/app/views/layouts/_top_menu.rhtml b/app/views/layouts/_top_menu.rhtml
index 71e1eeb..e1c591c 100644
--- a/app/views/layouts/_top_menu.rhtml
+++ b/app/views/layouts/_top_menu.rhtml
@@ -9,6 +9,7 @@
     <%= link_to "Фотки"._, all_photos_path %>
     <%= link_to "Видео"._, videos_path %>
     <%= link_to "Кланы"._, search_groups_path %>
+    <%= link_to "Встречи"._, meetings_path %>
     <%= link_to "Маркет"._, market_path %>
     <%= link_to "Поиск"._, search_what_path %>
 
diff --git a/app/views/layouts/_user_panel.rhtml b/app/views/layouts/_user_panel.rhtml
index de38e3f..2d0e83b 100644
--- a/app/views/layouts/_user_panel.rhtml
+++ b/app/views/layouts/_user_panel.rhtml
@@ -35,6 +35,12 @@
 <%=link_to 'Видео'._, {:controller => "/my_videos"}, :class => 'user_links' %>
                   

» <%= @title %>

+

<%= meeting.start_at.to_s(:long) %>

+

+ + + + + + +

+ + <%=link_to '» ' + _("Посмотреть/Оставить комментарии (%d)", @comment_count[meeting.id]), :action => "show", :id => meeting %> + +

+ +

+ +

+ + + + + + + + + + + + <%= link_to truncate(format_message(meeting.description),60) , :action => "show", :id => meeting %> Организатор: + <%=link_to_profile meeting.user %> + Категория: Поездки - + Поездка на природу + Где: + <%= link_to meeting.location , :action => "show", :id => meeting %> + Когда: <%= meeting.start_at.to_s(:long) %> по <%= meeting.end_at.to_s(:long) %> +

+ <% if meeting.user_id == current_user.id || is_moderator? %> + <%= link_to 'Редактировать событие', edit_meeting_path(:id => meeting) %> + <%=link_to "Отменить встречу", :action => "delete_meeting", :id => meeting.id, :confirm => 'Really?' %> + <% end %> +

+

+

Участники

<%='Заголовок'._%>:*
+<%= text_field 'photo_album', 'title', :size => 70 %>

<%='Дата'._%>:
+<%= date_select 'photo_album', 'taken_at', :start_year => current_user.age.year, :end_year => Time.now.year %>

<%='Описание'._%>:
+<%= text_area 'photo_album', 'description', :size => "60x4" %>

<%='Виден'._%>:
+ <%= select 'photo_album', 'privacy', PhotoAlbum::PRIVACY_A, {}, :style => 'width:200px;' %>

Meetings#exit

Find me in app/views/meetings/exit.html.erb

Meetings#list

Find me in app/views/meetings/list.html.erb

» <%='Мои Встречи'._%> (<%= @pages.item_count %>)

+

+ + <%=link_to image_tag('icons/trash.gif', :alt => 'Удалить'._), {:action => "delete_meeting", :id => meeting}, :confirm => 'Уверены?'._ %> + + + <%= h(meeting.location) %> + (<%= show_date(meeting.start_at) %>) +

+ <%= format_message(meeting.description) %> +

+ + <%=link_to "Изменить"._ , :action => "edit", :id => meeting %> | + <%=link_to _("Посмотреть комментарии (%d)", @comment_count[meeting.id]), :action => "show", :id => meeting %> + +

+<% end %> + +

+ +<%= pagination_div(@pages, params) %> +<% else %> +

<%='Нет фоток'._%>

+ Организатор: + <%=link_to_profile @meeting.user %> +

+ Место встречи: + <%=h @meeting.location %> +

+ Описание: + <%= format_message @meeting.description %> +

+ Время начала: + <%= @meeting.start_at.to_s(:short) %> +

+ Время завершения: + <%= @meeting.end_at.to_s(:short) %> +

<%='Комментарии'._%>

Нет

Meetings#update

Find me in app/views/meetings/update.html.erb