oonyeje/Pearlception_Website_RoR
1
0
Fork 0
mirror of https://github.com/oonyeje/Pearlception_Website_RoR.git synced 2025-12-25 11:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
74 Commits 10 Branches 0 Tags
Commit Graph

44 Commits

Author SHA1 Message Date
cole m alban
13b4fdb59b Added date filtering 2017-04-05 16:57:57 -04:00
cole m alban
8e2d357c3d Started on date filtering for stats 2017-04-04 12:20:22 -04:00
cole m alban
0ffa44897a Add date filter bar to stats page 2017-03-31 16:09:16 -04:00
cole m alban
129eff3821 Fix merge conflict 2017-03-31 14:45:59 -04:00
cole m alban
d1c705846c Add flash code to registrations new view 2017-03-30 12:50:28 -04:00
Okechi Onyeje
730c399b71 adding a tab character 2017-03-30 12:32:36 -04:00
Okechi Onyeje
30dd4290c1 Merge remote-tracking branch 'refs/remotes/Pearlception_Website/master' 
Conflicts:
	Pearlception/app/controllers/registrations_controller.rb
 2017-03-30 12:28:20 -04:00
Okechi Onyeje
7f03001238 Added flash messages for company sign up 2017-03-30 12:18:07 -04:00
cole m alban
19d19b5908 Fix missing password sign up bug 2017-03-29 16:22:56 -04:00
cole m alban
9e9c471b35 Add exception handling in registrations#create method 2017-03-29 16:03:45 -04:00
cole m alban
c92bac542d Fix error with double render 2017-03-28 13:05:17 -04:00
cole m alban
3efa49e6f3 Basic stats 2017-03-03 11:26:00 -05:00
cole m alban
e7bee7002c Config basic stats view 2017-03-03 10:52:04 -05:00
cole m alban
2c15b6290e Merge branch 'master' into stats 2017-03-03 09:57:44 -05:00
cole m alban
6c2d6f4918 Merge branch 'master' of https://github.com/oonyeje/Pearlception_Website_RoR 2017-03-03 09:57:31 -05:00
bmv root
edbcd9a0e6 merge conflicts 2017-02-24 14:56:31 -05:00
bmv root
9726f8529e Pre merge 2017-02-24 14:48:43 -05:00
bmv root
b3a80da10f Changes to local 2017-02-24 14:48:07 -05:00
Okechi Onyeje
c2e780ddf5 Admin Global Data view Implemented 2017-02-24 14:37:43 -05:00
Okechi Onyeje
4c141c7a2c Added admin global company lookup for result data 
- currently a bug that is not displaying data
 2017-02-23 17:09:58 -05:00
cole m alban
cbba4fe384 setups script 2017-02-23 13:26:27 -05:00
Okechi Onyeje
eab7216058 Add auto switch to default db for admin user 2017-02-23 12:18:44 -05:00
cole m alban
fefd17ae74 Add stats page base 2017-02-23 12:17:45 -05:00
Okechi Onyeje
15492253da Grades Tab implemented for Company Users 2017-02-16 16:10:22 -05:00
Okechi Onyeje
f06c2ca057 Mutltiple database pattern for companies integrated 
- When creating a new company as an admin, a new database containing models for Runs, Grades, Results, Machines, and Oysters is migrated and created
- When a user registers, they are automatically switched to their company's db in the server
- When a user signs in they are also automatically swithched
 2017-02-16 12:34:29 -05:00
Okechi Onyeje
3f5c53d49a Company Driven login and registration implemented 
- Admins identified by serial key they register with
- User's register under a company
 2017-02-09 13:28:37 -05:00
Okechi Onyeje
3f62c9f03c forgotten files for previous commit 2017-01-20 11:48:10 -05:00
Okechi Onyeje
384033bfe6 Added Index Route to Show Result Oysters 
- set up index route to show osyters of a specific result
- set up index view, controller method, and route
- commented out debug console
 2017-01-20 11:47:52 -05:00
Okechi Onyeje
7c6cf0f38d Create implemented Company 
- Create route and view implemented with minimal info
- index implemented and shows number of registered companies
 2017-01-20 02:40:43 -05:00
Okechi Onyeje
ace1290a76 Changed Index title of dashboard for admins 2017-01-20 02:16:45 -05:00
Okechi Onyeje
82876d7e4d Merged branch master into Companies 2017-01-20 01:53:30 -05:00
Okechi Onyeje
2b6452716b Results Index route implemented 
- Dashboard overview is the results index
- No filtering based on companies yet
 2017-01-20 01:51:13 -05:00
Okechi Onyeje
f2d8ca0338 Companies Views and Controllers somewhat implemented 
- Company index route & new route implemented with views
- Company create route has issues
- Company route only accessible to admins
 2017-01-20 01:03:06 -05:00
Okechi Onyeje
c0564fff14 Added Dashboard Integration and Authentication 
- Signin and Signup views still not being shown and defaulting to default
 2017-01-20 00:51:06 -05:00
Okechi Onyeje
9d17166e8f Dashboard integrated but with errors 
- authentication routes are glitchy
- custom devise views are not being displayed properly
- routing issues and custom fields for devise routes and models
 2017-01-19 15:42:49 -05:00
Okechi Onyeje
edfee4bc8a Merge remote-tracking branch 'refs/remotes/Pearlception_Website/addViewForViewData' 
Conflicts:
	Pearlception/app/views/layouts/application.html.erb
	Pearlception/config/routes.rb
 2017-01-19 09:31:30 -05:00
cole m alban
529a5930d1 Add dashboard view 2017-01-12 16:15:37 -05:00
cole alban
6bd9c5416a Fixed issue with JS running twice 2017-01-09 17:24:17 -05:00
Okechi Onyeje
4ee7e125b0 Merge branch 'master' 
Conflicts:
	Pearlception/db/schema.rb
 2017-01-09 13:50:25 -05:00
Okechi Onyeje
14778da673 set up devise for sign up and login 
- currently working to add company_id field
 2017-01-09 13:46:23 -05:00
cole m alban
0a79b9515c Add ajax to table view 2017-01-06 17:26:33 -05:00
Cole A
92b58aa680 Connect remote dbs 2017-01-04 16:12:58 -05:00
Cole A
6b68be2b17 Fix db 2017-01-04 15:13:48 -05:00
Okechi Onyeje
0dc095aa3f initial rails setup 2017-01-03 15:41:29 -05:00