Permalink
Browse files

changes to load https://latticegrid.cancer.northwestern.edu/orgs/abst…

  • Loading branch information...
1 parent 1d04db5 commit 2abd747db8dfdabb0b85516a9fe247b107958e55 Warren A. Kibbe committed Jun 11, 2012
Showing with 79 additions and 154 deletions.
  1. +74 −153 LatticeGrid.tmproj
  2. +4 −0 app/controllers/application_controller.rb
  3. +1 −1 doc/database_initiation.txt
View
227 LatticeGrid.tmproj
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>currentDocument</key>
- <string>lib/tasks/import_impact_factor.rake</string>
+ <string>db/migrate/20080916_create_foreign_keys.rb</string>
<key>documents</key>
<array>
<dict>
@@ -21,292 +21,214 @@
<integer>384</integer>
<key>metaData</key>
<dict>
- <key>app/controllers/abstracts_controller.rb</key>
+ <key>app/controllers/profiles_controller.rb</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>37</integer>
+ <integer>73</integer>
<key>line</key>
- <integer>159</integer>
+ <integer>246</integer>
</dict>
- <key>columnSelection</key>
- <false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>146</integer>
- <key>selectFrom</key>
- <dict>
- <key>column</key>
- <integer>27</integer>
- <key>line</key>
- <integer>159</integer>
- </dict>
- <key>selectTo</key>
- <dict>
- <key>column</key>
- <integer>48</integer>
- <key>line</key>
- <integer>159</integer>
- </dict>
+ <integer>219</integer>
</dict>
- <key>app/controllers/studies_controller.rb</key>
+ <key>app/helpers/orgs_helper.rb</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>30</integer>
<key>line</key>
- <integer>149</integer>
+ <integer>27</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>106</integer>
+ <integer>0</integer>
</dict>
- <key>app/models/journal.rb</key>
+ <key>app/models/abstract.rb</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>42</integer>
+ <integer>77</integer>
<key>line</key>
- <integer>50</integer>
+ <integer>4</integer>
</dict>
<key>columnSelection</key>
<false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>8</integer>
+ <integer>0</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
- <integer>23</integer>
+ <integer>73</integer>
<key>line</key>
- <integer>50</integer>
+ <integer>4</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
- <integer>45</integer>
+ <integer>77</integer>
<key>line</key>
- <integer>50</integer>
+ <integer>4</integer>
</dict>
</dict>
- <key>app/models/secondary_member.rb</key>
+ <key>app/views/graphs/org_nodes.rxml</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
- <integer>2</integer>
+ <integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
- <key>app/views/abstracts/ccsg.html.erb</key>
+ <key>app/views/graphs/show_member.rhtml</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>45</integer>
+ <integer>1</integer>
<key>line</key>
- <integer>187</integer>
+ <integer>11</integer>
</dict>
- <key>columnSelection</key>
- <false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>162</integer>
- <key>selectFrom</key>
- <dict>
- <key>column</key>
- <integer>34</integer>
- <key>line</key>
- <integer>187</integer>
- </dict>
- <key>selectTo</key>
- <dict>
- <key>column</key>
- <integer>59</integer>
- <key>line</key>
- <integer>187</integer>
- </dict>
+ <integer>0</integer>
</dict>
- <key>app/views/graphs/org_nodes.rxml</key>
+ <key>config/database.yml</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>0</integer>
+ <integer>39</integer>
<key>line</key>
- <integer>0</integer>
+ <integer>8</integer>
</dict>
+ <key>columnSelection</key>
+ <false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
- </dict>
- <key>app/views/graphs/show_member.rhtml</key>
- <dict>
- <key>caret</key>
+ <key>selectFrom</key>
<dict>
<key>column</key>
- <integer>1</integer>
+ <integer>24</integer>
<key>line</key>
- <integer>11</integer>
+ <integer>8</integer>
+ </dict>
+ <key>selectTo</key>
+ <dict>
+ <key>column</key>
+ <integer>42</integer>
+ <key>line</key>
+ <integer>8</integer>
</dict>
- <key>firstVisibleColumn</key>
- <integer>0</integer>
- <key>firstVisibleLine</key>
- <integer>0</integer>
</dict>
- <key>app/views/studies/org.html.erb</key>
+ <key>config/routes.rb</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>62</integer>
+ <integer>198</integer>
<key>line</key>
- <integer>30</integer>
+ <integer>23</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
- <key>config/initializers/latticegrid.rb</key>
+ <key>db/migrate/20080909_create_abstracts.rb</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>13</integer>
+ <integer>32</integer>
<key>line</key>
- <integer>3</integer>
+ <integer>30</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
- <key>doc/example_loads.txt</key>
+ <key>db/migrate/20080910_create_investigators.rb</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
- <integer>6</integer>
+ <integer>4</integer>
</dict>
- <key>columnSelection</key>
- <false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>0</integer>
- <key>selectFrom</key>
- <dict>
- <key>column</key>
- <integer>0</integer>
- <key>line</key>
- <integer>7</integer>
- </dict>
- <key>selectTo</key>
- <dict>
- <key>column</key>
- <integer>0</integer>
- <key>line</key>
- <integer>6</integer>
- </dict>
+ <integer>26</integer>
</dict>
- <key>doc/project_history.txt</key>
+ <key>db/migrate/20080911_create_investigator_abstracts.rb</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>0</integer>
+ <integer>18</integer>
<key>line</key>
- <integer>264</integer>
+ <integer>3</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>328</integer>
+ <integer>0</integer>
</dict>
- <key>lib/journal_utilities.rb</key>
+ <key>db/migrate/20080916_create_foreign_keys.rb</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>20</integer>
+ <integer>15</integer>
<key>line</key>
- <integer>17</integer>
+ <integer>26</integer>
</dict>
- <key>columnSelection</key>
- <false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
- <key>selectFrom</key>
- <dict>
- <key>column</key>
- <integer>4</integer>
- <key>line</key>
- <integer>17</integer>
- </dict>
- <key>selectTo</key>
- <dict>
- <key>column</key>
- <integer>36</integer>
- <key>line</key>
- <integer>17</integer>
- </dict>
</dict>
- <key>lib/latticegrid/Feinberg.rb</key>
+ <key>db/migrate/20110205035911_add_uniques.rb</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>35</integer>
+ <integer>0</integer>
<key>line</key>
- <integer>4</integer>
+ <integer>15</integer>
</dict>
- <key>columnSelection</key>
- <false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
- <key>selectFrom</key>
- <dict>
- <key>column</key>
- <integer>22</integer>
- <key>line</key>
- <integer>4</integer>
- </dict>
- <key>selectTo</key>
- <dict>
- <key>column</key>
- <integer>39</integer>
- <key>line</key>
- <integer>4</integer>
- </dict>
</dict>
- <key>lib/tasks/import_impact_factor.rake</key>
+ <key>doc/example_loads.txt</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>18</integer>
+ <integer>0</integer>
<key>line</key>
- <integer>88</integer>
+ <integer>6</integer>
</dict>
<key>columnSelection</key>
<false/>
@@ -317,37 +239,36 @@
<key>selectFrom</key>
<dict>
<key>column</key>
- <integer>6</integer>
+ <integer>0</integer>
<key>line</key>
- <integer>88</integer>
+ <integer>7</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
- <integer>28</integer>
+ <integer>0</integer>
<key>line</key>
- <integer>88</integer>
+ <integer>6</integer>
</dict>
</dict>
</dict>
<key>openDocuments</key>
<array>
<string>doc/example_loads.txt</string>
- <string>app/views/abstracts/ccsg.html.erb</string>
- <string>app/controllers/studies_controller.rb</string>
- <string>app/views/studies/org.html.erb</string>
- <string>doc/project_history.txt</string>
- <string>app/models/secondary_member.rb</string>
- <string>config/initializers/latticegrid.rb</string>
- <string>lib/latticegrid/Feinberg.rb</string>
- <string>app/controllers/abstracts_controller.rb</string>
- <string>app/models/journal.rb</string>
- <string>lib/journal_utilities.rb</string>
- <string>lib/tasks/import_impact_factor.rake</string>
+ <string>app/controllers/profiles_controller.rb</string>
+ <string>app/models/abstract.rb</string>
+ <string>config/database.yml</string>
+ <string>db/migrate/20110205035911_add_uniques.rb</string>
+ <string>db/migrate/20080909_create_abstracts.rb</string>
+ <string>db/migrate/20080910_create_investigators.rb</string>
+ <string>db/migrate/20080911_create_investigator_abstracts.rb</string>
+ <string>db/migrate/20080916_create_foreign_keys.rb</string>
+ <string>app/helpers/orgs_helper.rb</string>
+ <string>config/routes.rb</string>
</array>
<key>showFileHierarchyDrawer</key>
<true/>
<key>windowFrame</key>
- <string>{{10, 20}, {1531, 1008}}</string>
+ <string>{{4, 0}, {1519, 1028}}</string>
</dict>
</plist>
View
4 app/controllers/application_controller.rb
@@ -67,6 +67,10 @@ def handle_start_and_end_date
if ! params[:program].blank? then
params[:id]=params[:program][:id]
end
+ if params[:start_date].blank? and params[:end_date].blank? then
+ @end_date = Date.today
+ @start_date = one.year.ago
+ end
if params[:start_date].blank? then
@start_date = "01/01/#{@year}"
else
View
2 doc/database_initiation.txt
@@ -3,7 +3,7 @@
-- connecting to a remote postgres server:
-psql -h pstage rhlccc_latticegrid_staging -U rhlccc_latticegrid
+psql -h pstage rhlccc_latticegrid -U rhlccc
--PostgreSQL commands

0 comments on commit 2abd747

Please sign in to comment.