Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Batch 2 #3

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
251332b
• Employees should be able to login using their Service Numbers.
Jun 17, 2015
fec87f6
• Design should be reorganised for effective use on mobile phones
Jun 17, 2015
1b47915
• Competencies and Employees should have a many-to-many association, …
Jun 17, 2015
915ca8f
• Qualifications and Employees should have a many-to-many association…
Jun 17, 2015
25fdb93
• Spouses should be changed to “Dependants” and a column “relation” s…
Jun 17, 2015
dfb4910
• An additional class of “Promotion Date” should be added as a one-to…
Jun 17, 2015
d7f4664
• Date Pickers seem to always lose the date when editing details.
Jun 17, 2015
f01d886
• Avatars should be adjusted to fit well into the view
Jun 19, 2015
7507a6d
• Information for employees that they are able to see should be immed…
Jun 22, 2015
1e3eedd
• Each entity should have its own Index page where records are search…
Jun 23, 2015
42d62b9
• Admin should be able to activate and deactivate employees (allowing…
Jul 1, 2015
716b03e
• Records should automatically archive on a weekly basis in order to …
Jul 1, 2015
fb029ad
• A graph Gem such as Chartkick or Googlegraph to create graphs on pa…
Jul 1, 2015
ff6accc
Graphs.
Jul 7, 2015
0146836
Add Suggestions.
Jul 11, 2015
953e9c8
Announcements.
Jul 13, 2015
1aecbe3
• Geo Chart of UK with locations of all addresses of type Home
Jul 13, 2015
d287ce7
• Pie Chart of gender
Jul 13, 2015
5f9ebf3
• Column Chart of ages, with frequency along the left and age along t…
Jul 13, 2015
f6adf1f
• Bar Chart of each competence type, this should count the number of …
Jul 13, 2015
b2753e1
• Chart to show the number of each rank in the organisation, relative…
Jul 13, 2015
0a0afb8
Can you also add in a function which adds all the days where an emplo…
Jul 13, 2015
5b93438
Fix admin suggestions link.
Jul 13, 2015
6ab021b
and if a Report’s Next Date or Medical Record End Date is within 2 mo…
Jul 13, 2015
6e1163e
Use GB region in geo graphs and exclude admin from statistics.
Jul 13, 2015
bd18c7e
Fix geo graphs.
Jul 13, 2015
cc7b47e
Fix gendre field on employee form.
Jul 13, 2015
d201db4
Fix date in event graphs.
Jul 13, 2015
d38187b
Application html / undefined method `admin?' for nil:NilClass.
Jul 13, 2015
31f63f5
Fixes
Jul 13, 2015
3f08c9e
Change date format for announcements.
Jul 14, 2015
7fe2966
Fix link on log.
Jul 14, 2015
1edf6b6
Away messages add days.
Jul 14, 2015
ec37c60
Fix annouc.
Jul 14, 2015
e2aacfd
Fix
Jul 14, 2015
ad05e51
Config airbrake.
Jul 14, 2015
39e46f9
Fix abilty.
Jul 14, 2015
45bef4e
City Geo graph by markers.
Jul 14, 2015
7bf90ce
Exclude columns from resources.
Jul 14, 2015
4fb615a
Add responsive tables.
Jul 14, 2015
255f53b
Add Edit/Delete tp resources.
Jul 14, 2015
a1840ab
Fix expire date.
Jul 14, 2015
aeb0853
Show admin flashed only on home page.
Jul 14, 2015
98a2125
• Change all date selects to date-picker, including Passport expiry w…
Jul 20, 2015
ad61c35
• Remove timezone from datestamp views.
Jul 20, 2015
a57bd8d
Add devise invation.
Jul 20, 2015
8611ab7
Config s3 for paperclip.
Jul 20, 2015
3010d8c
Remove confirmate.
Jul 20, 2015
228c2dc
Fix meta.
Jul 20, 2015
55ae7c9
Just noticed that it seems that the admin can no longer create Qualif…
Jul 22, 2015
09fa719
undefined method `strftime' for nil:NilClass.
Jul 22, 2015
fd956ad
Remove AWS credentials.
Jul 22, 2015
af4e445
Fix datepicker.
Aug 19, 2015
d3b982a
Promotion dates graphs.
Aug 20, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove AWS credentials.
Vitaliy Babiychuck committed Aug 19, 2015
commit fd956adf7681be3232ad0b1180b04d1874382ab4
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
AWS_ACCESS_KEY_ID=AKIAJVTWCDBNIHNMJ6QQ
AWS_SECRET_ACCESS_KEY=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
S3_BUCKET=1rlclad
AWS_BUCKET=1rlclad
4 changes: 2 additions & 2 deletions app/models/employee.rb
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ def next_away_event
square: '200x200#',
medium: '300x300>'
},
storage: :s3,
storage: (Rails.env.production? ? :s3 : :filesystem),
s3_credentials: Proc.new{|a| a.instance.s3_credentials }


@@ -95,7 +95,7 @@ def self.find_for_database_authentication(warden_conditions)
end

def s3_credentials
{ bucket: '1rlc-lad', access_key_id: 'AKIAJQWRPNG3BF7RWHNQ', secret_access_key: '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' }
{ bucket: ENV['AWS_BUCKET'], access_key_id: ENV['AWS_ACCESS_KEY_ID'], secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'] }
end

private