Index: /trunk/src/grails-app/conf/BootStrap.groovy
===================================================================
--- /trunk/src/grails-app/conf/BootStrap.groovy (revision 39)
+++ /trunk/src/grails-app/conf/BootStrap.groovy (revision 40)
@@ -44,12 +44,28 @@
//Person
new Person(personGroup:PersonGroup.get(1),
- firstName:"Craig",
- lastName:"SuperTech").save()
+ firstName:"Admin",
+ lastName:"Powers",
+ userId:"admin",
+ password:"pass").save()
+ new Person(personGroup:PersonGroup.get(1),
+ firstName:"User",
+ lastName:"Tester",
+ userId:"user",
+ password:"pass").save()
+ new Person(personGroup:PersonGroup.get(1),
+ firstName:"Craig",
+ lastName:"SuperTech",
+ userId:"craig",
+ password:"pass").save()
new Person(personGroup:PersonGroup.get(2),
- firstName:"Joe",
- lastName:"Samples").save()
+ firstName:"Joe",
+ lastName:"Samples",
+ userId:"joe",
+ password:"pass").save()
new Person(personGroup:PersonGroup.get(1),
- firstName:"Production",
- lastName:"Mann").save()
+ firstName:"Production",
+ lastName:"Mann",
+ userId:"Mann",
+ password:"pass").save()
//TaskGroup
@@ -64,5 +80,5 @@
//Task
new Task(taskGroup:TaskGroup.findByName("Engineering"),
- person:Person.get(1),
+ person:Person.get(3),
name:"Check specific level sensor",
description:"Has been noted as problematic, try recallibrating",
@@ -70,7 +86,13 @@
targetDate: new Date() ).save()
new Task(taskGroup:TaskGroup.findByName("Production"),
- person:Person.get(2),
+ person:Person.get(5),
name:"Production Report",
description:"Production report for specific production run or shift",
+ scheduledDate: new Date(),
+ targetDate: new Date() ).save()
+ new Task(taskGroup:TaskGroup.findByName("NewProject(s)"),
+ person:Person.get(1),
+ name:"Make killer CMMS app",
+ description:"Use Grails and get a move on!",
scheduledDate: new Date(),
targetDate: new Date() ).save()
Index: /trunk/src/grails-app/controllers/BaseController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/BaseController.groovy (revision 40)
+++ /trunk/src/grails-app/controllers/BaseController.groovy (revision 40)
@@ -0,0 +1,12 @@
+abstract class BaseController {
+ def auth() {
+ if(!session.userId) {
+ def originalRequestParams = [controller:controllerName,action:actionName]
+ originalRequestParams.putAll(params)
+ session.originalRequestParams = originalRequestParams
+ redirect(controller:'person',action:'login')
+ return false
+ }
+ }
+}
+
Index: /trunk/src/grails-app/controllers/EntryController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/EntryController.groovy (revision 39)
+++ /trunk/src/grails-app/controllers/EntryController.groovy (revision 40)
@@ -1,4 +1,6 @@
-class EntryController {
-
+class EntryController extends BaseController {
+
+ def beforeInterceptor = [action:this.&auth]
+
def index = { redirect(action:list,params:params) }
Index: /trunk/src/grails-app/controllers/EntryTypeController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/EntryTypeController.groovy (revision 39)
+++ /trunk/src/grails-app/controllers/EntryTypeController.groovy (revision 40)
@@ -1,4 +1,6 @@
-class EntryTypeController {
-
+class EntryTypeController extends BaseController {
+
+ def beforeInterceptor = [action:this.&auth]
+
def index = { redirect(action:list,params:params) }
Index: /trunk/src/grails-app/controllers/ModificationController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/ModificationController.groovy (revision 39)
+++ /trunk/src/grails-app/controllers/ModificationController.groovy (revision 40)
@@ -1,4 +1,6 @@
-class ModificationController {
-
+class ModificationController extends BaseController {
+
+ def beforeInterceptor = [action:this.&auth]
+
def index = { redirect(action:list,params:params) }
Index: /trunk/src/grails-app/controllers/ModificationTypeController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/ModificationTypeController.groovy (revision 39)
+++ /trunk/src/grails-app/controllers/ModificationTypeController.groovy (revision 40)
@@ -1,4 +1,6 @@
-class ModificationTypeController {
-
+class ModificationTypeController extends BaseController {
+
+ def beforeInterceptor = [action:this.&auth]
+
def index = { redirect(action:list,params:params) }
Index: /trunk/src/grails-app/controllers/PersonController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/PersonController.groovy (revision 39)
+++ /trunk/src/grails-app/controllers/PersonController.groovy (revision 40)
@@ -1,4 +1,6 @@
-class PersonController {
-
+class PersonController extends BaseController {
+
+ def beforeInterceptor = [action:this.&auth,except:['login', 'logout']]
+
def index = { redirect(action:list,params:params) }
@@ -80,3 +82,34 @@
}
}
+
+ def login = {
+ if (request.method == "GET") {
+ session.userId = null
+ def person = new Person()
+ }
+ else {
+ def person = Person.findByUserIdAndPassword(params.userId,params.password)
+ if (person) {
+ session.userId = person.userId
+ def redirectParams =
+ session.originalRequestParams ?
+ session.originalRequestParams : [controller:'task']
+ redirect(redirectParams)
+ }
+ else {
+ flash['message'] = 'Please enter a valid user ID and password'
+ }
+ }
+ }
+
+ def logout = {
+ session.userId = null
+ flash['message'] = 'Successfully logged out'
+ redirect(controller:'person', action:'login')
+ }
+
+ def admin = {
+ render(view:'admin')
+ }
+
}
Index: /trunk/src/grails-app/controllers/PersonGroupController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/PersonGroupController.groovy (revision 39)
+++ /trunk/src/grails-app/controllers/PersonGroupController.groovy (revision 40)
@@ -1,4 +1,6 @@
-class PersonGroupController {
-
+class PersonGroupController extends BaseController {
+
+ def beforeInterceptor = [action:this.&auth]
+
def index = { redirect(action:list,params:params) }
Index: /trunk/src/grails-app/controllers/PersonGroupTypeController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/PersonGroupTypeController.groovy (revision 39)
+++ /trunk/src/grails-app/controllers/PersonGroupTypeController.groovy (revision 40)
@@ -1,4 +1,6 @@
-class PersonGroupTypeController {
-
+class PersonGroupTypeController extends BaseController {
+
+ def beforeInterceptor = [action:this.&auth]
+
def index = { redirect(action:list,params:params) }
Index: /trunk/src/grails-app/controllers/TaskController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/TaskController.groovy (revision 39)
+++ /trunk/src/grails-app/controllers/TaskController.groovy (revision 40)
@@ -1,4 +1,6 @@
-class TaskController {
-
+class TaskController extends BaseController {
+
+ def beforeInterceptor = [action:this.&auth]
+
def index = { redirect(action:list,params:params) }
Index: /trunk/src/grails-app/controllers/TaskGroupController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/TaskGroupController.groovy (revision 39)
+++ /trunk/src/grails-app/controllers/TaskGroupController.groovy (revision 40)
@@ -1,4 +1,6 @@
-class TaskGroupController {
-
+class TaskGroupController extends BaseController {
+
+ def beforeInterceptor = [action:this.&auth]
+
def index = { redirect(action:list,params:params) }
Index: /trunk/src/grails-app/domain/Person.groovy
===================================================================
--- /trunk/src/grails-app/domain/Person.groovy (revision 39)
+++ /trunk/src/grails-app/domain/Person.groovy (revision 40)
@@ -2,4 +2,6 @@
String firstName
String lastName
+ String userId
+ String password
Integer employeeID
boolean isActive = true
@@ -17,4 +19,6 @@
firstName(maxSize:50,blank:false)
lastName(maxSize:50,blank:false)
+ userId(maxSize:8,unique:true)
+ password(maxSize:8)
employeeID(blank:true, nullable:true)
}
Index: /trunk/src/grails-app/views/_adminmenubar.gsp
===================================================================
--- /trunk/src/grails-app/views/_adminmenubar.gsp (revision 40)
+++ /trunk/src/grails-app/views/_adminmenubar.gsp (revision 40)
@@ -0,0 +1,17 @@
+
+ Home +
++ + | ++ + + | +
+ + | ++ + + | +
- Home -
-