Skip to content

Commit 8f74c67

Browse files
KetanPandhiKetanPandhi
committed
removed test in calender
1 parent 9dc9f7d commit 8f74c67

File tree

6 files changed

+127
-13
lines changed

6 files changed

+127
-13
lines changed

‎Gemfile

+2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
source 'https://rubygems.org'
22

3+
gem 'therubyracer'
34
gem 'rails', '3.2.0'
45
gem 'carrierwave'
56

7+
68
# Bundle edge Rails instead:
79
# gem 'rails', :git => 'git://github.com/rails/rails.git'
810

‎Gemfile.lock

+16-11
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,33 @@ GEM
3232
arel (3.0.2)
3333
bcrypt-ruby (3.0.1)
3434
builder (3.0.0)
35-
carrierwave (0.5.8)
36-
activesupport (~> 3.0)
35+
carrierwave (0.6.2)
36+
activemodel (>= 3.2.0)
37+
activesupport (>= 3.2.0)
3738
coffee-rails (3.2.2)
3839
coffee-script (>= 2.2.0)
3940
railties (~> 3.2.0)
4041
coffee-script (2.2.0)
4142
coffee-script-source
4243
execjs
43-
coffee-script-source (1.3.1)
44+
coffee-script-source (1.3.3)
4445
erubis (2.7.0)
45-
execjs (1.3.2)
46+
execjs (1.4.0)
4647
multi_json (~> 1.0)
4748
hike (1.2.1)
4849
i18n (0.6.0)
49-
journey (1.0.3)
50+
journey (1.0.4)
5051
jquery-rails (2.0.2)
5152
railties (>= 3.2.0, < 5.0)
5253
thor (~> 0.14)
53-
json (1.7.1)
54+
json (1.7.3)
55+
libv8 (3.3.10.4)
5456
mail (2.4.4)
5557
i18n (>= 0.4.0)
5658
mime-types (~> 1.16)
5759
treetop (~> 1.4.8)
58-
mime-types (1.18)
59-
multi_json (1.3.4)
60+
mime-types (1.19)
61+
multi_json (1.3.6)
6062
polyglot (0.3.3)
6163
rack (1.4.1)
6264
rack-cache (1.2)
@@ -83,7 +85,7 @@ GEM
8385
rake (0.9.2.2)
8486
rdoc (3.12)
8587
json (~> 1.4)
86-
sass (3.1.17)
88+
sass (3.1.20)
8789
sass-rails (3.2.5)
8890
railties (~> 3.2.0)
8991
sass (>= 3.1.10)
@@ -93,15 +95,17 @@ GEM
9395
rack (~> 1.0)
9496
tilt (~> 1.1, != 1.3.0)
9597
sqlite3 (1.3.6)
98+
therubyracer (0.10.1)
99+
libv8 (~> 3.3.10)
96100
thor (0.14.6)
97101
tilt (1.3.3)
98102
treetop (1.4.10)
99103
polyglot
100104
polyglot (>= 0.3.1)
101105
tzinfo (0.3.33)
102-
uglifier (1.2.4)
106+
uglifier (1.2.6)
103107
execjs (>= 0.3.0)
104-
multi_json (>= 1.0.2)
108+
multi_json (~> 1.3)
105109

106110
PLATFORMS
107111
ruby
@@ -115,4 +119,5 @@ DEPENDENCIES
115119
rails (= 3.2.0)
116120
sass-rails (~> 3.2.3)
117121
sqlite3
122+
therubyracer
118123
uglifier (>= 1.0.3)

‎Gemfile~

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
source 'https://rubygems.org'
2+
3+
gem 'rails', '3.2.0'
4+
gem 'carrierwave'
5+
6+
# Bundle edge Rails instead:
7+
# gem 'rails', :git => 'git://github.com/rails/rails.git'
8+
9+
gem 'sqlite3'
10+
gem 'bcrypt-ruby', '~> 3.0.1'
11+
gem 'annotate', '~> 2.4.1.beta'
12+
13+
# Gems used only for assets and not required
14+
# in production environments by default.
15+
group :assets do
16+
gem 'sass-rails', '~> 3.2.3'
17+
gem 'coffee-rails', '~> 3.2.1'
18+
19+
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
20+
# gem 'therubyracer'
21+
22+
gem 'uglifier', '>= 1.0.3'
23+
end
24+
25+
gem 'jquery-rails'
26+
27+
# To use ActiveModel has_secure_password
28+
# gem 'bcrypt-ruby', '~> 3.0.0'
29+
30+
# To use Jbuilder templates for JSON
31+
# gem 'jbuilder'
32+
33+
# Use unicorn as the web server
34+
# gem 'unicorn'
35+
36+
# Deploy with Capistrano
37+
# gem 'capistrano'
38+
39+
# To use debugger
40+
# gem 'ruby-debug19', :require => 'ruby-debug'

‎app/views/calender/calender.html.erb

-1
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,3 @@
6565
</table>
6666
</div>
6767

68-
<div id="pass"><%= params %></div>

‎app/views/calender/calender.html.erb~

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<h1>Calender</h1>
2+
<%= form_tag({:action => 'calender'} , :id => "sub_cal" , method: 'get' , remote: true ) do %>
3+
<%= select_month @month.to_i %>
4+
<%= select_year @year.to_i , options = {start_year: 2012} %>
5+
<% end %>
6+
<div id="linker"><%= render 'linker.js' %></div>
7+
<div id="cal">
8+
<table id="monthly">
9+
<tr>
10+
<th>Sunday</th>
11+
<th>Monday</th>
12+
<th>Tuesday</th>
13+
<th>Wednesday</th>
14+
<th>Thursday</th>
15+
<th>Friday</th>
16+
<th>Saturday</th>
17+
</tr>
18+
<tr>
19+
<td id='square0'>&nbsp;</td>
20+
<td id='square1'>&nbsp;</td>
21+
<td id='square2'>&nbsp;</td>
22+
<td id='square3'>&nbsp;</td>
23+
<td id='square4'>&nbsp;</td>
24+
<td id='square5'>&nbsp;</td>
25+
<td id='square6'>&nbsp;</td>
26+
</tr>
27+
28+
<tr>
29+
<td id='square7'>&nbsp;</td>
30+
<td id='square8'>&nbsp;</td>
31+
<td id='square9'>&nbsp;</td>
32+
<td id='square10'>&nbsp;</td>
33+
<td id='square11'>&nbsp;</td>
34+
<td id='square12'>&nbsp;</td>
35+
<td id='square13'>&nbsp;</td>
36+
</tr>
37+
38+
<tr>
39+
<td id='square14'>&nbsp;</td>
40+
<td id='square15'>&nbsp;</td>
41+
<td id='square16'>&nbsp;</td>
42+
<td id='square17'>&nbsp;</td>
43+
<td id='square18'>&nbsp;</td>
44+
<td id='square19'>&nbsp;</td>
45+
<td id='square20'>&nbsp;</td>
46+
</tr>
47+
<tr>
48+
<td id='square21'>&nbsp;</td>
49+
<td id='square22'>&nbsp;</td>
50+
<td id='square23'>&nbsp;</td>
51+
<td id='square24'>&nbsp;</td>
52+
<td id='square25'>&nbsp;</td>
53+
<td id='square26'>&nbsp;</td>
54+
<td id='square27'>&nbsp;</td>
55+
</tr>
56+
<tr>
57+
<td id='square28'>&nbsp;</td>
58+
<td id='square29'>&nbsp;</td>
59+
<td id='square30'>&nbsp;</td>
60+
<td id='square31'>&nbsp;</td>
61+
<td id='square32'>&nbsp;</td>
62+
<td id='square33'>&nbsp;</td>
63+
<td id='square34'>&nbsp;</td>
64+
</tr>
65+
</table>
66+
</div>
67+

‎db/schema.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
# It's strongly recommended to check this file into your version control system.
1313

14-
ActiveRecord::Schema.define(:version => 20120628113900) do
14+
ActiveRecord::Schema.define(:version => 20120629085133) do
1515

1616
create_table "calenders", :force => true do |t|
1717
t.integer "user_id"
@@ -48,6 +48,7 @@
4848
t.text "user_id"
4949
t.datetime "created_at", :null => false
5050
t.datetime "updated_at", :null => false
51+
t.string "gavatar"
5152
end
5253

5354
create_table "users", :force => true do |t|

0 commit comments

Comments
 (0)