Changeset 127

Timestamp:

May 6, 2009, 3:40:07 AM (16 years ago)

Author:

gav

Message:

Logins now route through a welcome action to allow flash message and user environment setup. Session timeout now user configurable and defaults to 12 hours. Work on Planned Maintenance.

Location:

trunk

Files:

• doc/Definitions/PlannedMaintenance_PM.txt (added)
• doc/Definitions/TaskTerms.txt (modified) (2 diffs)
• doc/gnuMimsErd.dia (modified) (previous)
• grails-app/conf/BootStrap.groovy (modified) (1 diff)
• grails-app/conf/SecurityConfig.groovy (modified) (3 diffs)
• grails-app/controllers/AppCoreController.groovy (modified) (2 diffs)
• grails-app/domain/MaintenanceAction.groovy (modified) (3 diffs)
• grails-app/domain/Person.groovy (modified) (2 diffs)
• grails-app/domain/RecurringSchedule.groovy (modified) (2 diffs)
• grails-app/views/appCore/changeSessionTimeout.gsp (added)
• grails-app/views/appCore/options.gsp (modified) (1 diff)
• src/templates (added)

trunk/doc/Definitions/TaskTerms.txt

@@ +1 @@
+Intro
+
+ * Tasks may have one parent task and many sub tasks.
+ * Tasks may have a recurring schedule.
+ * Tasks with an enabled recurring schedule automatically generate subTasks.
+ * Tasks may have many "work done" or "fault" entries.
+
 Task terms and definitions.
 
@@ -54 +61 @@
                 - Default = Normal.
                 - Of Class TaskPriority.
-                - One of Low, Normal, High, Immediate.
+                - One of Normal, Low, High, Immediate.
                 - Automagically set to High if Unscheduled Breakin?
                 - Automagically set to ?

trunk/grails-app/conf/BootStrap.groovy

@@ -242 +242 @@
         def taskPriorityInstance
 
+        taskPriorityInstance = new TaskPriority(name:"Normal")
+        BootStrapSaveAndTest(taskPriorityInstance)
+
         taskPriorityInstance = new TaskPriority(name:"Low")
-        BootStrapSaveAndTest(taskPriorityInstance)
-
-        taskPriorityInstance = new TaskPriority(name:"Normal")
         BootStrapSaveAndTest(taskPriorityInstance)
 

trunk/grails-app/conf/SecurityConfig.groovy

@@ -1 +1 @@
 security {
+
+    def authenticateService
 
         // see DefaultSecurityConfig.groovy for all settable/overridable properties
@@ -46 +48 @@
 
     //We always want to go to the home page so that bookmarks are not used.
-    defaultTargetUrl = '/appCore/home'
+    defaultTargetUrl = '/appCore/welcome'
     alwaysUseDefaultTargetUrl = true
 
@@ -61 +63 @@
     cacheUsers = false
 
+//    //List for and events and run the closure(s) that follow.
+//    //Unfortunately the session is not available yet so many things can't be done here, us an defaultTargetUrl and controller.
+//    useSecurityEventListener = true
+//
+//    onAuthenticationSuccessEvent = { e, appCtx ->
+//        def p = e.source.principal
+//        def personInstance = Person.findByLoginName(p.username)
+//        println p.username
+//        println personInstance.loginName
+//        println personInstance.firstName
+//    }
+
 }

trunk/grails-app/controllers/AppCoreController.groovy

@@ -10 +10 @@
     //def allowedMethods = [delete:'POST', save:'POST', update:'POST']
 
+    def welcome = {
+        def personInstance = Person.get(authenticateService.userDomain().id)
+        flash.message = "Welcome, ${personInstance.firstName} ${personInstance.lastName}."
+
+        def sess = getSession()
+        sess.setMaxInactiveInterval(personInstance.sessionTimeout)
+        redirect(action:home)
+    }
+
     def home = {
     }
@@ -15 +24 @@
     def options = {
     }
+
+    def changeSessionTimeout = {
+        if (request.method == 'GET') {
+            def personInstance = Person.get(authenticateService.userDomain().id)
+            return [ personInstance : personInstance ]       
+        }
+        if (request.method == 'POST') {
+            def personInstance = Person.get(authenticateService.userDomain().id)
+//             personInstance.sessionTimeout = params.sessionTimeout.toInteger()
+                personInstance.properties = params
+                if (!personInstance.hasErrors() && personInstance.save()) {
+                    def sess = getSession()
+                    sess.setMaxInactiveInterval(personInstance.sessionTimeout)
+                    flash.message = "Session timeout changed."
+                    redirect(action:options)
+                }
+                else {
+                    render(view:'changeSessionTimeout',model:[personInstance:personInstance])
+                }
+        }
+    }         
 
     def changePassword = {

trunk/grails-app/domain/MaintenanceAction.groovy

@@ -1 @@
-class MaintenanceAction {
+class TaskAction {
+    Task task
     MaintenancePolicy maintenancePolicy
-    PlannedMaintenance plannedMaintenance
     SystemSection systemSection
     Asset asset
@@ -8 +8 @@
     SubAssembly subAssembly
     ComponentItem componentItem
-    String maintenanceAction
+    String action
     String reasoning = ""
-    Integer pmStepNumber
+    Integer stepNumber
     boolean isActive = true
 
 //     static hasMany = []
 
-    static belongsTo = [PlannedMaintenance]
+//     static belongsTo = []
 
     static constraints = {
@@ -24 +24 @@
         subAssembly(blank:true, nullable:true)
         componentItem(blank:true, nullable:true)
-        pmStepNumber(blank:true, nullable:true)
+        stepNumber(blank:true, nullable:true)
     }
 

trunk/grails-app/domain/Person.groovy

@@ -13 +13 @@
     String lastName
     String employeeID
+
+    /* Set after login by 'welcome' action, default to 12 hours, aka "sess.setMaxInactiveInterval(seconds) */
+    Integer sessionTimeout = 720
 
         /** MD5 Password */
@@ -42 +45 @@
         //So we need to use pass for validation then encode it for above.
         pass(blank: false, minSize:4)
+        sessionTimeout(min:60, max:720)
 
         }

trunk/grails-app/domain/RecurringSchedule.groovy

@@ -1 @@
-class RecurringSchedule {
+class TaskRecurringSchedule {
 
     Task task
+//     Task lastGeneratedSubTask
     Period period
-    PlannedMaintenance plannedMaintenance
 
     Integer recurEvery
     Date startDate = new Date()
-    Date lastExecutedDate
+    Date lastGeneratedDate
     Date nextDueDate
     boolean isActive = true
@@ -16 +16 @@
 
     static constraints = {
-        plannedMaintenance(blank:true, nullable:true)
-        lastExecutedDate(blank:true, nullable:true)
+//         lastGeneratedDate(blank:true, nullable:true)
     }
 

trunk/grails-app/views/appCore/options.gsp

@@ -17 +17 @@
             <div class="dialog">
             <a href="${createLink(action:'changePassword')}">Change Password</a>
-
+            <br />
+            <br />
+            <a href="${createLink(action:'changeSessionTimeout')}">Change Session Timeout</a>
             </div>
         </div>