73 Commits

Author SHA1 Message Date
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
b1bb0f69ad Sign in back to original 2017-03-28 13:06:17 -04:00
cole m alban
c92bac542d Fix error with double render 2017-03-28 13:05:17 -04:00
Okechi Onyeje
a7aa6b7768 vs code launcher config files 2017-03-17 14:01:37 -04:00
cole m alban
72b547dead Add grade insertion 2017-03-03 15:52:03 -05:00
cole m alban
5d35e732fc change setup scripts 2017-03-03 11:43:30 -05: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
cole m alban
e9e19fc037 Setup changed for db 2017-03-03 09:57:22 -05:00
cole m alban
c3e32ee7ba Add migrate runs script 2017-03-01 17:19:38 -05:00
cole alban
4f1715023b Add initial admin setup 2017-02-24 15:38:21 -05:00
cole alban
da0d2a215d Finish part 1 of db 2017-02-24 15:14:15 -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
cole alban
c0b2c96d11 fix mysql 2017-02-24 14:46:28 -05:00
Okechi Onyeje
66dfc7d12c Merged branch Admin-Display-All-Company-Runs into master 2017-02-24 14:39:20 -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
cole m alban
4783f37dcc Removed dead code from apartment config file 2017-02-23 12:03:59 -05:00
cole m alban
80d4df4b34 Add migration script for aws->local server data migration 2017-02-22 16:22:05 -05:00
Okechi Onyeje
a2d7d91615 Merged branch Create-Grades-Tab-For-Company-Users into master 2017-02-16 16:10:37 -05:00
Okechi Onyeje
15492253da Grades Tab implemented for Company Users 2017-02-16 16:10:22 -05:00
Okechi Onyeje
1156f37b26 Merged branch Schema-Redirect-By-Company into master 2017-02-16 12:38:43 -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
ac0ab198cb Merged branch User-Sign-In-Sign-Up into master 2017-02-09 14:09:42 -05:00
Okechi Onyeje
af447f1493 schema fix 2017-02-09 14:09:35 -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
bmv root
72fe53bff2 Db config 2017-02-02 12:19:28 -05:00
Okechi Onyeje
64b26077d2 Merged branch master into User-Sign-In-Sign-Up 2017-02-02 11:46:21 -05:00
Okechi Onyeje
f76c3a9e2c Merged branch Result-Show-Route into master 2017-01-20 11:48:50 -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
36c641d236 Merged branch master into User-Sign-In-Sign-Up 2017-01-20 02:47:16 -05:00
Okechi Onyeje
e127b930a2 Merged branch Companies into master 2017-01-20 02:40:59 -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