add datepicker, exercise, and date

.gitignore

@@ -2,3 +2,4 @@
 db/*.sqlite3
 log/*.log
 tmp/
+config/s3.yml

.gitignore~

@@ -0,0 +1,4 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/

Gemfile

@@ -3,13 +3,16 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.11'
 gem 'pg'
 gem 'devise'
-gem "recaptcha", :require => "recaptcha/rails"
+gem 'recaptcha', :require => 'recaptcha/rails'
 gem 'sinatra'
 gem 'mogli'
 gem 'gravatar_image_tag', '1.0.0.pre2'
 gem 'rails-i18n'
 gem 'jquery-rails', '>= 1.0.12'
 gem 'rails3-jquery-autocomplete'
+gem 'paperclip', '~> 3.0'
+gem 'aws-sdk', '~> 1.3.4'
+gem "watu_table_builder", :require => "table_builder"
 
 
 gem 'will_paginate', '~> 3.0.pre2'

Gemfile.lock

@@ -34,8 +34,14 @@ GEM
     addressable (2.2.7)
     arel (2.0.10)
     attr_required (0.0.5)
+    aws-sdk (1.3.9)
+      httparty (~> 0.7)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
     bcrypt-ruby (3.0.1)
     builder (2.1.2)
+    cocaine (0.2.1)
     coderay (1.0.5)
     daemons (1.1.8)
     dalli (1.1.5)
@@ -76,6 +82,7 @@ GEM
     multi_json (1.1.0)
     multi_xml (0.4.1)
     multipart-post (1.1.5)
+    nokogiri (1.5.2)
     oauth (0.4.5)
     oauth2 (0.5.2)
       faraday (~> 0.7)
@@ -100,6 +107,12 @@ GEM
     omniauth-twitter (0.0.8)
       omniauth-oauth (~> 1.0)
     orm_adapter (0.0.6)
+    paperclip (3.0.3)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (>= 0.0.2)
+      mime-types
     pg (0.13.2)
     polyglot (0.3.3)
     rack (1.2.5)
@@ -154,10 +167,12 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.32)
+    uuidtools (2.1.2)
     validate_url (0.2.0)
       activemodel (>= 3.0.0)
     warden (1.1.1)
       rack (>= 1.0)
+    watu_table_builder (0.3.0)
     will_paginate (3.0.3)
 
 PLATFORMS
@@ -166,6 +181,7 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   acts-as-taggable-on (~> 2.2.2)
+  aws-sdk (~> 1.3.4)
   coderay
   dalli
   devise
@@ -180,6 +196,7 @@ DEPENDENCIES
   omniauth-github
   omniauth-openid
   omniauth-twitter
+  paperclip (~> 3.0)
   pg
   rails (= 3.0.11)
   rails-i18n
@@ -189,4 +206,5 @@ DEPENDENCIES
   sqlite3
   thin
   validate_url
+  watu_table_builder
   will_paginate (~> 3.0.pre2)

Gemfile~

@@ -2,15 +2,16 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.11'
 gem 'pg'
-gem 'sqlite3', '1.3.3'
 gem 'devise'
-gem "recaptcha", :require => "recaptcha/rails"
+gem 'recaptcha', :require => 'recaptcha/rails'
 gem 'sinatra'
 gem 'mogli'
 gem 'gravatar_image_tag', '1.0.0.pre2'
 gem 'rails-i18n'
 gem 'jquery-rails', '>= 1.0.12'
 gem 'rails3-jquery-autocomplete'
+gem 'paperclip', '~> 3.0'
+gem 'aws-sdk', '~> 1.3.4'
 
 
 gem 'will_paginate', '~> 3.0.pre2'

app/controllers/admin_controller.rb

@@ -17,6 +17,8 @@ def index
 		@num_users = User.all.count
 		@num_users_active30days = User.where('last_sign_in_at > ?', 30.days.ago).count
 		@num_users_created30days = User.where('created_at > ?', 30.days.ago).count
+		@current_user.attributes = {'exercise_ids' => []}.merge(params[:user] || {})
+
 	end
 
 
@@ -147,7 +149,6 @@ def users
 		@users = User.where(:user_kind => @user_kind).order(@order).paginate(:page => params[:page], :per_page => 10)
 	end
 
-
 	protected
 	def is_admin
 		if current_user

app/controllers/admin_controller.rb~

@@ -17,6 +17,8 @@ class AdminController < ApplicationController
 		@num_users = User.all.count
 		@num_users_active30days = User.where('last_sign_in_at > ?', 30.days.ago).count
 		@num_users_created30days = User.where('created_at > ?', 30.days.ago).count
+		@user.attributes = {'exercise_ids' => []}.merge(params[:user] || {})
+
 	end
 
 
@@ -126,14 +128,6 @@ class AdminController < ApplicationController
 		@questions = Question.where(:state => @state).order(@order)
 	end
 
-	def exercises
-	    @exercises = Exercise.all
-    @exercises = Exercise.paginate(:page => params[:page])
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @exercises }
-	end
-	end
 
 	# διαχείριση των χρηστών από τον διαχειριστή (user.id = 1)
 	def users
@@ -155,7 +149,6 @@ class AdminController < ApplicationController
 		@users = User.where(:user_kind => @user_kind).order(@order).paginate(:page => params[:page], :per_page => 10)
 	end
 
-
 	protected
 	def is_admin
 		if current_user

app/controllers/application_controller.rb

@@ -1,6 +1,6 @@
 class ApplicationController < ActionController::Base
 	protect_from_forgery
-	before_filter :authenticate_user!, :except => [:index, :all, :show, :about]
+	before_filter :authenticate_user!, :except => [:all, :show, :about]
 	before_filter :count_questions
 	def about
 	end

app/controllers/application_controller.rb~

@@ -1,6 +1,6 @@
 class ApplicationController < ActionController::Base
 	protect_from_forgery
-	before_filter :authenticate_user!, :except => [:index, :all, :show, :about]
+	before_filter :authenticate_user!, :except => [:all, :show, :about]
 	before_filter :count_questions
 	def about
 	end
@@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base
 	def all
 		@questions = Question.where(:state => ['3', '4'])
 		respond_to do |format|
-			format.html { render 'index' }                  # uses the same view as the default index
+			format.html { render 'index' }  # χρήση του ίδιου view όπως το view index
 			format.xml  { render :xml => @questions }
 		end
 	end

app/controllers/exercises_controller.rb

@@ -11,11 +11,21 @@ def index
     end
   end
 
+
+	def myexercises
+		@myexercises = current_user.exercises.all
+		@myexercises = current_user.exercise.order('created_at desc').paginate(:page => params[:page], :per_page => 10)
+		respond_to do |format|
+			format.html { render 'myexercises'}
+			format.xml  { render :xml => @myexercises }
+		end
+	end
+
   # GET /exercises/1
   # GET /exercises/1.xml
   def show
     @exercise = Exercise.find(params[:id])
-
+    #@writings = Writing.find(all, :conditions => ["exercise_id = ?", @exercise.id]))
     respond_to do |format|
       format.html # show.html.erb
       format.xml  { render :xml => @exercise }
@@ -25,7 +35,7 @@ def show
   # GET /exercises/new
   # GET /exercises/new.xml
   def new
-    @exercise = Exercise.new
+    @exercise = current_user.exercises.new
 
     respond_to do |format|
       format.html # new.html.erb
@@ -45,8 +55,9 @@ def create
 
     respond_to do |format|
       if @exercise.save
-        format.html { redirect_to(@exercise, :notice => 'Η άσκση δημιουργήθηκε επιτυχώς.') }
+        format.html { redirect_to(@exercise, :notice => 'Η άσκηση δημιουργήθηκε επιτυχώς.') }
         format.xml  { render :xml => @exercise, :status => :created, :location => @exercise }
+        #format.xml  { render :xml => @writing, :status => :created, :location => @writing }
       else
         format.html { render :action => "new" }
         format.xml  { render :xml => @exercise.errors, :status => :unprocessable_entity }

app/controllers/exercises_controller.rb~

@@ -4,18 +4,28 @@ class ExercisesController < ApplicationController
   # GET /exercises.xml
   def index
     @exercises = Exercise.all
-    @exercises = Exercise.order('created desc').paginate(:page => params[:page], :per_page => 10)
+    @exercises = Exercise.order('created_at desc').paginate(:page => params[:page], :per_page => 10)
     respond_to do |format|
       format.html # index.html.erb
       format.xml  { render :xml => @exercises }
     end
   end
 
+
+	def myexercises
+		@myexercises = current_user.exercises.all
+		@myexercises = current_user.exercise.order('created_at desc').paginate(:page => params[:page], :per_page => 10)
+		respond_to do |format|
+			format.html { render 'myexercises'}
+			format.xml  { render :xml => @myexercises }
+		end
+	end
+
   # GET /exercises/1
   # GET /exercises/1.xml
   def show
     @exercise = Exercise.find(params[:id])
-
+    @writings = Writing.find(all, :conditions => ["exercise_id = ?", @exercise.id]))
     respond_to do |format|
       format.html # show.html.erb
       format.xml  { render :xml => @exercise }
@@ -25,7 +35,7 @@ class ExercisesController < ApplicationController
   # GET /exercises/new
   # GET /exercises/new.xml
   def new
-    @exercise = Exercise.new
+    @exercise = current_user.exercises.new
 
     respond_to do |format|
       format.html # new.html.erb
@@ -45,8 +55,9 @@ class ExercisesController < ApplicationController
 
     respond_to do |format|
       if @exercise.save
-        format.html { redirect_to(@exercise, :notice => 'Η άσκση δημιουργήθηκε επιτυχώς.') }
+        format.html { redirect_to(@exercise, :notice => 'Η άσκηση δημιουργήθηκε επιτυχώς.') }
         format.xml  { render :xml => @exercise, :status => :created, :location => @exercise }
+        #format.xml  { render :xml => @writing, :status => :created, :location => @writing }
       else
         format.html { render :action => "new" }
         format.xml  { render :xml => @exercise.errors, :status => :unprocessable_entity }

app/controllers/questions_controller.rb

@@ -3,7 +3,7 @@ class QuestionsController < ApplicationController
 	respond_to :json
 	autocomplete :tag, :name
 	# μόνο οι μέθοδοι index, all, about και show είναι προσβάσιμες από μη πιστοποιημένους χρήστες
-	before_filter :authenticate_user!, :except => [:index, :all, :show, :about]
+	before_filter :authenticate_user!, :except => [:index, :all, :about]
 	rescue_from ActiveRecord::RecordNotFound, :with => :record_not_found
 
 

app/controllers/questions_controller.rb~

@@ -102,11 +102,6 @@ class QuestionsController < ApplicationController
 	end
 
 
-	def edit
-		@question = current_user.questions.find(params[:id])
-	end
-
-
 	def postfacebook
 		@question = current_user.questions.find(params[:id])
 		begin
@@ -155,6 +150,9 @@ class QuestionsController < ApplicationController
 		end
 	end
 
+	def edit
+		@question = current_user.questions.find(params[:id])
+	end
 
 	def create
 		@question = current_user.questions.new(params[:question])

app/controllers/users_controller.rb

@@ -15,6 +15,7 @@ def update
 		end
 	end
 
+
 	def destroy
 			@user = User.find(params[:id])
 			if current_user.id < 2

app/controllers/users_controller.rb~

@@ -1,7 +1,7 @@
 # encoding: utf-8
 class UsersController < ApplicationController
 
-def update
+	def update
 		@user = User.find(params[:id])
 
 		respond_to do |format|
@@ -15,7 +15,16 @@ def update
 		end
 	end
 
-def destroy
+	def show
+	  @user = User.find(params[:id])
+
+    respond_to do |format|
+      format.html { render 'index' }
+      format.xml  { render :xml => @user }
+    end
+   end
+
+	def destroy
 			@user = User.find(params[:id])
 			if current_user.id < 2
 				@user.destroy