Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 6 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 108 additions and 80 deletions.
  1. +107 −79 .idea/workspace.xml
  2. +1 −1 app/controllers/stats_controller.rb
View
186 .idea/workspace.xml
@@ -1,33 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="188ad806-9dbe-4371-8574-0b8a662aa667" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/application/_punch.erb" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/application/_punch_form.erb" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/application/_punches.erb" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/punches/destroy.js.erb" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/punches/update.js.erb" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/config/locales/models.yml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/config/locales/will_paginate.yml" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/assets/stylesheets/grid.css" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/ponto_ra.iml" afterPath="$PROJECT_DIR$/.idea/ponto_ra.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile" afterPath="$PROJECT_DIR$/Gemfile" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/javascripts/punches.js.coffee" afterPath="$PROJECT_DIR$/app/assets/javascripts/punches.js.coffee" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/stylesheets/application.css.scss" afterPath="$PROJECT_DIR$/app/assets/stylesheets/application.css.scss" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/stylesheets/general.css.scss" afterPath="$PROJECT_DIR$/app/assets/stylesheets/general.css.scss" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/punches_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/punches_controller.rb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/users_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/users_controller.rb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/user.rb" afterPath="$PROJECT_DIR$/app/models/user.rb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/application/_user_stats.html.erb" afterPath="$PROJECT_DIR$/app/views/application/_user_stats.html.erb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/layouts/application.html.erb" afterPath="$PROJECT_DIR$/app/views/layouts/application.html.erb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/punches/_form.html.erb" afterPath="$PROJECT_DIR$/app/views/punches/_form.html.erb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/punches/index.html.erb" afterPath="$PROJECT_DIR$/app/views/punches/index.html.erb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/users/index.html.erb" afterPath="$PROJECT_DIR$/app/views/users/index.html.erb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/users/show.html.erb" afterPath="$PROJECT_DIR$/app/views/users/show.html.erb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/schema.rb" afterPath="$PROJECT_DIR$/db/schema.rb" />
- </list>
+ <list default="true" id="188ad806-9dbe-4371-8574-0b8a662aa667" name="Default" comment="" />
<ignored path="ponto_ra.iws" />
<ignored path=".idea/workspace.xml" />
<option name="TRACKING_ENABLED" value="true" />
@@ -53,37 +27,19 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="20111119190729_add_indexes.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/db/migrate/20111119190729_add_indexes.rb">
+ <file leaf-file-name="routes.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/config/routes.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="0" selection-start="295" selection-end="295" vertical-scroll-proportion="0.0">
+ <state line="9" column="22" selection-start="279" selection-end="304" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="stats_controller.rb" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="stats_controller.rb" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/controllers/stats_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="user.rb" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/app/models/user.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="26" column="4" selection-start="545" selection-end="545" vertical-scroll-proportion="0.6429675">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="schema.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/db/schema.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="5" column="74" selection-start="332" selection-end="332" vertical-scroll-proportion="0.0">
+ <state line="8" column="36" selection-start="300" selection-end="300" vertical-scroll-proportion="0.19783616">
<folding />
</state>
</provider>
@@ -103,7 +59,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/app/views/punches/destroy.js.erb" />
<option value="$PROJECT_DIR$/app/views/application/_punch.erb" />
<option value="$PROJECT_DIR$/app/views/application/_punch_form.erb" />
<option value="$PROJECT_DIR$/app/controllers/punches_controller.rb" />
@@ -119,6 +74,7 @@
<option value="$PROJECT_DIR$/app/controllers/users_controller.rb" />
<option value="$PROJECT_DIR$/config/locales/will_paginate.yml" />
<option value="$PROJECT_DIR$/db/migrate/20111119190729_add_indexes.rb" />
+ <option value="$PROJECT_DIR$/app/controllers/stats_controller.rb" />
</list>
</option>
</component>
@@ -149,6 +105,7 @@
</navigator>
<panes>
<pane id="Favorites" />
+ <pane id="Scope" />
<pane id="RailsProjectView">
<subPane>
<PATH>
@@ -219,9 +176,49 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="config" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ponto_ra" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ponto_ra" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="views" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ponto_ra" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ponto_ra" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="views" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="stats" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -254,6 +251,20 @@
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ponto_ra" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ponto_ra" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="controllers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
@@ -261,17 +272,16 @@
</PATH>
</subPane>
</pane>
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="options.splitter.main.proportions" value="0.3" />
<property name="WebServerToolWindowFactoryState" value="false" />
- <property name="recentsLimit" value="5" />
<property name="options.lastSelected" value="preferences.sourceCode" />
- <property name="options.searchVisible" value="true" />
- <property name="options.splitter.details.proportions" value="0.2" />
+ <property name="recentsLimit" value="5" />
<property name="GoToClass.includeJavaFiles" value="false" />
+ <property name="options.splitter.details.proportions" value="0.2" />
+ <property name="options.searchVisible" value="true" />
</component>
<component name="RunManager" selected="Rails.Development: ponto_ra">
<configuration default="true" type="RakeRunConfigurationType" factoryName="Rake">
@@ -347,6 +357,31 @@
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
<method />
</configuration>
+ <configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby">
+ <module name="" />
+ <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+ <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="" />
+ <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
+ <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
+ <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
+ <envs />
+ <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
+ <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" track_test_folders="true" runner="rcov">
+ <COVERAGE_PATTERN ENABLED="true">
+ <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+ </COVERAGE_PATTERN>
+ </EXTENSION>
+ <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="" />
+ <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
+ <method />
+ </configuration>
+ <configuration default="true" type="JavascriptDebugSession" factoryName="Remote">
+ <JSRemoteDebuggerConfigurationSettings>
+ <option name="engineId" value="embedded" />
+ <option name="fileUrl" />
+ </JSRemoteDebuggerConfigurationSettings>
+ <method />
+ </configuration>
<configuration default="true" type="CucumberRunConfigurationType" factoryName="Cucumber">
<predefined_log_file id="RUBY_CUCUMBER" enabled="true" />
<module name="" />
@@ -380,13 +415,6 @@
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SETTINGS_VERSION" VALUE="2" />
<method />
</configuration>
- <configuration default="true" type="JavascriptDebugSession" factoryName="Remote">
- <JSRemoteDebuggerConfigurationSettings>
- <option name="engineId" value="embedded" />
- <option name="fileUrl" />
- </JSRemoteDebuggerConfigurationSettings>
- <method />
- </configuration>
<configuration default="true" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda">
<predefined_log_file id="RUBY_TESTUNIT" enabled="true" />
<module name="" />
@@ -559,22 +587,22 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="378" y="164" width="1385" height="783" extended-state="0" />
+ <frame x="366" y="229" width="1385" height="783" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32907802" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32907802" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31362274" sideWeight="0.67" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3188623" sideWeight="0.67" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32907802" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32907802" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
@@ -624,13 +652,6 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/views/users/_form.html.erb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/config/locales/pt-BR.yml">
<provider selected="true" editor-type-id="text-editor">
<state line="2" column="8" selection-start="0" selection-end="65" vertical-scroll-proportion="0.05">
@@ -708,30 +729,37 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/db/schema.rb">
+ <entry file="file://$PROJECT_DIR$/app/models/user.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="74" selection-start="332" selection-end="332" vertical-scroll-proportion="0.0">
+ <state line="26" column="4" selection-start="545" selection-end="545" vertical-scroll-proportion="0.9644513">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/db/migrate/20111119190729_add_indexes.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="0" selection-start="295" selection-end="295" vertical-scroll-proportion="0.0">
+ <state line="13" column="0" selection-start="295" selection-end="295" vertical-scroll-proportion="0.3151515">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/stats_controller.rb">
+ <entry file="file://$PROJECT_DIR$/db/schema.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="5" column="74" selection-start="332" selection-end="332" vertical-scroll-proportion="0.096969694">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/models/user.rb">
+ <entry file="file://$PROJECT_DIR$/config/routes.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="9" column="22" selection-start="279" selection-end="304" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/controllers/stats_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="4" selection-start="545" selection-end="545" vertical-scroll-proportion="0.6429675">
+ <state line="8" column="36" selection-start="300" selection-end="300" vertical-scroll-proportion="0.19783616">
<folding />
</state>
</provider>
View
2 app/controllers/stats_controller.rb
@@ -1,6 +1,6 @@
class StatsController < ApplicationController
- COLORS = %w(#8DD3C7 #FFFFB3 #BEBADA #FB8072 #80B1D3 #FDB462 #B3DE69 #FCCDE5 #D9D9D9 #BC80BD #CCEBC5 #FFED6F)
+ COLORS = %w(8DD3C7 FFFFB3 BEBADA FB8072 80B1D3 FDB462 B3DE69 FCCDE5 D9D9D9 BC80BD CCEBC5 FFED6F)
def index
month_names = %w(JAN FEV MAR ABR MAI JUN JUL AGO SET OUT NOV DEZ)

No commit comments for this range

Something went wrong with that request. Please try again.